naja.git
10 years agoAdd missing full-stop.
Simon Cross [Sat, 17 May 2014 19:47:49 +0000 (21:47 +0200)]
Add missing full-stop.

10 years agoExplain tile replacement
Stefano Rivera [Sat, 17 May 2014 19:43:12 +0000 (21:43 +0200)]
Explain tile replacement

10 years agoBetter spelling and remove some early getting stuckness.
Simon Cross [Sat, 17 May 2014 19:43:29 +0000 (21:43 +0200)]
Better spelling and remove some early getting stuckness.

10 years agoPHYRRIC Victory\!
Simon Cross [Sat, 17 May 2014 19:34:24 +0000 (21:34 +0200)]
PHYRRIC Victory\!

10 years agoRemove some now unneeded code
Neil [Sat, 17 May 2014 19:39:51 +0000 (21:39 +0200)]
Remove some now  unneeded  code

10 years agoHook the introduction into the menus
Stefano Rivera [Sat, 17 May 2014 19:31:39 +0000 (21:31 +0200)]
Hook the introduction into the menus

10 years agoSome MSB is required when required.
Simon Cross [Sat, 17 May 2014 19:27:54 +0000 (21:27 +0200)]
Some MSB is required when required.

10 years agoWe have standards
Stefano Rivera [Sat, 17 May 2014 19:17:51 +0000 (21:17 +0200)]
We have standards

10 years agoSlightly better required keys displaying (now required keys are always shown).
Simon Cross [Sat, 17 May 2014 19:17:25 +0000 (21:17 +0200)]
Slightly better required keys displaying (now required keys are always shown).

10 years agoteeny weeny badge to be used as an overlay on locks to indicate an msb requirement
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

10 years agoSlightly better OS X build.
Jeremy Thurgood [Sat, 17 May 2014 18:48:38 +0000 (20:48 +0200)]
Slightly better OS X build.

10 years agoWe set defaults in new_game() don't pass parameters that aren't needed
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

10 years agoFix tests.
Simon Cross [Sat, 17 May 2014 19:09:21 +0000 (21:09 +0200)]
Fix tests.

10 years agoIntroduction level
Stefano Rivera [Sat, 17 May 2014 19:05:12 +0000 (21:05 +0200)]
Introduction level

10 years agoSetting defaults shouldn't be restricted to puzzles
Stefano Rivera [Sat, 17 May 2014 19:04:36 +0000 (21:04 +0200)]
Setting defaults shouldn't be restricted to puzzles

10 years agoRemove unnecessary quotes.
Simon Cross [Sat, 17 May 2014 19:01:32 +0000 (21:01 +0200)]
Remove unnecessary quotes.

10 years agoUse GenericBits's super cow powers.
Simon Cross [Sat, 17 May 2014 18:57:08 +0000 (20:57 +0200)]
Use GenericBits's super cow powers.

10 years agoMake GenericBits even more generic.
Simon Cross [Sat, 17 May 2014 18:56:52 +0000 (20:56 +0200)]
Make GenericBits even more generic.

10 years agoProper glyphs for GenericBits.
Simon Cross [Sat, 17 May 2014 18:40:01 +0000 (20:40 +0200)]
Proper glyphs for GenericBits.

10 years agotweaked spacing on win and lose screens
adrianna [Sat, 17 May 2014 18:39:03 +0000 (20:39 +0200)]
tweaked spacing on win and lose screens

10 years agoMake action.MSB_GLYPH a function, action.get_msb_glyph.
Simon Cross [Sat, 17 May 2014 18:37:31 +0000 (20:37 +0200)]
Make action.MSB_GLYPH a function, action.get_msb_glyph.

10 years agoMake action.GLYPHS a function, action.get_glyphs.
Simon Cross [Sat, 17 May 2014 18:35:33 +0000 (20:35 +0200)]
Make action.GLYPHS a function, action.get_glyphs.

10 years agoChess piece moves are in the corner.
Simon Cross [Sat, 17 May 2014 18:30:51 +0000 (20:30 +0200)]
Chess piece moves are in the corner.

10 years agoYou only win once.
Simon Cross [Sat, 17 May 2014 18:17:24 +0000 (20:17 +0200)]
You only win once.

