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

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

9 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

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

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

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

9 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

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

9 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

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

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

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

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

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

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

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

9 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

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

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

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

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

9 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

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

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

9 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

9 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

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

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

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

9 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

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

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

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

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

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

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

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

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

9 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

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

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

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

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

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

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

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

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

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

9 years agoBorders and better spacing and game mode for info_area.
Simon Cross [Sat, 17 May 2014 13:04:17 +0000 (15:04 +0200)]
Borders and better spacing and game mode for info_area.

9 years agoActually render borders.
Simon Cross [Sat, 17 May 2014 13:03:49 +0000 (15:03 +0200)]
Actually render borders.

9 years agoAdd INFO_RIGHT_PADDING constant.
Simon Cross [Sat, 17 May 2014 13:03:35 +0000 (15:03 +0200)]
Add INFO_RIGHT_PADDING constant.

9 years agoGenerate JSON during build time.
Stefano Rivera [Sat, 17 May 2014 12:57:13 +0000 (14:57 +0200)]
Generate JSON during build time.

And install time, if it doesn't exist, for install from git.

9 years agocard names should not be lists
Neil [Sat, 17 May 2014 12:45:22 +0000 (14:45 +0200)]
card names should not be lists

9 years agoUnbreak the game by adding card_names to the yaml files
Neil [Sat, 17 May 2014 12:34:12 +0000 (14:34 +0200)]
Unbreak the game by adding card_names to the yaml files

9 years agoAdd a card_name parameter
Neil [Sat, 17 May 2014 12:28:11 +0000 (14:28 +0200)]
Add a card_name parameter

9 years agoPEP-8
Stefano Rivera [Sat, 17 May 2014 12:39:52 +0000 (14:39 +0200)]
PEP-8

9 years agoHook up shift glyph
Stefano Rivera [Sat, 17 May 2014 12:39:03 +0000 (14:39 +0200)]
Hook up shift glyph

9 years agobitshift glyphs
adrianna [Sat, 17 May 2014 12:28:55 +0000 (14:28 +0200)]
bitshift glyphs

9 years agoBit shifts!
Stefano Rivera [Sat, 17 May 2014 12:26:17 +0000 (14:26 +0200)]
Bit shifts!

9 years agoMove hint up in preparation for state mode display (i.e. puzzle vs difficulty).
Simon Cross [Sat, 17 May 2014 11:50:55 +0000 (13:50 +0200)]
Move hint up in preparation for state mode display (i.e. puzzle vs difficulty).

9 years agoshifted robot minutely
adrianna [Sat, 17 May 2014 11:50:31 +0000 (13:50 +0200)]
shifted robot minutely

9 years agotweaked lose screen
adrianna [Sat, 17 May 2014 11:46:35 +0000 (13:46 +0200)]
tweaked lose screen

9 years agotweaked win screen
adrianna [Sat, 17 May 2014 11:24:07 +0000 (13:24 +0200)]
tweaked win screen

9 years agoAllow --deck and --load in non-debug mode.
Simon Cross [Sat, 17 May 2014 11:43:40 +0000 (13:43 +0200)]
Allow --deck and --load in non-debug mode.

9 years agoAdd deck loading.
Simon Cross [Sat, 17 May 2014 11:39:23 +0000 (13:39 +0200)]
Add deck loading.

9 years agoSaner save game loading.
Simon Cross [Sat, 17 May 2014 11:35:50 +0000 (13:35 +0200)]
Saner save game loading.

9 years agoAdd save-game loading.
Simon Cross [Sat, 17 May 2014 11:26:31 +0000 (13:26 +0200)]
Add save-game loading.

9 years agoOverride dh_python2's idea of supported python versions, for wider installability
Stefano Rivera [Sat, 17 May 2014 11:18:07 +0000 (13:18 +0200)]
Override dh_python2's idea of supported python versions, for wider installability

9 years agoDebian packaging
Stefano Rivera [Sat, 17 May 2014 10:53:49 +0000 (12:53 +0200)]
Debian packaging

9 years agoBetter name for SaveGame.
Simon Cross [Sat, 17 May 2014 10:50:27 +0000 (12:50 +0200)]
Better name for SaveGame.

9 years agoFactor out game saving and loading for re-use with --load.
Simon Cross [Sat, 17 May 2014 10:46:40 +0000 (12:46 +0200)]
Factor out game saving and loading for re-use with --load.

9 years agoDummy sound should know about foreground as well
Neil [Sat, 17 May 2014 10:34:18 +0000 (12:34 +0200)]
Dummy sound should know about foreground as well

9 years agodouble-arrow selector
Neil [Sat, 17 May 2014 10:32:15 +0000 (12:32 +0200)]
double-arrow selector

