naja.git
10 years agoUse multi-color images
Neil [Tue, 13 May 2014 08:44:15 +0000 (10:44 +0200)]
Use multi-color images

10 years agoDraw tile backgrounds
Neil [Tue, 13 May 2014 08:28:24 +0000 (10:28 +0200)]
Draw tile backgrounds

10 years agocolour tweaks; selected tile
adrianna [Tue, 13 May 2014 08:20:11 +0000 (10:20 +0200)]
colour tweaks; selected tile

10 years agoswitched to Apple II palette; changed coloured bits into locks + keys
adrianna [Tue, 13 May 2014 01:08:05 +0000 (03:08 +0200)]
switched to Apple II palette; changed coloured bits into locks + keys

10 years agoOnly move if the flags allow.
Jeremy Thurgood [Mon, 12 May 2014 21:29:49 +0000 (23:29 +0200)]
Only move if the flags allow.

10 years agoMove the player.
Jeremy Thurgood [Mon, 12 May 2014 21:18:45 +0000 (23:18 +0200)]
Move the player.

10 years agoIt isn't always a 4/4 split
Stefano Rivera [Mon, 12 May 2014 19:10:02 +0000 (21:10 +0200)]
It isn't always a 4/4 split

10 years agoDefine some YAML references for common actions.
Jeremy Thurgood [Mon, 12 May 2014 17:38:11 +0000 (19:38 +0200)]
Define some YAML references for common actions.

10 years agoMore location deck things.
Jeremy Thurgood [Mon, 12 May 2014 12:12:04 +0000 (14:12 +0200)]
More location deck things.

10 years agoLoad location deck from file.
Jeremy Thurgood [Mon, 12 May 2014 11:52:47 +0000 (13:52 +0200)]
Load location deck from file.

10 years agode-heath the tests
Neil [Mon, 12 May 2014 09:05:44 +0000 (11:05 +0200)]
de-heath the tests

10 years agobetter action export
Neil [Mon, 12 May 2014 09:01:17 +0000 (11:01 +0200)]
better action export

10 years agoHeath Robinson, I presume
Neil [Mon, 12 May 2014 08:58:18 +0000 (10:58 +0200)]
Heath Robinson, I presume

10 years agoAdd a day 1 screenshot
Neil [Sun, 11 May 2014 21:39:58 +0000 (23:39 +0200)]
Add a day 1 screenshot

10 years agotweaked bits
adrianna [Sun, 11 May 2014 22:20:04 +0000 (00:20 +0200)]
tweaked bits

10 years agoUse EIGHT_BIT for game bits.
Simon Cross [Sun, 11 May 2014 22:01:35 +0000 (00:01 +0200)]
Use EIGHT_BIT for game bits.

10 years agoImplement game bits.
Simon Cross [Sun, 11 May 2014 21:59:19 +0000 (23:59 +0200)]
Implement game bits.

10 years agotwo tile backgrounds, which may well look hideous on the actual board
adrianna [Sun, 11 May 2014 22:01:05 +0000 (00:01 +0200)]
two tile backgrounds, which may well look hideous on the actual board

10 years agoScale up images
Stefano Rivera [Sun, 11 May 2014 21:58:19 +0000 (23:58 +0200)]
Scale up images

10 years agoStart on GameBits widget.
Simon Cross [Sun, 11 May 2014 21:47:01 +0000 (23:47 +0200)]
Start on GameBits widget.

10 years agoStart of GameBits
Stefano Rivera [Sun, 11 May 2014 21:46:33 +0000 (23:46 +0200)]
Start of GameBits

10 years agoFix docstrings in credit scene.
Simon Cross [Sun, 11 May 2014 21:41:05 +0000 (23:41 +0200)]
Fix docstrings in credit scene.

10 years agoClean up credits test string.
Simon Cross [Sun, 11 May 2014 21:40:16 +0000 (23:40 +0200)]
Clean up credits test string.

10 years agoconverted all images to same limited colour palette and scaled them back down to 1:1
adrianna [Sun, 11 May 2014 21:39:32 +0000 (23:39 +0200)]
converted all images to same limited colour palette and scaled them back down to 1:1

10 years agoFactor out EIGHT_BIT_SCALE.
Simon Cross [Sun, 11 May 2014 21:36:08 +0000 (23:36 +0200)]
Factor out EIGHT_BIT_SCALE.

