Commit Graph

226 Commits

Author SHA1 Message Date
PfandBoss
f788440640 SS 2022-12-11 11:34:53 +01:00
PfandBoss
b16544ab62 bug fixing 2022-12-11 11:31:59 +01:00
PfandBoss
608fde54a1 moving moving backround 2022-12-11 11:31:25 +01:00
5eea81e600 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-11 11:21:22 +01:00
5d40bd8ac0 Trains 2022-12-11 11:21:14 +01:00
Arthur
e3c86cd906 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 11:20:01 +01:00
Arthur
10091e2f88 MainMenu3D Fully working except for references 2022-12-11 11:19:29 +01:00
d6928d02b3 Leo - Controller EntryMap 2022-12-11 11:16:19 +01:00
Arthur
8bb73800ef Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 11:01:10 +01:00
Arthur
81f3a26e9c Added Labels 2022-12-11 11:01:03 +01:00
PfandBoss
ee1bf09db3 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 10:58:00 +01:00
PfandBoss
e4b3835ec3 drehendes zahnrad 2022-12-11 10:57:57 +01:00
Arthur
40cb510f4c Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 10:53:48 +01:00
Arthur
607e2da99e Added descriptions 2022-12-11 10:53:31 +01:00
Florian Decker
eeae4f3f8b Sand texture 2022-12-11 10:49:00 +01:00
63f951a013 Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022 2022-12-11 10:47:10 +01:00
a425d72f07 objects 2022-12-11 10:47:02 +01:00
Florian Decker
05e95a3a78 Add trashcan 2022-12-11 10:35:00 +01:00
Albion
4e51cae845 Slider fine 2022-12-11 10:33:26 +01:00
PfandBoss
edb53171d0 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 10:27:01 +01:00
PfandBoss
f6782a73b5 New Storages in lef train 2022-12-11 10:26:29 +01:00
Florian Decker
092223866e changes to train scene, add furnace 2022-12-11 10:23:45 +01:00
Arthur
13e4e7b221 imported font 2022-12-11 10:17:58 +01:00
Arthur
27106eeab6 Functional 3D User Interface 2022-12-11 10:11:14 +01:00
PfandBoss
dabe1db9d4 shader added ( 2022-12-11 09:28:55 +01:00
PfandBoss
70609a6511 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 09:22:26 +01:00
PfandBoss
7872ff8a3c Pipi kacka man 2022-12-11 09:22:18 +01:00
Arthur
7e90449624 Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022 2022-12-11 09:15:33 +01:00
Arthur
82fd7a610d hitbox for gear and papierrolle 2022-12-11 09:14:49 +01:00
PfandBoss
e6a7ee0ced Hallo albion 2022-12-11 09:14:48 +01:00
79864b9b5e exports 2022-12-11 09:07:25 +01:00
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
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