10 years agoOptional remove win actions once they're used.
Simon Cross [Sat, 17 May 2014 18:17:13 +0000 (20:17 +0200)]
Optional remove win actions once they're used.

10 years agoFix loading save games (by telling the loaded player about the board they're on)...
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).

10 years agoOS X build.
Jeremy Thurgood [Sat, 17 May 2014 18:30:29 +0000 (20:30 +0200)]
OS X build.

10 years agoHack hack hack hack
Stefano Rivera [Sat, 17 May 2014 18:09:09 +0000 (20:09 +0200)]
Hack hack hack hack

10 years agoUse GenericBits for NEWS.
Simon Cross [Sat, 17 May 2014 17:56:12 +0000 (19:56 +0200)]
Use GenericBits for NEWS.

10 years agoMenu text update.
Jeremy Thurgood [Sat, 17 May 2014 17:52:35 +0000 (19:52 +0200)]
Menu text update.

10 years agoUse new GenericBits in chess puzzle.
Simon Cross [Sat, 17 May 2014 17:48:49 +0000 (19:48 +0200)]
Use new GenericBits in chess puzzle.

10 years agoGenericBits action.
Simon Cross [Sat, 17 May 2014 17:48:02 +0000 (19:48 +0200)]
GenericBits action.

10 years agoUse parse_bits from utils.
Simon Cross [Sat, 17 May 2014 17:47:16 +0000 (19:47 +0200)]
Use parse_bits from utils.

10 years agoAdd parse_bits to utils.
Simon Cross [Sat, 17 May 2014 17:46:59 +0000 (19:46 +0200)]
Add parse_bits to utils.

10 years agoHave win require bits.
Simon Cross [Sat, 17 May 2014 17:20:19 +0000 (19:20 +0200)]
Have win require bits.

10 years agoBetter action text.
Jeremy Thurgood [Sat, 17 May 2014 17:47:23 +0000 (19:47 +0200)]
Better action text.

10 years agoClearBits action
Stefano Rivera [Sat, 17 May 2014 17:42:43 +0000 (19:42 +0200)]
ClearBits action

10 years agoOverrideable messages
Stefano Rivera [Sat, 17 May 2014 17:42:36 +0000 (19:42 +0200)]
Overrideable messages

10 years agoAdd a puzzle selection screen
Neil [Sat, 17 May 2014 17:38:30 +0000 (19:38 +0200)]
Add a puzzle selection screen

10 years agoUse "tile" consistently in player-visible text.
Jeremy Thurgood [Sat, 17 May 2014 17:37:31 +0000 (19:37 +0200)]
Use "tile" consistently in player-visible text.

10 years agopedantic correntions
adrianna [Sat, 17 May 2014 17:37:02 +0000 (19:37 +0200)]
pedantic correntions

10 years agoGain-MSB default action.
Jeremy Thurgood [Sat, 17 May 2014 17:31:43 +0000 (19:31 +0200)]
Gain-MSB default action.

10 years agoMove-if-MSB actions.
Jeremy Thurgood [Sat, 17 May 2014 17:25:33 +0000 (19:25 +0200)]
Move-if-MSB actions.

10 years agoDon't hardcode the initial cursor position
Stefano Rivera [Sat, 17 May 2014 17:08:10 +0000 (19:08 +0200)]
Don't hardcode the initial cursor position

10 years agoNot exactly Kasparov.
Simon Cross [Sat, 17 May 2014 17:07:47 +0000 (19:07 +0200)]
Not exactly Kasparov.

10 years agoShorter replacement params.
Jeremy Thurgood [Sat, 17 May 2014 17:04:37 +0000 (19:04 +0200)]
Shorter replacement params.

10 years agochanged bit toggle glyph to +/-
adrianna [Sat, 17 May 2014 17:03:26 +0000 (19:03 +0200)]
changed bit toggle glyph to +/-

10 years agoYAML knows about integers. Not tuples
Stefano Rivera [Sat, 17 May 2014 17:01:37 +0000 (19:01 +0200)]
YAML knows about integers. Not tuples

10 years agoAll puzzles to have cards without default actions.
Simon Cross [Sat, 17 May 2014 17:00:18 +0000 (19:00 +0200)]
All puzzles to have cards without default actions.

10 years agoMinor cleanup.
Jeremy Thurgood [Sat, 17 May 2014 17:01:21 +0000 (19:01 +0200)]
Minor cleanup.

