193 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Arthur	82fd7a610d	hitbox for gear and papierrolle	2022-12-11 09:14:49 +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
PfandBoss	4771304d0f	Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022	2022-12-11 08:27:55 +01:00
PfandBoss	5995a131b0	shooting added	2022-12-11 08:27:49 +01:00
Arthur	d445aba1b9	MainMenu3D non-functional	2022-12-11 08:25:51 +01:00
Arthur	6a4aa05a18	Imported Main Menu 3D Objects	2022-12-11 07:58:46 +01:00
PfandBoss	6b34c26182	Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022	2022-12-11 07:41:24 +01:00
PfandBoss	85e7425b2f	bin sound added	2022-12-11 07:41:15 +01:00
Arthur	23e4d40a4c	Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022	2022-12-11 07:40:36 +01:00
Arthur	687e1fe5a1	musik	2022-12-11 07:40:26 +01:00
PfandBoss	25a6bdf8f1	Made sounds loopable	2022-12-11 07:27:39 +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
INoro	822783712f	Leo - basically nothing new	2022-12-11 06:55:54 +01:00
INoro	b5c78c1302	Leo - bug fixes	2022-12-11 06:14:57 +01:00
INoro	275c6205e6	Leo bug fixes	2022-12-11 06:06:07 +01:00
INoro	f2fd6fb376	Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022	2022-12-11 05:19:58 +01:00
INoro	b87baba2fe	Leo - GUI checkpoint	2022-12-11 05:19:46 +01:00
Arthur	219152ecc6	added trains	2022-12-11 04:37:02 +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
Florian Decker	597479a4a7	Add ammo pile and gunpowder barrel model	2022-12-11 02:54:46 +01:00
INoro	c201a1a08a	Leo - rnadom	2022-12-11 02:33:17 +01:00
INoro	7b6d939f74	Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022	2022-12-11 02:25:34 +01:00
Lukas Moungos	0d9acc5f47	exports	2022-12-11 02:19:40 +01:00
INoro	14490c71e4	Leo - GUI WIP	2022-12-11 01:50:33 +01:00
PfandBoss	a852fe8894	fixed layers	2022-12-11 01:22:16 +01:00
Lukas Moungos	0fd55ef13f	Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022	2022-12-11 01:16:27 +01:00
Lukas Moungos	5b1db8f65f	exports	2022-12-11 01:16:24 +01:00
INoro	553214600e	Leo -Assets für GUI geladen	2022-12-11 01:15:21 +01:00
PfandBoss	5e6b25f5cc	Update project.godot	2022-12-11 01:11:47 +01:00
PfandBoss	146451c376	Added icon fucntion	2022-12-11 01:10:31 +01:00
Lukas Moungos	6076447fcd	infinite scroll	2022-12-11 01:07:11 +01:00
Lukas Moungos	cef356a7b7	infinite scroll	2022-12-11 01:06:41 +01:00
Lukas Moungos	f252274803	Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022	2022-12-11 00:47:09 +01:00
Lukas Moungos	9a7acdceb6	infinite scroll	2022-12-11 00:46:56 +01:00
PfandBoss	195c6e604f	TRains updatet	2022-12-11 00:46:20 +01:00
Lukas Moungos	64242d629f	infinite scroll	2022-12-11 00:43:30 +01:00
Lukas Moungos	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