Commit graph

12 commits

Author SHA1 Message Date
Ruben Müller 70d783cc5e sprites are workin!! 2011-08-20 19:42:09 +02:00
Aaron 9dba2fb5ee Merge branch 'master' of c:/Users/Aaron/Desktop/game/Git
Conflicts:
	src/Globals.pbi
2011-08-20 19:13:03 +02:00
Aaron 44de931356 more sound 2011-08-20 19:11:45 +02:00
Ruben Müller e07c64c6c7 fix the image bug 2011-08-20 19:09:23 +02:00
Ruben Müller 0b6a963f34 png and jpg test 2011-08-20 18:27:49 +02:00
Aaron 51dd7953fb Merge branch 'master' of c:/Users/Aaron/Desktop/game/Git 2011-08-20 18:18:56 +02:00
Aaron 9a39e7b66c Start implement the sound thingy 2011-08-20 18:18:52 +02:00
Ruben Müller 36cabac454 sprite stuff 2011-08-20 18:15:38 +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 177b3cae2e added first tilemap 2011-08-20 15:11:04 +02:00
Ruben Müller 9b069db5cd initial data and stuff 2011-08-20 14:49:54 +02:00