9 years agoAdd debug options for starting straight at a particular deck or save game (currently...
Simon Cross [Sat, 17 May 2014 10:27:34 +0000 (12:27 +0200)]
Add debug options for starting straight at a particular deck or save game (currently they do nothing).

9 years agoGo straight to game after loading.
Simon Cross [Sat, 17 May 2014 10:26:51 +0000 (12:26 +0200)]
Go straight to game after loading.

9 years agoadded paragraph spacing to win screen
adrianna [Sat, 17 May 2014 10:19:28 +0000 (12:19 +0200)]
added paragraph spacing to win screen

9 years agoTweak infobar layout yet again
Neil [Sat, 17 May 2014 10:15:51 +0000 (12:15 +0200)]
Tweak infobar layout yet again

9 years agoDefault to using full box_width
Neil [Sat, 17 May 2014 10:14:54 +0000 (12:14 +0200)]
Default to using full box_width

9 years agoShift bit display up
Neil [Sat, 17 May 2014 10:05:50 +0000 (12:05 +0200)]
Shift bit display up

9 years agohooked up win and lose screens
adrianna [Sat, 17 May 2014 10:09:57 +0000 (12:09 +0200)]
hooked up win and lose screens

9 years agochanged 'do nothing' glyph use
adrianna [Sat, 17 May 2014 09:43:55 +0000 (11:43 +0200)]
changed 'do nothing' glyph use

9 years agoI missed a capital YAML
Stefano Rivera [Sat, 17 May 2014 09:41:56 +0000 (11:41 +0200)]
I missed a capital YAML

9 years agoRe-brand setup.py
Stefano Rivera [Sat, 17 May 2014 09:41:32 +0000 (11:41 +0200)]
Re-brand setup.py

9 years agoremove stray prints
adrianna [Sat, 17 May 2014 07:55:22 +0000 (09:55 +0200)]
remove stray prints

9 years agoclockwise and anticlockwise were swapped because I thought west was east
adrianna [Sat, 17 May 2014 00:13:50 +0000 (02:13 +0200)]
clockwise and anticlockwise were swapped because I thought west was east

9 years agoDay 6 screenshot.
Simon Cross [Sat, 17 May 2014 00:03:26 +0000 (02:03 +0200)]
Day 6 screenshot.

9 years agoMention puzzle mode in howto.
Simon Cross [Fri, 16 May 2014 23:51:23 +0000 (01:51 +0200)]
Mention puzzle mode in howto.

9 years agoUpdate new game screen to use new goodies.
Simon Cross [Fri, 16 May 2014 23:47:34 +0000 (01:47 +0200)]
Update new game screen to use new goodies.

9 years agoPEP8 fixes.
Simon Cross [Fri, 16 May 2014 23:40:58 +0000 (01:40 +0200)]
PEP8 fixes.

9 years agoStop music when the game ends
Neil [Fri, 16 May 2014 23:40:10 +0000 (01:40 +0200)]
Stop music when the game ends

9 years agoFix width in lose screen
Neil [Fri, 16 May 2014 23:38:25 +0000 (01:38 +0200)]
Fix width in lose screen

9 years agowin and lose screens
adrianna [Fri, 16 May 2014 23:40:03 +0000 (01:40 +0200)]
win and lose screens

9 years agoUse centering on Credits screen.
Simon Cross [Fri, 16 May 2014 23:38:56 +0000 (01:38 +0200)]
Use centering on Credits screen.

9 years agoFix TextBoxWidget centering to work with TextWidget centering.
Simon Cross [Fri, 16 May 2014 23:38:38 +0000 (01:38 +0200)]
Fix TextBoxWidget centering to work with TextWidget centering.

9 years agoCredits title shouldn't scroll
Stefano Rivera [Fri, 16 May 2014 23:32:46 +0000 (01:32 +0200)]
Credits title shouldn't scroll

9 years agoMake Credits a scrollable text box.
Simon Cross [Fri, 16 May 2014 23:24:38 +0000 (01:24 +0200)]
Make Credits a scrollable text box.

9 years agoAllow other transforms without losing 8-bit.
Simon Cross [Fri, 16 May 2014 23:24:22 +0000 (01:24 +0200)]
Allow other transforms without losing 8-bit.

9 years agoSupport for centring.
Simon Cross [Fri, 16 May 2014 23:23:59 +0000 (01:23 +0200)]
Support for centring.

9 years agoAllow custom flags for blending.
Simon Cross [Fri, 16 May 2014 23:23:40 +0000 (01:23 +0200)]
Allow custom flags for blending.

9 years agoTake EIGHT_BIT_SCALE into account, in box_width
Stefano Rivera [Fri, 16 May 2014 23:26:27 +0000 (01:26 +0200)]
Take EIGHT_BIT_SCALE into account, in box_width