koperkapel.git
8 years agoMake new images safe.
Simon Cross [Sat, 5 Mar 2016 19:54:15 +0000 (21:54 +0200)]
Make new images safe.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 19:52:27 +0000 (21:52 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agopython2 vs python3
adrianna [Sat, 5 Mar 2016 19:52:10 +0000 (21:52 +0200)]
python2 vs python3

8 years agoUse new splash screen.
Simon Cross [Sat, 5 Mar 2016 19:52:14 +0000 (21:52 +0200)]
Use new splash screen.

8 years agoPull SelectableSurfActor out of vehicles.
Simon Cross [Sat, 5 Mar 2016 19:42:25 +0000 (21:42 +0200)]
Pull SelectableSurfActor out of vehicles.

8 years agoEnemies appear
Neil [Sat, 5 Mar 2016 19:40:04 +0000 (21:40 +0200)]
Enemies appear

8 years agothink of the poor windows users
adrianna [Sat, 5 Mar 2016 19:38:19 +0000 (21:38 +0200)]
think of the poor windows users

8 years agoDrop old weapon when picking up new one.
Simon Cross [Sat, 5 Mar 2016 19:37:00 +0000 (21:37 +0200)]
Drop old weapon when picking up new one.

8 years agoReally gain items.
Simon Cross [Sat, 5 Mar 2016 19:22:57 +0000 (21:22 +0200)]
Really gain items.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 19:20:32 +0000 (21:20 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoGain items.
Simon Cross [Sat, 5 Mar 2016 19:20:17 +0000 (21:20 +0200)]
Gain items.

8 years agorandomly rotate serum puddles
adrianna [Sat, 5 Mar 2016 19:14:00 +0000 (21:14 +0200)]
randomly rotate serum puddles

8 years agoPEP8 fixes.
Simon Cross [Sat, 5 Mar 2016 19:07:38 +0000 (21:07 +0200)]
PEP8 fixes.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 19:05:32 +0000 (21:05 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoHack keyboard behaviour to be different. Also incidently allow rotating in place
Neil [Sat, 5 Mar 2016 19:05:07 +0000 (21:05 +0200)]
Hack keyboard behaviour to be different. Also incidently allow rotating in place

8 years agoAble to consume items.
Simon Cross [Sat, 5 Mar 2016 19:05:14 +0000 (21:05 +0200)]
Able to consume items.

8 years agogame_pos should be a tuple.
Simon Cross [Sat, 5 Mar 2016 19:04:59 +0000 (21:04 +0200)]
game_pos should be a tuple.

8 years agoWeapons should be still when not in use.
Simon Cross [Sat, 5 Mar 2016 18:48:49 +0000 (20:48 +0200)]
Weapons should be still when not in use.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 18:45:41 +0000 (20:45 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoShow weapons when walking.
Simon Cross [Sat, 5 Mar 2016 18:45:29 +0000 (20:45 +0200)]
Show weapons when walking.

8 years agoThe first steps towards enemy generators
Neil [Sat, 5 Mar 2016 18:31:50 +0000 (20:31 +0200)]
The first steps towards enemy generators

8 years agoAnimate weapons.
Simon Cross [Sat, 5 Mar 2016 18:35:50 +0000 (20:35 +0200)]
Animate weapons.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 18:30:00 +0000 (20:30 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoAdd a butter knife to level 1.
Simon Cross [Sat, 5 Mar 2016 18:29:55 +0000 (20:29 +0200)]
Add a butter knife to level 1.

8 years agoAdd smart and strong serums to level 1.
Simon Cross [Sat, 5 Mar 2016 18:26:47 +0000 (20:26 +0200)]
Add smart and strong serums to level 1.

8 years agorenamed weapon frames
adrianna [Sat, 5 Mar 2016 18:25:46 +0000 (20:25 +0200)]
renamed weapon frames

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 18:18:36 +0000 (20:18 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoDisplay a serum on level1.
Simon Cross [Sat, 5 Mar 2016 18:18:30 +0000 (20:18 +0200)]
Display a serum on level1.

8 years agoweapon animations
adrianna [Sat, 5 Mar 2016 18:06:18 +0000 (20:06 +0200)]
weapon animations

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 18:03:34 +0000 (20:03 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoLoad items.
Simon Cross [Sat, 5 Mar 2016 18:03:24 +0000 (20:03 +0200)]
Load items.

8 years agoFix module comment.
Simon Cross [Sat, 5 Mar 2016 18:02:56 +0000 (20:02 +0200)]
Fix module comment.

8 years agoAdd items to haunt us.
Simon Cross [Sat, 5 Mar 2016 18:02:41 +0000 (20:02 +0200)]
Add items to haunt us.

8 years agonew exit sign
adrianna [Sat, 5 Mar 2016 18:00:51 +0000 (20:00 +0200)]
new exit sign

8 years agoAdd weapons.
Simon Cross [Sat, 5 Mar 2016 17:51:23 +0000 (19:51 +0200)]
Add weapons.

8 years agoblank weapon
adrianna [Sat, 5 Mar 2016 17:45:52 +0000 (19:45 +0200)]
blank weapon

8 years agoThe endless pointlessness of level progression
Neil [Sat, 5 Mar 2016 17:33:47 +0000 (19:33 +0200)]
The endless pointlessness of level progression

8 years agoAdd placeholder exit tile
Neil [Sat, 5 Mar 2016 17:06:40 +0000 (19:06 +0200)]
Add placeholder exit tile

8 years agosplash screen
adrianna [Sat, 5 Mar 2016 17:28:30 +0000 (19:28 +0200)]
splash screen

8 years agoAdd default weapon (spit).
Simon Cross [Sat, 5 Mar 2016 17:21:11 +0000 (19:21 +0200)]
Add default weapon (spit).

8 years agoRefactor giant on_key_down.
Simon Cross [Sat, 5 Mar 2016 17:18:46 +0000 (19:18 +0200)]
Refactor giant on_key_down.

8 years agoAdd basis for second level
Neil [Sat, 5 Mar 2016 17:00:58 +0000 (19:00 +0200)]
Add basis for second level

8 years agoadd roaches placeholder
Neil [Sat, 5 Mar 2016 16:57:45 +0000 (18:57 +0200)]
add roaches placeholder

8 years agoMake level convertor take arguments
Neil [Sat, 5 Mar 2016 16:45:25 +0000 (18:45 +0200)]
Make level convertor take arguments

8 years agoRefactor cat.
Simon Cross [Sat, 5 Mar 2016 17:01:57 +0000 (19:01 +0200)]
Refactor cat.

8 years agoUpdate the menu.
Simon Cross [Sat, 5 Mar 2016 16:42:51 +0000 (18:42 +0200)]
Update the menu.

8 years agorat
adrianna [Sat, 5 Mar 2016 16:24:49 +0000 (18:24 +0200)]
rat

8 years agoGain more roaches
Neil [Sat, 5 Mar 2016 15:58:50 +0000 (17:58 +0200)]
Gain more roaches

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 16:15:26 +0000 (18:15 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoRandom vehicle swapping.
Simon Cross [Sat, 5 Mar 2016 16:15:20 +0000 (18:15 +0200)]
Random vehicle swapping.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
David.Sharpe [Sat, 5 Mar 2016 16:11:23 +0000 (18:11 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoFix level converter tool
David.Sharpe [Sat, 5 Mar 2016 16:10:53 +0000 (18:10 +0200)]
Fix level converter tool

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 16:01:20 +0000 (18:01 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoAdd base support for deferring world updates.
Simon Cross [Sat, 5 Mar 2016 16:01:11 +0000 (18:01 +0200)]
Add base support for deferring world updates.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
David.Sharpe [Sat, 5 Mar 2016 15:50:42 +0000 (17:50 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoStuff
David.Sharpe [Sat, 5 Mar 2016 15:50:19 +0000 (17:50 +0200)]
Stuff

8 years agoSample level converter
David.Sharpe [Sat, 5 Mar 2016 15:49:28 +0000 (17:49 +0200)]
Sample level converter

8 years agoWill it blend?
Simon Cross [Sat, 5 Mar 2016 15:48:48 +0000 (17:48 +0200)]
Will it blend?

8 years agoMore vehicles!
Simon Cross [Sat, 5 Mar 2016 15:35:43 +0000 (17:35 +0200)]
More vehicles!

8 years agoAdd big vehicles images.
Simon Cross [Sat, 5 Mar 2016 15:35:26 +0000 (17:35 +0200)]
Add big vehicles images.

8 years agoPass through extra arguments to AnimatedSurfActor.
Simon Cross [Sat, 5 Mar 2016 15:34:54 +0000 (17:34 +0200)]
Pass through extra arguments to AnimatedSurfActor.

8 years agoAdd seating for new vehicles.
Simon Cross [Sat, 5 Mar 2016 15:34:24 +0000 (17:34 +0200)]
Add seating for new vehicles.

8 years agoRemove some fiddling with pygzero internals.
Simon Cross [Sat, 5 Mar 2016 15:13:58 +0000 (17:13 +0200)]
Remove some fiddling with pygzero internals.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 15:10:58 +0000 (17:10 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoMoar vehicles!
Simon Cross [Sat, 5 Mar 2016 15:10:42 +0000 (17:10 +0200)]
Moar vehicles!

8 years agoinfo
adrianna [Sat, 5 Mar 2016 15:04:14 +0000 (17:04 +0200)]
info

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 14:53:09 +0000 (16:53 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoActually add animsurf.
Simon Cross [Sat, 5 Mar 2016 14:52:58 +0000 (16:52 +0200)]
Actually add animsurf.

8 years agoFactor out frame based actors.
Simon Cross [Sat, 5 Mar 2016 14:52:13 +0000 (16:52 +0200)]
Factor out frame based actors.

8 years agocrowbnar
adrianna [Sat, 5 Mar 2016 14:50:17 +0000 (16:50 +0200)]
crowbnar

8 years agoFix anchor for lots roaches
Neil [Sat, 5 Mar 2016 14:42:50 +0000 (16:42 +0200)]
Fix anchor for lots roaches

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 14:37:52 +0000 (16:37 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoActors will perform where asked.
Simon Cross [Sat, 5 Mar 2016 14:37:41 +0000 (16:37 +0200)]
Actors will perform where asked.

8 years agoone of these things is not like the others
adrianna [Sat, 5 Mar 2016 14:34:06 +0000 (16:34 +0200)]
one of these things is not like the others

8 years agoMove viewport from Engine to Scene.
Simon Cross [Sat, 5 Mar 2016 14:33:34 +0000 (16:33 +0200)]
Move viewport from Engine to Scene.

8 years agoUpdate roach management overlay.
Simon Cross [Sat, 5 Mar 2016 14:32:38 +0000 (16:32 +0200)]
Update roach management overlay.

8 years agoDon't re-initialize when re-entering.
Simon Cross [Sat, 5 Mar 2016 14:07:47 +0000 (16:07 +0200)]
Don't re-initialize when re-entering.

8 years agoMinor clean-ups.
Simon Cross [Sat, 5 Mar 2016 14:06:27 +0000 (16:06 +0200)]
Minor clean-ups.

8 years agoAdd returing to level scene from roach management.
Simon Cross [Sat, 5 Mar 2016 14:01:24 +0000 (16:01 +0200)]
Add returing to level scene from roach management.

8 years agoZ is for Zehicle Management.
Simon Cross [Sat, 5 Mar 2016 13:57:53 +0000 (15:57 +0200)]
Z is for Zehicle Management.

8 years agoRemove stale debugging print
Neil [Sat, 5 Mar 2016 13:45:03 +0000 (15:45 +0200)]
Remove stale debugging print

8 years agoFix anchor for changed images
Neil [Sat, 5 Mar 2016 13:43:47 +0000 (15:43 +0200)]
Fix anchor for changed images

8 years agothese were buggy
adrianna [Sat, 5 Mar 2016 13:40:13 +0000 (15:40 +0200)]
these were buggy

8 years agobutter knife and tape
adrianna [Sat, 5 Mar 2016 13:32:54 +0000 (15:32 +0200)]
butter knife and tape

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 13:29:39 +0000 (15:29 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoSupport applying serums.
Simon Cross [Sat, 5 Mar 2016 13:29:34 +0000 (15:29 +0200)]
Support applying serums.

8 years agoAdd roach_at helper.
Simon Cross [Sat, 5 Mar 2016 13:29:18 +0000 (15:29 +0200)]
Add roach_at helper.

8 years agoAdd roach_is_serumless helper.
Simon Cross [Sat, 5 Mar 2016 13:29:03 +0000 (15:29 +0200)]
Add roach_is_serumless helper.

8 years agoAdd roach_by_name helper.
Simon Cross [Sat, 5 Mar 2016 13:28:45 +0000 (15:28 +0200)]
Add roach_by_name helper.

8 years agoVery crudely hack vehicles into the level
Neil [Sat, 5 Mar 2016 13:24:18 +0000 (15:24 +0200)]
Very crudely hack vehicles into the level

8 years agoHack anchor support for rotation
Neil [Sat, 5 Mar 2016 13:23:50 +0000 (15:23 +0200)]
Hack anchor support for rotation

8 years agoraised inventory label
adrianna [Sat, 5 Mar 2016 12:51:36 +0000 (14:51 +0200)]
raised inventory label

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 12:49:52 +0000 (14:49 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoSeatable roaches.
Simon Cross [Sat, 5 Mar 2016 12:49:46 +0000 (14:49 +0200)]
Seatable roaches.

8 years agofont and arrows on management screen
adrianna [Sat, 5 Mar 2016 12:28:49 +0000 (14:28 +0200)]
font and arrows on management screen

8 years agoDoors can open (and also close)
Neil [Sat, 5 Mar 2016 12:17:46 +0000 (14:17 +0200)]
Doors can open (and also close)

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 12:13:18 +0000 (14:13 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoSelectable seats.
Simon Cross [Sat, 5 Mar 2016 12:12:37 +0000 (14:12 +0200)]
Selectable seats.

8 years agoOrientate the doors
Neil [Sat, 5 Mar 2016 12:06:22 +0000 (14:06 +0200)]
Orientate the doors

8 years agoFix door positon
Neil [Sat, 5 Mar 2016 12:06:07 +0000 (14:06 +0200)]
Fix door positon