|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
d7211e62de
|
Merge pull request 'Implemented ITask' (#17) from keyinsertminigame into KeyInsertMinigame
Reviewed-on: #17
|
2026-05-17 12:54:50 +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 |
|
|
|
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 |
|
|
|
023bddc91b
|
conflict partially resolved
|
2026-05-17 11:31:00 +02:00 |
|
|
|
c8d8b6b802
|
Conflict resolve
|
2026-05-17 11:25:21 +02:00 |
|
|
|
1082fc9ad0
|
plne funkcni data transfer
|
2026-05-17 10:50:17 +02:00 |
|
|
|
2ae5d28cc9
|
Implemented ITask
|
2026-05-17 10:06:36 +02:00 |
|
gravitrax-bublina
|
dd5aefcb49
|
Update Eda minigame scene and project settings
|
2026-05-17 10:03:13 +02:00 |
|
|
|
37c6d7a552
|
male zmeny
|
2026-05-11 21:31:33 +02:00 |
|
|
|
e55aa6b258
|
A completely working minigame Insert Keys, Added SFX + Light, Still not mergable - needs dev team check
|
2026-05-11 21:19:01 +02:00 |
|
|
|
d7838c0a04
|
fix mensich ui bugu na ipadech crate a join loading furt funguji divne
|
2026-05-10 17:49:03 +02:00 |
|
|
|
90fd3514fb
|
fix main menu ui designu v join loading a create podle me nejak vadi playerlistu honzuv kod a z nejakyho duvodu meni barvu nejakych tlacitek coz idk jak fixnout je take potreba zaimplementovat UiManager do designu coz idk jak udelat honzo sry pokud jsem neco omilem rozbil ale o nicem nevim
|
2026-05-10 01:15:07 +02:00 |
|
|
|
9a736e1d53
|
fix rozbiteho ui, potrbuje implementovat UiManager
|
2026-05-10 00:45:45 +02:00 |
|
|
|
2f86bab336
|
Almost comletely working minigame, but still in progress, code almost done
|
2026-05-08 10:20:22 +02:00 |
|
|
|
8948cbdb14
|
Added right numbers to keyholes, project clean up, safety commit - to not lose progress
|
2026-05-07 17:30:10 +02:00 |
|
Bandwidth
|
207f997254
|
Added better GPS handling, Improved test mode, Fixed naming of players not being broadcast until a new HelloClient, Fixed lobby restarts, Fixed task handling
|
2026-04-27 23:18:13 +02:00 |
|
|
|
f9ceea4992
|
Small asset clean-up
|
2026-04-26 21:57:42 +02:00 |
|
Bandwidth
|
d886f97e14
|
GeoSus
|
2026-04-26 20:49:32 +02:00 |
|
|
|
e0b808faed
|
Zabiju je 2. Epicky thriller od tvurce Zabiju je
|
2026-04-26 14:58:39 +02:00 |
|
|
|
666f731b6d
|
Created base UI of the minigame, added keyslots
|
2026-04-26 14:51:45 +02:00 |
|
|
|
700e6bfbfc
|
Zabiju je
|
2026-04-26 13:30:33 +02:00 |
|
|
|
ab6263cb10
|
skybox,design domecku a cest
|
2026-04-26 13:17:30 +02:00 |
|
|
|
f800e78f14
|
kontrola simulace na telefonu
|
2026-04-26 11:40:58 +02:00 |
|
|
|
e29581cc21
|
opravene kabely (je jen 1 scena)
|
2026-04-26 10:30:47 +02:00 |
|
|
|
208696487e
|
Mergnuta minihra
|
2026-04-26 09:11:01 +02:00 |
|
|
|
3879c0879d
|
Added Textures and models of key&keyhole
|
2026-04-25 22:50:53 +02:00 |
|
|
|
1de91b0d57
|
Hra kabely
|
2026-03-28 19:28:59 +01:00 |
|
|
|
b0e90221dc
|
fixed merges
|
2026-03-28 11:19:27 +01:00 |
|
|
|
dcb1066d80
|
Fixed merge conflict
|
2026-03-28 11:18:01 +01:00 |
|
|
|
d80ac111c2
|
Removed meta files
|
2026-03-28 11:06:53 +01:00 |
|
