Commit graph

52 commits

Author SHA1 Message Date
Ruben Müller
f6f7f0250e darkess fix 2011-08-21 13:54:12 +02:00
Ruben Müller
15e8e95aa4 screenshot of the darkness added 2011-08-21 12:45:28 +02:00
Ruben Müller
cb9262752c bewaaaaare, the shaodow of darkness is there! :o 2011-08-21 12:42:55 +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
Ruben Müller
ad91d81b01 player and camera movement done! 2011-08-20 23:51:33 +02:00
Aaron
480ddca935 Player is movin 2011-08-20 22:52:29 +02:00
Aaron
bdd6ba3eda The Map will be build now 2011-08-20 22:37:31 +02:00
Aaron
c7c7c30eb0 Fix title song 2011-08-20 22:36:54 +02:00
Ruben Müller
6274521032 tileset updated to 20px 2011-08-20 22:29:37 +02:00
Aaron
33a3cb6187 STEREO 2011-08-20 21:51:09 +02:00
Aaron
22cc49cfd4 The awesome title song11111 2011-08-20 21:48:27 +02:00
Ruben Müller
1f5db54fce Merge branch 'master' of /Volumes/game/Git 2011-08-20 21:43:19 +02:00
Ruben Müller
f2821000cf tiledraw works! 2011-08-20 21:43:17 +02:00
Aaron
460db4f8c9 Merge branch 'master' of c:/Users/Aaron/Desktop/game/Git
Conflicts:
	src/Globals.pbi
2011-08-20 21:41:38 +02:00
Aaron
a6f3e9a3e2 Handle background music 2011-08-20 21:40:04 +02:00
Ruben Müller
71f2ea055e fix and shto 2011-08-20 20:27:13 +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
b09169256b key fix 2011-08-20 19:44:21 +02:00
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
f6ab4d9452 merge2 2011-08-20 18:45:54 +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
f089be7018 change DATA_PATH constant 2011-08-20 18:33:24 +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
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
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
Aaron
8b2ea22581 Merge branch 'master' of c:/Users/Aaron/Desktop/game/Git 2011-08-20 17:06:35 +02:00
Aaron
0de778fb48 Add a gitignore file 2011-08-20 17:06:11 +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
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
Ruben Müller
5ad8a0fb96 testcommit 2011-08-20 14:33:39 +02:00
Ruben Müller
8b03bb1ed2 Merge branch 'master' of ssh://aaron-server/var/git/ESCape 2011-08-20 14:29:16 +02:00