10 years agoAdjust save slot positioning.
Jeremy Thurgood [Sat, 17 May 2014 17:00:08 +0000 (19:00 +0200)]
Adjust save slot positioning.

10 years agoFix cheat detection.
Jeremy Thurgood [Sat, 17 May 2014 16:59:21 +0000 (18:59 +0200)]
Fix cheat detection.

10 years agoAllow overriding defaults from puzzles
Stefano Rivera [Sat, 17 May 2014 16:59:06 +0000 (18:59 +0200)]
Allow overriding defaults from puzzles

10 years agoUse new countdown glyphs.
Jeremy Thurgood [Sat, 17 May 2014 16:45:49 +0000 (18:45 +0200)]
Use new countdown glyphs.

10 years agoPuzzles now live in a subdir
Stefano Rivera [Sat, 17 May 2014 16:31:33 +0000 (18:31 +0200)]
Puzzles now live in a subdir

10 years agocountdown glyphs
adrianna [Sat, 17 May 2014 16:29:38 +0000 (18:29 +0200)]
countdown glyphs

10 years agoFix tests.
Jeremy Thurgood [Sat, 17 May 2014 16:25:57 +0000 (18:25 +0200)]
Fix tests.

10 years agoOptimize
Stefano Rivera [Sat, 17 May 2014 16:16:57 +0000 (18:16 +0200)]
Optimize

10 years agoicotool doesn't care about indexed palettes
Stefano Rivera [Sat, 17 May 2014 16:16:49 +0000 (18:16 +0200)]
icotool doesn't care about indexed palettes

10 years agoFix the icon on Windows
Stefano Rivera [Sat, 17 May 2014 16:13:12 +0000 (18:13 +0200)]
Fix the icon on Windows

10 years agoWe now have a 64x64 icon
Stefano Rivera [Sat, 17 May 2014 16:10:16 +0000 (18:10 +0200)]
We now have a 64x64 icon

10 years agoRebuild the XPM icon too
Stefano Rivera [Sat, 17 May 2014 16:08:23 +0000 (18:08 +0200)]
Rebuild the XPM icon too

10 years agoMake icons
Stefano Rivera [Sat, 17 May 2014 16:02:30 +0000 (18:02 +0200)]
Make icons

10 years agoStart folder for puzzle decks.
Simon Cross [Sat, 17 May 2014 16:01:43 +0000 (18:01 +0200)]
Start folder for puzzle decks.

10 years agoicons with a lock
adrianna [Sat, 17 May 2014 16:00:08 +0000 (18:00 +0200)]
icons with a lock

10 years agoAdd (ugly) countdown timer to tile.
Jeremy Thurgood [Sat, 17 May 2014 15:47:20 +0000 (17:47 +0200)]
Add (ugly) countdown timer to tile.

10 years agoStandardise music volume
Neil [Sat, 17 May 2014 15:22:39 +0000 (17:22 +0200)]
Standardise music volume

10 years agoSad losing music or so
Neil [Sat, 17 May 2014 15:22:10 +0000 (17:22 +0200)]
Sad losing music or so

10 years agoMerge branch 'master' of git://ctpug.org.za/naja
David Sharpe [Sat, 17 May 2014 13:02:32 +0000 (15:02 +0200)]
Merge branch 'master' of git://ctpug.org.za/naja

10 years agoWhitespace
Stefano Rivera [Sat, 17 May 2014 15:17:03 +0000 (17:17 +0200)]
Whitespace

10 years agoActually barrel-shift
Stefano Rivera [Sat, 17 May 2014 15:16:20 +0000 (17:16 +0200)]
Actually barrel-shift

10 years agomissed a file
David Sharpe [Sat, 17 May 2014 13:02:16 +0000 (15:02 +0200)]
missed a file

10 years agoupdated parameters in yaml
David Sharpe [Sat, 17 May 2014 12:58:54 +0000 (14:58 +0200)]
updated parameters in yaml

10 years agoMerge branch 'master' of git://ctpug.org.za/naja
David Sharpe [Sat, 17 May 2014 12:51:20 +0000 (14:51 +0200)]
Merge branch 'master' of git://ctpug.org.za/naja

