naja.git
10 years agoMerge branch 'master' into No_movement_mode
Jeremy Thurgood [Thu, 15 May 2014 17:11:33 +0000 (19:11 +0200)]
Merge branch 'master' into No_movement_mode

10 years agoTreat tile_selected as an overlay that applies to the base tile image.
Simon Cross [Thu, 15 May 2014 16:08:08 +0000 (18:08 +0200)]
Treat tile_selected as an overlay that applies to the base tile image.

10 years agotest fine overlay for selected square
adrianna [Thu, 15 May 2014 16:06:01 +0000 (18:06 +0200)]
test fine overlay for selected square

10 years agodispense with movement mode
Neil [Thu, 15 May 2014 15:23:10 +0000 (17:23 +0200)]
dispense with movement mode

10 years agoDraw locks on infobar above the text
Neil [Thu, 15 May 2014 08:52:44 +0000 (10:52 +0200)]
Draw locks on infobar above the text

10 years agoforgot to add screenshot
adrianna [Thu, 15 May 2014 08:03:59 +0000 (10:03 +0200)]
forgot to add screenshot

10 years agoswapped blue and magenta
adrianna [Thu, 15 May 2014 08:03:45 +0000 (10:03 +0200)]
swapped blue and magenta

10 years agoPlayer position is always a valid move.
Jeremy Thurgood [Thu, 15 May 2014 07:33:17 +0000 (09:33 +0200)]
Player position is always a valid move.

10 years agoNo more need for the MSB in the win action.
Jeremy Thurgood [Thu, 15 May 2014 07:30:04 +0000 (09:30 +0200)]
No more need for the MSB in the win action.

10 years agoAvoid crash when returning to game during act mode
Neil [Wed, 14 May 2014 22:24:12 +0000 (00:24 +0200)]
Avoid crash when returning to game during act mode

10 years agoTweak hint position and add padding
Neil [Wed, 14 May 2014 22:23:11 +0000 (00:23 +0200)]
Tweak hint position and add padding

10 years agodon't discard width padding
Neil [Wed, 14 May 2014 22:22:50 +0000 (00:22 +0200)]
don't discard width padding

10 years agoreduced pixel scale and selected bigger font
adrianna [Wed, 14 May 2014 22:14:21 +0000 (00:14 +0200)]
reduced pixel scale and selected bigger font

10 years agoembiggened images
adrianna [Wed, 14 May 2014 22:07:41 +0000 (00:07 +0200)]
embiggened images

10 years agoParameterised action text.
Jeremy Thurgood [Wed, 14 May 2014 21:07:27 +0000 (23:07 +0200)]
Parameterised action text.

10 years agoShift board locations.
Jeremy Thurgood [Wed, 14 May 2014 21:00:12 +0000 (23:00 +0200)]
Shift board locations.

10 years agoHighlight illegal actions in a different colour
Neil [Wed, 14 May 2014 20:55:52 +0000 (22:55 +0200)]
Highlight illegal actions in a different colour

10 years agoKeep move highlighting in examine move
Neil [Wed, 14 May 2014 20:07:15 +0000 (22:07 +0200)]
Keep move highlighting in examine move

10 years agoAdd exmine mode
Neil [Wed, 14 May 2014 20:04:46 +0000 (22:04 +0200)]
Add exmine mode

10 years agoHighlight tiles that are legal moves.
Jeremy Thurgood [Wed, 14 May 2014 20:00:22 +0000 (22:00 +0200)]
Highlight tiles that are legal moves.

10 years agoGet legal moves from player.
Jeremy Thurgood [Wed, 14 May 2014 19:49:43 +0000 (21:49 +0200)]
Get legal moves from player.

10 years agoCleaner player direction selection.
Jeremy Thurgood [Wed, 14 May 2014 19:40:54 +0000 (21:40 +0200)]
Cleaner player direction selection.

10 years agoproposed bigger font for 1:2
adrianna [Wed, 14 May 2014 18:31:55 +0000 (20:31 +0200)]
proposed bigger font for 1:2

10 years agorough 1:2 robot
adrianna [Wed, 14 May 2014 18:31:38 +0000 (20:31 +0200)]
rough 1:2 robot

10 years agoexperimental 1:2 scale double lock
adrianna [Wed, 14 May 2014 17:57:56 +0000 (19:57 +0200)]
experimental 1:2 scale double lock

10 years agoWin and lose screens and conditions.
Jeremy Thurgood [Wed, 14 May 2014 15:28:39 +0000 (17:28 +0200)]
Win and lose screens and conditions.

10 years agoHacky card bits display.
Jeremy Thurgood [Wed, 14 May 2014 11:50:04 +0000 (13:50 +0200)]
Hacky card bits display.

10 years agoAction to gain health.
Jeremy Thurgood [Wed, 14 May 2014 11:31:59 +0000 (13:31 +0200)]
Action to gain health.

10 years agoImprove action tests.
Jeremy Thurgood [Wed, 14 May 2014 11:15:18 +0000 (13:15 +0200)]
Improve action tests.

10 years agoRefactor info area preparation.
Jeremy Thurgood [Wed, 14 May 2014 10:29:57 +0000 (12:29 +0200)]
Refactor info area preparation.

10 years agoOptimize PNGs
Stefano Rivera [Wed, 14 May 2014 10:23:09 +0000 (12:23 +0200)]
Optimize PNGs

10 years agoadded lighter gold to small tiles
adrianna [Wed, 14 May 2014 09:02:33 +0000 (11:02 +0200)]
added lighter gold to small tiles

10 years agoFix tests.
Jeremy Thurgood [Wed, 14 May 2014 07:59:29 +0000 (09:59 +0200)]
Fix tests.

10 years agoBetter card action handling.
Jeremy Thurgood [Wed, 14 May 2014 07:53:30 +0000 (09:53 +0200)]
Better card action handling.

10 years agomade robot gold; shuffled tile backgrounds
adrianna [Wed, 14 May 2014 07:29:26 +0000 (09:29 +0200)]
made robot gold; shuffled tile backgrounds

10 years agoAgain, to get to a stable state
Stefano Rivera [Wed, 14 May 2014 00:09:36 +0000 (02:09 +0200)]
Again, to get to a stable state

10 years agoOptimize PNGs
Stefano Rivera [Tue, 13 May 2014 23:41:05 +0000 (01:41 +0200)]
Optimize PNGs

10 years agoScreenshot
Stefano Rivera [Tue, 13 May 2014 23:34:39 +0000 (01:34 +0200)]
Screenshot

10 years agoAdd win token action.
Jeremy Thurgood [Tue, 13 May 2014 21:07:40 +0000 (23:07 +0200)]
Add win token action.

10 years agoUpdate info display when card changes.
Jeremy Thurgood [Tue, 13 May 2014 21:07:04 +0000 (23:07 +0200)]
Update info display when card changes.

10 years agoChange card after taking action.
Jeremy Thurgood [Tue, 13 May 2014 20:38:40 +0000 (22:38 +0200)]
Change card after taking action.

10 years agoBetter event handling.
Jeremy Thurgood [Tue, 13 May 2014 20:21:19 +0000 (22:21 +0200)]
Better event handling.

10 years agoProperly implement player movement.
Jeremy Thurgood [Tue, 13 May 2014 20:06:18 +0000 (22:06 +0200)]
Properly implement player movement.

10 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

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

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

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

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

10 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...)

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

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

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

10 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

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

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

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

10 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

10 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

10 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

10 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

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

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

10 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

10 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

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

10 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

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