3002257
/
gai-ca2
forked from 2121578/gai-ca2
1
0
Fork 0
Code Pull Requests Activity
68 Commits
1 Branch
0 Tags
66 KiB
Commit Graph

68 Commits (57db80e6856ca88fad1fe4de30cd7dedfa2326b9)

Author SHA1 Message Date
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
Yan Wittmann b89131bbaa Added first real behavior 2025-01-09 17:54:24 +01:00
Yan Wittmann 3c61ce4e7f Started writing visualization and added new state machine mode 2025-01-09 16:45:32 +01:00
Yan Wittmann bfca1ff23f Started implementing behaviors 2025-01-09 13:47:40 +01:00
Yan Wittmann b3e33b7cfa Added camp functionality and started event tracking system 2025-01-09 12:43:07 +01:00
Yan Wittmann 51a04ca403 Added walk up to tile feature and navigation visualization 2025-01-09 10:55:44 +01:00
2021587 22fa9eb33e Added boat,firepit,tent,stick sprites 2025-01-08 20:44:17 +01:00
Yan Wittmann e1c87b5e4d Undid Luca and Colin changes that broke the code 2025-01-08 19:56:40 +01:00
Yan Wittmann b49d3a6d27 Merge pull request 'Interactable Items' (#4) from Interacable-Items into main 
Reviewed-on: 2121578/gai-ca2#4
 2025-01-08 18:48:55 +01:00
Yan Wittmann aee610c7a0 More PR review 2025-01-08 18:48:14 +01:00
Dominik Koschik 092203a31e berries correction 2025-01-08 18:32:50 +01:00
Dominik Koschik 1eebbfe264 added berries 2025-01-08 18:30:53 +01:00
Yan Wittmann ad3023cc44 PR review 2025-01-08 18:24:01 +01:00
Yan Wittmann 996ec1a297 Merge branch 'refs/heads/main' into Interacable-Items 
# Conflicts:
#	project/assets/tilemap/tilemaps/tilemap_objects.png
#	project/scripts/tilemap/TileMapTileTypes.gd
 2025-01-08 17:52:35 +01:00
Dominik Koschik b5b016d5d6 Merge pull request 'assets' (#3) from assets into main 
Reviewed-on: 2121578/gai-ca2#3
 2025-01-08 17:35:28 +01:00
Luca e8f9a0b163 joar 2025-01-08 17:09:28 +01:00
Luca fb84f548d4 joar 2025-01-08 15:02:00 +01:00
Luca d81f9cace8 joar 2025-01-08 14:59:29 +01:00
2021587 37f198bc95 Added sprites tiles need reconfiguration (what to do with alternate textures) 2025-01-08 01:30:55 +01:00
Yan Wittmann facdb2487a Planning doc 2025-01-07 21:14:15 +01:00
Yan Wittmann cfab98a8d0 Pathfinding improvements 2025-01-07 20:38:39 +01:00
Dominik Koschik 2d03502722 added stone,tree and fire assets 2025-01-07 18:22:02 +01:00