wagic

ActionElement.cpp

reformatting code according to guidelines defined at

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

ActionLayer.cpp

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

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

ActionStack.cpp

- Fixed a bug where the AI would block its own attacking creatures (I reintroduced that bug recently when I removed a safeguard Zethfox had added a while ago)

2011-05-07 11:58:37 +00:00

AIHints.cpp

- Fixed a Bug where AI would not block any attacker in Demo mode (bug introduced in r2759)

2011-05-05 14:27:46 +00:00

AIMomirPlayer.cpp

Replaced ManaCost's int array with int8_t. Shrinks ManaCost by another 24 bytes, which in turn lowers CardPrimitive's footprint by the same amount.

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

AIPlayer.cpp

- Fixed a bug where the AI would block its own attacking creatures (I reintroduced that bug recently when I removed a safeguard Zethfox had added a while ago)

2011-05-07 11:58:37 +00:00

AIStats.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

AllAbilities.cpp

* fixed some formatting

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

CardDescriptor.cpp

Fixes for exclusion/inclusion combinations of colors or abilities.

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

CardDisplay.cpp

Fixed a crash occuring when trying to select card with the mouse in an empty list

2010-12-02 20:35:42 +00:00

CardEffect.cpp

reformatting code according to guidelines defined at

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

CardGui.cpp

* fixed some formatting

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

CardPrimitive.cpp

Fix for issue 647 (Evil Presence cast on a swamp removes mana ability)

2011-05-08 09:06:56 +00:00

CardSelector.cpp

- Fix issue 552 (Card images too big in deck editor)

2011-04-03 06:07:23 +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

* fixed some formatting

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

Credits.cpp

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

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

Damage.cpp

Android cross-compiling fixes regarding constants

2011-04-20 20:14:25 +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

Issue 634:

2011-04-21 08:32:32 +00:00

DeckMenuItem.cpp

ok made minor changes to mikes last commit, instead of loading "nothing" im making it load a card back instead, that black hole drove me nuts....second instead of loading a premade "evil twin" i made it load what ever the users avatar was flipped horizontally. didn't tint it red becuase i am not that attuned to the graphics side of wagic.

2011-04-20 20:24:53 +00:00

DeckMetaData.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

DeckStats.cpp

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

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

DuelLayers.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

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

UPDATE YOUR rules FOLDER!!!

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

GameLauncher.cpp

reformatting code according to guidelines defined at

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

GameObserver.cpp

Fix for issue 647 (Evil Presence cast on a swamp removes mana ability)

2011-05-08 09:06:56 +00:00

GameOptions.cpp

3 things here

2011-04-22 11:17:20 +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

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

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

GameStateDeckViewer.cpp

Minor code cleanup: removed a path to fetch thumbnails in the non-threaded code - at this point, it's trying to draw in text mode, so this shouldn't be here (it was always stepped over because of the options flag, so it was never executing anyway).

2011-04-25 05:26:46 +00:00

GameStateDuel.cpp

Please update your rules folder

2011-05-03 11:59:27 +00:00

GameStateMenu.cpp

Fix an issue where pressing "triangle" on the PSP in the play menu would crash the game

2011-04-30 13:43:12 +00:00

GameStateOptions.cpp

3 things here

2011-04-22 11:17:20 +00:00

GameStateShop.cpp

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

2011-05-05 05:51:50 +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

3 things here

2011-04-22 11:17:20 +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

Reverting r3496 to fix failing tests

2011-04-21 15:16:22 +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

Additional fix to go along with r2834 - the previous fix revealed an ugly interdependency between CardView and MTGCardInstance. Neither object owns the other, but they each have a pointer reference to each other, which is a recipe for disaster if not managed correctly. I had fixed half of the problem, where the status of a CardView being destroyed wasn't reflected in the MTGCardInstance; meanwhile, it introduced another problem where if the MTGCardInstance was destroyed first, the CardView would crash when trying to do the cleanup.

2010-12-16 21:17:18 +00:00

GuiMana.cpp

fix PSP build

2011-05-07 12:43:00 +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

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

ManaCost.cpp

Fixed the psp side - darned implicit casts...

2011-05-04 10:15:38 +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

- Fixed a bug where the AI would block its own attacking creatures (I reintroduced that bug recently when I removed a safeguard Zethfox had added a while ago)

2011-05-07 11:58:37 +00:00

MTGAbility.cpp

* fixed some formatting

2011-05-08 11:56:25 +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

Fix for issue 647 (Evil Presence cast on a swamp removes mana ability)

2011-05-08 09:06:56 +00:00

MTGDeck.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

MTGDefinitions.cpp

added "abilities=canattack"

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

MTGGamePhase.cpp

Forcing LF as the line ending style through SVN properties. No actual code changes here.

2011-01-28 06:00:51 +00:00

MTGGameZones.cpp

cleanup: Remove "computeXX" functions and XX variables, these were always returning X/2 in all cases.

2011-05-02 11:28:04 +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

* fixed some formatting

2011-05-08 11:56:25 +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

- Fixed a Bug where AI would not block any attacker in Demo mode (bug introduced in r2759)

2011-05-05 14:27:46 +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

Eliminated a spurious float to long conversion.

2011-04-17 06:26:52 +00:00

PlayGuiObjectController.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +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

- Fixed a Bug where AI would not block any attacker in Demo mode (bug introduced in r2759)

2011-05-05 14:27:46 +00:00

SimpleMenu.cpp

3 things here

2011-04-22 11:17:20 +00:00

SimpleMenuItem.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

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

- Minor refactor of "transforms" ability

2011-05-06 03:52:35 +00:00

TargetChooser.cpp

Fixes for exclusion/inclusion combinations of colors or abilities.

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

TargetsList.cpp

reformatting code according to guidelines defined at

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

Tasks.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

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

fixed a parsing error with tokengen, no actually my fault :P there was never a check if the end was the real end or not.

2011-04-14 17:06:44 +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

- Defined keys translation for SDL config

2011-04-23 21:30:36 +00:00

Trash.cpp

reformatting code according to guidelines defined at

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

utils.cpp

- Adding a generic "ueot" effect. This will be initially confusing, but the ultimate goal is to get rid of all the particular cases we handled with "until end of turn" effects. this "ueot " works like "may " and "choice ", it has to be at the very beginning of the ability(ies) it targets. The reason is to avoid conflicts with the existing "ueot" we have all over the place. I have only tested it with transforms and loseabilities for now (see "ovinize") but hopefully this will become the new norm. This should also reduce the code inside the parser, long term.

2011-05-05 06:18:50 +00:00

WCachedResource.cpp

Some preparation work for new platform support.

2011-04-21 13:16:11 +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

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

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

WFont.cpp

Some preparation work for new platform support.

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

WGui.cpp

* fixed some formatting

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

WResourceManager.cpp

- Fixed a Bug where AI would not block any attacker in Demo mode (bug introduced in r2759)

2011-05-05 14:27:46 +00:00