1
0
Fork 0
Commit graph

123 commits

Author SHA1 Message Date
Piegames
5355bbb303 Merge branch 'PiegamesDev' 2018-04-23 14:52:01 +02:00
Piegames
1f1e62500b Meta things 2018-04-23 14:36:00 +02:00
Triceraptodactyl
f93a301c23 Türen werden Korrekt angezeigt 2018-04-23 14:33:27 +02:00
Saibotk
215487a40c meta + relocate sprite 2018-04-23 13:31:03 +02:00
Saibotk
854d291bf7 Add logo + Redesign Title screen 2018-04-23 13:29:38 +02:00
Piegames
411cc88812 Meta data 2018-04-23 13:13:30 +02:00
Piegames
4f24f39611 Paint ground below wall/rock 2018-04-23 01:32:20 +02:00
Triceraptodactyl
e27eeb301d Merge remote-tracking branch 'origin/master' 2018-04-23 00:31:55 +02:00
Triceraptodactyl
c729060e2c Car Textur 2018-04-23 00:31:52 +02:00
Saibotk
b39dbdf231 Scorpion Prefab 2018-04-23 00:25:37 +02:00
Saibotk
143bd95218 Remove Thumbs.db 2018-04-23 00:00:47 +02:00
Saibotk
9e29c2f82c Merge remote-tracking branch 'origin/master' into SaibotkDev 2018-04-22 23:59:49 +02:00
Piegames
41865aaaa4 Meta files and .gitignore 2018-04-22 23:52:32 +02:00
Saibotk
83e54fb772 Entity uses Attack
Player shoots bullets
2018-04-22 23:50:39 +02:00
Unknown
ac7e058227 UI Update 2018-04-22 21:42:08 +02:00
Triceraptodactyl
8ac403b93c wheelFront und Door Update (door nicht fertig, aber vorlage liegt vor) 2018-04-22 21:13:15 +02:00
Unknown
5a5ce57c10 Merge branch 'Graphics' 2018-04-22 20:20:49 +02:00
Unknown
cda72dd00c Fixed Scorpion 2018-04-22 19:06:34 +02:00
Unknown
cd48d0d5fa Break UI 2018-04-22 18:51:48 +02:00
Saibotk
cb8425f9e1 Add Hallways | resize car 2018-04-22 18:17:44 +02:00
Unknown
d3100cf945 Metadaten... 2018-04-22 18:02:24 +02:00
Saibotk
dac3894a8c Set UI Sprites to point filtering | reposition Healthbar 2018-04-22 17:59:00 +02:00
Unknown
f951c3560d Enemy1 2018-04-22 17:57:43 +02:00
Saibotk
99d4083d30 Merge remote-tracking branch 'origin/master' 2018-04-22 17:52:26 +02:00
Saibotk
e35c70e002 Generation integration Part 1
Fix Texture Unit size
Added Root tags
Fixed NullPointers
Todo: 
- Fix sprite rotation
- Fix processing of hallways
- Put doors in their own root GameObject
2018-04-22 17:52:20 +02:00
Triceraptodactyl
4b76cafd04 Wand Update für dunkleres Plateau 2018-04-22 17:48:51 +02:00
Triceraptodactyl
1531464420 Kleineres Grafik Update (removed Thumbs.db) 2018-04-22 16:55:39 +02:00
Unknown
8ebeb2b982 Merge branch 'Graphics' 2018-04-22 16:41:41 +02:00
Unknown
6b274211fe Particles and more 2018-04-22 16:38:23 +02:00
Unknown
01587d8172 Merge remote-tracking branch 'origin/MapGeneration' 2018-04-22 16:02:23 +02:00
Piegames
7512fef314 Thumbs.db.meta gitignore 2018-04-22 15:17:51 +02:00
Unknown
98264c451a Buttons 2018-04-22 14:19:37 +02:00
Unknown
5f391b8361 Merge branch 'master' into MapGeneration 2018-04-22 12:53:47 +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
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
Triceraptodactyl
220b551971 Größere Texturresortierung
Einige alte Templates gelöscht/verschoben und neue hinzugefügt
2018-04-22 04:56:47 +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
Unknown
2508df1be0 Merge remote-tracking branch 'origin/master' 2018-04-22 01:21:39 +02:00