wagic

ActionElement.cpp

- Removed "isClone" flag. This flag was error prone. The "core" classes now have decent copy constructors, and ideally long term we should create copy constructors for the abilities that have additional pointers in them.

2011-07-27 14:31:27 +00:00

ActionLayer.cpp

More warning cleanup - converted certain class functions to return bool instead of int where appropriate. Also fixed the sdl update() tickCount assignment that I just broke in my last checkin.

2011-06-02 07:01:42 +00:00

ActionStack.cpp

- Added TutorialMessage ability

2011-07-03 08:47:51 +00:00

AIHints.cpp

- Removed "isClone" flag. This flag was error prone. The "core" classes now have decent copy constructors, and ideally long term we should create copy constructors for the abilities that have additional pointers in them.

2011-07-27 14:31:27 +00:00

AIMomirPlayer.cpp

- Removed "isClone" flag. This flag was error prone. The "core" classes now have decent copy constructors, and ideally long term we should create copy constructors for the abilities that have additional pointers in them.

2011-07-27 14:31:27 +00:00

AIPlayer.cpp

- graphical representation of counters. see graphics/counters/quest.jpg for an example

2011-07-29 17:43:45 +00:00

AIStats.cpp

More warning cleanup (type to type conversion warnings).

2011-06-02 06:14:28 +00:00

AllAbilities.cpp

- graphical representation of counters. see graphics/counters/quest.jpg for an example

2011-07-29 17:43:45 +00:00

CardDescriptor.cpp

Fixes for exclusion/inclusion combinations of colors or abilities.

2011-04-28 05:01:06 +00:00

CardDisplay.cpp

Fixed issue 677

2011-07-04 19:09:19 +00:00

CardEffect.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

CardGui.cpp

- graphical representation of counters. see graphics/counters/quest.jpg for an example

2011-07-29 17:43:45 +00:00

CardPrimitive.cpp

- graphical representation of counters. see graphics/counters/quest.jpg for an example

2011-07-29 17:43:45 +00:00

CardSelector.cpp

Updated the Qt project to work on Desktop/Maemo/Meego/Symbian. Removed all dependencies except Qt and OpenGl.

2011-07-17 18:18:17 +00:00

CardSelectorSingleton.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Closest.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Counters.cpp

- graphical representation of counters. see graphics/counters/quest.jpg for an example

2011-07-29 17:43:45 +00:00

Credits.cpp

reinstated target coloring, added text display for stonehewer and hermit mode unlock.

2011-07-08 19:39:47 +00:00

Damage.cpp

added incrementing of "damageCount" the variable that tracks the damage dealt to a player, to "infect" damaging...this is a rules correction, a creature with "infect" still "deals damage"...it just does it differently.

2011-07-26 16:56:01 +00:00

DamagerDamaged.cpp

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

DeckDataWrapper.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

DeckEditorMenu.cpp

moved the translator init code earlier; added some translation support for the code of r2517 and r2907; updated some Chinese translation.

2011-01-31 14:21:46 +00:00

DeckManager.cpp

fixed a memory leak. Not sure how it got introduced but the destructor for DeckManager now does the heavy lifting for memory cleanup and not the static method EndInstance().

2011-04-21 06:35:44 +00:00

DeckMenu.cpp

Additional tweak for issue 693: reduce the size of some background images. I think the visual result is still ok. The images go from 480x272 to 450x255, and end up taking twice as less space in ram (512x256 instead of 512x512).

2011-07-11 14:34:12 +00:00

DeckMenuItem.cpp

Fixed issue 674 for deck selection in menu by mouse/touch

2011-06-03 20:01:50 +00:00

DeckMetaData.cpp

Refix on issue 634. Calling EndInstance() on the DeckManager wasn't the right fix here, as it blows away all the instance data and basically nullifies the advantage of caching all the stats data. From what I could see, the problem was more a case of when a new deck was targetted, if no stats file was already present for the new deck, the old values from the previous player deck would persist. Now we clear these up before attempting to assign new values, so if the stat info doesn't exist, it'll show 0 matches / victories /etc instead of stale data belonging to another player deck.

