Commit Graph

114 Commits

Author SHA1 Message Date
604e195f1c Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 12:21:55 +01:00
1fd9a1c366 players 2022-12-10 12:21:32 +01:00
Arthur
c00792a810 Engine logic update 2022-12-10 12:19:55 +01:00
Arthur
fbb96edc50 Engine.gd Speed dependencies 2022-12-10 12:16:04 +01:00
PfandBoss
64197ae3c9 Update Cannon.gd 2022-12-10 11:44:43 +01:00
PfandBoss
aaa8be864a sds 2022-12-10 11:32:13 +01:00
d52af547ed fix transforms 2022-12-10 10:42:20 +01:00
d5c7539df0 game scene 2022-12-10 10:40:31 +01:00
Albion
4cc4b47966 Soundbus 2022-12-10 10:40:00 +01:00
cbddbca96c merge 2022-12-10 10:36:16 +01:00
cb097aec94 add fake splitscreen 2022-12-10 10:35:03 +01:00
PfandBoss
5f02f31566 push push 2022-12-10 10:32:39 +01:00
PfandBoss
ffe9b2f047 Adds 2022-12-10 09:49:40 +01:00
5b74f2c77a Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 09:38:24 +01:00
2fb20600e2 delete gitignore files 2022-12-10 09:38:18 +01:00
7c076dbebb delete gitignore files 2022-12-10 09:37:51 +01:00
Albion
9f6f423179 Auto stash before merge of "main" and "origin/main"
nicht mehr kaputt
2022-12-10 09:37:01 +01:00
23f14286fd merge 2022-12-10 09:34:32 +01:00
900e550976 add gitignore 2022-12-10 09:30:28 +01:00
Albion
8369e7b718 oops 2022-12-10 09:26:52 +01:00
Albion
d12388e268 Merge remote-tracking branch 'origin/main' into main 2022-12-10 09:21:04 +01:00
5990c2ad91 inputs 2022-12-10 09:19:03 +01:00
06a5ced5d3 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 09:16:27 +01:00
e45e95b5ff revert 2022-12-10 09:16:22 +01:00
Albion
742e4e2abb Auto stash before merge of "main" and "origin/main" 2022-12-10 09:14:10 +01:00
PfandBoss
afdddfc1df Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 09:01:11 +01:00
PfandBoss
b2ef48ebce bib 2022-12-10 09:01:09 +01:00
1a289951c1 add map 2022-12-10 08:54:18 +01:00
f3d3048291 add map 2022-12-10 08:53:58 +01:00
c278c93c52 playable 2022-12-10 07:28:26 +01:00
2e0faec3ac fix bugs 2022-12-10 07:24:53 +01:00
652f758c73 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 07:15:08 +01:00
e4d130f581 start MapNodes 2022-12-10 07:15:02 +01:00
14f2ad7cbb Leo - Dateien geordnet 2022-12-10 07:08:47 +01:00
523fb63fe4 Leo - Player wird hinzugefügt 2022-12-10 07:05:52 +01:00
0d3aaf42d8 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 04:53:14 +01:00
78710c4445 5 uhr 2022-12-10 04:53:09 +01:00
PfandBoss
c8d42a39eb pipi 2022-12-10 04:14:01 +01:00
PfandBoss
619054319c Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 04:13:00 +01:00
PfandBoss
f43307ac67 e 2022-12-10 04:11:58 +01:00
35d1bf72f3 Changes on Cannon.gd 2022-12-10 03:43:27 +01:00
ec8dcac756 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 03:31:48 +01:00
08de745774 Changes on Game.gd 2022-12-10 03:31:43 +01:00
Arthur
d427fa82f1 Update Storage.gd 2022-12-10 03:20:51 +01:00
PfandBoss
701f0bfee9 idc 2022-12-10 03:18:55 +01:00
Arthur
0b64014d01 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-10 03:02:53 +01:00
Arthur
2a46b39a4d Summary (required) 2022-12-10 03:02:44 +01:00
PfandBoss
c76634285b JA 2022-12-10 02:35:47 +01:00
fce9eff26e Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-10 02:29:37 +01:00
ce9d568559 Initial Game Logic 2022-12-10 02:29:15 +01:00