koperkapel.git
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

8 years agoSomewhat doorish
Neil [Sat, 5 Mar 2016 12:00:21 +0000 (14:00 +0200)]
Somewhat doorish

8 years agoDoor hacking
Neil [Sat, 5 Mar 2016 11:35:36 +0000 (13:35 +0200)]
Door hacking

8 years agoPEP8 fixes.
Simon Cross [Sat, 5 Mar 2016 11:59:35 +0000 (13:59 +0200)]
PEP8 fixes.

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

8 years agoDisplay seated and outside roaches.
Simon Cross [Sat, 5 Mar 2016 11:38:33 +0000 (13:38 +0200)]
Display seated and outside roaches.

8 years agoImplement 5s rule for seating.
Simon Cross [Sat, 5 Mar 2016 11:38:22 +0000 (13:38 +0200)]
Implement 5s rule for seating.

8 years agoopen and closed door, and keypad
adrianna [Sat, 5 Mar 2016 11:16:12 +0000 (13:16 +0200)]
open and closed door, and keypad

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

8 years agoSlightly more advanced roach seating.
Simon Cross [Sat, 5 Mar 2016 11:07:36 +0000 (13:07 +0200)]
Slightly more advanced roach seating.

8 years agoAdd __getitem__ and __setitem__ for WorldDictProxy.
Simon Cross [Sat, 5 Mar 2016 11:07:04 +0000 (13:07 +0200)]
Add __getitem__ and __setitem__ for WorldDictProxy.

8 years agocircle for multiplying with grate background later maybe
adrianna [Sat, 5 Mar 2016 11:06:40 +0000 (13:06 +0200)]
circle for multiplying with grate background later maybe

8 years agograte
adrianna [Sat, 5 Mar 2016 10:58:50 +0000 (12:58 +0200)]
grate

8 years agoShow the grate
Neil [Sat, 5 Mar 2016 10:49:14 +0000 (12:49 +0200)]
Show the grate

8 years agoActually commit the correct grate image
Neil [Sat, 5 Mar 2016 10:48:58 +0000 (12:48 +0200)]
Actually commit the correct grate image

8 years agoPlaceholder grate image
Neil [Sat, 5 Mar 2016 10:41:41 +0000 (12:41 +0200)]
Placeholder grate image

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

8 years agoName layer attributes more clearly.
Simon Cross [Sat, 5 Mar 2016 10:48:09 +0000 (12:48 +0200)]
Name layer attributes more clearly.

8 years agorobot
adrianna [Sat, 5 Mar 2016 10:43:27 +0000 (12:43 +0200)]
robot

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

8 years agoRefactor seating a bit.
Simon Cross [Sat, 5 Mar 2016 10:39:01 +0000 (12:39 +0200)]
Refactor seating a bit.

8 years agoAdd a second grate
Neil [Sat, 5 Mar 2016 10:26:07 +0000 (12:26 +0200)]
Add a second grate

8 years agoMany-angled roaches
Neil [Sat, 5 Mar 2016 10:20:39 +0000 (12:20 +0200)]
Many-angled roaches

8 years agoPre-booked seats.
Simon Cross [Sat, 5 Mar 2016 10:16:23 +0000 (12:16 +0200)]
Pre-booked seats.

8 years agoOne vehicle at a time.
Simon Cross [Sat, 5 Mar 2016 10:11:24 +0000 (12:11 +0200)]
One vehicle at a time.

8 years agoHook up crawl behaviour. Make tunnel entrance even harder to find as a result
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

8 years agoAdd 'crawl' behavior to level. Use prettier options for saving level, since we're...
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

8 years agoAdd a run_game.py script.
Simon Cross [Sat, 5 Mar 2016 09:55:55 +0000 (11:55 +0200)]
Add a run_game.py script.

8 years agoCenter display around our hero(es)
Neil [Sat, 5 Mar 2016 06:23:12 +0000 (08:23 +0200)]
Center display around our hero(es)

8 years agoClean up inventory displaying.
Simon Cross [Fri, 4 Mar 2016 22:58:03 +0000 (00:58 +0200)]
Clean up inventory displaying.

8 years agoHackish serum placement offset.
Simon Cross [Fri, 4 Mar 2016 22:49:21 +0000 (00:49 +0200)]
Hackish serum placement offset.

8 years agothis is unnecessary
adrianna [Fri, 4 Mar 2016 22:44:57 +0000 (00:44 +0200)]
this is unnecessary

