Commit Graph

80 Commits

Author SHA1 Message Date
wagic.the.homebrew@gmail.com
fa0d98988d Erwan
- quick patches, attempt at fixing a few crashes
2010-03-13 08:48:40 +00:00
jean.chalard
168154b52d J :
* Add the confirmation screen for bindings.
  - Add support for asking confirmations before exiting the menu.
  - Add support for cancelling saving of options.
  - Add support for requesting focus when the parent allows to yield.
* Recenter most options' text.
* Change the background color of the selected options (else, there is
  no way of knowing where is the cursor when both option text and
  option value are icons).
* Change symbol names to their equivalent PSP icon use in wagic.
2010-02-28 12:36:09 +00:00
jean.chalard
2566d780b1 J :
* Display pictures for buttons on PSP in the keybinding screen.
* Fix a bug where the New Binding... button would disappear when
  creating a new binding.
* Fix a bug where the menu to choose the bound symbol was not modal.
2010-02-27 18:49:03 +00:00
jean.chalard
de94069829 J :
* Remove a crash
* This removes images for PSP buttons for the moment
2010-02-19 22:43:55 +00:00
jean.chalard
b63e9f9847 J :
* Use images for PSP buttons.
* Um not tested. I don't have my PSP on me
2010-02-19 06:42:47 +00:00
jean.chalard
abd92ffcbf J :
* This finalizes the functionality for key bindings.
* Key bindings are saved in the user's configuration file and read
  back the next time.
* Still got to do : display, instead of a number, an icon on PSP and a
  string on windows (linux/mac already done).
2010-02-18 20:36:31 +00:00
jean.chalard
c87a98eb14 J :
* Grab the keyboard and display the grabbed key.
* Include a tentative interface for the initial message. It's ugly.
2010-02-18 08:03:22 +00:00
jean.chalard
8a19b0567b J :
* Add support for key icons in the keybinding menu
2010-02-16 02:30:11 +00:00
jean.chalard
e7d72b7722 J :
* The key bindings now display (semi-)correctly.
  - Here, "semi-" means the local keys display as a string under X and
    a number everywhere else. The number is all but helpful and will
    have to be replaced before it is usable, but at the moment, the
    code is stable afaik.
2010-02-15 17:34:30 +00:00
jean.chalard
56ce4a14ae J :
* Create the subsystem for keybindings.
2010-02-14 13:21:12 +00:00
wagic.jeck
83e2b04547 Jeck - Added full filtering system to deck editor and shop. I've spent 24hours on pure debugging, but there are likely a couple bugs I've missed. So please, if you find something, make an issue of it! :P Also split OptionItem classes into separate files, and added support for mixed-set boosters (which I think are way, way cool). 2010-02-08 01:03:07 +00:00
jean.chalard
5a2bae75d5 J :
* Add newlines at end of files. This is for better portability.
* Fix a direct reference to g++ in the makefile
2010-02-02 10:19:43 +00:00
wagic.jeck
46215a2bc0 Jeck - Updated the WGui/OptionItem classes to all use ReadButton. Also updated daily build. 2010-02-01 20:58:52 +00:00
wagic.jeck
cf2dfec105 Jeck - Changes to WGui, potential fix to issue 258 (please verify). 2010-01-31 21:38:07 +00:00
wagic.the.homebrew@gmail.com
dd01706527 Erwan
- introducing "grade" system for cards
- Fixed a few typos in _cards.dat
2010-01-30 06:33:40 +00:00
jean.chalard
0a083f4385 J :
* Fixes for compilation on 64-bit architectures :
  string position-returning functions return size_t, not uint.
  Fix that.
* Fixes warnings with new gcc about non-fixed string AND no arguments.