2011-05-28 05:00:40 +00:00

DeckStats.cpp

- Fix issue 694

2011-07-05 13:02:41 +00:00

DuelLayers.cpp

Fixed issue 677

2011-07-04 19:09:19 +00:00

Effects.cpp

J :

2009-06-15 01:01:57 +00:00

ExtraCost.cpp

Added object analytics around ExtraCost & ManaCost; some formatting style cleanup.

2011-04-24 10:33:38 +00:00

GameApp.cpp

Tied in my recent Android flick gesture addition to a Scroll() function. GameState now has a virtual function OnScroll() call that, by default is a no-op; each game state can choose to override how to respond to flick gestures. I've added one such override in the Deck Editor so that a flick up/down acts like the psp button up/down for scrolling between color filters.

2011-06-15 09:52:11 +00:00

GameLauncher.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

GameObserver.cpp

fixed a bug where altercost would cause extracost payments like PMana to lose their source, because the source for the cost is set after the card is placed in hand, and altercost resets the cost of cards to the new cost.

2011-07-08 17:43:19 +00:00

GameOptions.cpp

- Added TutorialMessage ability

2011-07-03 08:47:51 +00:00

GameState.cpp

Adding a way to mark decks as "locked" based on options requirements (option on or off). Can be used for example to lock a deck until a specific set is not unlocked. Works for both player decks (could be used for premade?) and AI decks.

2011-05-06 06:40:00 +00:00

GameStateAwards.cpp

Fixed issue 676 (was not related to mouse support at all)

2011-07-08 21:26:21 +00:00

GameStateDeckViewer.cpp

Switched another case of the psp icons to (explicitly) use the managed cache.

2011-07-07 08:26:01 +00:00

GameStateDuel.cpp

- Fix issue 694

2011-07-05 13:02:41 +00:00

GameStateMenu.cpp

