Simon Cross [Sat, 17 May 2014 20:30:10 +0000 (22:30 +0200)]
Rename test puzzle to marathon.
Simon Cross [Sat, 17 May 2014 20:23:33 +0000 (22:23 +0200)]
Remove test references.
Jeremy Thurgood [Sat, 17 May 2014 20:27:18 +0000 (22:27 +0200)]
*REAL* Python has no dict comprehensions.
David Sharpe [Sat, 17 May 2014 20:18:06 +0000 (22:18 +0200)]
Merge branch 'master' of git://ctpug.org.za/naja
Simon Cross [Sat, 17 May 2014 20:17:56 +0000 (22:17 +0200)]
Add bits to introduction.
David Sharpe [Sat, 17 May 2014 20:17:42 +0000 (22:17 +0200)]
Merge branch 'master' of git://ctpug.org.za/naja
David Sharpe [Sat, 17 May 2014 20:17:36 +0000 (22:17 +0200)]
Words
Stefano Rivera [Sat, 17 May 2014 20:14:33 +0000 (22:14 +0200)]
Strip underscory stuff from JSON
Simon Cross [Sat, 17 May 2014 20:13:55 +0000 (22:13 +0200)]
Mark all the bits.
Simon Cross [Sat, 17 May 2014 20:13:27 +0000 (22:13 +0200)]
Optional sanity check for actions.
David Sharpe [Sat, 17 May 2014 20:11:57 +0000 (22:11 +0200)]
Mor deth wit speling
David Sharpe [Sat, 17 May 2014 20:08:54 +0000 (22:08 +0200)]
Mor deth
Stefano Rivera [Sat, 17 May 2014 19:58:56 +0000 (21:58 +0200)]
Explain some movement bit manipulation, in the tutorial
David Sharpe [Sat, 17 May 2014 19:56:12 +0000 (21:56 +0200)]
Merge branch 'master' of git://ctpug.org.za/naja
David Sharpe [Sat, 17 May 2014 19:56:07 +0000 (21:56 +0200)]
Made game harder, beeeeeches.
Simon Cross [Sat, 17 May 2014 19:47:49 +0000 (21:47 +0200)]
Add missing full-stop.
Stefano Rivera [Sat, 17 May 2014 19:43:12 +0000 (21:43 +0200)]
Explain tile replacement
Simon Cross [Sat, 17 May 2014 19:43:29 +0000 (21:43 +0200)]
Better spelling and remove some early getting stuckness.
Simon Cross [Sat, 17 May 2014 19:34:24 +0000 (21:34 +0200)]
PHYRRIC Victory\!
Neil [Sat, 17 May 2014 19:39:51 +0000 (21:39 +0200)]
Remove some now unneeded code
Stefano Rivera [Sat, 17 May 2014 19:31:39 +0000 (21:31 +0200)]
Hook the introduction into the menus
Simon Cross [Sat, 17 May 2014 19:27:54 +0000 (21:27 +0200)]
Some MSB is required when required.
Stefano Rivera [Sat, 17 May 2014 19:17:51 +0000 (21:17 +0200)]
We have standards
Simon Cross [Sat, 17 May 2014 19:17:25 +0000 (21:17 +0200)]
Slightly better required keys displaying (now required keys are always shown).
adrianna [Sat, 17 May 2014 19:15:58 +0000 (21:15 +0200)]
teeny weeny badge to be used as an overlay on locks to indicate an msb requirement
Jeremy Thurgood [Sat, 17 May 2014 18:48:38 +0000 (20:48 +0200)]
Slightly better OS X build.
Stefano Rivera [Sat, 17 May 2014 19:10:46 +0000 (21:10 +0200)]
We set defaults in new_game() don't pass parameters that aren't needed
Simon Cross [Sat, 17 May 2014 19:09:21 +0000 (21:09 +0200)]
Fix tests.
Stefano Rivera [Sat, 17 May 2014 19:05:12 +0000 (21:05 +0200)]
Introduction level
Stefano Rivera [Sat, 17 May 2014 19:04:36 +0000 (21:04 +0200)]
Setting defaults shouldn't be restricted to puzzles
Simon Cross [Sat, 17 May 2014 19:01:32 +0000 (21:01 +0200)]
Remove unnecessary quotes.
Simon Cross [Sat, 17 May 2014 18:57:08 +0000 (20:57 +0200)]
Use GenericBits's super cow powers.
Simon Cross [Sat, 17 May 2014 18:56:52 +0000 (20:56 +0200)]
Make GenericBits even more generic.
Simon Cross [Sat, 17 May 2014 18:40:01 +0000 (20:40 +0200)]
Proper glyphs for GenericBits.
adrianna [Sat, 17 May 2014 18:39:03 +0000 (20:39 +0200)]
tweaked spacing on win and lose screens
Simon Cross [Sat, 17 May 2014 18:37:31 +0000 (20:37 +0200)]
Make action.MSB_GLYPH a function, action.get_msb_glyph.
Simon Cross [Sat, 17 May 2014 18:35:33 +0000 (20:35 +0200)]
Make action.GLYPHS a function, action.get_glyphs.
Simon Cross [Sat, 17 May 2014 18:30:51 +0000 (20:30 +0200)]
Chess piece moves are in the corner.
Simon Cross [Sat, 17 May 2014 18:17:24 +0000 (20:17 +0200)]
You only win once.
Simon Cross [Sat, 17 May 2014 18:17:13 +0000 (20:17 +0200)]
Optional remove win actions once they're used.
Simon Cross [Sat, 17 May 2014 18:16:45 +0000 (20:16 +0200)]
Fix loading save games (by telling the loaded player about the board they're on) (@nitwit).
Jeremy Thurgood [Sat, 17 May 2014 18:30:29 +0000 (20:30 +0200)]
OS X build.
Stefano Rivera [Sat, 17 May 2014 18:09:09 +0000 (20:09 +0200)]
Hack hack hack hack
Simon Cross [Sat, 17 May 2014 17:56:12 +0000 (19:56 +0200)]
Use GenericBits for NEWS.
Jeremy Thurgood [Sat, 17 May 2014 17:52:35 +0000 (19:52 +0200)]
Menu text update.
Simon Cross [Sat, 17 May 2014 17:48:49 +0000 (19:48 +0200)]
Use new GenericBits in chess puzzle.
Simon Cross [Sat, 17 May 2014 17:48:02 +0000 (19:48 +0200)]
GenericBits action.
Simon Cross [Sat, 17 May 2014 17:47:16 +0000 (19:47 +0200)]
Use parse_bits from utils.
Simon Cross [Sat, 17 May 2014 17:46:59 +0000 (19:46 +0200)]
Add parse_bits to utils.
Simon Cross [Sat, 17 May 2014 17:20:19 +0000 (19:20 +0200)]
Have win require bits.
Jeremy Thurgood [Sat, 17 May 2014 17:47:23 +0000 (19:47 +0200)]
Better action text.
Stefano Rivera [Sat, 17 May 2014 17:42:43 +0000 (19:42 +0200)]
ClearBits action
Stefano Rivera [Sat, 17 May 2014 17:42:36 +0000 (19:42 +0200)]
Overrideable messages
Neil [Sat, 17 May 2014 17:38:30 +0000 (19:38 +0200)]
Add a puzzle selection screen
Jeremy Thurgood [Sat, 17 May 2014 17:37:31 +0000 (19:37 +0200)]
Use "tile" consistently in player-visible text.
adrianna [Sat, 17 May 2014 17:37:02 +0000 (19:37 +0200)]
pedantic correntions
Jeremy Thurgood [Sat, 17 May 2014 17:31:43 +0000 (19:31 +0200)]
Gain-MSB default action.
Jeremy Thurgood [Sat, 17 May 2014 17:25:33 +0000 (19:25 +0200)]
Move-if-MSB actions.
Stefano Rivera [Sat, 17 May 2014 17:08:10 +0000 (19:08 +0200)]
Don't hardcode the initial cursor position
Simon Cross [Sat, 17 May 2014 17:07:47 +0000 (19:07 +0200)]
Not exactly Kasparov.
Jeremy Thurgood [Sat, 17 May 2014 17:04:37 +0000 (19:04 +0200)]
Shorter replacement params.
adrianna [Sat, 17 May 2014 17:03:26 +0000 (19:03 +0200)]
changed bit toggle glyph to +/-
Stefano Rivera [Sat, 17 May 2014 17:01:37 +0000 (19:01 +0200)]
YAML knows about integers. Not tuples
Simon Cross [Sat, 17 May 2014 17:00:18 +0000 (19:00 +0200)]
All puzzles to have cards without default actions.
Jeremy Thurgood [Sat, 17 May 2014 17:01:21 +0000 (19:01 +0200)]
Minor cleanup.
Jeremy Thurgood [Sat, 17 May 2014 17:00:08 +0000 (19:00 +0200)]
Adjust save slot positioning.
Jeremy Thurgood [Sat, 17 May 2014 16:59:21 +0000 (18:59 +0200)]
Fix cheat detection.
Stefano Rivera [Sat, 17 May 2014 16:59:06 +0000 (18:59 +0200)]
Allow overriding defaults from puzzles
Jeremy Thurgood [Sat, 17 May 2014 16:45:49 +0000 (18:45 +0200)]
Use new countdown glyphs.
Stefano Rivera [Sat, 17 May 2014 16:31:33 +0000 (18:31 +0200)]
Puzzles now live in a subdir
adrianna [Sat, 17 May 2014 16:29:38 +0000 (18:29 +0200)]
countdown glyphs
Jeremy Thurgood [Sat, 17 May 2014 16:25:57 +0000 (18:25 +0200)]
Fix tests.
Stefano Rivera [Sat, 17 May 2014 16:16:57 +0000 (18:16 +0200)]
Optimize
Stefano Rivera [Sat, 17 May 2014 16:16:49 +0000 (18:16 +0200)]
icotool doesn't care about indexed palettes
Stefano Rivera [Sat, 17 May 2014 16:13:12 +0000 (18:13 +0200)]
Fix the icon on Windows
Stefano Rivera [Sat, 17 May 2014 16:10:16 +0000 (18:10 +0200)]
We now have a 64x64 icon
Stefano Rivera [Sat, 17 May 2014 16:08:23 +0000 (18:08 +0200)]
Rebuild the XPM icon too
Stefano Rivera [Sat, 17 May 2014 16:02:30 +0000 (18:02 +0200)]
Make icons
Simon Cross [Sat, 17 May 2014 16:01:43 +0000 (18:01 +0200)]
Start folder for puzzle decks.
adrianna [Sat, 17 May 2014 16:00:08 +0000 (18:00 +0200)]
icons with a lock
Jeremy Thurgood [Sat, 17 May 2014 15:47:20 +0000 (17:47 +0200)]
Add (ugly) countdown timer to tile.
Neil [Sat, 17 May 2014 15:22:39 +0000 (17:22 +0200)]
Standardise music volume
Neil [Sat, 17 May 2014 15:22:10 +0000 (17:22 +0200)]
Sad losing music or so
David Sharpe [Sat, 17 May 2014 13:02:32 +0000 (15:02 +0200)]
Merge branch 'master' of git://ctpug.org.za/naja
Stefano Rivera [Sat, 17 May 2014 15:17:03 +0000 (17:17 +0200)]
Whitespace
Stefano Rivera [Sat, 17 May 2014 15:16:20 +0000 (17:16 +0200)]
Actually barrel-shift
David Sharpe [Sat, 17 May 2014 13:02:16 +0000 (15:02 +0200)]
missed a file
David Sharpe [Sat, 17 May 2014 12:58:54 +0000 (14:58 +0200)]
updated parameters in yaml
David Sharpe [Sat, 17 May 2014 12:51:20 +0000 (14:51 +0200)]
Merge branch 'master' of git://ctpug.org.za/naja
Neil [Sat, 17 May 2014 15:05:03 +0000 (17:05 +0200)]
Drop state when the game is over (after we've found out if we're cheating or not)
Neil [Sat, 17 May 2014 14:55:13 +0000 (16:55 +0200)]
Victory tune
Neil [Sat, 17 May 2014 14:54:24 +0000 (16:54 +0200)]
win & lose return to main menu
Stefano Rivera [Sat, 17 May 2014 14:53:19 +0000 (16:53 +0200)]
Adrianna: We *can* spell your name correctly
Simon Cross [Sat, 17 May 2014 14:47:32 +0000 (16:47 +0200)]
Use YAML and JSON support for deck loading.
Simon Cross [Sat, 17 May 2014 14:47:10 +0000 (16:47 +0200)]
Add direct yaml and json support to resources.
Simon Cross [Sat, 17 May 2014 14:46:45 +0000 (16:46 +0200)]
Don't swallow deck load errors when debugging.
Stefano Rivera [Sat, 17 May 2014 14:34:25 +0000 (16:34 +0200)]
We're generating single-channel sounds. Tell oggenc that
Stefano Rivera [Sat, 17 May 2014 14:21:35 +0000 (16:21 +0200)]
MOAR sounds
Neil [Sat, 17 May 2014 14:09:06 +0000 (16:09 +0200)]
Unbreak no-sound again
Simon Cross [Sat, 17 May 2014 13:47:03 +0000 (15:47 +0200)]
Use new puzzle tiles.