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.
Simon Cross [Sat, 5 Mar 2016 13:29:18 +0000 (15:29 +0200)]
Add roach_at helper.
Simon Cross [Sat, 5 Mar 2016 13:29:03 +0000 (15:29 +0200)]
Add roach_is_serumless helper.
Simon Cross [Sat, 5 Mar 2016 13:28:45 +0000 (15:28 +0200)]
Add roach_by_name helper.
Neil [Sat, 5 Mar 2016 13:24:18 +0000 (15:24 +0200)]
Very crudely hack vehicles into the level
Neil [Sat, 5 Mar 2016 13:23:50 +0000 (15:23 +0200)]
Hack anchor support for rotation
adrianna [Sat, 5 Mar 2016 12:51:36 +0000 (14:51 +0200)]
raised inventory label
Simon Cross [Sat, 5 Mar 2016 12:49:52 +0000 (14:49 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 12:49:46 +0000 (14:49 +0200)]
Seatable roaches.
adrianna [Sat, 5 Mar 2016 12:28:49 +0000 (14:28 +0200)]
font and arrows on management screen
Neil [Sat, 5 Mar 2016 12:17:46 +0000 (14:17 +0200)]
Doors can open (and also close)
Simon Cross [Sat, 5 Mar 2016 12:13:18 +0000 (14:13 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 12:12:37 +0000 (14:12 +0200)]
Selectable seats.
Neil [Sat, 5 Mar 2016 12:06:22 +0000 (14:06 +0200)]
Orientate the doors
Neil [Sat, 5 Mar 2016 12:06:07 +0000 (14:06 +0200)]
Fix door positon
Neil [Sat, 5 Mar 2016 12:00:21 +0000 (14:00 +0200)]
Somewhat doorish
Neil [Sat, 5 Mar 2016 11:35:36 +0000 (13:35 +0200)]
Door hacking
Simon Cross [Sat, 5 Mar 2016 11:59:35 +0000 (13:59 +0200)]
PEP8 fixes.
Simon Cross [Sat, 5 Mar 2016 11:38:51 +0000 (13:38 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 11:38:33 +0000 (13:38 +0200)]
Display seated and outside roaches.
Simon Cross [Sat, 5 Mar 2016 11:38:22 +0000 (13:38 +0200)]
Implement 5s rule for seating.
adrianna [Sat, 5 Mar 2016 11:16:12 +0000 (13:16 +0200)]
open and closed door, and keypad
Simon Cross [Sat, 5 Mar 2016 11:07:43 +0000 (13:07 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 11:07:36 +0000 (13:07 +0200)]
Slightly more advanced roach seating.
Simon Cross [Sat, 5 Mar 2016 11:07:04 +0000 (13:07 +0200)]
Add __getitem__ and __setitem__ for WorldDictProxy.
adrianna [Sat, 5 Mar 2016 11:06:40 +0000 (13:06 +0200)]
circle for multiplying with grate background later maybe
adrianna [Sat, 5 Mar 2016 10:58:50 +0000 (12:58 +0200)]
grate
Neil [Sat, 5 Mar 2016 10:49:14 +0000 (12:49 +0200)]
Show the grate
Neil [Sat, 5 Mar 2016 10:48:58 +0000 (12:48 +0200)]
Actually commit the correct grate image
Neil [Sat, 5 Mar 2016 10:41:41 +0000 (12:41 +0200)]
Placeholder grate image
Simon Cross [Sat, 5 Mar 2016 10:48:20 +0000 (12:48 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 10:48:09 +0000 (12:48 +0200)]
Name layer attributes more clearly.
adrianna [Sat, 5 Mar 2016 10:43:27 +0000 (12:43 +0200)]
robot
Simon Cross [Sat, 5 Mar 2016 10:39:23 +0000 (12:39 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Sat, 5 Mar 2016 10:39:01 +0000 (12:39 +0200)]
Refactor seating a bit.
Neil [Sat, 5 Mar 2016 10:26:07 +0000 (12:26 +0200)]
Add a second grate
Neil [Sat, 5 Mar 2016 10:20:39 +0000 (12:20 +0200)]
Many-angled roaches
Simon Cross [Sat, 5 Mar 2016 10:16:23 +0000 (12:16 +0200)]
Pre-booked seats.
Simon Cross [Sat, 5 Mar 2016 10:11:24 +0000 (12:11 +0200)]
One vehicle at a time.
Neil [Sat, 5 Mar 2016 09:59:49 +0000 (11:59 +0200)]
Hook up crawl behaviour. Make tunnel entrance even harder to find as a result
Neil [Sat, 5 Mar 2016 09:59:15 +0000 (11:59 +0200)]
Add 'crawl' behavior to level. Use prettier options for saving level, since we're autogenerating less stuff
Simon Cross [Sat, 5 Mar 2016 09:55:55 +0000 (11:55 +0200)]
Add a run_game.py script.
Neil [Sat, 5 Mar 2016 06:23:12 +0000 (08:23 +0200)]
Center display around our hero(es)
Simon Cross [Fri, 4 Mar 2016 22:58:03 +0000 (00:58 +0200)]
Clean up inventory displaying.
Simon Cross [Fri, 4 Mar 2016 22:49:21 +0000 (00:49 +0200)]
Hackish serum placement offset.
adrianna [Fri, 4 Mar 2016 22:44:57 +0000 (00:44 +0200)]
this is unnecessary
adrianna [Fri, 4 Mar 2016 22:44:39 +0000 (00:44 +0200)]
colours should work with this
Simon Cross [Fri, 4 Mar 2016 22:43:19 +0000 (00:43 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Fri, 4 Mar 2016 22:43:07 +0000 (00:43 +0200)]
Cycle through serums.
Simon Cross [Fri, 4 Mar 2016 22:42:41 +0000 (00:42 +0200)]
Serum assembly.
Simon Cross [Fri, 4 Mar 2016 22:42:11 +0000 (00:42 +0200)]
Clear method for layers.
Simon Cross [Fri, 4 Mar 2016 22:41:50 +0000 (00:41 +0200)]
__len__ and __bool__ for world list proxies.
Simon Cross [Fri, 4 Mar 2016 22:41:12 +0000 (00:41 +0200)]
Be a bit more clear about what needs copies.
adrianna [Fri, 4 Mar 2016 22:22:48 +0000 (00:22 +0200)]
flying quadcopter and vibrating roomba
Simon Cross [Fri, 4 Mar 2016 22:19:43 +0000 (00:19 +0200)]
Remove commented out code.
Simon Cross [Fri, 4 Mar 2016 22:15:36 +0000 (00:15 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Fri, 4 Mar 2016 22:14:39 +0000 (00:14 +0200)]
Generate big serum images for management screen.
Neil [Fri, 4 Mar 2016 22:09:53 +0000 (00:09 +0200)]
A roach wanders into the world
Simon Cross [Fri, 4 Mar 2016 21:59:46 +0000 (23:59 +0200)]
Start describing serums.
Simon Cross [Fri, 4 Mar 2016 21:39:47 +0000 (23:39 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Fri, 4 Mar 2016 21:39:33 +0000 (23:39 +0200)]
Color roaches according to their abilities.
adrianna [Fri, 4 Mar 2016 21:29:09 +0000 (23:29 +0200)]
roomba
Simon Cross [Fri, 4 Mar 2016 21:25:03 +0000 (23:25 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Fri, 4 Mar 2016 21:24:30 +0000 (23:24 +0200)]
Game structure notes and ideas.
Neil [Fri, 4 Mar 2016 21:24:17 +0000 (23:24 +0200)]
Saner default starting pos
Neil [Fri, 4 Mar 2016 21:17:45 +0000 (23:17 +0200)]
Add starting position to level, and show it on view level screen
Simon Cross [Fri, 4 Mar 2016 20:45:51 +0000 (22:45 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Fri, 4 Mar 2016 20:45:27 +0000 (22:45 +0200)]
Give roaches more colours and fewer legs.
adrianna [Fri, 4 Mar 2016 20:35:49 +0000 (22:35 +0200)]
serum graphics
projects / koperkapel.git / log