232 Commits

Author SHA1 Message Date
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
Florian Decker
5942d5bf5a rails 2022-12-10 22:56:38 +01:00
PfandBoss
756e555aed Bub 2022-12-10 22:54:48 +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
001f29cb39 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 22:31:21 +01:00
PfandBoss
12f26032aa fixing 2022-12-10 22:31:14 +01:00
Florian Decker
400cd5265b Pipes , lamp, canonball 2022-12-10 22:14:35 +01:00
d303e8ba89 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 21:42:49 +01:00
c817582204 Better Anim 2022-12-10 21:42:41 +01:00
PfandBoss
257db83511 Update UI.tscn 2022-12-10 21:40:46 +01:00
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