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.
Simon Cross [Sat, 17 May 2014 13:46:51 +0000 (15:46 +0200)]
New tile options for puzzles (PNGs).
Simon Cross [Sat, 17 May 2014 13:46:29 +0000 (15:46 +0200)]
New tile options for puzzles.
Stefano Rivera [Sat, 17 May 2014 13:57:29 +0000 (15:57 +0200)]
Musical menus
Stefano Rivera [Sat, 17 May 2014 13:57:23 +0000 (15:57 +0200)]
Unbreak howto screen
Stefano Rivera [Sat, 17 May 2014 13:48:14 +0000 (15:48 +0200)]
Icon Makefile
Neil [Sat, 17 May 2014 13:23:24 +0000 (15:23 +0200)]
Limit the number of win tiles in the game
Neil [Sat, 17 May 2014 13:23:06 +0000 (15:23 +0200)]
Add max_number limitation (with tests, nogal)
David Sharpe [Sat, 17 May 2014 12:50:42 +0000 (14:50 +0200)]
bastard merge
David Sharpe [Sat, 17 May 2014 12:47:02 +0000 (14:47 +0200)]
added timed card specific behaviour
David Sharpe [Sat, 17 May 2014 11:00:36 +0000 (13:00 +0200)]
added animations
adrianna [Sat, 17 May 2014 13:16:57 +0000 (15:16 +0200)]
not actually text
adrianna [Sat, 17 May 2014 13:14:52 +0000 (15:14 +0200)]
restored missing tumbleweed
Simon Cross [Sat, 17 May 2014 13:14:53 +0000 (15:14 +0200)]
Proper text for the game mode hint.
adrianna [Sat, 17 May 2014 13:10:13 +0000 (15:10 +0200)]
put back favicon
adrianna [Sat, 17 May 2014 13:05:18 +0000 (15:05 +0200)]
added website source
Simon Cross [Sat, 17 May 2014 13:04:17 +0000 (15:04 +0200)]
Borders and better spacing and game mode for info_area.
Simon Cross [Sat, 17 May 2014 13:03:49 +0000 (15:03 +0200)]
Actually render borders.
Simon Cross [Sat, 17 May 2014 13:03:35 +0000 (15:03 +0200)]
Add INFO_RIGHT_PADDING constant.
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.
Neil [Sat, 17 May 2014 12:45:22 +0000 (14:45 +0200)]
card names should not be lists
Neil [Sat, 17 May 2014 12:34:12 +0000 (14:34 +0200)]
Unbreak the game by adding card_names to the yaml files
Neil [Sat, 17 May 2014 12:28:11 +0000 (14:28 +0200)]
Add a card_name parameter
Stefano Rivera [Sat, 17 May 2014 12:39:52 +0000 (14:39 +0200)]
PEP-8
Stefano Rivera [Sat, 17 May 2014 12:39:03 +0000 (14:39 +0200)]
Hook up shift glyph
adrianna [Sat, 17 May 2014 12:28:55 +0000 (14:28 +0200)]
bitshift glyphs
Stefano Rivera [Sat, 17 May 2014 12:26:17 +0000 (14:26 +0200)]
Bit shifts!
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).
adrianna [Sat, 17 May 2014 11:50:31 +0000 (13:50 +0200)]
shifted robot minutely
adrianna [Sat, 17 May 2014 11:46:35 +0000 (13:46 +0200)]
tweaked lose screen
adrianna [Sat, 17 May 2014 11:24:07 +0000 (13:24 +0200)]
tweaked win screen
Simon Cross [Sat, 17 May 2014 11:43:40 +0000 (13:43 +0200)]
Allow --deck and --load in non-debug mode.
Simon Cross [Sat, 17 May 2014 11:39:23 +0000 (13:39 +0200)]
Add deck loading.
Simon Cross [Sat, 17 May 2014 11:35:50 +0000 (13:35 +0200)]
Saner save game loading.
Simon Cross [Sat, 17 May 2014 11:26:31 +0000 (13:26 +0200)]
Add save-game loading.
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
Stefano Rivera [Sat, 17 May 2014 10:53:49 +0000 (12:53 +0200)]
Debian packaging
Simon Cross [Sat, 17 May 2014 10:50:27 +0000 (12:50 +0200)]
Better name for SaveGame.
Simon Cross [Sat, 17 May 2014 10:46:40 +0000 (12:46 +0200)]
Factor out game saving and loading for re-use with --load.
Neil [Sat, 17 May 2014 10:34:18 +0000 (12:34 +0200)]
Dummy sound should know about foreground as well
Neil [Sat, 17 May 2014 10:32:15 +0000 (12:32 +0200)]
double-arrow selector
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).
Simon Cross [Sat, 17 May 2014 10:26:51 +0000 (12:26 +0200)]
Go straight to game after loading.
adrianna [Sat, 17 May 2014 10:19:28 +0000 (12:19 +0200)]
added paragraph spacing to win screen
Neil [Sat, 17 May 2014 10:15:51 +0000 (12:15 +0200)]
Tweak infobar layout yet again
Neil [Sat, 17 May 2014 10:14:54 +0000 (12:14 +0200)]
Default to using full box_width
Neil [Sat, 17 May 2014 10:05:50 +0000 (12:05 +0200)]
Shift bit display up
adrianna [Sat, 17 May 2014 10:09:57 +0000 (12:09 +0200)]
hooked up win and lose screens
adrianna [Sat, 17 May 2014 09:43:55 +0000 (11:43 +0200)]
changed 'do nothing' glyph use
Stefano Rivera [Sat, 17 May 2014 09:41:56 +0000 (11:41 +0200)]
I missed a capital YAML
Stefano Rivera [Sat, 17 May 2014 09:41:32 +0000 (11:41 +0200)]
Re-brand setup.py
adrianna [Sat, 17 May 2014 07:55:22 +0000 (09:55 +0200)]
remove stray prints
adrianna [Sat, 17 May 2014 00:13:50 +0000 (02:13 +0200)]
clockwise and anticlockwise were swapped because I thought west was east
Simon Cross [Sat, 17 May 2014 00:03:26 +0000 (02:03 +0200)]
Day 6 screenshot.
Simon Cross [Fri, 16 May 2014 23:51:23 +0000 (01:51 +0200)]
Mention puzzle mode in howto.
Simon Cross [Fri, 16 May 2014 23:47:34 +0000 (01:47 +0200)]
Update new game screen to use new goodies.
Simon Cross [Fri, 16 May 2014 23:40:58 +0000 (01:40 +0200)]
PEP8 fixes.
Neil [Fri, 16 May 2014 23:40:10 +0000 (01:40 +0200)]
Stop music when the game ends
Neil [Fri, 16 May 2014 23:38:25 +0000 (01:38 +0200)]
Fix width in lose screen
adrianna [Fri, 16 May 2014 23:40:03 +0000 (01:40 +0200)]
win and lose screens
Simon Cross [Fri, 16 May 2014 23:38:56 +0000 (01:38 +0200)]
Use centering on Credits screen.
Simon Cross [Fri, 16 May 2014 23:38:38 +0000 (01:38 +0200)]
Fix TextBoxWidget centering to work with TextWidget centering.
Stefano Rivera [Fri, 16 May 2014 23:32:46 +0000 (01:32 +0200)]
Credits title shouldn't scroll
Simon Cross [Fri, 16 May 2014 23:24:38 +0000 (01:24 +0200)]
Make Credits a scrollable text box.
Simon Cross [Fri, 16 May 2014 23:24:22 +0000 (01:24 +0200)]
Allow other transforms without losing 8-bit.
Simon Cross [Fri, 16 May 2014 23:23:59 +0000 (01:23 +0200)]
Support for centring.
Simon Cross [Fri, 16 May 2014 23:23:40 +0000 (01:23 +0200)]
Allow custom flags for blending.
Stefano Rivera [Fri, 16 May 2014 23:26:27 +0000 (01:26 +0200)]
Take EIGHT_BIT_SCALE into account, in box_width
Stefano Rivera [Fri, 16 May 2014 23:17:13 +0000 (01:17 +0200)]
Standard difficulty by default
Stefano Rivera [Fri, 16 May 2014 23:13:27 +0000 (01:13 +0200)]
Scroll arrows on (and neater) how to play page
Neil [Fri, 16 May 2014 23:05:44 +0000 (01:05 +0200)]
Centre menu items
Neil [Fri, 16 May 2014 23:05:41 +0000 (01:05 +0200)]
Centre some credits lines
Neil [Fri, 16 May 2014 22:51:10 +0000 (00:51 +0200)]
Allow centre=True
Simon Cross [Fri, 16 May 2014 22:49:32 +0000 (00:49 +0200)]
Press ESC to return to the menu.
Stefano Rivera [Fri, 16 May 2014 22:49:36 +0000 (00:49 +0200)]
Create a source distribution
Jeremy Thurgood [Fri, 16 May 2014 22:49:20 +0000 (00:49 +0200)]
Another small main menu tweak.
Simon Cross [Fri, 16 May 2014 22:47:12 +0000 (00:47 +0200)]
Move menu items closer.
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).
Simon Cross [Fri, 16 May 2014 22:40:23 +0000 (00:40 +0200)]
Put the menu screen background in place.
Stefano Rivera [Fri, 16 May 2014 22:32:58 +0000 (00:32 +0200)]
Pre-generate JSON, so we don't need to require pyyaml
Simon Cross [Fri, 16 May 2014 22:28:20 +0000 (00:28 +0200)]
Scrollable text widgets.
Neil [Fri, 16 May 2014 22:13:41 +0000 (00:13 +0200)]
Less whimisical credits
Neil [Fri, 16 May 2014 22:13:26 +0000 (00:13 +0200)]
Espescially if it plays