10 years agoOh yeah, we're using a AttrDict thing, aren't we?
Neil [Sun, 11 May 2014 21:34:32 +0000 (23:34 +0200)]
Oh yeah, we're using a AttrDict thing, aren't we?

10 years agoworking PlayerBitsWidget
Stefano Rivera [Sun, 11 May 2014 21:34:25 +0000 (23:34 +0200)]
working PlayerBitsWidget

10 years agoUnshift the world
Neil [Sun, 11 May 2014 21:30:07 +0000 (23:30 +0200)]
Unshift the world

10 years agoDraw robot on the world
Neil [Sun, 11 May 2014 21:23:49 +0000 (23:23 +0200)]
Draw robot on the world

10 years agoAdd property to get at board_locations
Neil [Sun, 11 May 2014 21:11:06 +0000 (23:11 +0200)]
Add property to get at board_locations

10 years agoRefactor text boxes.
Simon Cross [Sun, 11 May 2014 21:29:40 +0000 (23:29 +0200)]
Refactor text boxes.

10 years agoPEP8.
Simon Cross [Sun, 11 May 2014 21:29:17 +0000 (23:29 +0200)]
PEP8.

10 years agoblit actually wants a pos, no need to calculate the rect
Stefano Rivera [Sun, 11 May 2014 21:21:02 +0000 (23:21 +0200)]
blit actually wants a pos, no need to calculate the rect

10 years agoEven blocker text
Stefano Rivera [Sun, 11 May 2014 21:01:54 +0000 (23:01 +0200)]
Even blocker text

10 years agoRemove boilerplate overrides
Stefano Rivera [Sun, 11 May 2014 21:00:08 +0000 (23:00 +0200)]
Remove boilerplate overrides

10 years agoReturn True when we called a callback
Stefano Rivera [Sun, 11 May 2014 20:48:05 +0000 (22:48 +0200)]
Return True when we called a callback

10 years agoSelectorWidget
Stefano Rivera [Sun, 11 May 2014 20:45:31 +0000 (22:45 +0200)]
SelectorWidget

10 years agoCallbacks for widget events
Stefano Rivera [Sun, 11 May 2014 20:44:25 +0000 (22:44 +0200)]
Callbacks for widget events

10 years agoApply self.pos to TextBoxWidget rendering.
Simon Cross [Sun, 11 May 2014 20:40:36 +0000 (22:40 +0200)]
Apply self.pos to TextBoxWidget rendering.

10 years agoPEP8 fixes.
Simon Cross [Sun, 11 May 2014 20:33:46 +0000 (22:33 +0200)]
PEP8 fixes.

10 years agoRender bit pattern markers on tile widgets
Neil [Sun, 11 May 2014 20:31:50 +0000 (22:31 +0200)]
Render bit pattern markers on tile widgets

10 years agoAdd a non-empty set of locations for testing
Neil [Sun, 11 May 2014 20:16:43 +0000 (22:16 +0200)]
Add a non-empty set of locations for testing

10 years agoAdd export methdo to DoNothing action for testing purposes
Neil [Sun, 11 May 2014 20:15:47 +0000 (22:15 +0200)]
Add export methdo to DoNothing action for testing purposes

10 years agoNo .orig files
Stefano Rivera [Sun, 11 May 2014 20:02:18 +0000 (22:02 +0200)]
No .orig files

10 years agoBastard merge
David Sharpe [Sun, 11 May 2014 19:59:04 +0000 (21:59 +0200)]
Bastard merge

10 years agoGot text wrapping working.
David Sharpe [Sun, 11 May 2014 19:54:38 +0000 (21:54 +0200)]
Got text wrapping working.

10 years agoThe world is invalid (sometimes, when desirable)
Neil [Sun, 11 May 2014 19:52:20 +0000 (21:52 +0200)]
The world is invalid (sometimes, when desirable)

10 years agoUnbreak game startup
Neil [Sun, 11 May 2014 19:50:54 +0000 (21:50 +0200)]
Unbreak game startup

10 years agoChoose locations for the board.
Jeremy Thurgood [Sun, 11 May 2014 19:35:35 +0000 (21:35 +0200)]
Choose locations for the board.

10 years agoExplain Widget methods
Stefano Rivera [Sun, 11 May 2014 19:04:15 +0000 (21:04 +0200)]
Explain Widget methods

