3002257
/
gai-ca2
forked from 2121578/gai-ca2
1
0
Fork 0
Code Pull Requests Activity
89 Commits
1 Branch
0 Tags
4.7 MiB
Commit Graph

89 Commits (3b4d8a4d8e6965743d7f9e27305225b2e6a25dd8)

Author SHA1 Message Date
Yan Wittmann 3b4d8a4d8e Merge pull request 'CampAndInventoryUI' (#8) from CampAndInventoryUI into main 
Reviewed-on: 2121578/gai-ca2#8
 2025-01-14 21:37:23 +01:00
Yan Wittmann 3d716ed06d Added "better" implementation for camp UI 2025-01-14 21:37:13 +01:00
Yan Wittmann f3f4cef1bf Added image files back in 2025-01-14 19:30:01 +01:00
Yan Wittmann 263816fa53 Merge branch 'main' into CampAndInventoryUI 2025-01-14 19:26:43 +01:00
Luca 08647a4188 BoatParrtProgress und CampUI hinzugefügt 2025-01-14 19:25:18 +01:00
Yan Wittmann 7a18765ebd Added images 2025-01-14 19:21:08 +01:00
Yan Wittmann da1fdf10d0 Some more adjustments to the map 2025-01-14 12:11:45 +01:00
Yan Wittmann 624c14150e Made exploration task smarter by canceling if was close once 2025-01-14 12:01:11 +01:00
Yan Wittmann a75eb4aa1d Adjusted map, added key to set exploration goal 2025-01-14 11:35:16 +01:00
Yan Wittmann 28c9b857bd Added outro sequence 2025-01-14 10:13:35 +01:00
Yan Wittmann 2e1559d96e Added clock timer 2025-01-14 09:43:53 +01:00
Yan Wittmann 9822c716f2 Added instructions on how to play during gameplay 2025-01-13 20:12:42 +01:00
Yan Wittmann b187b96507 Added graphedit node highlighting and scrolling 2025-01-13 19:30:46 +01:00
Yan Wittmann fcbd269f68 FINALLY, A WORKING TREE DISTRIBUTION ALGORITHM 2025-01-13 18:57:05 +01:00
Yan Wittmann b3220f968d Merge pull request 'IntroAndTastaturLayout' (#7) from IntroAndTastaturLayout into main 
Reviewed-on: 2121578/gai-ca2#7
 2025-01-13 18:18:06 +01:00
Yan Wittmann dc3ead30b4 Added auto-waking toggle with auto-follow and zoom, and better different screen sizes support 2025-01-13 18:17:25 +01:00
Crazyrx7 d026c07804 Fade-in mit tastaturlayout hinzugefügt 2025-01-13 11:37:55 +01:00
Crazyrx7 4b8479e87e Fade-in bei Spielstart into Tastaturlayout und bei Tastendruck gehts dann los 2025-01-13 11:35:12 +01:00
Yan Wittmann d8bc800077 Initial version of a tree visualizer 2025-01-12 17:45:21 +01:00
Yan Wittmann 0becddf3d2 Campfire and sleep mechanic 2025-01-12 16:28:36 +01:00
Yan Wittmann cd01fd24a2 Made UI more modular 2025-01-12 15:04:17 +01:00
Yan Wittmann 57db80e685 Added exploration behavior 2025-01-12 14:37:40 +01:00
Yan Wittmann 268f2c0ce1 Game now finally works somewhat properly 2025-01-11 19:05:03 +01:00
Yan Wittmann 4763de9827 Attempt #1 at fixing main 2025-01-11 17:43:13 +01:00
Yan Wittmann 238af1cc83 Merge branch 'working-map' 
# Conflicts:
#	project/main-scenes/island.tscn
 2025-01-11 17:40:50 +01:00
Yan Wittmann cd82cf5bdf Fixed up tilemap and content 2025-01-11 17:39:37 +01:00
2021587 2923738906 now its only the gameworld 2025-01-11 17:00:31 +01:00
2021587 8bbca6cef5 Revert "added game world" 
This reverts commit 7304b48f3c.
 2025-01-11 16:59:42 +01:00
2021587 7304b48f3c added game world 2025-01-11 16:59:08 +01:00
Yan Wittmann 9446c10556 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	project/assets/tilemap/tileset.tres
#	project/main-scenes/island.tscn
 2025-01-11 16:15:03 +01:00
Yan Wittmann 731ff9ed12 Initial version of boat construction 2025-01-11 16:09:10 +01:00
2021587 f27f1b944a added game world 2025-01-11 16:07:18 +01:00
Yan Wittmann ed665886d3 Added visualizer for events tracker 2025-01-11 14:34:30 +01:00
Yan Wittmann 75af4679c0 Bush/Tree refill, fast-forward, fixed item drop incorrect item 2025-01-11 14:05:45 +01:00
Yan Wittmann 947b762774 Added current inventory item visualization and improved UI management 2025-01-11 13:43:57 +01:00
Yan Wittmann 7d5f91adcb Fixed temperature bar 2025-01-11 13:15:28 +01:00
Yan Wittmann 5c0fc2beed Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	project/scripts/global/GameManager.gd
#	project/scripts/player/PlayerManager.gd
 2025-01-11 13:09:54 +01:00
Luca e36bbd36dc anzeigen hinzugefuegt 2025-01-11 13:05:08 +01:00
Luca fe7db59dd8 values werden jetzt in den StatusBars angezeigt und aktualisiert 2025-01-11 13:01:03 +01:00
Yan Wittmann 30ee500ae9 Started temperature implementation 2025-01-11 12:58:45 +01:00
2021587 e280b7dc72 fix? 2025-01-11 11:40:02 +01:00
2021587 658c5811dd fixxed texture 2025-01-11 11:38:06 +01:00
Dominik Koschik 09bcacf75e Added snow 2025-01-11 11:30:50 +01:00
Yan Wittmann 162812b9c7 Temperature layer will no longer be updated by testing behaviors 2025-01-11 11:14:53 +01:00
Yan Wittmann a4ee7cc336 Added function to access textures 2025-01-11 11:13:08 +01:00
Luca Ahlf deb896bf17 Merge pull request 'StatusBars' (#6) from StatusBars into main 
Reviewed-on: 2121578/gai-ca2#6
 2025-01-11 11:11:48 +01:00
Luca fc1795529e Island Scene die gefehlt hatte 2025-01-11 11:02:18 +01:00
Yan Wittmann 46ad66380d Configured shader once again 2025-01-11 10:23:34 +01:00
Yan Wittmann 798c3c4fa1 Added missing shaders 2025-01-11 10:22:09 +01:00
Luca 93e3a26b24 Statusbars und TemperatureLayerToggle hinzugefügt 2025-01-10 20:45:33 +01:00