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 |
|
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 |
|