naja.git
11 years agoDon't scrible on the original image
Neil [Tue, 13 May 2014 19:42:00 +0000 (21:42 +0200)]
Don't scrible on the original image

11 years agoFix bits and add new action.
Jeremy Thurgood [Tue, 13 May 2014 18:37:39 +0000 (20:37 +0200)]
Fix bits and add new action.

11 years agoKEYDOWN everywhere
Stefano Rivera [Tue, 13 May 2014 18:29:54 +0000 (20:29 +0200)]
KEYDOWN everywhere

11 years agoMove keys to constants
Stefano Rivera [Tue, 13 May 2014 18:29:33 +0000 (20:29 +0200)]
Move keys to constants

11 years agoBeep if action is unavailable.
Jeremy Thurgood [Tue, 13 May 2014 18:09:48 +0000 (20:09 +0200)]
Beep if action is unavailable.

11 years agoDvorak support (also, we need to factor these out...)
Stefano Rivera [Tue, 13 May 2014 18:03:29 +0000 (20:03 +0200)]
Dvorak support (also, we need to factor these out...)

11 years agoOnly change mode after performing action.
Jeremy Thurgood [Tue, 13 May 2014 18:01:14 +0000 (20:01 +0200)]
Only change mode after performing action.

11 years agoPerform selected action.
Jeremy Thurgood [Tue, 13 May 2014 17:55:51 +0000 (19:55 +0200)]
Perform selected action.

11 years agoAnd ASDF too
Stefano Rivera [Tue, 13 May 2014 17:55:54 +0000 (19:55 +0200)]
And ASDF too

11 years agoGood point, neil, KP_ENTER should count too
Stefano Rivera [Tue, 13 May 2014 17:52:25 +0000 (19:52 +0200)]
Good point, neil, KP_ENTER should count too

11 years agoFix tests.
Jeremy Thurgood [Tue, 13 May 2014 17:08:52 +0000 (19:08 +0200)]
Fix tests.

11 years agoDefault default action.
Jeremy Thurgood [Tue, 13 May 2014 16:54:49 +0000 (18:54 +0200)]
Default default action.

11 years agoHack in multi-modal behaviour
Neil [Tue, 13 May 2014 16:53:41 +0000 (18:53 +0200)]
Hack in multi-modal behaviour

11 years agoAdded some bitmap fonts and picked the smallest one for now
Adrianna Pińska [Tue, 13 May 2014 15:21:13 +0000 (17:21 +0200)]
Added some bitmap fonts and picked the smallest one for now

11 years agoDisplay 1s and 0s on the bits
Stefano Rivera [Tue, 13 May 2014 14:06:16 +0000 (16:06 +0200)]
Display 1s and 0s on the bits

11 years agoDisplay some info about the current tile
Neil [Tue, 13 May 2014 13:41:53 +0000 (15:41 +0200)]
Display some info about the current tile

11 years agoBetter align things to our grid
Neil [Tue, 13 May 2014 12:29:49 +0000 (14:29 +0200)]
Better align things to our grid

11 years agoChessboard
Neil [Tue, 13 May 2014 10:54:15 +0000 (12:54 +0200)]
Chessboard

11 years agorobots repel locks
Neil [Tue, 13 May 2014 10:45:48 +0000 (12:45 +0200)]
robots repel locks

11 years agoadded borders to squares; changed background for selected tile with robot
adrianna [Tue, 13 May 2014 10:16:09 +0000 (12:16 +0200)]
added borders to squares; changed background for selected tile with robot

11 years agoUse small locks when robot is on the tile
Neil [Tue, 13 May 2014 09:49:18 +0000 (11:49 +0200)]
Use small locks when robot is on the tile

11 years agocenter robot again
Neil [Tue, 13 May 2014 09:48:51 +0000 (11:48 +0200)]
center robot again

11 years agoAdded small locks for displaying on the square at the same time as the robot
adrianna [Tue, 13 May 2014 08:50:21 +0000 (10:50 +0200)]
Added small locks for displaying on the square at the same time as the robot

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

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

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

11 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

11 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.

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

11 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

11 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.

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

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

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

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

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

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

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

11 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.

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

11 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

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

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

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

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

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

11 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

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

11 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?

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

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

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

11 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

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

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

11 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

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

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

11 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

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

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

11 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.

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

11 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

11 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

11 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

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

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

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

11 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)

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

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

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

11 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

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

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

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

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

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

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

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

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

11 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

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

11 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)

11 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__.

11 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.

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

11 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.

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

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

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

11 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

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

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

11 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

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

11 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

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

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