1
0
Fork 0
Commit graph

380 commits

Author SHA1 Message Date
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
Unknown
0d15d8922c Update HP_Bar 2018-04-21 22:01:49 +02:00
Piegames
4aaad807fa Merge branch 'Graphics' 2018-04-21 21:58:50 +02:00
Unknown
c669ac411b HP_UI 2018-04-21 21:58:21 +02:00
Jan
1f24c2aa74 add basic title screen and changed buildorder 2018-04-21 20:54:58 +02:00
Unknown
0bb31fb823 HP 2018-04-21 20:53:48 +02:00
Unknown
c604f6e4e6 Some UI 2018-04-21 20:47:50 +02:00
ALoTron
15e6166e5b Added Camera Movement 2018-04-21 20:19:06 +02:00
Jan
5c3552d1a0 collision now uses 2d colliders 2018-04-21 20:13:58 +02:00
Jan
6be4f03e6a fixes to CodeDEV scene 2018-04-21 20:06:58 +02:00
Jan
3cb311f614 Merge remote-tracking branch 'origin/master' 2018-04-21 20:04:22 +02:00
Unknown
72236a6988 HP_UI 2018-04-21 19:58:52 +02:00
Jan
0f127ea048 change starting room prefab 2018-04-21 19:55:49 +02:00
Piegames
bb476cc969 Room 2018-04-21 19:50:50 +02:00
Jan
5c30563dcc add collision for player 2018-04-21 19:50:12 +02:00
Jan
8a79bd69e9 chang physic collision between layers 2018-04-21 19:49:45 +02:00
Jan
7b7e5c1d18 add new walls to scene 2018-04-21 19:48:37 +02:00
Jan
a919d75c5b add door and wall tag 2018-04-21 19:47:49 +02:00
Jan
80dad9db2f add wall prefab 2018-04-21 19:46:53 +02:00
Saibotk
f4d87b156a Player bounds 2018-04-21 19:25:19 +02:00
Saibotk
0dfcf759fb Starting room door 2018-04-21 19:05:13 +02:00
Saibotk
9a8c3858c1 Player spawning in start room | Player class | Objective usage changed 2018-04-21 18:45:26 +02:00
Jan
947b6d4e84 updated door 2018-04-21 18:22:56 +02:00
Jan
7b684c1800 add trigger to door prefab 2018-04-21 18:22:56 +02:00
Piegames
f50398e44b Merge remote-tracking branch 'origin/master' 2018-04-21 18:21:35 +02:00
Piegames
0abad3bc57 Brake 2018-04-21 18:19:53 +02:00