Commit Graph

Select branches

Hide Pull Requests

Albionium

main

Mono Color

• 6718475504 Create game2.tscn PfandBoss 2022-12-10 23:33:47 +01:00
• ff801db14a Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 Lukas Moungos 2022-12-10 23:32:45 +01:00
• eea0ae37d6 s PfandBoss 2022-12-10 23:32:36 +01:00
• 8ab2f8d3ba merge Lukas Moungos 2022-12-10 23:31:25 +01:00
• 7c96139422 merge Lukas Moungos 2022-12-10 23:30:49 +01:00
• cd6cd181d2 Sound added PfandBoss 2022-12-10 23:27:14 +01:00
• a118fad15e pop PfandBoss 2022-12-10 23:21:45 +01:00
• 97a70e2737 mein PfandBoss 2022-12-10 23:11:38 +01:00
• 8ce7e3081d Added shooting sound PfandBoss 2022-12-10 23:05:06 +01:00
• 5942d5bf5a rails Florian Decker 2022-12-10 22:56:38 +01:00
• 756e555aed Bub PfandBoss 2022-12-10 22:54:48 +01:00
• e7a7ff685c FIX Lukas Moungos 2022-12-10 22:53:50 +01:00
• c1bf5eb72e Train Lukas Moungos 2022-12-10 22:50:53 +01:00
• e628ecd801 Train Lukas Moungos 2022-12-10 22:50:04 +01:00
• a470dfeca7 Train Lukas Moungos 2022-12-10 22:49:09 +01:00
• 001f29cb39 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 PfandBoss 2022-12-10 22:31:21 +01:00
• 12f26032aa fixing PfandBoss 2022-12-10 22:31:14 +01:00
• 400cd5265b Pipes , lamp, canonball Florian Decker 2022-12-10 22:14:35 +01:00
• d303e8ba89 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 Lukas Moungos 2022-12-10 21:42:49 +01:00
• c817582204 Better Anim Lukas Moungos 2022-12-10 21:42:41 +01:00
• 257db83511 Update UI.tscn PfandBoss 2022-12-10 21:40:46 +01:00
• 28ccaf42b3 wav imports PfandBoss 2022-12-10 21:38:01 +01:00
• 2e80c08258 projekt Godot 👀 Albion 2022-12-10 21:36:33 +01:00
• 379d2d095a MinigameAdded Albion 2022-12-10 21:35:18 +01:00
• 5b84059b8c Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 PfandBoss 2022-12-10 21:34:32 +01:00
• fb5634a938 Finnished gunpowder PfandBoss 2022-12-10 21:34:02 +01:00
• 383b22ee80 SOUND ADDED BITCH INoro 2022-12-10 21:33:35 +01:00
• d4784e6cb5 Added Bin and finnished canons for train 1 PfandBoss 2022-12-10 21:31:03 +01:00
• 2e10a0fa64 Add light setup, scene for main level, add canon model, add generic metal materials Florian Decker 2022-12-10 21:09:53 +01:00
• 8ef7cc2507 Leo - Train pickup function INoro 2022-12-10 20:44:43 +01:00
• 977a451752 Cannon finished PfandBoss 2022-12-10 20:27:51 +01:00
• fb942136bf Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 PfandBoss 2022-12-10 20:07:02 +01:00
• 75ad400f87 Yippi PfandBoss 2022-12-10 20:07:01 +01:00
• 8ea8fe272a cannon Arthur 2022-12-10 20:01:26 +01:00
• bbdfd1930c clearinventory Arthur 2022-12-10 19:50:06 +01:00
• 007ca92441 Added Clear Inventory Arthur 2022-12-10 19:49:09 +01:00
• c95a044347 updatet some things Arthur 2022-12-10 19:36:57 +01:00
• 7dd00a1936 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 Lukas Moungos 2022-12-10 18:22:02 +01:00
• 591fa6c260 otter animations added Arthur 2022-12-10 18:03:32 +01:00
• 8366aaf268 Added Coal Animation Arthur 2022-12-10 17:38:49 +01:00
• 69b8ca643c Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 Arthur 2022-12-10 17:28:14 +01:00
• 57c19def26 Added GunPowder Animation Arthur 2022-12-10 17:27:56 +01:00
• 5ea4528ed3 new coal texture Florian Decker 2022-12-10 17:15:34 +01:00
• 9f250c0833 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 Lukas Moungos 2022-12-10 17:13:31 +01:00
• a19d66f38c train Lukas Moungos 2022-12-10 17:13:28 +01:00
• c99a1530a2 HAllo mein schatz PfandBoss 2022-12-10 17:10:49 +01:00
• d896223fdf Add Coal Module Asset Florian Decker 2022-12-10 16:56:32 +01:00
• e193df57ab add train Lukas Moungos 2022-12-10 16:41:10 +01:00
• e78c2e088c add train Lukas Moungos 2022-12-10 16:39:18 +01:00
• d6821bd639 Storages fixed PfandBoss 2022-12-10 16:10:38 +01:00
• 1afb543c56 Add train interior modular kit (WIP) Florian Decker 2022-12-10 15:47:41 +01:00
• 236a6f92a7 fix hitboxes Lukas Moungos 2022-12-10 15:37:20 +01:00
• af78a923f8 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 PfandBoss 2022-12-10 14:14:35 +01:00
• 60e9d7da08 ZUg klappt meine buben PfandBoss 2022-12-10 14:14:33 +01:00
• 0655e0c942 Added fullscreen-button Albion 2022-12-10 13:37:44 +01:00
• 991d21c820 Leo - Bin finished INoro 2022-12-10 13:33:38 +01:00
• cd4970b2dc push ui PfandBoss 2022-12-10 13:20:33 +01:00
• 797396b4f2 Leo - storage finished2.0 INoro 2022-12-10 13:09:57 +01:00
• 7d8127e151 game scene Lukas Moungos 2022-12-10 13:04:31 +01:00
• ecc68b73d4 game scene Lukas Moungos 2022-12-10 12:56:00 +01:00
• 4e42c62701 merge Lukas Moungos 2022-12-10 12:54:26 +01:00
• 289daadc35 make scenes Lukas Moungos 2022-12-10 12:53:38 +01:00
• ed89ae1cf4 Update project.godot PfandBoss 2022-12-10 12:45:47 +01:00
• 1810889481 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 PfandBoss 2022-12-10 12:45:45 +01:00
• c9755bfe8c Game UI PfandBoss 2022-12-10 12:45:06 +01:00
• 642a32b56f Leo -bug fixes INoro 2022-12-10 12:36:51 +01:00
• 3eae3de1ae Szenen angepasst INoro 2022-12-10 12:33:25 +01:00
• 6d945ef32b Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 INoro 2022-12-10 12:30:19 +01:00
• 118f910aeb Leo - Szenen angepasst INoro 2022-12-10 12:30:06 +01:00
• a9dd03f3e9 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 Arthur 2022-12-10 12:27:42 +01:00
• 5f00ff20e7 Added Trash bin Arthur 2022-12-10 12:27:28 +01:00
• 604e195f1c Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 Lukas Moungos 2022-12-10 12:21:55 +01:00
• 1fd9a1c366 players Lukas Moungos 2022-12-10 12:21:32 +01:00
• c00792a810 Engine logic update Arthur 2022-12-10 12:19:55 +01:00
• fbb96edc50 Engine.gd Speed dependencies Arthur 2022-12-10 12:16:04 +01:00
• 64197ae3c9 Update Cannon.gd PfandBoss 2022-12-10 11:44:43 +01:00
• aaa8be864a sds PfandBoss 2022-12-10 11:32:13 +01:00
• d52af547ed fix transforms Lukas Moungos 2022-12-10 10:42:20 +01:00
• d5c7539df0 game scene Lukas Moungos 2022-12-10 10:40:31 +01:00
• 4cc4b47966 Soundbus Albion 2022-12-10 10:40:00 +01:00
• cbddbca96c merge Lukas Moungos 2022-12-10 10:36:16 +01:00
• cb097aec94 add fake splitscreen Lukas Moungos 2022-12-10 10:35:03 +01:00
• 5f02f31566 push push PfandBoss 2022-12-10 10:32:39 +01:00
• ffe9b2f047 Adds PfandBoss 2022-12-10 09:49:40 +01:00
• 5b74f2c77a Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 Lukas Moungos 2022-12-10 09:38:24 +01:00
• 2fb20600e2 delete gitignore files Lukas Moungos 2022-12-10 09:38:18 +01:00
• 7c076dbebb delete gitignore files Lukas Moungos 2022-12-10 09:37:51 +01:00
• 9f6f423179 Auto stash before merge of "main" and "origin/main" Albion 2022-12-10 09:37:01 +01:00
• 23f14286fd merge Lukas Moungos 2022-12-10 09:34:32 +01:00
• 900e550976 add gitignore Lukas Moungos 2022-12-10 09:30:28 +01:00
• 8369e7b718 oops Albion 2022-12-10 09:26:52 +01:00
• d12388e268 Merge remote-tracking branch 'origin/main' into main Albion 2022-12-10 09:21:04 +01:00
• 5990c2ad91 inputs Lukas Moungos 2022-12-10 09:19:03 +01:00
• 06a5ced5d3 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 Lukas Moungos 2022-12-10 09:16:27 +01:00
• e45e95b5ff revert Lukas Moungos 2022-12-10 09:16:22 +01:00
• 742e4e2abb Auto stash before merge of "main" and "origin/main" Albion 2022-12-10 09:14:10 +01:00
• afdddfc1df Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 PfandBoss 2022-12-10 09:01:11 +01:00
• b2ef48ebce bib PfandBoss 2022-12-10 09:01:09 +01:00
• 1a289951c1 add map Lukas Moungos 2022-12-10 08:54:18 +01:00
• f3d3048291 add map Lukas Moungos 2022-12-10 08:53:58 +01:00