NOTE : 64-bit architectures still do not compile. There are 2 different places
where printf is used with a specifier that is not large enough on 64-bit because
size_t is now a ulong and not a uint. The solution on GNU systems is the %zu
specifier, but as I'm not sure it is supported on windows I don't want to
introduce a huge hard-to-notice bug, so I'll do it at a time when I got a
windowser to back me up.
2010-01-25 09:58:30 +00:00
wagic.jeck
bd0e139e6d Jeck - Minor update to trophy room, moved metadata into cards.dat
* updated daily build
* Card spoiler now sorts by collector's number.
* Metadata looks for "[m" (for speed reasons), I've been using "[meta]" in files. No sets currently use metadata.
2010-01-05 23:32:31 +00:00
wagic.jeck
4ea8234f79 Jeck - quick fix to issue 285. Meant to do this later today with some other stuff, but had it ready now, so...
Eventually, the WDataSource stuff will need to be analyzed more in depth. WSrcMTGSet is very similar (though simplified) in functionality to the deck data wrapper stuff.
2010-01-04 12:59:57 +00:00
wagic.the.homebrew@gmail.com
1b91bbdff7 Erwan
- Adding option to interrupt AI after main phase 2
2009-12-20 02:48:25 +00:00
jean.chalard
6af5563103 J :
* Re-input a close that had been deleted by mistake.
2009-12-18 10:12:07 +00:00
jean.chalard
a89458bca8 J :
* Remove a useless debug print.
2009-12-17 18:15:36 +00:00
jean.chalard
54791762b1 J :
* Fix a bug where valid directories would be ignored and invalid ones
  would be accepted for profiles and themes.
* Fix a compilation fault when compiling in debug mode.
2009-12-17 17:29:24 +00:00
wagic.jeck
b7b48a0ab3 Jeck - "Fix" to issue 247 (see issue for notes), added additional award ("Collection valued over 10,000 credits"), minor enhancement to trophy room UI (floating "O - Details" notification).
The new award will need some art before we ship, but it won't take too much work to add that :)
2009-12-15 18:03:42 +00:00
wagic.jeck
d873b573f8 Jeck - Minor improvement to delayed loading in card spoiler. 2009-12-13 16:34:35 +00:00
wagic.jeck
b766dd6e4a Jeck - Fixes for how options handle first boot, should resolve trophy room issue (no unlocked set on first boot). 2009-12-13 15:00:53 +00:00
wagic.the.homebrew@gmail.com
74accec275 Erwan
- Fix issue 144 (Sound is either 0 or 100%), for PSP ONLY. The methods are now here for linux/windows, but only the music volume method will work currently, and it sets the volume globally. Patch by Yeshua with some cleanup by myself.
2009-12-12 15:10:32 +00:00
wagic.jeck
61c9772a66 Jeck - Included missing file for r1460, updated trophy room. Trophies now render from bottom left, so any size png can be used. 2009-12-12 11:24:23 +00:00
wagic.jeck
70411f025f Jeck - Trophy room added, triangle is now dedicated alt-render toggle. Hopefully I'm not forgetting anything... 2009-12-12 10:23:28 +00:00
wagic.the.homebrew@gmail.com
66a505969e Erwan
- fix issue 215
- added test for purple screen (this is the small white square on top of the loading screen)
2009-11-23 08:25:27 +00:00
wagic.the.homebrew@gmail.com
da9a82cff4 Erwan
- removed some unused code. Please review!
- Added protection from() auto keyword. It is still possible to use protection from [color] in abilities, but when it is not possible, please use protection from([target]) in auto=
2009-11-21 07:26:26 +00:00
wagic.jeck
101854af77 Jeck - Small fix to r1305. This still leaves card text untranslated, but at least clears the translated text out of memory.
The thing complicating a "100% functionality" fix for this is that all translation changes are destructive- they overwrite the original text. We want this behavior, as it prevents having two sets of strings in memory (the untranslated and translated sets) when card text currently takes hundreds of kb... however, to switch languages we'd want the original text available, which means reloading all the set files. That's not optimal either...