8 years agocolours should work with this
adrianna [Fri, 4 Mar 2016 22:44:39 +0000 (00:44 +0200)]
colours should work with this

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Fri, 4 Mar 2016 22:43:19 +0000 (00:43 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoCycle through serums.
Simon Cross [Fri, 4 Mar 2016 22:43:07 +0000 (00:43 +0200)]
Cycle through serums.

8 years agoSerum assembly.
Simon Cross [Fri, 4 Mar 2016 22:42:41 +0000 (00:42 +0200)]
Serum assembly.

8 years agoClear method for layers.
Simon Cross [Fri, 4 Mar 2016 22:42:11 +0000 (00:42 +0200)]
Clear method for layers.

8 years ago__len__ and __bool__ for world list proxies.
Simon Cross [Fri, 4 Mar 2016 22:41:50 +0000 (00:41 +0200)]
__len__ and __bool__ for world list proxies.

8 years agoBe a bit more clear about what needs copies.
Simon Cross [Fri, 4 Mar 2016 22:41:12 +0000 (00:41 +0200)]
Be a bit more clear about what needs copies.

8 years agoflying quadcopter and vibrating roomba
adrianna [Fri, 4 Mar 2016 22:22:48 +0000 (00:22 +0200)]
flying quadcopter and vibrating roomba

8 years agoRemove commented out code.
Simon Cross [Fri, 4 Mar 2016 22:19:43 +0000 (00:19 +0200)]
Remove commented out code.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Fri, 4 Mar 2016 22:15:36 +0000 (00:15 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoGenerate big serum images for management screen.
Simon Cross [Fri, 4 Mar 2016 22:14:39 +0000 (00:14 +0200)]
Generate big serum images for management screen.

8 years agoA roach wanders into the world
Neil [Fri, 4 Mar 2016 22:09:53 +0000 (00:09 +0200)]
A roach wanders into the world

8 years agoStart describing serums.
Simon Cross [Fri, 4 Mar 2016 21:59:46 +0000 (23:59 +0200)]
Start describing serums.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Fri, 4 Mar 2016 21:39:47 +0000 (23:39 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoColor roaches according to their abilities.
Simon Cross [Fri, 4 Mar 2016 21:39:33 +0000 (23:39 +0200)]
Color roaches according to their abilities.

8 years agoroomba
adrianna [Fri, 4 Mar 2016 21:29:09 +0000 (23:29 +0200)]
roomba

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Fri, 4 Mar 2016 21:25:03 +0000 (23:25 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoGame structure notes and ideas.
Simon Cross [Fri, 4 Mar 2016 21:24:30 +0000 (23:24 +0200)]
Game structure notes and ideas.

8 years agoSaner default starting pos
Neil [Fri, 4 Mar 2016 21:24:17 +0000 (23:24 +0200)]
Saner default starting pos

8 years agoAdd starting position to level, and show it on view level screen
Neil [Fri, 4 Mar 2016 21:17:45 +0000 (23:17 +0200)]
Add starting position to level, and show it on view level screen

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Fri, 4 Mar 2016 20:45:51 +0000 (22:45 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoGive roaches more colours and fewer legs.
Simon Cross [Fri, 4 Mar 2016 20:45:27 +0000 (22:45 +0200)]
Give roaches more colours and fewer legs.

8 years agoserum graphics
adrianna [Fri, 4 Mar 2016 20:35:49 +0000 (22:35 +0200)]
serum graphics

8 years agoThe roaches have eyes!
Simon Cross [Fri, 4 Mar 2016 20:27:37 +0000 (22:27 +0200)]
The roaches have eyes!

8 years agoWalking roaches.
Simon Cross [Fri, 4 Mar 2016 20:24:57 +0000 (22:24 +0200)]
Walking roaches.

8 years agoRename roach management scene module.
Simon Cross [Fri, 4 Mar 2016 19:35:33 +0000 (21:35 +0200)]
Rename roach management scene module.

8 years agoBigger roaches.
Simon Cross [Fri, 4 Mar 2016 19:28:53 +0000 (21:28 +0200)]
Bigger roaches.

8 years agoPlace roach seats.
Simon Cross [Fri, 4 Mar 2016 19:21:05 +0000 (21:21 +0200)]
Place roach seats.

8 years agoRoach seats.
Simon Cross [Fri, 4 Mar 2016 19:20:35 +0000 (21:20 +0200)]
Roach seats.

8 years agoUpdate roach management images for new game size.
Simon Cross [Fri, 4 Mar 2016 18:58:54 +0000 (20:58 +0200)]
Update roach management images for new game size.

8 years agoAdd more structured level 1 as basis for tutorial
Neil [Fri, 4 Mar 2016 15:57:35 +0000 (17:57 +0200)]
Add more structured level 1 as basis for tutorial

8 years agoFixed rooms in maps again and added passages(broken)
David Sharpe [Fri, 4 Mar 2016 05:45:25 +0000 (07:45 +0200)]
Fixed rooms in maps again and added passages(broken)

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Thu, 3 Mar 2016 22:37:26 +0000 (00:37 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoVague sketch of displaying vehicle in roach management scene.
Simon Cross [Thu, 3 Mar 2016 22:37:09 +0000 (00:37 +0200)]
Vague sketch of displaying vehicle in roach management scene.

8 years agoSet initial (lack of) vehicle.
Simon Cross [Thu, 3 Mar 2016 22:36:02 +0000 (00:36 +0200)]
Set initial (lack of) vehicle.

8 years agoRoaches on foot.
Simon Cross [Thu, 3 Mar 2016 22:35:33 +0000 (00:35 +0200)]
Roaches on foot.

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
David Sharpe [Thu, 3 Mar 2016 22:31:58 +0000 (00:31 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoMerge of doom
David Sharpe [Thu, 3 Mar 2016 22:31:06 +0000 (00:31 +0200)]
Merge of doom

8 years agoMerge branch 'master' of ctpug.org.za:koperkapel
Simon Cross [Thu, 3 Mar 2016 22:02:31 +0000 (00:02 +0200)]
Merge branch 'master' of ctpug.org.za:koperkapel

8 years agoPackage for vehicles.
Simon Cross [Thu, 3 Mar 2016 22:02:17 +0000 (00:02 +0200)]
Package for vehicles.

8 years agoMove various bits into gamelib
Neil [Thu, 3 Mar 2016 21:37:16 +0000 (23:37 +0200)]
Move various bits into gamelib

8 years agoSplit level scene for game play extensions
Neil [Thu, 3 Mar 2016 21:16:03 +0000 (23:16 +0200)]
Split level scene for game play extensions

8 years agoMerge
David Sharpe [Thu, 3 Mar 2016 21:09:36 +0000 (23:09 +0200)]
Merge

8 years agoMerge
David Sharpe [Thu, 3 Mar 2016 21:08:58 +0000 (23:08 +0200)]
Merge

8 years agofixed random tile rotationa nd made OrientatedTile inherit fromTile
adrianna [Thu, 3 Mar 2016 15:21:50 +0000 (17:21 +0200)]
fixed random tile rotationa nd made OrientatedTile inherit fromTile

8 years agorefactored to fix bunker dependency regeneration
adrianna [Thu, 3 Mar 2016 15:19:49 +0000 (17:19 +0200)]
refactored to fix bunker dependency regeneration

8 years agoLoad tunnel tiles
Neil [Thu, 3 Mar 2016 11:32:35 +0000 (13:32 +0200)]
Load tunnel tiles

8 years agoAdd placeholder tunnel images
Neil [Thu, 3 Mar 2016 11:32:23 +0000 (13:32 +0200)]
Add placeholder tunnel images

8 years agoAdd placeholder underground images. Start work on proper tunnel image loading
Neil [Thu, 3 Mar 2016 10:23:28 +0000 (12:23 +0200)]
Add placeholder underground images. Start work on proper tunnel image loading

8 years agoAdd placeholder underground tile types
Neil [Thu, 3 Mar 2016 09:46:58 +0000 (11:46 +0200)]
Add placeholder underground tile types

8 years agoUpdate level
Neil [Thu, 3 Mar 2016 09:44:28 +0000 (11:44 +0200)]
Update level

8 years agoRename underground tiles in level generator
Neil [Thu, 3 Mar 2016 09:44:22 +0000 (11:44 +0200)]
Rename underground tiles in level generator

8 years agoCrudely hack tileset support back in
Neil [Thu, 3 Mar 2016 09:07:05 +0000 (11:07 +0200)]
Crudely hack tileset support back in

8 years agoMake screen size a tile shorter
Neil [Thu, 3 Mar 2016 08:48:24 +0000 (10:48 +0200)]
Make screen size a tile shorter

8 years agoMake roach pads slightly shorter
Neil [Thu, 3 Mar 2016 08:48:06 +0000 (10:48 +0200)]
Make roach pads slightly shorter

8 years agoDon't make diagonal tunnels
Neil [Thu, 3 Mar 2016 05:44:38 +0000 (07:44 +0200)]
Don't make diagonal tunnels

8 years agoRename to be more distinct from actor layers
Neil [Wed, 2 Mar 2016 21:59:47 +0000 (23:59 +0200)]
Rename to be more distinct from actor layers

8 years agoSteps towards switching views between the level layers
Neil [Wed, 2 Mar 2016 21:55:18 +0000 (23:55 +0200)]
Steps towards switching views between the level layers

8 years agoRecreate test level with underlay
Neil [Wed, 2 Mar 2016 21:26:26 +0000 (23:26 +0200)]
Recreate test level with underlay

8 years agoHack in underlay generation
Neil [Wed, 2 Mar 2016 21:24:58 +0000 (23:24 +0200)]
Hack in underlay generation

8 years agoReorganise tiles so we can potentially create tilesets
Neil [Wed, 2 Mar 2016 20:36:27 +0000 (22:36 +0200)]
Reorganise tiles so we can potentially create tilesets