- Manual cache cleanup in the menu to help a bit with issue 693. This is unfortunately not enough, we are dealing with ram fragmentation problems here :(

2011-07-10 13:51:39 +00:00

GameStateOptions.cpp

Activated mouse tracking in option and award menus. Activated offset support in SimpleMenu, it should help for issue 674

2011-06-04 16:22:45 +00:00

GameStateShop.cpp

- Added TutorialMessage ability

2011-07-03 08:47:51 +00:00

GameStateStory.cpp

Added a debug helper override class for ifstream - this normally washes out to std::ifstream. If #define TRACK_FILE_USAGE_STATS is enabled, it derives from ifstream, but additionally tracks each time we create an instance for a given file name & counts each hit in a map, and dump the statistics on shutdown. This is to help track how often we open up certain files, since i/o is costly on the psp.

2011-01-11 10:11:15 +00:00

GameStateTransitions.cpp

Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

2011-04-20 07:50:00 +00:00

GuiAvatars.cpp

Fixed issue 677

2011-07-04 19:09:19 +00:00

GuiBackground.cpp

Consolidated some loose strings into constant declarations in order to reduce allocation thrashing on temporary string constructs. I'm sure there are more, but "back_thumb", "back", and "backdrop.jpg" were the ones that showed up most in memory profiling.

2011-04-21 22:48:22 +00:00

GuiCardsController.cpp

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.

2010-10-24 05:55:24 +00:00

GuiCombat.cpp

- Removing "mCount" variable from GuiLayers

2011-05-29 04:40:13 +00:00

GuiFrame.cpp

Resuming on my threading support work with the card caching mechanism. This change unfortunately touches quite a few files, but I needed to get it out of the way before things got out of hand: one significant hurdle is the assumed lifetime of a JQuad pointer. In a single threaded model, the life time of the pointer is clear: you fetch it into the cache, the cache makes room, you use the pointer immediately. In a multithreaded context however, it's unsafe, as the drawing thread can request a few JQuads, and the cache operating on a separate thread can potentially bounce a JQuad out of the cache before the draw routine is done using it, which ends up in an access violation when you attempt to draw using an invalidated quad pointer. To prevent this, the bulk of this change swaps out the use of naked JQuad* pointers in the code with a JQuadPtr, which is basically a typedef to a boost shared_ptr<JQuad>.

2011-02-01 10:37:21 +00:00

GuiHand.cpp

Consolidated some loose strings into constant declarations in order to reduce allocation thrashing on temporary string constructs. I'm sure there are more, but "back_thumb", "back", and "backdrop.jpg" were the ones that showed up most in memory profiling.

2011-04-21 22:48:22 +00:00

GuiLayers.cpp

- Removing "mCount" variable from GuiLayers

2011-05-29 04:40:13 +00:00

GuiMana.cpp

Updated the Qt project to work on Desktop/Maemo/Meego/Symbian. Removed all dependencies except Qt and OpenGl.

2011-07-17 18:18:17 +00:00

GuiMessageBox.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

GuiPhaseBar.cpp

Resuming on my threading support work with the card caching mechanism. This change unfortunately touches quite a few files, but I needed to get it out of the way before things got out of hand: one significant hurdle is the assumed lifetime of a JQuad pointer. In a single threaded model, the life time of the pointer is clear: you fetch it into the cache, the cache makes room, you use the pointer immediately. In a multithreaded context however, it's unsafe, as the drawing thread can request a few JQuads, and the cache operating on a separate thread can potentially bounce a JQuad out of the cache before the draw routine is done using it, which ends up in an access violation when you attempt to draw using an invalidated quad pointer. To prevent this, the bulk of this change swaps out the use of naked JQuad* pointers in the code with a JQuadPtr, which is basically a typedef to a boost shared_ptr<JQuad>.

2011-02-01 10:37:21 +00:00

GuiPlay.cpp

* fixed some formatting

2011-05-08 11:56:25 +00:00

GuiStatic.cpp

Fixed issue 677

2011-07-04 19:09:19 +00:00

IconButton.cpp

- Added TutorialMessage ability

2011-07-03 08:47:51 +00:00

ManaCost.cpp

- Removed "isClone" flag. This flag was error prone. The "core" classes now have decent copy constructors, and ideally long term we should create copy constructors for the abilities that have additional pointers in them.

2011-07-27 14:31:27 +00:00

ManaCostHybrid.cpp

updated ManaCost copy constructor to do a true deep copy.

2011-02-09 20:42:19 +00:00

MenuItem.cpp

UPDATE YOUR rules FOLDER!!!

2011-04-29 17:30:57 +00:00

ModRules.cpp

More warning cleanup (type to type conversion warnings).

2011-06-02 06:14:28 +00:00

MTGAbility.cpp

Cleanup of some Trigger code

2011-07-28 13:51:42 +00:00

MTGardInstance.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

MTGCard.cpp

Improvement on my last change for reducing the formatted text caching: chopped it out altogether. I ran some profiling to see how much time on the psp it took to process the formatting on the description text (ie word wrapping it into several lines to fit on a card), and it ends up taking an average of 0.14 ms per card. For context, 60 fps is 16 ms. So clearly the formatting time is not the bottleneck here, and we gain no real performance caching the text, but lose memory due to pooling. So I cut it out entirely of the base class and we format on the fly during renders.

2011-04-23 09:54:19 +00:00

MTGCardInstance.cpp

- graphical representation of counters. see graphics/counters/quest.jpg for an example

2011-07-29 17:43:45 +00:00

MTGDeck.cpp

- graphical representation of counters. see graphics/counters/quest.jpg for an example

2011-07-29 17:43:45 +00:00

MTGDefinitions.cpp

added "abilities=canattack"

2011-03-31 16:39:28 +00:00

MTGGamePhase.cpp

- Removed "isClone" flag. This flag was error prone. The "core" classes now have decent copy constructors, and ideally long term we should create copy constructors for the abilities that have additional pointers in them.

2011-07-27 14:31:27 +00:00

MTGGameZones.cpp

More warning cleanup - converted certain class functions to return bool instead of int where appropriate. Also fixed the sdl update() tickCount assignment that I just broke in my last checkin.

2011-06-02 07:01:42 +00:00

MTGPack.cpp

Fixes for Boosters in the Shop. Fixes issue 644 and issue 621

2011-05-05 05:51:50 +00:00

MTGRules.cpp

- Removed "isClone" flag. This flag was error prone. The "core" classes now have decent copy constructors, and ideally long term we should create copy constructors for the abilities that have additional pointers in them.

2011-07-27 14:31:27 +00:00

MTGSpellStack.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Navigator.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

NetworkPlayer.cpp

- reworked completly the JNetwork, JSocket interface (had to ifdef out the PSP socket code)

2011-03-13 21:19:02 +00:00

ObjectAnalytics.cpp

Added object analytics around ExtraCost & ManaCost; some formatting style cleanup.

2011-04-24 10:33:38 +00:00

OptionItem.cpp

- Moved the card collection out of the GameApp class to clean up the dependencies

2011-02-06 11:35:40 +00:00

PhaseRing.cpp

remove "cleanup" phase being automatically added to custom phase ring. People who want it should add it manually in their custom ring.

2011-05-07 04:48:56 +00:00

Player.cpp

first moved the def of handsize for a game into the rules.txt as discussed with wololo...

2011-05-23 11:46:04 +00:00

PlayerData.cpp

Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

2011-04-20 07:50:00 +00:00

PlayGuiObject.cpp

Some warning cleanup involving (seemlingly unintended) bool to int conversions. It seems that the original design intent was to pass down IDs to the base class JGuiObject, but certain classes broke the pattern with their constructors.

2011-06-02 05:33:45 +00:00

PlayGuiObjectController.cpp

- Removing "mCount" variable from GuiLayers

2011-05-29 04:40:13 +00:00

PlayRestrictions.cpp

Erwan

2011-03-02 13:41:24 +00:00

Pos.cpp

UPDATE YOUR rules FOLDER!!!

2011-04-29 17:30:57 +00:00

PrecompiledHeader.cpp

Added newline to end-of-file

2011-01-08 12:24:39 +00:00

PriceList.cpp

Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

2011-04-20 07:50:00 +00:00

ReplacementEffects.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Rules.cpp

- minor tweaks:

2011-07-10 07:55:08 +00:00

SimpleMenu.cpp

- Reverting r3744. This fixes issue 707

2011-07-10 04:36:55 +00:00

SimpleMenuItem.cpp

Activated mouse tracking in option and award menus. Activated offset support in SimpleMenu, it should help for issue 674

2011-06-04 16:22:45 +00:00

SimplePad.cpp

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

SimplePopup.cpp

Resuming on my threading support work with the card caching mechanism. This change unfortunately touches quite a few files, but I needed to get it out of the way before things got out of hand: one significant hurdle is the assumed lifetime of a JQuad pointer. In a single threaded model, the life time of the pointer is clear: you fetch it into the cache, the cache makes room, you use the pointer immediately. In a multithreaded context however, it's unsafe, as the drawing thread can request a few JQuads, and the cache operating on a separate thread can potentially bounce a JQuad out of the cache before the draw routine is done using it, which ends up in an access violation when you attempt to draw using an invalidated quad pointer. To prevent this, the bulk of this change swaps out the use of naked JQuad* pointers in the code with a JQuadPtr, which is basically a typedef to a boost shared_ptr<JQuad>.

2011-02-01 10:37:21 +00:00

StoryFlow.cpp

- Files in Res/rules are now loaded dynamically. This allows people to add their own mods fairly easily

2011-04-23 13:24:19 +00:00

StyleManager.cpp

- Moved the card collection out of the GameApp class to clean up the dependencies

2011-02-06 11:35:40 +00:00

Subtypes.cpp

- Subtypes "getValuesById" now returns a reference

2011-05-16 23:19:08 +00:00

TargetChooser.cpp

refactored the typemin: cast restriction, there was a reported bug with it and while debugging it screamed refactor.

2011-07-07 11:39:06 +00:00

TargetsList.cpp

-Fix for issue 583 (fireball crash)

2011-05-26 12:27:44 +00:00

Tasks.cpp

- Added TutorialMessage ability

2011-07-03 08:47:51 +00:00

testfeatures.c

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

TestSuiteAI.cpp

- Fix for issue 650 (tidal Warrior effect doesn't end at end of turn)

2011-05-07 04:10:47 +00:00

TextScroller.cpp

Added newline to end-of-file

2011-01-08 12:24:39 +00:00

ThisDescriptor.cpp

- Removed "isClone" flag. This flag was error prone. The "core" classes now have decent copy constructors, and ideally long term we should create copy constructors for the abilities that have additional pointers in them.

2011-07-27 14:31:27 +00:00

Token.cpp

im forced to do this commit in whole instead of parts as originally planned, and before my beta test period of the changes is complete BECAUSE there are people doing "clean up" and the MASSIVE amount of conflicts i have to resolve from it is WAY too much for me to take on after nearly 200 hours of coding this patch. i cant seem to get enough respect to have people hold off on "clean up" so this brings me to being forced to do a full commit before playtest period is done, so they can go ahead with there *super important* clean up.

2011-01-21 20:18:56 +00:00

Translate.cpp

Removed GameApp.h from GameOptions.h - this should help prevent the precompiled header from rebuilding constantly when any header is touched, as GameApp.h ends up pulling virtually every other header by some level of indirection. We really need though to sit down at some point & refactor the inclusion tree. It's a big yarn ball at the moment.

2011-04-21 02:35:51 +00:00

TranslateKeys.cpp

Fixed JGE key binding in SDL config

2011-05-26 21:24:17 +00:00

Trash.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

utils.cpp

- Added TutorialMessage ability

2011-07-03 08:47:51 +00:00

WCachedResource.cpp

Fixed the back image card drawing offset. There's probably a better way to fix this, but it stems from the fact that cards (and the large back.jpg image handling) have their hotspots set to the center of the card coords, but for whatever reason, the code that draws the thumbnail version of the back image doesn't. Rather than try to fix the coords in all the places where we draw the back thumb image, I refined the quad sharing code so that there's one quad for temp cards, and another for actual back image drawing.

2011-07-09 04:30:18 +00:00

WDataSrc.cpp

*POSSIBLY DESTABLIZING CHANGE, PLS PING ME IF YOU SEE ISSUES*

2011-04-19 07:12:05 +00:00

WEvent.cpp

fixed a reported bug with @vampired, it was tricky, but ultimately i had to move the building of vampevent outside of TRVampired...the reason being that all instances of TRVamp were able to send and react to other instances of it sending out "vampevents", so move it into rules so only one object handles that, also changed the method it was handled, it now maps the cards with a 2nd vector of the vampires...basically "this card was dealt damage by X, Y, Z this turn"...

2011-04-29 13:24:02 +00:00

WFilter.cpp

fixed logic bug for length of src variable in filter. When src is modified the local var representing

2011-05-15 18:41:40 +00:00

WFont.cpp

Some preparation work for new platform support.

2011-04-21 13:16:11 +00:00

WGui.cpp

added the missing types into types filtering.

2011-07-09 20:33:07 +00:00

WResourceManager.cpp

Three improvements involving image caching:

2011-07-07 07:37:17 +00:00