Commit Graph

74 Commits

Author SHA1 Message Date
PfandBoss
957e03d118 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 00:30:56 +01:00
PfandBoss
8eab12a0cd added icons when near storage 2022-12-11 00:30:50 +01:00
Albion
9d4f13c6f1 fixed minigame! 2022-12-11 00:29:32 +01:00
Arthur
8802b8643e added cannon functionality 2022-12-11 00:17:57 +01:00
Albion
e670293ee6 minigame immer noch weird 2022-12-10 23:57:05 +01:00
Albion
c8a51bd2f6 welp 2022-12-10 23:54:50 +01:00
Albion
686e73cd20 ? 2022-12-10 23:53:47 +01:00
94ea63a8ac merge 2022-12-10 23:34:26 +01:00
f7e7f43fe5 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 23:33:52 +01:00
PfandBoss
6718475504 Create game2.tscn 2022-12-10 23:33:47 +01:00
ff801db14a Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 23:32:45 +01:00
PfandBoss
eea0ae37d6 s 2022-12-10 23:32:36 +01:00
8ab2f8d3ba merge 2022-12-10 23:31:25 +01:00
7c96139422 merge 2022-12-10 23:30:49 +01:00
PfandBoss
cd6cd181d2 Sound added 2022-12-10 23:27:14 +01:00
PfandBoss
a118fad15e pop 2022-12-10 23:21:45 +01:00
PfandBoss
97a70e2737 mein 2022-12-10 23:11:38 +01:00
PfandBoss
8ce7e3081d Added shooting sound 2022-12-10 23:05:06 +01:00
e7a7ff685c FIX 2022-12-10 22:53:50 +01:00
c1bf5eb72e Train 2022-12-10 22:50:53 +01:00
e628ecd801 Train 2022-12-10 22:50:04 +01:00
a470dfeca7 Train 2022-12-10 22:49:09 +01:00
PfandBoss
12f26032aa fixing 2022-12-10 22:31:14 +01:00
PfandBoss
257db83511 Update UI.tscn 2022-12-10 21:40:46 +01:00
Albion
379d2d095a MinigameAdded 2022-12-10 21:35:18 +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
PfandBoss
75ad400f87 Yippi 2022-12-10 20:07:01 +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
57c19def26 Added GunPowder Animation 2022-12-10 17:27:56 +01:00
PfandBoss
c99a1530a2 HAllo mein schatz 2022-12-10 17:10:49 +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
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
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