Simon Cross [Sat, 10 Sep 2016 14:49:55 +0000 (16:49 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Sat, 10 Sep 2016 14:47:56 +0000 (16:47 +0200)]
Add end day.
Simon Cross [Sat, 10 Sep 2016 14:47:44 +0000 (16:47 +0200)]
Add battery pack manager.
adrianna [Sat, 10 Sep 2016 14:25:27 +0000 (16:25 +0200)]
added pausing to night and moved reset tool after other tools
Simon Cross [Sat, 10 Sep 2016 14:29:26 +0000 (16:29 +0200)]
Add battery config to levels.
Simon Cross [Sat, 10 Sep 2016 14:27:09 +0000 (16:27 +0200)]
End of the day button is done.
Simon Cross [Sat, 10 Sep 2016 14:21:39 +0000 (16:21 +0200)]
Clear light toolbar when the tool is cancelled.
Simon Cross [Sat, 10 Sep 2016 14:19:40 +0000 (16:19 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Sat, 10 Sep 2016 14:19:34 +0000 (16:19 +0200)]
Add colour selection based on available colours.
Simon Cross [Sat, 10 Sep 2016 14:18:16 +0000 (16:18 +0200)]
Allow supplying and image to image button.
Simon Cross [Sat, 10 Sep 2016 14:17:52 +0000 (16:17 +0200)]
Add method for finding light fitting image by light type.
Simon Cross [Sat, 10 Sep 2016 14:17:22 +0000 (16:17 +0200)]
Add light colour wedges transforms.
Neil [Sat, 10 Sep 2016 14:08:37 +0000 (16:08 +0200)]
Update TODO
Neil [Sat, 10 Sep 2016 14:07:51 +0000 (16:07 +0200)]
Fix syntax
Neil [Sat, 10 Sep 2016 14:04:22 +0000 (16:04 +0200)]
Add 'game over' check and display
adrianna [Sat, 10 Sep 2016 13:57:21 +0000 (15:57 +0200)]
made pause/play buttons for night time
adrianna [Sat, 10 Sep 2016 13:48:48 +0000 (15:48 +0200)]
added exit button
Neil [Sat, 10 Sep 2016 13:42:22 +0000 (15:42 +0200)]
Transition screen done
adrianna [Sat, 10 Sep 2016 13:37:10 +0000 (15:37 +0200)]
hooked up night button and moved cursor reset next to other tools
adrianna [Sat, 10 Sep 2016 13:32:29 +0000 (15:32 +0200)]
new default cursor image plus night time activation image
Neil [Sat, 10 Sep 2016 13:39:23 +0000 (15:39 +0200)]
Add end of night text overlay
Neil [Sat, 10 Sep 2016 13:38:11 +0000 (15:38 +0200)]
Drop-shadow helper
Simon Cross [Sat, 10 Sep 2016 13:24:26 +0000 (15:24 +0200)]
Set available colour combinations in levels.
Simon Cross [Sat, 10 Sep 2016 13:23:26 +0000 (15:23 +0200)]
Factor light fitting rendering out into a function.
Simon Cross [Sat, 10 Sep 2016 13:09:01 +0000 (15:09 +0200)]
PEP8 fixes.
Simon Cross [Sat, 10 Sep 2016 12:55:33 +0000 (14:55 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Sat, 10 Sep 2016 12:55:25 +0000 (14:55 +0200)]
Populate toolbar from available lights.
Simon Cross [Sat, 10 Sep 2016 12:55:02 +0000 (14:55 +0200)]
Add available lights list to levels.
Neil [Sat, 10 Sep 2016 12:38:29 +0000 (14:38 +0200)]
Check correct distance
Neil [Sat, 10 Sep 2016 12:28:08 +0000 (14:28 +0200)]
Add todo items
Neil [Sat, 10 Sep 2016 12:26:31 +0000 (14:26 +0200)]
Increase Boyd's starting health over time
Neil [Sat, 10 Sep 2016 12:25:48 +0000 (14:25 +0200)]
Increment day at the end of the night
Neil [Sat, 10 Sep 2016 12:24:09 +0000 (14:24 +0200)]
Add days to gamestate and day screen display
Simon Cross [Sat, 10 Sep 2016 12:21:27 +0000 (14:21 +0200)]
Remove unused import.
Simon Cross [Sat, 10 Sep 2016 12:20:38 +0000 (14:20 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Sat, 10 Sep 2016 12:20:32 +0000 (14:20 +0200)]
Add available lights to tutorial.
adrianna [Sat, 10 Sep 2016 12:19:50 +0000 (14:19 +0200)]
approximate circles by polygons in pymunk
Simon Cross [Sat, 10 Sep 2016 12:18:00 +0000 (14:18 +0200)]
Remove initial lights from tutorial.
Simon Cross [Sat, 10 Sep 2016 12:12:31 +0000 (14:12 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Sat, 10 Sep 2016 12:12:20 +0000 (14:12 +0200)]
List levels by title.
Neil [Sat, 10 Sep 2016 12:04:01 +0000 (14:04 +0200)]
Hide 'end the night' keypress option behind DEBUG
Neil [Sat, 10 Sep 2016 12:02:42 +0000 (14:02 +0200)]
Add todo items
Neil [Sat, 10 Sep 2016 12:00:04 +0000 (14:00 +0200)]
Actually end the night on timeout. Also end the night if Boyd dies out
Simon Cross [Sat, 10 Sep 2016 11:55:29 +0000 (13:55 +0200)]
Return 0 for the direction if it is currently None.
Simon Cross [Sat, 10 Sep 2016 11:53:06 +0000 (13:53 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Sat, 10 Sep 2016 11:52:54 +0000 (13:52 +0200)]
Rename tutorial level.
Simon Cross [Sat, 10 Sep 2016 11:52:37 +0000 (13:52 +0200)]
Retitle tutorial level.
Neil [Sat, 10 Sep 2016 11:47:38 +0000 (13:47 +0200)]
Tweak Boyd's max size
Neil [Sat, 10 Sep 2016 11:47:29 +0000 (13:47 +0200)]
Add night length
Simon Cross [Sat, 10 Sep 2016 11:44:35 +0000 (13:44 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Sat, 10 Sep 2016 11:44:24 +0000 (13:44 +0200)]
Set tutorial obstacles.
adrianna [Sat, 10 Sep 2016 11:41:02 +0000 (13:41 +0200)]
shrub achieved
adrianna [Sat, 10 Sep 2016 11:25:06 +0000 (13:25 +0200)]
rotating spotlight fixture
Simon Cross [Sat, 10 Sep 2016 11:37:43 +0000 (13:37 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Sat, 10 Sep 2016 11:37:29 +0000 (13:37 +0200)]
Use some elif.
Neil [Sat, 10 Sep 2016 11:34:15 +0000 (13:34 +0200)]
Tweak Boyd
Neil [Sat, 10 Sep 2016 11:27:00 +0000 (13:27 +0200)]
Add Boyd's spawn position to stations
Simon Cross [Sat, 10 Sep 2016 11:31:45 +0000 (13:31 +0200)]
Remove unused local variable.
Simon Cross [Sat, 10 Sep 2016 11:29:04 +0000 (13:29 +0200)]
Fix pep8.
Simon Cross [Sat, 10 Sep 2016 11:04:17 +0000 (13:04 +0200)]
Rescale intensity.
Neil [Sat, 10 Sep 2016 10:56:27 +0000 (12:56 +0200)]
Update placement to changed API
Neil [Sat, 10 Sep 2016 10:54:36 +0000 (12:54 +0200)]
Update angle in gamestate as well for passing to night
Simon Cross [Sat, 10 Sep 2016 10:54:59 +0000 (12:54 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Sat, 10 Sep 2016 10:54:53 +0000 (12:54 +0200)]
Add total power and damage.
adrianna [Sat, 10 Sep 2016 10:47:05 +0000 (12:47 +0200)]
merged display of multicoloured light into base class
adrianna [Sat, 10 Sep 2016 10:39:21 +0000 (12:39 +0200)]
multicoloured light display
Neil [Sat, 10 Sep 2016 10:37:57 +0000 (12:37 +0200)]
Right-click and drag light rotation
Simon Cross [Sat, 10 Sep 2016 10:36:41 +0000 (12:36 +0200)]
Update todos.
Simon Cross [Sat, 10 Sep 2016 10:34:54 +0000 (12:34 +0200)]
Make all lamps multicoloured.
Simon Cross [Sat, 10 Sep 2016 10:28:12 +0000 (12:28 +0200)]
Add direction property to ray manager.
Simon Cross [Sat, 10 Sep 2016 10:17:50 +0000 (12:17 +0200)]
Specify direction and spread rather than angle limits.
Simon Cross [Sat, 10 Sep 2016 10:05:40 +0000 (12:05 +0200)]
Add todos from breakfast.
Neil [Sat, 10 Sep 2016 09:54:47 +0000 (11:54 +0200)]
Multi-level light toolbar
Neil [Sat, 10 Sep 2016 09:54:15 +0000 (11:54 +0200)]
Move colour definitions into constants
Simon Cross [Fri, 9 Sep 2016 22:43:32 +0000 (00:43 +0200)]
Also pulsate intensity.
Simon Cross [Fri, 9 Sep 2016 22:34:14 +0000 (00:34 +0200)]
Add pulsating lamp.
Simon Cross [Fri, 9 Sep 2016 22:17:43 +0000 (00:17 +0200)]
Add multi-colour lamp.
Simon Cross [Fri, 9 Sep 2016 21:53:26 +0000 (23:53 +0200)]
PEP8 fix.
Simon Cross [Fri, 9 Sep 2016 21:52:36 +0000 (23:52 +0200)]
Remove old direction and spread parameters.
Simon Cross [Fri, 9 Sep 2016 21:48:34 +0000 (23:48 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Fri, 9 Sep 2016 21:48:20 +0000 (23:48 +0200)]
Add back light radius checks.
Neil [Fri, 9 Sep 2016 21:47:44 +0000 (23:47 +0200)]
Tweak test station
Neil [Fri, 9 Sep 2016 21:46:58 +0000 (23:46 +0200)]
Limit how close lights can be placed to each other
adrianna [Fri, 9 Sep 2016 21:40:37 +0000 (23:40 +0200)]
blue is not cyan
Simon Cross [Fri, 9 Sep 2016 21:40:21 +0000 (23:40 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Fri, 9 Sep 2016 21:39:02 +0000 (23:39 +0200)]
Move radius and angle limits into ray manager.
adrianna [Fri, 9 Sep 2016 21:20:40 +0000 (23:20 +0200)]
made turnips bigger
adrianna [Fri, 9 Sep 2016 21:14:41 +0000 (23:14 +0200)]
made light body bigger
Neil [Fri, 9 Sep 2016 21:12:28 +0000 (23:12 +0200)]
Lights can be added to the world
adrianna [Fri, 9 Sep 2016 21:10:22 +0000 (23:10 +0200)]
made light fixtures smaller
adrianna [Fri, 9 Sep 2016 20:55:07 +0000 (22:55 +0200)]
alpha transform; made seed cursor transparent
Simon Cross [Fri, 9 Sep 2016 20:39:17 +0000 (22:39 +0200)]
Wrap long line.
adrianna [Fri, 9 Sep 2016 20:34:57 +0000 (22:34 +0200)]
copying cursors automatically
adrianna [Fri, 9 Sep 2016 20:32:34 +0000 (22:32 +0200)]
made the lamp a lamp
Neil [Fri, 9 Sep 2016 20:28:03 +0000 (22:28 +0200)]
Use multiply transform
Neil [Fri, 9 Sep 2016 20:08:07 +0000 (22:08 +0200)]
Start working toward light placement
Neil [Fri, 9 Sep 2016 20:07:47 +0000 (22:07 +0200)]
Add transform support to cursor and image buttons
adrianna [Fri, 9 Sep 2016 20:22:53 +0000 (22:22 +0200)]
added a multiply transform to use on light fittings
Simon Cross [Fri, 9 Sep 2016 20:21:11 +0000 (22:21 +0200)]
Merge branch 'master' of ctpug.org.za:tabakrolletjie
Simon Cross [Fri, 9 Sep 2016 20:21:05 +0000 (22:21 +0200)]
Proper __hash__ and __eq__ for transforms.
projects / tabakrolletjie.git / log