Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12359 commits 17 branches 142 tags 291 MiB
Commit graph

79 commits

Author SHA1 Message Date
Tom Ross
e633bc0be9 Rename solitaire_ bitmaps to card_ since they are used in solitaire and blackjack. Ideally all future card games will use these graphics. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12281 a1c6a512-1295-4272-9138-f99709370657
 2007-02-12 04:21:49 +00:00
Dave Chapman
d64e626387 Start of work on a port to the Archos 'AV300' (AV320/340/380) - a working UI simulator (but with a dummy background image for now) and the beginnings of the target-specific firmare code. Port is temporarily using a 2bpp LCD buffer format - the AV300 has a 320x240 colour (YCbCr-based) LCD which will need a new framebuffer format and drawing routines, but the LCD is also capable of various paletted bitmap modes, one of which has an identical framebuffer format to the greyscale ipods. Buttons (and hence the button mappings) are identical to the Archos Recorder, with the exception that the PLAY button on the Recorder is replaced by pressing the joystick on the AV300 (which I call BUTTON_SELECT). The initial port will begin by being strictly HWCODEC, but will evolve to be a hybrid SWCODEC/HWCODEC platform - it has a MAS3587F but also a main CPU (54MHz arm7tdmi plus DSP) capable of software decoding of at least some formats. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12008 a1c6a512-1295-4272-9138-f99709370657
 2007-01-14 13:48:09 +00:00
Daniel Ankers
17676672e0 Improved Sansa keymappings for Pacbox, Solitaire and Star. From FS#6466 by Piotr Jafiszow 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11892 a1c6a512-1295-4272-9138-f99709370657
 2007-01-03 23:53:22 +00:00
Jens Arnold
59320834b6 Solitaire: Repair card border and selection frame. Would it be better to make the playfield background always green again? 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11557 a1c6a512-1295-4272-9138-f99709370657
 2006-11-19 22:49:37 +00:00
Karl Kurbjun
d6b0c97312 Don't need to remove the backdrop for all plugins - leave it up for some. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11526 a1c6a512-1295-4272-9138-f99709370657
 2006-11-15 06:14:27 +00:00
Barry Wardell
24f4a2a8cf Allow the Sansa e200 UI simulator to be built. Thanks to Andre Smith for the nice image of the Sansa. Lots more to be done including testing and tweaking the keymaps and modifying the plugins for the Sansa's 176x220 LCD. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11351 a1c6a512-1295-4272-9138-f99709370657
 2006-10-26 13:38:09 +00:00
Jens Arnold
748036bb70 Solitaire: Optionally auto-unhide the next card on a stack if the last known card is moved away. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11323 a1c6a512-1295-4272-9138-f99709370657
 2006-10-23 22:44:46 +00:00
Marianne Arnold
bfa4cb8c96 Solitaire: better button assignments for H10 and X5 (with working shortcuts) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11262 a1c6a512-1295-4272-9138-f99709370657
 2006-10-18 21:39:57 +00:00
Michael Sevakis
dd7b8fcbe2 Fixed background color on solitaire menu. It wasn't set when entering menu and having a dark background made it almost unreadable. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11182 a1c6a512-1295-4272-9138-f99709370657
 2006-10-11 02:24:57 +00:00
Jens Arnold
d72506cf98 Solitaire: Fixed incorrect condition check that caused an out-of-bounds access allowing to put the 2 of spades into nirvana. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11104 a1c6a512-1295-4272-9138-f99709370657
 2006-10-01 20:55:41 +00:00
Jens Arnold
f3fc9cbd8b Solitaire: Don't let the REM2STACK shortcut repeat on irivers. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11103 a1c6a512-1295-4272-9138-f99709370657
 2006-10-01 20:02:44 +00:00
Jens Arnold
d47983b642 Solitaire: colourised selection frame on colour targets. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11097 a1c6a512-1295-4272-9138-f99709370657
 2006-09-30 09:04:05 +00:00
Jens Arnold
912574b5f9 Heavy graphical rework of solitaire: * Now uses full-card bitmaps (minus border) in several resolutions and colour depths. All graphical work done by Marianne Arnold; 37x49 and 26x33 pixel graphics partially based on the PySol cardset adapted from kdegames 1.0 * Cardback for greyscale targets. * Nicer edges for large cards. * Correct vertical card spacing within columns, hidden cards always use half the space now. * Correct horizontal spacing of columns. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11096 a1c6a512-1295-4272-9138-f99709370657
 2006-09-29 20:39:29 +00:00
