Commit Graph

110 Commits

Author SHA1 Message Date
0e6bce027f exports 2022-12-11 09:01:30 +01:00
648fe8a0a2 exports 2022-12-11 09:01:14 +01:00
1a77c484f5 exports 2022-12-11 09:00:26 +01:00
Arthur
44e18e0b55 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 08:57:38 +01:00
Arthur
d6665c4995 Started Functionality of 3DUI 2022-12-11 08:57:30 +01:00
PfandBoss
dec150a151 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 08:36:26 +01:00
PfandBoss
adbfceeae0 shooting finnished 2022-12-11 08:36:24 +01:00
Arthur
1d662e0c9e Added Deko Pic to Main Menu 3D Scene 2022-12-11 08:30:21 +01:00
Arthur
d445aba1b9 MainMenu3D non-functional 2022-12-11 08:25:51 +01:00
PfandBoss
85e7425b2f bin sound added 2022-12-11 07:41:15 +01:00
PfandBoss
b46596f24a fixed icons 2022-12-11 07:25:54 +01:00
PfandBoss
a6c52c5f2d ddd 2022-12-11 07:24:27 +01:00
PfandBoss
18c9a7ccaf dd 2022-12-11 07:20:45 +01:00
822783712f Leo - basically nothing new 2022-12-11 06:55:54 +01:00
275c6205e6 Leo bug fixes 2022-12-11 06:06:07 +01:00
f2fd6fb376 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 05:19:58 +01:00
b87baba2fe Leo - GUI checkpoint 2022-12-11 05:19:46 +01:00
Arthur
77bc4b5055 Added Animations 2022-12-11 03:47:47 +01:00
PfandBoss
53fa4bd942 Update game.tscn 2022-12-11 03:00:24 +01:00
PfandBoss
54fcfe1866 added moving backround 2022-12-11 02:58:09 +01:00
c201a1a08a Leo - rnadom 2022-12-11 02:33:17 +01:00
7b6d939f74 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 02:25:34 +01:00
0d9acc5f47 exports 2022-12-11 02:19:40 +01:00
14490c71e4 Leo - GUI WIP 2022-12-11 01:50:33 +01:00
PfandBoss
a852fe8894 fixed layers 2022-12-11 01:22:16 +01:00
5b1db8f65f exports 2022-12-11 01:16:24 +01:00
PfandBoss
146451c376 Added icon fucntion 2022-12-11 01:10:31 +01:00
6076447fcd infinite scroll 2022-12-11 01:07:11 +01:00
cef356a7b7 infinite scroll 2022-12-11 01:06:41 +01:00
f252274803 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-11 00:47:09 +01:00
9a7acdceb6 infinite scroll 2022-12-11 00:46:56 +01:00
PfandBoss
195c6e604f TRains updatet 2022-12-11 00:46:20 +01:00
64242d629f infinite scroll 2022-12-11 00:43:30 +01:00
ac725c194f infinite scroll 2022-12-11 00:42:21 +01:00
Florian Decker
bd10d8ca58 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022
# Conflicts:
#	Nodes/Train_P1.tscn
#	Nodes/Train_P2.tscn
2022-12-11 00:41:16 +01:00
Florian Decker
a13d9dbed3 New train scene 2022-12-11 00:35:38 +01:00
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