Commit Graph

53 Commits

Author SHA1 Message Date
b1eeed1119 Spieler geht nach oben und unten, fällt aber oben noch durch die Boxen 2017-04-25 19:42:06 +02:00
0052a50521 Merge branch 'master' of https://gogs.mikescher.com/BlackForestBytes/ColorRunner 2017-04-25 18:46:38 +02:00
ee91769e84 get the Triggers 2017-04-25 18:44:34 +02:00
c515ec9ffb
Fix trigger zone loading offset + draw zones in debug renderer 2017-04-24 22:24:54 +02:00
811143d192
fixed map_pieces 2017-04-18 20:10:12 +02:00
28f1b4d1de Erkunng des Triggertypes zum gegeben x und y Wertes 2017-04-18 20:02:13 +02:00
7bb50b7275 start to implement gamemodi 2017-04-17 22:07:30 +02:00
b0043fe89e Backkey nur inGame, Last Best Ingame 2017-04-16 18:56:03 +02:00
ee5f14665f Back Key :) 2017-04-16 18:50:23 +02:00
23fc5af648 ein paar Spielestatistiken hinzugefügt 2017-04-16 18:38:28 +02:00
a24ec22dc5 bugfix, flush() hat gefehlt damit der sound auch gespeichert wird 2017-04-15 21:09:48 +02:00
db4c1feb4e Sound lässt sich ein und aus schalten, settings pref erstellst 2017-04-15 20:41:16 +02:00
30bd801355 Punkte werden nun gezählt :) 2017-04-14 22:58:43 +02:00
87e95ba645 debug Anzeig auskommentiert 2017-04-14 21:36:35 +02:00
25fe22da77 ImageButton für das Menü hinzugefügt(testing) 2017-04-14 21:09:16 +02:00
99714c24ce implementet the Music and change something at the hud 2017-04-14 12:32:25 +02:00
dba41061a4 test with backgrounds 2017-04-14 03:20:33 +02:00
2253d55fd2 bei Tot wieder zurück ins Menü 2017-04-14 01:59:46 +02:00
856f6e92e7
MERGE CONFLICT 2017-04-14 01:26:54 +02:00
283767a14b merge conflict 2017-04-14 01:22:54 +02:00
a3f874bd33 Merge branch 'master' of https://gogs.mikescher.com/BlackForestBytes/ColorRunner 2017-04-14 01:19:16 +02:00
c086c74ec6 zeugs von armin 2017-04-14 01:11:39 +02:00
71b69ec0a9
added StaticMapProvider 2017-04-14 01:07:10 +02:00
c9909f0317
Merge branch 'master' of https://gogs.mikescher.com/BlackForestBytes/ColorRunner 2017-04-14 00:16:40 +02:00
dbdc2a670e
abstract MapProvider away 2017-04-14 00:13:20 +02:00
60e1983ce0 added level 001 2017-04-14 00:09:34 +02:00
0d984ecd84
add editorconfig 2017-04-13 23:36:11 +02:00
d5495c2f48 CommitforMike 2017-04-13 23:30:38 +02:00
f025501d37 fuck gradle, stupid fuckin bullshit - shit fuck
~ Mike
2017-04-13 22:01:57 +02:00
887c013b46 fuckin gradle fixes
~ by Mikescher
2017-04-13 21:40:57 +02:00
a2d19985e7 added [R]eset 2014-08-11 21:36:01 +02:00
453d50f1c0 More MapPieces & DebugInfos 2014-08-11 21:21:52 +02:00
809192ba95 Merge remote-tracking branch 'origin/master' 2014-08-11 18:23:15 +02:00
0d66c2dea1 Fixed things 4 android 2014-08-11 18:23:07 +02:00
Anastron
a8e9e0ce08 added OptionMenuScreen, updated MainMenu 2014-08-11 17:19:11 +02:00
38e018febf Fixed last commit 2014-08-11 15:47:58 +02:00
1d13c5b754 Merge remote-tracking branch 'origin/master' 2014-08-11 15:36:33 +02:00
82be5b223e things 2014-08-11 15:36:03 +02:00
Anastron
91f91ab4b0 added MainMenu 2014-08-11 15:30:43 +02:00
Anastron
57da84eb7a added SplashScreen 2014-08-11 14:23:09 +02:00
30f911bf4f Remove FloorTiles when OOB 2014-08-11 13:51:41 +02:00
95572ac86f More Map Pieces 2014-08-11 12:40:19 +02:00
f8ca4a8451 More maps & physics 2014-08-11 12:19:51 +02:00
cb8cd2190f Tiled maps etc 2014-08-11 02:32:28 +02:00
520973d010 Reimplemented Colors + cam 2014-08-11 00:24:55 +02:00
faf6e21500 A little bit FPS independency 2014-08-10 20:59:50 +02:00
59b679756a Added Collision Detection 2014-08-10 19:41:06 +02:00
d6f8f324ad Custom Entity system 2014-08-10 17:19:40 +02:00
553fdb261e Added Scene2D actors + colors + jumping 2014-08-10 01:59:18 +02:00
bc201739b8 Simple Screens and so 2014-08-10 00:42:19 +02:00