10 years agoScenes get a Container for widgets
Stefano Rivera [Sun, 11 May 2014 19:00:58 +0000 (21:00 +0200)]
Scenes get a Container for widgets

10 years agoMore actions.
Jeremy Thurgood [Sun, 11 May 2014 18:52:16 +0000 (20:52 +0200)]
More actions.

10 years agoTweak actions.
Jeremy Thurgood [Sun, 11 May 2014 18:31:04 +0000 (20:31 +0200)]
Tweak actions.

10 years agoFix tests.
Simon Cross [Sun, 11 May 2014 17:32:15 +0000 (19:32 +0200)]
Fix tests.

10 years agorobot things
adrianna [Sun, 11 May 2014 17:31:56 +0000 (19:31 +0200)]
robot things

10 years agoMove player defaults into constants.
Simon Cross [Sun, 11 May 2014 17:31:14 +0000 (19:31 +0200)]
Move player defaults into constants.

10 years agoFix gamestate setup.
Simon Cross [Sun, 11 May 2014 17:24:53 +0000 (19:24 +0200)]
Fix gamestate setup.

10 years agoOne true import-style
Stefano Rivera [Sun, 11 May 2014 17:20:21 +0000 (19:20 +0200)]
One true import-style

10 years agofixed win
adrianna [Sun, 11 May 2014 17:16:40 +0000 (19:16 +0200)]
fixed win

10 years agofixed victory points; added square indicators and bare robot
adrianna [Sun, 11 May 2014 17:13:52 +0000 (19:13 +0200)]
fixed victory points; added square indicators and bare robot

10 years agoMore state management.
Jeremy Thurgood [Sun, 11 May 2014 17:13:42 +0000 (19:13 +0200)]
More state management.

