Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,076 Commits 14 Branches 14 Tags
ac1b571c00a7230e914cd4eab28e3b74f97183c2
Commit Graph

94 Commits

Author SHA1 Message Date
Xawotihs
963730536e Mouse/touch support for the options menu (issue 576). Still missing support for the virtual keyboard. 2011-01-16 11:05:02 +00:00
techdragon.nguyen@gmail.com
1be97b76f8 code cleanup. No code changes 
- removed unused variables
- added line breaks between methods (not everywhere just where i saw it while removing unused variables)
 2011-01-16 07:49:34 +00:00
wrenczes@gmail.com
65e38b0694 Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context. 2010-12-01 08:22:17 +00:00
techdragon.nguyen@gmail.com
f1a4f26c79 fixed unsigned vs signed int comparison for vector iteration. 2010-11-20 19:50:06 +00:00
Xawotihs
048ecb3324 Mouse support in Shop 2010-11-20 17:46:53 +00:00
techdragon.nguyen@gmail.com
f684795810 refactored menu classes 
fixed some layout issues with detailed info popup
changed requirements for detailed info popup button to be determined by the number of wins aginst AI deck instead of just the number of games.
 2010-11-19 04:19:03 +00:00
techdragon.nguyen@gmail.com
acd7bb1aa4 reformatting code according to guidelines defined at 
http://wololo.net/forum/viewtopic.php?f=35&t=2235&start=10
 2010-11-16 00:55:16 +00:00
wrenczes@gmail.com
27fd107208 1st step in refactoring some of the card rendering logic - currently, each 'client' has duplicated code having to deal with how to render the full card graphic vs text mode vs using a 'back' image if a card isn't found. This is a first pass at consolidating some of that logic to one location - the ultimate goal being, eventually, the resource cache will actually own the notion of whether it's handing out a real card image or a default filler if the card isn't available, and the client code rendering the card should be oblivious. 
In this change, I made the CardGui's RenderBig() and AlternateRender() functions protected; anyone wanting to render a card simply calls RenderCard(), and the card drawing mode is passed along as a param.
 2010-11-14 08:15:26 +00:00
wrenczes@gmail.com
3c19533a4c Added the notion of a 'cancel' button, and unified all the 'cancel' menu IDs to be kCancelMenuID (ie -1). I've slaved the Menu button (ie Esc on win, 'Start' button on PSP) to this - the idea being, if you hit the Menu button to bring up a menu, hitting it again will dismiss it without doing anything, which is pretty standard behavior for most console/computer games. 2010-11-07 02:08:17 +00:00
wrenczes@gmail.com
e74c0fcc7c Moved a few more common shared includes into the precompiled header. 2010-10-24 06:55:40 +00:00
wrenczes
d5f3e4cfea Enabled precompiled headers for the build. This cuts the win compile time in debug by at least half on my laptop; on the psp compile, it shaves it down by ~ 45 seconds. I only did a cursory inspection of what to add to PrecompiledHeader.h, there's probably more that we can throw in there for more incremental speed improvements. 
Also fixed the project includes so that we don't need to always use the indirect include path, ie:
#include "../include/foo.h" -> #include "foo.h"

I'm don't know much about make files - if I busted the linux build, mea culpa, but I think we're okay on that front too.  For future reference, here's the most straightforward link on the topic of adding pch support to make files:

http://www.mercs-eng.com/~hulud/index.php?2008/06/13/6-writing-a-good-makefile-for-a-c-project
 2010-10-24 05:55:24 +00:00
omegablast2002@yahoo.com
f3449592de Fixed a bug where "Maxglee" cheat was adding token workaround cards to the collection. also, removed subtype search "nothing" from the Wfilters...before anyone jumps on me, there are over 18000s MTG cards, NOT a single ones of those cards have subtype="nothing" or any variations of "nothing" 2010-10-22 14:53:39 +00:00
wrenczes@gmail.com
5aa3dc6fd3 Refactoring of some of the font management in WResourceManager. This change looks bigger than it actually is - most of the touched files are simply renaming of some font enums that I moved out of MTGDefinitions into the resource manager header files. The main points of this change: collapsing the font containers into a single map, eliminating duplicated functions, and migrating the font building logic into the resource manager class. GameApp doesn't need to know anything about the fonts it uses, and likewise, font users don't need to know what the name of their chosen font is, just the FONT_TYPE enum. 
(I did a cursory check to make sure chinese still displays correctly - at a glance, I'm seeing what looks correct to someone who doesn't read the language :) )
 2010-10-19 07:51:32 +00:00
wrenczes@gmail.com
f7361fb030 More type conversion warning fixes, with some minor refactoring thrown in. 2010-10-14 07:39:00 +00:00
wagic.the.homebrew@gmail.com
361c39e86f Erwan 
- fix for issue 405 (unlocking ALL twice through Cheat mode in deck editor crashes the game)
 2010-09-26 10:54:39 +00:00