Jens Arnold
32e6f114aa Tweaked the card animation a bit more. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11028 a1c6a512-1295-4272-9138-f99709370657
 2006-09-22 22:44:57 +00:00
Jens Arnold
10381032ab Solitaire: Adjust bouncing cards parameters to the LCD resolution. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11021 a1c6a512-1295-4272-9138-f99709370657
 2006-09-21 20:12:04 +00:00
Jens Arnold
84d64e16c4 Solitaire: Don't use bitfields where it's unnecessary, and use 'int' for single variables. Saves ~400 bytes of code on SH1, and ~1200 bytes of code on coldfire. ARM doesn't profit though. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11016 a1c6a512-1295-4272-9138-f99709370657
 2006-09-20 23:34:54 +00:00
Jens Arnold
1d5b248f7b Solitaire: Fixed menu colours. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10999 a1c6a512-1295-4272-9138-f99709370657
 2006-09-19 06:14:56 +00:00
Jens Arnold
3408b60136 Solitaire: Removed unused button definitions. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10987 a1c6a512-1295-4272-9138-f99709370657
 2006-09-18 00:49:54 +00:00
Jens Arnold
7b76bd9f69 Solitaire: * Use rockbox API menu. * Fixed typo. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10986 a1c6a512-1295-4272-9138-f99709370657
 2006-09-18 00:36:09 +00:00
Jens Arnold
6b97c1793f Solitaire: * Button assignments: Better layout for ipods, allowing one-handed operation during the game. More logical shortcut buttons for Ondios. Slight changes for other targets, including working button repeat for up/down when there is no dual use. * Help text showing all possible buttons instead of forcing the user to try and find out. The text adapts to LCD resolution and selected font. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10984 a1c6a512-1295-4272-9138-f99709370657
 2006-09-17 22:14:18 +00:00
Jens Arnold
1350d57751 Solitaire: * Even more 'natural' bouncing cards. * Only load the config from disk once, and only save it on exit if it changed. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10949 a1c6a512-1295-4272-9138-f99709370657
 2006-09-15 06:24:36 +00:00
Antoine Cellerier
bfa94aad7e Looks like we need to explicitly say that we need signed chars. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10926 a1c6a512-1295-4272-9138-f99709370657
 2006-09-10 20:39:46 +00:00
Antoine Cellerier
764632c684 Fix corruption in remains stack and simplify code where possible 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10924 a1c6a512-1295-4272-9138-f99709370657
 2006-09-10 20:04:17 +00:00
Martin Arver
6fbfddd7b5 Correct the help text for iriver HXXX players 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10898 a1c6a512-1295-4272-9138-f99709370657
 2006-09-06 08:28:13 +00:00
Jens Arnold
cbee01ed62 More natural bouncing cards animation. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10897 a1c6a512-1295-4272-9138-f99709370657
 2006-09-06 07:45:10 +00:00
Jens Arnold
d540ab9a12 Solitaire: * Improved large suits for medium/large LCDs, and all new large suits for small LCDs, by Marianne Arnold. * Use the actual card dimensions in the code. Old values were one off. * #ifdef cleanup using the capabilities of the bitmap build system. * Some more tweaks. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10896 a1c6a512-1295-4272-9138-f99709370657
 2006-09-06 01:33:26 +00:00
Antoine Cellerier
e0cb0f6893 Untested cursor display fix when no cards are left/drawn on the remains stack. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10894 a1c6a512-1295-4272-9138-f99709370657
 2006-09-05 21:47:31 +00:00
Antoine Cellerier
9db73f40e7 Add some yielding during the bouncing cards sequence (and only refresh what's needed) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10893 a1c6a512-1295-4272-9138-f99709370657
 2006-09-05 20:54:46 +00:00
Antoine Cellerier
7c587a25e5 Foreground color in menus 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10885 a1c6a512-1295-4272-9138-f99709370657
 2006-09-04 21:46:56 +00:00
Antoine Cellerier
e31845a84c Bouncing cards when you win :) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10884 a1c6a512-1295-4272-9138-f99709370657
 2006-09-04 21:33:08 +00:00
Antoine Cellerier
669490d1a4 Restore default background color when going back to menu after winning. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10883 a1c6a512-1295-4272-9138-f99709370657
 2006-09-04 20:26:31 +00:00
Antoine Cellerier
e9bf85935b Some more remains' stack bug fixes. I must've been drunk when i wrote the original code... 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10881 a1c6a512-1295-4272-9138-f99709370657
 2006-09-04 19:36:09 +00:00