10 years agoA menu that works (but doesn't show the selection)
Stefano Rivera [Sun, 11 May 2014 17:11:30 +0000 (19:11 +0200)]
A menu that works (but doesn't show the selection)

10 years agoCall Menu.__init__ with state in __main__.
Simon Cross [Sun, 11 May 2014 17:10:21 +0000 (19:10 +0200)]
Call Menu.__init__ with state in __main__.

10 years agoAdd missing state arguments to scene __init__s.
Simon Cross [Sun, 11 May 2014 17:09:37 +0000 (19:09 +0200)]
Add missing state arguments to scene __init__s.

10 years agoUpdate scene changing.
Simon Cross [Sun, 11 May 2014 17:06:05 +0000 (19:06 +0200)]
Update scene changing.

10 years agoMake scenes take the game state.
Simon Cross [Sun, 11 May 2014 17:03:56 +0000 (19:03 +0200)]
Make scenes take the game state.

10 years agoKeydown
Stefano Rivera [Sun, 11 May 2014 17:06:20 +0000 (19:06 +0200)]
Keydown

10 years agoMore menu options
Stefano Rivera [Sun, 11 May 2014 17:03:52 +0000 (19:03 +0200)]
More menu options

10 years agoPass positions to the widgets
Neil [Sun, 11 May 2014 17:03:02 +0000 (19:03 +0200)]
Pass positions to the widgets

10 years agoAdd tiles to the board. Skip draw for other game scene widgets for now
Neil [Sun, 11 May 2014 17:02:46 +0000 (19:02 +0200)]
Add tiles to the board. Skip draw for other game scene widgets for now

10 years agoAdd placeholder drawing logic
Neil [Sun, 11 May 2014 16:34:36 +0000 (18:34 +0200)]
Add placeholder drawing logic

10 years agoRemove debug print.
Simon Cross [Sun, 11 May 2014 17:02:02 +0000 (19:02 +0200)]
Remove debug print.

10 years agoMerge branch 'master' of git+ssh://ctpug.org.za/naja
David Sharpe [Sun, 11 May 2014 16:59:26 +0000 (18:59 +0200)]
Merge branch 'master' of git+ssh://ctpug.org.za/naja

10 years agoFix initial bits.
Simon Cross [Sun, 11 May 2014 16:59:10 +0000 (18:59 +0200)]
Fix initial bits.

10 years agoMerge branch 'master' of git+ssh://ctpug.org.za/naja
David Sharpe [Sun, 11 May 2014 16:59:04 +0000 (18:59 +0200)]
Merge branch 'master' of git+ssh://ctpug.org.za/naja

10 years agoFucking megres
David Sharpe [Sun, 11 May 2014 16:58:38 +0000 (18:58 +0200)]
Fucking megres

10 years agoGameState.
Simon Cross [Sun, 11 May 2014 16:57:35 +0000 (18:57 +0200)]
GameState.

10 years agoRotation mutators
Stefano Rivera [Sun, 11 May 2014 16:41:18 +0000 (18:41 +0200)]
Rotation mutators

10 years agoTurn resources into a module, which can hold mutators too
Stefano Rivera [Sun, 11 May 2014 16:38:51 +0000 (18:38 +0200)]
Turn resources into a module, which can hold mutators too

10 years agoAdd widgets and skeleton for game scene.
Simon Cross [Sun, 11 May 2014 16:31:36 +0000 (18:31 +0200)]
Add widgets and skeleton for game scene.

10 years agomerge
David Sharpe [Sun, 11 May 2014 16:32:11 +0000 (18:32 +0200)]
merge

10 years agoHelper for colour conversion
Stefano Rivera [Sun, 11 May 2014 16:31:49 +0000 (18:31 +0200)]
Helper for colour conversion

10 years agoAdded basic credits scene.
David Sharpe [Sun, 11 May 2014 16:30:02 +0000 (18:30 +0200)]
Added basic credits scene.

10 years agoremaining bits
adrianna [Sun, 11 May 2014 16:29:21 +0000 (18:29 +0200)]
remaining bits

10 years agoBlocky text (4 pixels per pixel)
Stefano Rivera [Sun, 11 May 2014 16:23:27 +0000 (18:23 +0200)]
Blocky text (4 pixels per pixel)

10 years agoGame state management.
Jeremy Thurgood [Sun, 11 May 2014 16:23:20 +0000 (18:23 +0200)]
Game state management.

10 years agoPlaceholder tile
Neil [Sun, 11 May 2014 16:21:40 +0000 (18:21 +0200)]
Placeholder tile

10 years agoBlank the screen on each frame
Stefano Rivera [Sun, 11 May 2014 16:17:28 +0000 (18:17 +0200)]
Blank the screen on each frame

10 years agoAdd quitting.
Simon Cross [Sun, 11 May 2014 16:04:07 +0000 (18:04 +0200)]
Add quitting.

10 years agoScenes have a widget list (in draw order)
Stefano Rivera [Sun, 11 May 2014 16:03:18 +0000 (18:03 +0200)]
Scenes have a widget list (in draw order)

10 years agosome bits
adrianna [Sun, 11 May 2014 16:01:02 +0000 (18:01 +0200)]
some bits

10 years agoLimit frame rate
Stefano Rivera [Sun, 11 May 2014 15:59:51 +0000 (17:59 +0200)]
Limit frame rate

10 years agoMerge branch 'master' of git+ssh://ctpug.org.za/naja
Simon Cross [Sun, 11 May 2014 15:57:37 +0000 (17:57 +0200)]
Merge branch 'master' of git+ssh://ctpug.org.za/naja

10 years agoRefactor widget rendering a bit.
Simon Cross [Sun, 11 May 2014 15:56:50 +0000 (17:56 +0200)]
Refactor widget rendering a bit.

10 years agoDecouple action from required bits.
Jeremy Thurgood [Sun, 11 May 2014 15:52:57 +0000 (17:52 +0200)]
Decouple action from required bits.

10 years agoA TextWidget
Stefano Rivera [Sun, 11 May 2014 15:50:03 +0000 (17:50 +0200)]
A TextWidget

10 years agoAdd game scene.
Simon Cross [Sun, 11 May 2014 15:43:13 +0000 (17:43 +0200)]
Add game scene.

10 years agoMerge branch 'master' of git+ssh://ctpug.org.za/naja
Simon Cross [Sun, 11 May 2014 15:32:18 +0000 (17:32 +0200)]
Merge branch 'master' of git+ssh://ctpug.org.za/naja

10 years agoQuitGameEvent.
Simon Cross [Sun, 11 May 2014 15:31:56 +0000 (17:31 +0200)]
QuitGameEvent.

10 years agoStart of location actions.
Jeremy Thurgood [Sun, 11 May 2014 15:31:07 +0000 (17:31 +0200)]
Start of location actions.