naja.git
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

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

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

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

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

10 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

10 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

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

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

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

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

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

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

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

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

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

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

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

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

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

10 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

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

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

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

10 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

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

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

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

10 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

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

10 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

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

10 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

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

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

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

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

10 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

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

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

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

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

10 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

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

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

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

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

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

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

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

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

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

10 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

10 years agoStandard difficulty by default
Stefano Rivera [Fri, 16 May 2014 23:17:13 +0000 (01:17 +0200)]
Standard difficulty by default

10 years agoScroll arrows on (and neater) how to play page
Stefano Rivera [Fri, 16 May 2014 23:13:27 +0000 (01:13 +0200)]
Scroll arrows on (and neater) how to play page

10 years agoCentre menu items
Neil [Fri, 16 May 2014 23:05:44 +0000 (01:05 +0200)]
Centre menu items

10 years agoCentre some credits lines
Neil [Fri, 16 May 2014 23:05:41 +0000 (01:05 +0200)]
Centre some credits lines

10 years agoAllow centre=True
Neil [Fri, 16 May 2014 22:51:10 +0000 (00:51 +0200)]
Allow centre=True

10 years agoPress ESC to return to the menu.
Simon Cross [Fri, 16 May 2014 22:49:32 +0000 (00:49 +0200)]
Press ESC to return to the menu.

10 years agoCreate a source distribution
Stefano Rivera [Fri, 16 May 2014 22:49:36 +0000 (00:49 +0200)]
Create a source distribution

10 years agoAnother small main menu tweak.
Jeremy Thurgood [Fri, 16 May 2014 22:49:20 +0000 (00:49 +0200)]
Another small main menu tweak.

10 years agoMove menu items closer.
Simon Cross [Fri, 16 May 2014 22:47:12 +0000 (00:47 +0200)]
Move menu items closer.

10 years agoSlightly better menu item positions (stop gap while I do something better).
Simon Cross [Fri, 16 May 2014 22:44:31 +0000 (00:44 +0200)]
Slightly better menu item positions (stop gap while I do something better).

10 years agoPut the menu screen background in place.
Simon Cross [Fri, 16 May 2014 22:40:23 +0000 (00:40 +0200)]
Put the menu screen background in place.

10 years agoPre-generate JSON, so we don't need to require pyyaml
Stefano Rivera [Fri, 16 May 2014 22:32:58 +0000 (00:32 +0200)]
Pre-generate JSON, so we don't need to require pyyaml

10 years agoScrollable text widgets.
Simon Cross [Fri, 16 May 2014 22:28:20 +0000 (00:28 +0200)]
Scrollable text widgets.

10 years agoLess whimisical credits
Neil [Fri, 16 May 2014 22:13:41 +0000 (00:13 +0200)]
Less whimisical credits

10 years agoEspescially if it plays
Neil [Fri, 16 May 2014 22:13:26 +0000 (00:13 +0200)]
Espescially if it plays

10 years agoMusic makes the world go round
Neil [Fri, 16 May 2014 22:13:10 +0000 (00:13 +0200)]
Music makes the world go round

10 years agosplash screen
adrianna [Fri, 16 May 2014 21:49:30 +0000 (23:49 +0200)]
splash screen

10 years agoPiece of puzzle commit that got forgotten.
Simon Cross [Fri, 16 May 2014 21:38:30 +0000 (23:38 +0200)]
Piece of puzzle commit that got forgotten.

10 years agoRemove unnecessary overriding of TextWidget.draw in TextBoxWidget.draw.
Simon Cross [Fri, 16 May 2014 21:37:56 +0000 (23:37 +0200)]
Remove unnecessary overriding of TextWidget.draw in TextBoxWidget.draw.