Commit Graph

214 Commits

Author SHA1 Message Date
PfandBoss
28ccaf42b3 wav imports 2022-12-10 21:38:01 +01:00
Albion
2e80c08258 projekt Godot 👀 2022-12-10 21:36:33 +01:00
Albion
379d2d095a MinigameAdded 2022-12-10 21:35:18 +01:00
PfandBoss
5b84059b8c Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 21:34:32 +01:00
PfandBoss
fb5634a938 Finnished gunpowder 2022-12-10 21:34:02 +01:00
383b22ee80 SOUND ADDED BITCH 2022-12-10 21:33:35 +01:00
PfandBoss
d4784e6cb5 Added Bin and finnished canons for train 1 2022-12-10 21:31:03 +01:00
Florian Decker
2e10a0fa64 Add light setup, scene for main level, add canon model, add generic metal materials 2022-12-10 21:09:53 +01:00
8ef7cc2507 Leo - Train pickup function 2022-12-10 20:44:43 +01:00
PfandBoss
977a451752 Cannon finished 2022-12-10 20:27:51 +01:00
PfandBoss
fb942136bf Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 20:07:02 +01:00
PfandBoss
75ad400f87 Yippi 2022-12-10 20:07:01 +01:00
Arthur
8ea8fe272a cannon 2022-12-10 20:01:26 +01:00
Arthur
bbdfd1930c clearinventory 2022-12-10 19:50:06 +01:00
Arthur
007ca92441 Added Clear Inventory 2022-12-10 19:49:09 +01:00
Arthur
c95a044347 updatet some things 2022-12-10 19:36:57 +01:00
7dd00a1936 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 18:22:02 +01:00
Arthur
591fa6c260 otter animations added 2022-12-10 18:03:32 +01:00
Arthur
8366aaf268 Added Coal Animation 2022-12-10 17:38:49 +01:00
Arthur
69b8ca643c Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 17:28:14 +01:00
Arthur
57c19def26 Added GunPowder Animation 2022-12-10 17:27:56 +01:00
Florian Decker
5ea4528ed3 new coal texture 2022-12-10 17:15:34 +01:00
9f250c0833 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 17:13:31 +01:00
a19d66f38c train 2022-12-10 17:13:28 +01:00
PfandBoss
c99a1530a2 HAllo mein schatz 2022-12-10 17:10:49 +01:00
Florian Decker
d896223fdf Add Coal Module Asset 2022-12-10 16:56:32 +01:00
e193df57ab add train 2022-12-10 16:41:10 +01:00
e78c2e088c add train 2022-12-10 16:39:18 +01:00
PfandBoss
d6821bd639 Storages fixed 2022-12-10 16:10:38 +01:00
Florian Decker
1afb543c56 Add train interior modular kit (WIP) 2022-12-10 15:47:41 +01:00
236a6f92a7 fix hitboxes 2022-12-10 15:37:20 +01:00
PfandBoss
af78a923f8 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 14:14:35 +01:00
PfandBoss
60e9d7da08 ZUg klappt meine buben 2022-12-10 14:14:33 +01:00
Albion
0655e0c942 Added fullscreen-button 2022-12-10 13:37:44 +01:00
991d21c820 Leo - Bin finished 2022-12-10 13:33:38 +01:00
PfandBoss
cd4970b2dc push ui 2022-12-10 13:20:33 +01:00
797396b4f2 Leo - storage finished2.0 2022-12-10 13:09:57 +01:00
7d8127e151 game scene 2022-12-10 13:04:31 +01:00
ecc68b73d4 game scene 2022-12-10 12:56:00 +01:00
4e42c62701 merge 2022-12-10 12:54:26 +01:00
289daadc35 make scenes 2022-12-10 12:53:38 +01:00
PfandBoss
ed89ae1cf4 Update project.godot 2022-12-10 12:45:47 +01:00
PfandBoss
1810889481 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 12:45:45 +01:00
PfandBoss
c9755bfe8c Game UI 2022-12-10 12:45:06 +01:00
642a32b56f Leo -bug fixes 2022-12-10 12:36:51 +01:00
3eae3de1ae Szenen angepasst 2022-12-10 12:33:25 +01:00
6d945ef32b Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 12:30:19 +01:00
118f910aeb Leo - Szenen angepasst 2022-12-10 12:30:06 +01:00
Arthur
a9dd03f3e9 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 12:27:42 +01:00
Arthur
5f00ff20e7 Added Trash bin 2022-12-10 12:27:28 +01:00