As it is, the player must reset their PSP for translated card text. Again, not optimal. I'm submitting an issue on this topic.
2009-11-19 09:27:11 +00:00
wagic.jeck
e27fbac7be Jeck - Language is now a per-profile option settable in the options menu. Also, game no longer crashes when no language files are present. 2009-11-19 03:13:55 +00:00
wagic.jeck
37ad16d90e Jeck - Basic set metadata support. Also a minor improvement to WGuiImage.
* Metadata is currently only used in exactly one place: the set's "Pretty Name" is displayed when the set is first unlocked. 
* WGuiImage now has a function to set scaling.
2009-11-18 09:27:24 +00:00
wagic.jeck
e10130b718 Jeck - Whoops. Forgot to make invisible cheats unselectable. Fixed. 2009-11-02 06:25:03 +00:00
wagic.jeck
6946544a2a Jeck - Minor language support fiddling, gui decorator for cheat-profile only options. 2009-11-02 06:15:37 +00:00
wagic.jeck
a4a19a1c9a Jeck - Fix to r1220. Apparently, _() doesn't like \n. 2009-11-01 23:13:30 +00:00
wagic.jeck
29219be4df Jeck - Added "# of unlocked sets" info to profile switcher, ran profile stats through _(). 2009-11-01 23:01:19 +00:00
wagic.the.homebrew@gmail.com
01c949f881 Erwan
- Fixed a few tranlsation issues in the code
- Updated French translation
2009-10-31 07:58:21 +00:00
wagic.jeck
0efb205469 Jeck - Final theme updates. Reverted backdrop.jpg to 255H, expanded wood.png to 32H, though only 28 are used (to prevent gray box issue). Also minor change to OptionItem.cpp so that themeinfo.txt loads on Default theme. 2009-10-25 01:37:23 +00:00
wagic.jeck
f117b04dea Jeck - And this is why I shouldn't code at 3 AM. Fix to r1152, which potentially closed a non-existent file descriptor. Not a major bug, but it's better to do it this way. 2009-10-23 07:29:21 +00:00
wagic.jeck
c552a47087 Jeck - Fix to r1151, which left an open file descriptor. 2009-10-23 07:26:12 +00:00
wagic.jeck
c87343a7f2 Jeck - Simplistic solution to issue 131. Reads only the first line of themeinfo.txt and uses the first 16 characters as the author name, if present. The rest of the file is completely ignored. Not exactly the most elegant solution, but I don't think we really need much metadata beyond who the theme's author is. My suggestion would be to let the authors use the rest of the file as a "Readme.txt" with whatever details they want to put in it. (Art credits, etc.).
The next version of Wagic will use XML-like themes, so I think it's alright to use such a non-extensible format.
2009-10-23 07:16:58 +00:00
wagic.jeck
6d62c013df Jeck - Fix for two obscure edge case bugs in the options menu.
* Confirmable options used to only check for confirmation when selecting another option. They now autoconfirm when saving & exiting. This bug could possibly result in loading the wrong theme. Fixed.
 * Changing profiles, canceling, then changing to the profile again could also result in improper theme loading. Fixed.
2009-10-21 02:34:29 +00:00
wagic.jeck
63ddbd52ad Jeck - Hopefully fixes issue 114.
* Options before the desired optionID were not using the correct option class.
 * Enums were expected to be lower-case.
2009-10-20 16:54:53 +00:00
wagic.jeck
8c4c3f2418 Jeck - Final fix to r1109. It was reloading the old options halfway through saving the new ones. 2009-10-20 04:33:43 +00:00
wagic.jeck
3a4dd403e2 Jeck - Quick fix to r1109. 2009-10-20 04:14:13 +00:00
wagic.jeck
7f7320f904 Jeck - Some basic options handling rewrites, main menu update, example alternate theme (for testing). I'm closing issues 44 and 45, as hopefully this resolves them satisfactorily.
* The alternate theme is just useful for testing themes, but please comment on the changes to the main theme.
 * Options reading and initializing separated from UI.
 * Options UI abstracted a bit, made more easily extensible.
 * With some extension, the options UI could be used as the basis for more complicated themes, if we load a file and use it to do stuff like GameStateOptions::Start()
2009-10-20 03:46:18 +00:00
wagic.the.homebrew@gmail.com
620ea034b8 Erwan
-Issue 26: added an option for Mana Display. This needs a bit testing, but it should also lower the priority of "manapool slowness" as this mode probably fixes performance issue as well.
-I can't seem to be able to "save" some options (hand position, mana display) ion the windows version, does this change break something ?
2009-10-04 06:01:00 +00:00
wagic.the.homebrew@gmail.com
888edfd5b8 Erwan
-more JGE cleanup
-removed calls to BindTexture that were made out of the Render methods. Please let me know if this has side effects (and let's discuss it in that case)
-Still no luck with the purple screen bug :(
2009-10-03 08:50:44 +00:00
wagic.jeck
2020dce4fd Jeck - unsigned/signed fix, options fixes
* Abstracted out option calls to "f3" behind Constants::OPTION_FONT
 * Added option to disable card image loading.
2009-09-24 23:26:32 +00:00