|
|
b2aa499a59
|
conflict resolved
|
2026-05-31 20:10:39 +02:00 |
|
|
|
413b0df60b
|
Return of the settings.json
|
2026-05-27 21:34:20 +02:00 |
|
|
|
1593daae43
|
Merge pull request 'dira-minigame' (#26) from dira-minigame into main
Reviewed-on: #26
Reviewed-by: Trubkokrtek <agentdominik707@gmail.com>
|
2026-05-27 21:33:45 +02:00 |
|
|
|
13f62000b3
|
Some conflicts resolved
|
2026-05-27 21:32:22 +02:00 |
|
|
|
e96ce2de20
|
Merge pull request 'Fix player name UI and persist name between menu scenes' (#15) from eda-fix-errors into main
Reviewed-on: #15
Reviewed-by: Trubkokrtek <agentdominik707@gmail.com>
|
2026-05-24 11:41:13 +02:00 |
|
|
|
d0f89893a5
|
Resolved conflict
|
2026-05-24 11:40:14 +02:00 |
|
|
|
015c9b5caa
|
Merge pull request 'HappyWheelMinigame' (#11) from HappyWheelMinigame into main
Reviewed-on: #11
Reviewed-by: Trubkokrtek <agentdominik707@gmail.com>
|
2026-05-24 11:29:36 +02:00 |
|
|
|
31522cda01
|
conflict resolved
|
2026-05-24 11:28:32 +02:00 |
|
gravitrax-bublina
|
213e894640
|
Remove unused placeholder model asset
|
2026-05-22 20:52:55 +02:00 |
|
|
|
dea21e2af5
|
Merge pull request 'find-the-sweet-spot' (#25) from find-the-sweet-spot into main
Reviewed-on: #25
|
2026-05-21 20:14:38 +02:00 |
|
|
|
4f9aa12cad
|
Merge pull request 'Eda minigame but new branch' (#22) from EdaSweeSpotMinigame into main
Reviewed-on: #22
|
2026-05-21 20:00:31 +02:00 |
|
gravitrax-bublina
|
abc5801b18
|
Remove unused placeholder model assets
|
2026-05-21 19:57:45 +02:00 |
|
gravitrax-bublina
|
f427dbb6e7
|
Move minigame audio into Assets
|
2026-05-21 19:57:39 +02:00 |
|
gravitrax-bublina
|
2d5b6fae60
|
Remove unused placeholder model assets
|
2026-05-21 19:45:22 +02:00 |
|
gravitrax-bublina
|
3b2a5a0677
|
Remove unused placeholder model assets
|
2026-05-21 19:39:54 +02:00 |
|
|
|
e776b9476e
|
Revert "merge conflict"
This reverts commit 37797d5f7d.
|
2026-05-18 20:57:27 +02:00 |
|
|
|
37797d5f7d
|
merge conflict
psl co tam mám změnit?
|
2026-05-18 18:06:56 +02:00 |
|
|
|
645bc8203b
|
Minigame list update
|
2026-05-17 23:05:17 +02:00 |
|
|
|
c2566b8db0
|
Merge conflict patch and map texture update
|
2026-05-17 22:50:01 +02:00 |
|
|
|
fed08d08ad
|
Merge pull request 'Package patch' (#23) from Pajka into main
Reviewed-on: #23
|
2026-05-17 22:23:23 +02:00 |
|
|
|
843c121666
|
Package patch
|
2026-05-17 22:21:36 +02:00 |
|
|
|
a15a9790b5
|
Eda minigame but new branch
|
2026-05-17 20:44:46 +02:00 |
|
|
|
dfec8df767
|
Revert "Merge pull request 'find-the-sweet-spot' (#13) from find-the-sweet-spot into main"
This reverts commit 5b8e4eaeac, reversing
changes made to 03c0b158a4.
|
2026-05-17 20:22:01 +02:00 |
|
|
|
5b8e4eaeac
|
Merge pull request 'find-the-sweet-spot' (#13) from find-the-sweet-spot into main
Reviewed-on: #13
Reviewed-by: Trubkokrtek <agentdominik707@gmail.com>
|
2026-05-17 20:18:15 +02:00 |
|
|
|
9571be257c
|
resolved conflict
|
2026-05-17 20:17:21 +02:00 |
|
|
|
03c0b158a4
|
Merge pull request 'KeyInsertMinigame' (#16) from KeyInsertMinigame into main
Reviewed-on: #16
Reviewed-by: Trubkokrtek <agentdominik707@gmail.com>
|
2026-05-17 20:16:23 +02:00 |
|
|
|
b0945c9bdb
|
resolving conflict
|
2026-05-17 20:15:06 +02:00 |
|
|
|
28a81b6014
|
Merge pull request 'fixnuty design mapy, soubory maji dobre jmeno' (#19) from DesignMapy into main
Reviewed-on: #19
Reviewed-by: Trubkokrtek <agentdominik707@gmail.com>
|
2026-05-17 20:11:07 +02:00 |
|
|
|
ab6938e6cf
|
Merge branch 'DesignMapy' of ssh://git.honzuvkod.dev:222/BlueCabinetGames/GeoSusGame into DesignMapy
|
2026-05-17 20:09:21 +02:00 |
|
|
|
c5703fc92a
|
resolved conflicts
|
2026-05-17 20:09:05 +02:00 |
|
gravitrax-bublina
|
e4970c738f
|
Set URP pipeline assets for Happy Wheel
|
2026-05-17 15:01:07 +02:00 |
|
|
|
82c120f362
|
Merge pull request 'Assets CleanUp' (#20) from MainCleanUp into main
Reviewed-on: #20
|
2026-05-17 14:52:28 +02:00 |
|
|
|
099f3ec939
|
Assets CleanUp
|
2026-05-17 14:50:32 +02:00 |
|
gravitrax-bublina
|
bd646df706
|
Add brambora variant used by Happy Wheel scene
|
2026-05-17 14:47:47 +02:00 |
|
gravitrax-bublina
|
8ab0a350f3
|
Update Happy Wheel for current Unity version
|
2026-05-17 14:25:03 +02:00 |
|
|
|
e0a4cf31b2
|
prejmenovani souboru na mapu a design mapy fixnuto
|
2026-05-17 14:20:33 +02:00 |
|
|
|
1aa3d2a787
|
Merge pull request 'MainMenuUiBugFix' (#18) from MainMenuUiBugFix into main
Reviewed-on: #18
|
2026-05-17 13:43:04 +02:00 |
|
gravitrax-bublina
|
f9d2a951da
|
Add Happy Wheel prefab meta files
|
2026-05-17 13:31:47 +02:00 |
|
gravitrax-bublina
|
059cfa6d28
|
Add ArenaRoot prefab and prefab meta files
|
2026-05-17 13:30:45 +02:00 |
|
gravitrax-bublina
|
f2931c1c0b
|
Relink Happy Wheel scene to new prefab assets
|
2026-05-17 13:23:33 +02:00 |
|
gravitrax-bublina
|
176bb7a704
|
Update Happy Wheel scene and remaining prefabs
|
2026-05-17 12:59:09 +02:00 |
|
|
|
d7211e62de
|
Merge pull request 'Implemented ITask' (#17) from keyinsertminigame into KeyInsertMinigame
Reviewed-on: #17
|
2026-05-17 12:54:50 +02:00 |
|
gravitrax-bublina
|
2c13a899d7
|
Add missing Happy Wheel prefabs and fix scene references
|
2026-05-17 12:54:22 +02:00 |
|
|
|
a2a55a7135
|
Try of anchoring, deleted old scripts, mergable
|
2026-05-17 12:49:24 +02:00 |
|
|
|
a5e657ef05
|
Merge pull request 'opravene kabely (je jen 1 scena)' (#8) from KabelyOprava into main
Reviewed-on: #8
Reviewed-by: Trubkokrtek <agentdominik707@gmail.com>
|
2026-05-17 12:48:26 +02:00 |
|
|
|
2040b59593
|
meta patch
|
2026-05-17 12:47:09 +02:00 |
|
gravitrax-bublina
|
54bfcf745b
|
Fix player name UI and persist name between menu scenes
|
2026-05-17 12:34:22 +02:00 |
|
|
|
8bec2f0cf8
|
conflict resolve
|
2026-05-17 12:32:20 +02:00 |
|
gravitrax-bublina
|
9a99405f4b
|
Ignore .utmp temp folder
|
2026-05-17 12:15:46 +02:00 |
|
gravitrax-bublina
|
b4b746de25
|
Remove .utmp temp files from PR
|
2026-05-17 12:14:53 +02:00 |
|
