diff options
author | Tim Ansell <mithro@mithis.com> | 2009-01-23 13:34:06 (GMT) |
---|---|---|
committer | Tim Ansell <mithro@mithis.com> | 2009-01-23 13:34:06 (GMT) |
commit | 1bbc58cb4ddd3292a4469f4de4d122f351310e70 (patch) | |
tree | 8f2de98fabd3e65157925c82a92673a3a3c3a1fe | |
parent | da5a924f143ed140f2f5f972c02153c4e50ce047 (diff) | |
parent | 22ff510a1140852675924e423479e81684a21212 (diff) |
Merge commit 'origin/master'
-rw-r--r-- | ovpc.py | 6 | ||||
-rw-r--r-- | res/child-death.png (renamed from child-death.png) | bin | 39476 -> 39476 bytes | |||
-rw-r--r-- | res/child-death01.png (renamed from child-death01.png) | bin | 1793 -> 1793 bytes | |||
-rw-r--r-- | res/child-death02.png (renamed from child-death02.png) | bin | 1795 -> 1795 bytes | |||
-rw-r--r-- | res/child-death03.png (renamed from child-death03.png) | bin | 1809 -> 1809 bytes | |||
-rw-r--r-- | res/child-death04.png (renamed from child-death04.png) | bin | 1780 -> 1780 bytes | |||
-rw-r--r-- | res/child-death05.png (renamed from child-death05.png) | bin | 1797 -> 1797 bytes | |||
-rw-r--r-- | res/child-death06.png (renamed from child-death06.png) | bin | 1909 -> 1909 bytes | |||
-rw-r--r-- | res/child-death08.png (renamed from child-death08.png) | bin | 2246 -> 2246 bytes | |||
-rw-r--r-- | res/child-death09.png (renamed from child-death09.png) | bin | 2230 -> 2230 bytes | |||
-rw-r--r-- | res/child-death10.png (renamed from child-death10.png) | bin | 2235 -> 2235 bytes | |||
-rw-r--r-- | res/child-death11.png (renamed from child-death11.png) | bin | 2504 -> 2504 bytes | |||
-rw-r--r-- | res/child-death12.png (renamed from child-death12.png) | bin | 5358 -> 5358 bytes | |||
-rw-r--r-- | res/child-death13.png (renamed from child-death13.png) | bin | 5502 -> 5502 bytes | |||
-rw-r--r-- | res/child-death14.png (renamed from child-death14.png) | bin | 4547 -> 4547 bytes | |||
-rw-r--r-- | res/child-death15.png (renamed from child-death15.png) | bin | 4358 -> 4358 bytes | |||
-rw-r--r-- | res/child-death16.png (renamed from child-death16.png) | bin | 3874 -> 3874 bytes | |||
-rw-r--r-- | res/child-death17.png (renamed from child-death17.png) | bin | 3887 -> 3887 bytes | |||
-rw-r--r-- | res/child-death18.png (renamed from child-death18.png) | bin | 3924 -> 3924 bytes | |||
-rw-r--r-- | res/child-death19.png (renamed from child-death19.png) | bin | 3748 -> 3748 bytes | |||
-rw-r--r-- | res/child-death20.png (renamed from child-death20.png) | bin | 3177 -> 3177 bytes | |||
-rw-r--r-- | res/child-death21.png (renamed from child-death21.png) | bin | 2630 -> 2630 bytes | |||
-rw-r--r-- | res/child-death22.png (renamed from child-death22.png) | bin | 2272 -> 2272 bytes | |||
-rw-r--r-- | res/child.png (renamed from child.png) | bin | 1713 -> 1713 bytes | |||
-rw-r--r-- | res/raptor-anim.png (renamed from raptor-anim.png) | bin | 12371 -> 12371 bytes | |||
-rw-r--r-- | res/raptor1.png (renamed from raptor1.png) | bin | 4882 -> 4882 bytes | |||
-rw-r--r-- | res/raptor2.png (renamed from raptor2.png) | bin | 6272 -> 6272 bytes | |||
-rw-r--r-- | res/raptor3.png (renamed from raptor3.png) | bin | 6583 -> 6583 bytes |
28 files changed, 3 insertions, 3 deletions
@@ -18,20 +18,20 @@ window.push_handlers(keys) batch = pyglet.graphics.Batch() -child_death_files = glob.glob("child-death[012]*.png") +child_death_files = glob.glob("res/child-death[012]*.png") child_death_files.sort() child_death = pyglet.image.Animation.from_image_sequence( [pyglet.resource.image(x) for x in child_death_files], 0.1, False) -raptor_anim_files = glob.glob("raptor[123].png") +raptor_anim_files = glob.glob("res/raptor[123].png") raptor_anim_files.sort() raptor_anim = pyglet.image.Animation.from_image_sequence( [pyglet.resource.image(x) for x in raptor_anim_files], 0.1, True) pack = [] -child = pyglet.sprite.Sprite(pyglet.resource.image('child.png'), batch=batch) +child = pyglet.sprite.Sprite(pyglet.resource.image('res/child.png'), batch=batch) score = 0 diff --git a/child-death.png b/res/child-death.png Binary files differindex cfdcbf7..cfdcbf7 100644 --- a/child-death.png +++ b/res/child-death.png diff --git a/child-death01.png b/res/child-death01.png Binary files differindex be41272..be41272 100644 --- a/child-death01.png +++ b/res/child-death01.png diff --git a/child-death02.png b/res/child-death02.png Binary files differindex 7e69175..7e69175 100644 --- a/child-death02.png +++ b/res/child-death02.png diff --git a/child-death03.png b/res/child-death03.png Binary files differindex 09101c4..09101c4 100644 --- a/child-death03.png +++ b/res/child-death03.png diff --git a/child-death04.png b/res/child-death04.png Binary files differindex b9ea5e8..b9ea5e8 100644 --- a/child-death04.png +++ b/res/child-death04.png diff --git a/child-death05.png b/res/child-death05.png Binary files differindex fc008e5..fc008e5 100644 --- a/child-death05.png +++ b/res/child-death05.png diff --git a/child-death06.png b/res/child-death06.png Binary files differindex f518422..f518422 100644 --- a/child-death06.png +++ b/res/child-death06.png diff --git a/child-death08.png b/res/child-death08.png Binary files differindex 585c8af..585c8af 100644 --- a/child-death08.png +++ b/res/child-death08.png diff --git a/child-death09.png b/res/child-death09.png Binary files differindex 8e689d8..8e689d8 100644 --- a/child-death09.png +++ b/res/child-death09.png diff --git a/child-death10.png b/res/child-death10.png Binary files differindex 026e80b..026e80b 100644 --- a/child-death10.png +++ b/res/child-death10.png diff --git a/child-death11.png b/res/child-death11.png Binary files differindex da3cc0e..da3cc0e 100644 --- a/child-death11.png +++ b/res/child-death11.png diff --git a/child-death12.png b/res/child-death12.png Binary files differindex 8daba2a..8daba2a 100644 --- a/child-death12.png +++ b/res/child-death12.png diff --git a/child-death13.png b/res/child-death13.png Binary files differindex bc413e7..bc413e7 100644 --- a/child-death13.png +++ b/res/child-death13.png diff --git a/child-death14.png b/res/child-death14.png Binary files differindex f8dd4a5..f8dd4a5 100644 --- a/child-death14.png +++ b/res/child-death14.png diff --git a/child-death15.png b/res/child-death15.png Binary files differindex ecf60ae..ecf60ae 100644 --- a/child-death15.png +++ b/res/child-death15.png diff --git a/child-death16.png b/res/child-death16.png Binary files differindex e26737b..e26737b 100644 --- a/child-death16.png +++ b/res/child-death16.png diff --git a/child-death17.png b/res/child-death17.png Binary files differindex a94bedc..a94bedc 100644 --- a/child-death17.png +++ b/res/child-death17.png diff --git a/child-death18.png b/res/child-death18.png Binary files differindex dde6fc9..dde6fc9 100644 --- a/child-death18.png +++ b/res/child-death18.png diff --git a/child-death19.png b/res/child-death19.png Binary files differindex de03bec..de03bec 100644 --- a/child-death19.png +++ b/res/child-death19.png diff --git a/child-death20.png b/res/child-death20.png Binary files differindex 0214965..0214965 100644 --- a/child-death20.png +++ b/res/child-death20.png diff --git a/child-death21.png b/res/child-death21.png Binary files differindex a685cb1..a685cb1 100644 --- a/child-death21.png +++ b/res/child-death21.png diff --git a/child-death22.png b/res/child-death22.png Binary files differindex 3dfcca8..3dfcca8 100644 --- a/child-death22.png +++ b/res/child-death22.png diff --git a/child.png b/res/child.png Binary files differindex 2e5ce0c..2e5ce0c 100644 --- a/child.png +++ b/res/child.png diff --git a/raptor-anim.png b/res/raptor-anim.png Binary files differindex aae6d84..aae6d84 100644 --- a/raptor-anim.png +++ b/res/raptor-anim.png diff --git a/raptor1.png b/res/raptor1.png Binary files differindex 5bb4f2a..5bb4f2a 100644 --- a/raptor1.png +++ b/res/raptor1.png diff --git a/raptor2.png b/res/raptor2.png Binary files differindex 5a36718..5a36718 100644 --- a/raptor2.png +++ b/res/raptor2.png diff --git a/raptor3.png b/res/raptor3.png Binary files differindex acd582b..acd582b 100644 --- a/raptor3.png +++ b/res/raptor3.png |