Antoine Cellerier
48865c45f1 Fix some more bugs found by amiconn: 
(1) The bug I already described yesterday: If the draw
    stack becomes completely empty, it reappears. Slightly
    irritating
(2) When the cursor is placed on the remains' stack when
    there is no card, and then a card is drawn, the cursor
    disappears
(4) (easy one) The help texts refer to drawing 3 new cards,
    but solitaire now has selectable draw one / draw three


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10873 a1c6a512-1295-4272-9138-f99709370657
 2006-09-03 16:54:42 +00:00
Antoine Cellerier
cfae9238b5 Use consistant margins. If people still have ideas to make it look better on some of the targets, feel free to say so on IRC. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10868 a1c6a512-1295-4272-9138-f99709370657
 2006-09-03 14:16:03 +00:00
Antoine Cellerier
dede571a25 Some more tweaking so that it now looks really good on small screens 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10862 a1c6a512-1295-4272-9138-f99709370657
 2006-09-02 23:10:28 +00:00
Antoine Cellerier
cf605c3434 Fix solitaire card colors 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10861 a1c6a512-1295-4272-9138-f99709370657
 2006-09-02 22:45:27 +00:00
Antoine Cellerier
ce9fe07d51 Hopefully fix solitaire invisible card bug ... and add some more. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10859 a1c6a512-1295-4272-9138-f99709370657
 2006-09-02 21:56:22 +00:00
Hristo Kovachev
79f60d4054 Removed too much... 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10523 a1c6a512-1295-4272-9138-f99709370657
 2006-08-11 09:14:35 +00:00
Hristo Kovachev
f4ae59d8d7 Correct H10's #define indents, remove redundant lines 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10522 a1c6a512-1295-4272-9138-f99709370657
 2006-08-11 09:05:58 +00:00
Hristo Kovachev
9dc0e62229 Patch #5731 by Barry Wardell: more iriver h10 work. Thanks! 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10521 a1c6a512-1295-4272-9138-f99709370657
 2006-08-11 08:35:27 +00:00
Antoine Cellerier
737e4768a1 Yet some more fixes (mostly for small archos screens). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10453 a1c6a512-1295-4272-9138-f99709370657
 2006-08-03 20:58:35 +00:00
Daniel Stenberg
1e88be518a Barry Wardell's keymappings for H10 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10446 a1c6a512-1295-4272-9138-f99709370657
 2006-08-03 20:17:25 +00:00
Antoine Cellerier
364e892050 Remove some more useless code 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10445 a1c6a512-1295-4272-9138-f99709370657
 2006-08-03 20:11:47 +00:00
Antoine Cellerier
312ccc2f2f Some graphics fixes for solitaire. (Numbers for hearts and diamonds still need to be colored red on color LCD screens) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10443 a1c6a512-1295-4272-9138-f99709370657
 2006-08-03 19:57:33 +00:00
Antoine Cellerier
e3851828af Fix compile warning (and small diaply bug) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10423 a1c6a512-1295-4272-9138-f99709370657
 2006-08-02 22:33:34 +00:00
Antoine Cellerier
5e2a9a19cf Cleanup solitaire code a bit. A side effect is that it should now be possible to play on small LCD screens like the recorder's (which had become impossible since revision 1.20). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10422 a1c6a512-1295-4272-9138-f99709370657
 2006-08-02 22:17:21 +00:00
Antoine Cellerier
7ee850e432 * fix bug (when double clicking on a card on the remains' stack to 
automatically move it to the corresponding final stack, if the move
worked, the cursor wasn't able to select a new card afterwards. - yeah,
this sounds a bit complicated)
 * remove trailing spaces/tabs

TODO: Fix/clean/rewrite the plugin. This whole code is a mess. It's
impossible to read and maintain.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10196 a1c6a512-1295-4272-9138-f99709370657
 2006-07-11 21:38:27 +00:00
Kevin Ferrare
0e027bd90c To avoid having to use the main unit when accidentally launching a plugin from the remote, plugins now support remote quit 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10157 a1c6a512-1295-4272-9138-f99709370657
 2006-06-30 16:43:47 +00:00
Dave Chapman
7e7423373e Add cardback bitmap for colour LCDs smaller than 220x176. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9139 a1c6a512-1295-4272-9138-f99709370657
 2006-03-20 22:07:35 +00:00
Dave Chapman
fb4e384367 More iPod 3G work from Seven Le Mesle 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8835 a1c6a512-1295-4272-9138-f99709370657
 2006-02-24 20:54:09 +00:00