10 years agoDrop state when the game is over (after we've found out if we're cheating or not)
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)

10 years agoVictory tune
Neil [Sat, 17 May 2014 14:55:13 +0000 (16:55 +0200)]
Victory tune

10 years agowin & lose return to main menu
Neil [Sat, 17 May 2014 14:54:24 +0000 (16:54 +0200)]
win & lose return to main menu

10 years agoAdrianna: We *can* spell your name correctly
Stefano Rivera [Sat, 17 May 2014 14:53:19 +0000 (16:53 +0200)]
Adrianna: We *can* spell your name correctly

10 years agoUse YAML and JSON support for deck loading.
Simon Cross [Sat, 17 May 2014 14:47:32 +0000 (16:47 +0200)]
Use YAML and JSON support for deck loading.

10 years agoAdd direct yaml and json support to resources.
Simon Cross [Sat, 17 May 2014 14:47:10 +0000 (16:47 +0200)]
Add direct yaml and json support to resources.

10 years agoDon't swallow deck load errors when debugging.
Simon Cross [Sat, 17 May 2014 14:46:45 +0000 (16:46 +0200)]
Don't swallow deck load errors when debugging.

10 years agoWe're generating single-channel sounds. Tell oggenc that
Stefano Rivera [Sat, 17 May 2014 14:34:25 +0000 (16:34 +0200)]
We're generating single-channel sounds. Tell oggenc that

10 years agoMOAR sounds
Stefano Rivera [Sat, 17 May 2014 14:21:35 +0000 (16:21 +0200)]
MOAR sounds

10 years agoUnbreak no-sound again
Neil [Sat, 17 May 2014 14:09:06 +0000 (16:09 +0200)]
Unbreak no-sound again

10 years agoUse new puzzle tiles.
Simon Cross [Sat, 17 May 2014 13:47:03 +0000 (15:47 +0200)]
Use new puzzle tiles.

10 years agoNew tile options for puzzles (PNGs).
Simon Cross [Sat, 17 May 2014 13:46:51 +0000 (15:46 +0200)]
New tile options for puzzles (PNGs).

10 years agoNew tile options for puzzles.
Simon Cross [Sat, 17 May 2014 13:46:29 +0000 (15:46 +0200)]
New tile options for puzzles.

10 years agoMusical menus
Stefano Rivera [Sat, 17 May 2014 13:57:29 +0000 (15:57 +0200)]
Musical menus

10 years agoUnbreak howto screen
Stefano Rivera [Sat, 17 May 2014 13:57:23 +0000 (15:57 +0200)]
Unbreak howto screen

10 years agoIcon Makefile
Stefano Rivera [Sat, 17 May 2014 13:48:14 +0000 (15:48 +0200)]
Icon Makefile

10 years agoLimit the number of win tiles in the game
Neil [Sat, 17 May 2014 13:23:24 +0000 (15:23 +0200)]
Limit the number of win tiles in the game

10 years agoAdd max_number limitation (with tests, nogal)
Neil [Sat, 17 May 2014 13:23:06 +0000 (15:23 +0200)]
Add max_number limitation (with tests, nogal)

10 years agobastard merge
David Sharpe [Sat, 17 May 2014 12:50:42 +0000 (14:50 +0200)]
bastard merge

10 years agoadded timed card specific behaviour
David Sharpe [Sat, 17 May 2014 12:47:02 +0000 (14:47 +0200)]
added timed card specific behaviour

10 years agoadded animations
David Sharpe [Sat, 17 May 2014 11:00:36 +0000 (13:00 +0200)]
added animations

10 years agonot actually text
adrianna [Sat, 17 May 2014 13:16:57 +0000 (15:16 +0200)]
not actually text

10 years agorestored missing tumbleweed
adrianna [Sat, 17 May 2014 13:14:52 +0000 (15:14 +0200)]
restored missing tumbleweed

10 years agoProper text for the game mode hint.
Simon Cross [Sat, 17 May 2014 13:14:53 +0000 (15:14 +0200)]
Proper text for the game mode hint.

10 years agoput back favicon
adrianna [Sat, 17 May 2014 13:10:13 +0000 (15:10 +0200)]
put back favicon

10 years agoadded website source
adrianna [Sat, 17 May 2014 13:05:18 +0000 (15:05 +0200)]
added website source