Commit graph

28 commits

Author SHA1 Message Date
Ruben Müller a43354f7af cleanup 2011-08-21 18:19:11 +02:00
Aaron Mueller 0a3149c44d Merge branch 'master' of ssh://xen/var/git/ESCape 2011-08-21 17:59:26 +02:00
Aaron Mueller 8005cddac8 Fix some Linux specific bugs 2011-08-21 17:59:16 +02:00
Ruben Müller 345592067b hud and some player stuff 2011-08-21 16:51:16 +02:00
Ruben Müller c6b205f0a3 fixed tha regex bug! map-loading is awesome now :) 2011-08-21 11:48:49 +02:00
Aaron b125c73a19 Map stuff 2011-08-21 02:16:30 +02:00
Ruben Müller a840f8d2b2 Fullscreen fix 2011-08-21 00:06:02 +02:00
Aaron bdd6ba3eda The Map will be build now 2011-08-20 22:37:31 +02:00
Aaron a6f3e9a3e2 Handle background music 2011-08-20 21:40:04 +02:00
Ruben Müller 2a633da757 merge 2011-08-20 20:19:16 +02:00
Aaron 7d1213164b Merge branch 'master' of c:/Users/Aaron/Desktop/game/Git
Conflicts:
	src/Draw.pbi
	src/Functions.pbi
	src/Globals.pbi
2011-08-20 20:18:02 +02:00
Aaron ce00b27eae Start with teh drawing 2011-08-20 20:15:44 +02:00
Ruben Müller 5ea7373d3e sprite stuff 2011-08-20 20:14:22 +02:00
Ruben Müller 70d783cc5e sprites are workin!! 2011-08-20 19:42:09 +02:00
Ruben Müller d68b5d32e9 merge 2011-08-20 18:45:05 +02:00
Ruben Müller f2cd452d10 try to get the image crash handled 2011-08-20 18:44:21 +02:00
Aaron 566660364b Merge branch 'master' of c:/Users/Aaron/Desktop/game/Git 2011-08-20 18:30:38 +02:00
Aaron 66e15a7991 Sound works fine 2011-08-20 18:30:12 +02:00
Ruben Müller 0b6a963f34 png and jpg test 2011-08-20 18:27:49 +02:00
Aaron 9a39e7b66c Start implement the sound thingy 2011-08-20 18:18:52 +02:00
Aaron c5e16f150f Working menu 2011-08-20 17:57:26 +02:00
Aaron 2dba5ef64c Some mayor changes 2011-08-20 17:49:22 +02:00
Ruben Müller 30a48990e2 stuff 2011-08-20 17:40:18 +02:00
Ruben Müller 21cb61eb0a cleanup 2011-08-20 17:04:33 +02:00
Ruben Müller b5249a1717 stuff 2011-08-20 17:00:06 +02:00
Ruben Müller 29cd37f37c fix 2011-08-20 16:49:48 +02:00
Ruben Müller cbb5ccfe4e small change 2011-08-20 16:34:37 +02:00
Ruben Müller 9b069db5cd initial data and stuff 2011-08-20 14:49:54 +02:00