1
0
Fork 0
Commit graph

105 commits

Author SHA1 Message Date
Piegames
91becdbdec C# world generation (BROKEN) 2018-04-22 13:51:56 +02:00
Unknown
5f391b8361 Merge branch 'master' into MapGeneration 2018-04-22 12:53:47 +02:00
Piegames
b4010cc811 Java part is done 2018-04-22 12:50:55 +02:00
Jan
e487e1038d redid Healthbar UI 2018-04-22 12:12:54 +02:00
Jan
8660075e08 reverted to old CodeDev Scene 2018-04-22 12:07:17 +02:00
Jan
46652c0a6b healthbar now tracks players health 2018-04-22 11:49:15 +02:00
Saibotk
3dd472d7e3 Fix Texture references 2018-04-22 11:40:19 +02:00
Saibotk
05602258ff WIP Room enter detection 2018-04-22 11:27:09 +02:00
Unknown
74033ef206 Coin + meta 2018-04-22 11:14:10 +02:00
Triceraptodactyl
987ad8a9c2 Merge remote-tracking branch 'origin/master' 2018-04-22 11:09:56 +02:00
Unknown
8dfb5a1919 coin texture 2018-04-22 11:02:19 +02:00
Triceraptodactyl
c13a2334ef Merge remote-tracking branch 'origin/master' 2018-04-22 11:00:24 +02:00
Saibotk
b3bac680d5 Merge remote-tracking branch 'origin/Graphics' 2018-04-22 10:47:37 +02:00
Piegames
cc36c1f48c Corners 2018-04-22 10:45:02 +02:00
Unknown
e4b3717ff3 Finished Rocks 2018-04-22 10:40:49 +02:00
Triceraptodactyl
3ef214d14f Merge remote-tracking branch 'origin/master' 2018-04-22 10:29:04 +02:00
Saibotk
732a2ebf68 Merge remote-tracking branch 'origin/Graphics' 2018-04-22 10:23:25 +02:00
Unknown
4addd64297 moreUI 2018-04-22 10:16:32 +02:00
Unknown
ef36d070eb more Rocks 2018-04-22 10:15:09 +02:00
Saibotk
d737457101 Add Rock tile prefabs 2018-04-22 09:37:35 +02:00
Saibotk
ea3d46c4f5 Door placeholder | dumb Dmg logic | Changed room / objective logic |...
Extended game starting logic
2018-04-22 05:57:26 +02:00
ALoTron
619c35d977 Added horizontal and vertical tunnel-generation 2018-04-22 05:38:39 +02:00
Triceraptodactyl
220b551971 Größere Texturresortierung
Einige alte Templates gelöscht/verschoben und neue hinzugefügt
2018-04-22 04:56:47 +02:00
Saibotk
fd7ac485a6 Fix #7 Decouple UI from Room 2018-04-22 04:30:01 +02:00
Triceraptodactyl
5bcf1aad30 Wall Textures (missing texture at the top part) 2018-04-22 04:17:59 +02:00
Triceraptodactyl
a50b903c49 Wall Textur Templates 2018-04-22 03:01:23 +02:00
Saibotk
f2af761722 Merge remote-tracking branch 'origin/MapGeneration' into MapGeneration 2018-04-22 02:24:09 +02:00
Saibotk
50d76e7ec2 GenerationProcessor 2018-04-22 02:23:13 +02:00
ALoTron
143ce8ddc9 First enemy. KI WIP 2018-04-22 02:07:00 +02:00
Piegames
a9c6157589 Tobi ist doof 2018-04-22 02:06:53 +02:00
Piegames
755ad3a35c Merge branch 'master' into MapGeneration 2018-04-22 02:03:57 +02:00
Unknown
2508df1be0 Merge remote-tracking branch 'origin/master' 2018-04-22 01:21:39 +02:00
Unknown
898928a870 Update Hp Bar 2018-04-22 01:19:59 +02:00
Jan
c16c248bd6 add basics for healthbar system 2018-04-22 01:17:45 +02:00
Unknown
cb819cd81f Merge branch 'Graphics' 2018-04-22 01:11:18 +02:00
Unknown
f72ea8e762 Merge branch 'master' into Graphics 2018-04-22 01:08:43 +02:00
Unknown
887e80c045 Ignore Thumbs.db 2018-04-22 01:07:37 +02:00
Unknown
908525d223 more bricks in the wall 2018-04-22 00:55:31 +02:00
Triceraptodactyl
e475becbcc Merge remote-tracking branch 'origin/master' 2018-04-22 00:24:02 +02:00
Triceraptodactyl
eeafaf47b1 Rename von Wall zu Rock 2018-04-22 00:23:50 +02:00
Jan
ecda05da04 add gameover UI 2018-04-22 00:23:45 +02:00
Jan
c40bf08fef add testing scene for UI, add gameover UI,close #7 2018-04-22 00:23:45 +02:00
Jan
b39d70af7e move ButtonActions to UIController 2018-04-22 00:23:45 +02:00
Triceraptodactyl
e939bd05d6 Die letzten geraden Wall Texturen! 2018-04-22 00:15:31 +02:00
Unknown
9d602b3463 Update Wall/Stone 2018-04-21 23:29:44 +02:00
Triceraptodactyl
badbb96ca5 Textur Kram 2018-04-21 23:23:21 +02:00
Triceraptodactyl
c2f967bb48 Stone Textures und Car_vorläufig2 2018-04-21 23:22:58 +02:00
Unknown
47910cd371 More HP textures 2018-04-21 23:19:03 +02:00
Unknown
ec1189b3c4 Merge remote-tracking branch 'origin/Graphics' into Graphics 2018-04-21 23:18:37 +02:00
Jan
ebe2e18432 made player movement smoother fix #2 2018-04-21 22:09:36 +02:00