Simon Cross [Sat, 5 Mar 2016 20:45:22 +0000 (22:45 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 20:45:16 +0000 (22:45 +0200)]
Melee weapons now do damage.
Neil [Sat, 5 Mar 2016 20:27:04 +0000 (22:27 +0200)]
Load sounds on weapon init
Neil [Sat, 5 Mar 2016 20:21:34 +0000 (22:21 +0200)]
pass sound to gun
Neil [Sat, 5 Mar 2016 20:20:30 +0000 (22:20 +0200)]
Gun sound
Neil [Sat, 5 Mar 2016 20:08:15 +0000 (22:08 +0200)]
Move sound to right place
Neil [Sat, 5 Mar 2016 20:05:32 +0000 (22:05 +0200)]
Add sound parameter to weapon class
Neil [Sat, 5 Mar 2016 20:05:14 +0000 (22:05 +0200)]
Credit sound
Neil [Sat, 5 Mar 2016 20:03:01 +0000 (22:03 +0200)]
Add a sound for spitting
Simon Cross [Sat, 5 Mar 2016 20:02:11 +0000 (22:02 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 20:02:06 +0000 (22:02 +0200)]
Pass in weapon explicitly to avoid it being confused with the color.
Neil [Sat, 5 Mar 2016 20:00:13 +0000 (22:00 +0200)]
Fix name
Neil [Sat, 5 Mar 2016 19:58:33 +0000 (21:58 +0200)]
Fix names
Simon Cross [Sat, 5 Mar 2016 19:56:31 +0000 (21:56 +0200)]
Better positioning.
Simon Cross [Sat, 5 Mar 2016 19:54:15 +0000 (21:54 +0200)]
Make new images safe.
Simon Cross [Sat, 5 Mar 2016 19:52:27 +0000 (21:52 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
adrianna [Sat, 5 Mar 2016 19:52:10 +0000 (21:52 +0200)]
python2 vs python3
Simon Cross [Sat, 5 Mar 2016 19:52:14 +0000 (21:52 +0200)]
Use new splash screen.
Simon Cross [Sat, 5 Mar 2016 19:42:25 +0000 (21:42 +0200)]
Pull SelectableSurfActor out of vehicles.
Neil [Sat, 5 Mar 2016 19:40:04 +0000 (21:40 +0200)]
Enemies appear
adrianna [Sat, 5 Mar 2016 19:38:19 +0000 (21:38 +0200)]
think of the poor windows users
Simon Cross [Sat, 5 Mar 2016 19:37:00 +0000 (21:37 +0200)]
Drop old weapon when picking up new one.
Simon Cross [Sat, 5 Mar 2016 19:22:57 +0000 (21:22 +0200)]
Really gain items.
Simon Cross [Sat, 5 Mar 2016 19:20:32 +0000 (21:20 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 19:20:17 +0000 (21:20 +0200)]
Gain items.
adrianna [Sat, 5 Mar 2016 19:14:00 +0000 (21:14 +0200)]
randomly rotate serum puddles
Simon Cross [Sat, 5 Mar 2016 19:07:38 +0000 (21:07 +0200)]
PEP8 fixes.
Simon Cross [Sat, 5 Mar 2016 19:05:32 +0000 (21:05 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Neil [Sat, 5 Mar 2016 19:05:07 +0000 (21:05 +0200)]
Hack keyboard behaviour to be different. Also incidently allow rotating in place
Simon Cross [Sat, 5 Mar 2016 19:05:14 +0000 (21:05 +0200)]
Able to consume items.
Simon Cross [Sat, 5 Mar 2016 19:04:59 +0000 (21:04 +0200)]
game_pos should be a tuple.
Simon Cross [Sat, 5 Mar 2016 18:48:49 +0000 (20:48 +0200)]
Weapons should be still when not in use.
Simon Cross [Sat, 5 Mar 2016 18:45:41 +0000 (20:45 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 18:45:29 +0000 (20:45 +0200)]
Show weapons when walking.
Neil [Sat, 5 Mar 2016 18:31:50 +0000 (20:31 +0200)]
The first steps towards enemy generators
Simon Cross [Sat, 5 Mar 2016 18:35:50 +0000 (20:35 +0200)]
Animate weapons.
Simon Cross [Sat, 5 Mar 2016 18:30:00 +0000 (20:30 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 18:29:55 +0000 (20:29 +0200)]
Add a butter knife to level 1.
Simon Cross [Sat, 5 Mar 2016 18:26:47 +0000 (20:26 +0200)]
Add smart and strong serums to level 1.
adrianna [Sat, 5 Mar 2016 18:25:46 +0000 (20:25 +0200)]
renamed weapon frames
Simon Cross [Sat, 5 Mar 2016 18:18:36 +0000 (20:18 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 18:18:30 +0000 (20:18 +0200)]
Display a serum on level1.
adrianna [Sat, 5 Mar 2016 18:06:18 +0000 (20:06 +0200)]
weapon animations
Simon Cross [Sat, 5 Mar 2016 18:03:34 +0000 (20:03 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 18:03:24 +0000 (20:03 +0200)]
Load items.
Simon Cross [Sat, 5 Mar 2016 18:02:56 +0000 (20:02 +0200)]
Fix module comment.
Simon Cross [Sat, 5 Mar 2016 18:02:41 +0000 (20:02 +0200)]
Add items to haunt us.
adrianna [Sat, 5 Mar 2016 18:00:51 +0000 (20:00 +0200)]
new exit sign
Simon Cross [Sat, 5 Mar 2016 17:51:23 +0000 (19:51 +0200)]
Add weapons.
adrianna [Sat, 5 Mar 2016 17:45:52 +0000 (19:45 +0200)]
blank weapon
Neil [Sat, 5 Mar 2016 17:33:47 +0000 (19:33 +0200)]
The endless pointlessness of level progression
Neil [Sat, 5 Mar 2016 17:06:40 +0000 (19:06 +0200)]
Add placeholder exit tile
adrianna [Sat, 5 Mar 2016 17:28:30 +0000 (19:28 +0200)]
splash screen
Simon Cross [Sat, 5 Mar 2016 17:21:11 +0000 (19:21 +0200)]
Add default weapon (spit).
Simon Cross [Sat, 5 Mar 2016 17:18:46 +0000 (19:18 +0200)]
Refactor giant on_key_down.
Neil [Sat, 5 Mar 2016 17:00:58 +0000 (19:00 +0200)]
Add basis for second level
Neil [Sat, 5 Mar 2016 16:57:45 +0000 (18:57 +0200)]
add roaches placeholder
Neil [Sat, 5 Mar 2016 16:45:25 +0000 (18:45 +0200)]
Make level convertor take arguments
Simon Cross [Sat, 5 Mar 2016 17:01:57 +0000 (19:01 +0200)]
Refactor cat.
Simon Cross [Sat, 5 Mar 2016 16:42:51 +0000 (18:42 +0200)]
Update the menu.
adrianna [Sat, 5 Mar 2016 16:24:49 +0000 (18:24 +0200)]
rat
Neil [Sat, 5 Mar 2016 15:58:50 +0000 (17:58 +0200)]
Gain more roaches
Simon Cross [Sat, 5 Mar 2016 16:15:26 +0000 (18:15 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 16:15:20 +0000 (18:15 +0200)]
Random vehicle swapping.
David.Sharpe [Sat, 5 Mar 2016 16:11:23 +0000 (18:11 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
David.Sharpe [Sat, 5 Mar 2016 16:10:53 +0000 (18:10 +0200)]
Fix level converter tool
Simon Cross [Sat, 5 Mar 2016 16:01:20 +0000 (18:01 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 16:01:11 +0000 (18:01 +0200)]
Add base support for deferring world updates.
David.Sharpe [Sat, 5 Mar 2016 15:50:42 +0000 (17:50 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
David.Sharpe [Sat, 5 Mar 2016 15:50:19 +0000 (17:50 +0200)]
Stuff
David.Sharpe [Sat, 5 Mar 2016 15:49:28 +0000 (17:49 +0200)]
Sample level converter
Simon Cross [Sat, 5 Mar 2016 15:48:48 +0000 (17:48 +0200)]
Will it blend?
Simon Cross [Sat, 5 Mar 2016 15:35:43 +0000 (17:35 +0200)]
More vehicles!
Simon Cross [Sat, 5 Mar 2016 15:35:26 +0000 (17:35 +0200)]
Add big vehicles images.
Simon Cross [Sat, 5 Mar 2016 15:34:54 +0000 (17:34 +0200)]
Pass through extra arguments to AnimatedSurfActor.
Simon Cross [Sat, 5 Mar 2016 15:34:24 +0000 (17:34 +0200)]
Add seating for new vehicles.
Simon Cross [Sat, 5 Mar 2016 15:13:58 +0000 (17:13 +0200)]
Remove some fiddling with pygzero internals.
Simon Cross [Sat, 5 Mar 2016 15:10:58 +0000 (17:10 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 15:10:42 +0000 (17:10 +0200)]
Moar vehicles!
adrianna [Sat, 5 Mar 2016 15:04:14 +0000 (17:04 +0200)]
info
Simon Cross [Sat, 5 Mar 2016 14:53:09 +0000 (16:53 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 14:52:58 +0000 (16:52 +0200)]
Actually add animsurf.
Simon Cross [Sat, 5 Mar 2016 14:52:13 +0000 (16:52 +0200)]
Factor out frame based actors.
adrianna [Sat, 5 Mar 2016 14:50:17 +0000 (16:50 +0200)]
crowbnar
Neil [Sat, 5 Mar 2016 14:42:50 +0000 (16:42 +0200)]
Fix anchor for lots roaches
Simon Cross [Sat, 5 Mar 2016 14:37:52 +0000 (16:37 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 14:37:41 +0000 (16:37 +0200)]
Actors will perform where asked.
adrianna [Sat, 5 Mar 2016 14:34:06 +0000 (16:34 +0200)]
one of these things is not like the others
Simon Cross [Sat, 5 Mar 2016 14:33:34 +0000 (16:33 +0200)]
Move viewport from Engine to Scene.
Simon Cross [Sat, 5 Mar 2016 14:32:38 +0000 (16:32 +0200)]
Update roach management overlay.
Simon Cross [Sat, 5 Mar 2016 14:07:47 +0000 (16:07 +0200)]
Don't re-initialize when re-entering.
Simon Cross [Sat, 5 Mar 2016 14:06:27 +0000 (16:06 +0200)]
Minor clean-ups.
Simon Cross [Sat, 5 Mar 2016 14:01:24 +0000 (16:01 +0200)]
Add returing to level scene from roach management.
Simon Cross [Sat, 5 Mar 2016 13:57:53 +0000 (15:57 +0200)]
Z is for Zehicle Management.
Neil [Sat, 5 Mar 2016 13:45:03 +0000 (15:45 +0200)]
Remove stale debugging print
Neil [Sat, 5 Mar 2016 13:43:47 +0000 (15:43 +0200)]
Fix anchor for changed images
adrianna [Sat, 5 Mar 2016 13:40:13 +0000 (15:40 +0200)]
these were buggy
adrianna [Sat, 5 Mar 2016 13:32:54 +0000 (15:32 +0200)]
butter knife and tape
Simon Cross [Sat, 5 Mar 2016 13:29:39 +0000 (15:29 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 13:29:34 +0000 (15:29 +0200)]
Support applying serums.
projects / koperkapel.git / log