wagic.the.homebrew@gmail.com
f40af0b1cb Erwan 
- Chinese patch by linshier
 2010-07-31 14:41:04 +00:00
wagic.the.homebrew@gmail.com
fa0d98988d Erwan 
- quick patches, attempt at fixing a few crashes
 2010-03-13 08:48:40 +00:00
wagic.the.homebrew@gmail.com
cf1e419aaf Erwan 
- fix for issue 348
- Fix a bug when going out of the deck editor then back to it again would show an incorrect color icon instead of nothing
- Fix a bug where the AI tries to play a spell with a target instead of just checking if it can play it. (visually, this showed as the AI tapping mana, then "freezing" for a few seconds with some cards grayed out on the battlefield)
 2010-03-04 11:43:22 +00:00
wagic.jeck
706ebca249 Jeck - Quick fix for issue 370, issue 365, (and hopefully) issue 319 . Thanks for the report, Psy. 
(Counts weren't being updated as often as they should be. Now they might be updated too often, but that's better than the alternative.)
 2010-02-28 22:12:17 +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
wagic.jeck
5dd2388b6f Jeck - More deck editor fixes, quick hack to subtypes filter. I've noticed some slowdown while scrolling up/down in the deck editor, I think this is due to some recent changes that removed a few of the filter system's optimizations. I'll re-implement them tonight. 2010-02-19 23:06:44 +00:00
wagic.jeck
25e6906149 Jeck - More deck editor fixes, linked in prior coded subtype filter. 2010-02-19 21:54:39 +00:00
wagic.jeck
afffd4509f Jeck - fixed issue 354, cleaned up mixed boosters, fixed a few issues with pack loading (slot pools weren't working), fixed TSP boosters to use 'S' rarity, removed some unused code. 2010-02-19 20:10:30 +00:00
jean.chalard
72e395d1e1 J : 
* Fix a bug on key bindings on PSP.
 2010-02-18 20:54:18 +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
wagic.jeck
71e0792cde Jeck - Additional fixes for deck editor. Unfortunately, it still has separate filters for deck and collection, but I'm working on that. 2010-02-17 23:27:17 +00:00
jean.chalard
436da6fcc0 J : 
* Very small addition to the key bindings menu.
 2010-02-17 15:24:14 +00:00
wagic.jeck
4fd38766b1 Jeck - Daily build & fix to r1895. Now the deck editor does what I thought it did. 2010-02-17 15:16:59 +00:00
wagic.jeck
ab22719e4d Jeck - Deck editor filtering now works much better- single filter, automatically recolors itself to match the active color. 2010-02-17 04:08:51 +00:00
wagic.jeck
92b0c80563 Jeck - Simple scaling of the options tabs. 2010-02-16 17:48:31 +00:00
jean.chalard
2faabf98b5 J : 
* Little progress on the interface for key bindings.
* This seems to still be stable so I commit while I'm at it.
 2010-02-15 18:14:24 +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
16ca1a929f J : 
* Some interface for key bindings
 2010-02-15 14:32:56 +00:00
jean.chalard
56ce4a14ae J : 
* Create the subsystem for keybindings.
 2010-02-14 13:21:12 +00:00
wagic.jeck
ab34fc16f9 Jeck - Added custom booster packs (see miki), numerous small fixes. Once we hit feature-freeze I'll be reviewing this stuff in depth, as again there's likely a lot of room for cleaning... just wanted to get it in first :). 
I cut some bits out that weren't ready for SVN, hopefully I've committed everything correctly.
 2010-02-11 18:32:44 +00:00
wagic.jeck
cf03d4cc64 Jeck - fix to issue 318. 2010-02-10 15:48:38 +00:00
wagic.jeck
9806edc6d0 Jeck - Fix for issue 316 (shop selection not cyclical). 2010-02-10 14:03:08 +00:00
wagic.jeck
4be2dddaf9 Jeck - Cleaned up filters a tiny bit (they no longer use idiotically duplicated vector<pair<string,string>>'s), added colorless mana filter ability, "exclusively X color" filter. 2010-02-09 19:25:53 +00:00
wagic.jeck
e5be940766 Jeck - Added filtering by card's first letter. This is pretty much the last filter I can think of, except possibly some more complex ones like the mana producer filter. 2010-02-08 23:10:45 +00:00
wagic.jeck
bf4595ee70 Jeck - Added filter for mana-producing abilities. 2010-02-08 06:08:29 +00:00
wagic.jeck
07ebd926fe Jeck - Added 4 additional filters: CMC, Power, Toughness, and "Exclusively this color". That last one isn't hooked into the gui, as it might be confusing for too little gain... but it's there for future use of filters as a deck/format validation tool. 2010-02-08 05:36:51 +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