Commit Graph

436 Commits

Author SHA1 Message Date
wagic.the.homebrew@gmail.com
7c4fbde7d3 Erwan
-Fix farhaven elf
2009-09-12 14:03:22 +00:00
jean.chalard
34d973c60d J :
* Create selection zones to remember the last card the cursor was on.
2009-09-12 12:57:50 +00:00
wagic.the.homebrew@gmail.com
23fb17e58e Erwan
- Added deathtouch (TODO: update Combat rules for damage on multiple blockers)
- Added intimidate (untested)
2009-09-12 12:40:14 +00:00
wagic.jeck
9d203619aa Jeck - Extremely minor speedup for cache access in GameStateDeckViewer, minor fix to WResourceManager::cleanup(). 2009-09-11 08:17:05 +00:00
wagic.the.homebrew@gmail.com
c0be024093 Erwan
- Put back delayed loading functionality for the Deck editor
2009-09-09 13:51:29 +00:00
wagic.jeck
91a9387e33 Jeck - Profile loading fix, minor options menu improvements, minor cleanup. 2009-09-09 11:11:17 +00:00
wagic.jeck
4993cc5dea Jeck - Cache now pretty damn near guarantees successful retrieval.
* The only fail condition is if all resources are locked, or the file doesn't exist at all.
2009-09-09 05:02:08 +00:00
wagic.jeck
e3d86f0824 Jeck - Improved cache size tracking. 2009-09-09 00:15:33 +00:00
jean.chalard
457266184d J :
* Add a helper function.
2009-09-08 14:53:23 +00:00
wagic.the.homebrew@gmail.com
471da5d9d9 Erwan
-better fix for psp compilation
2009-09-08 14:11:47 +00:00
wagic.the.homebrew@gmail.com
bc74cea1aa Erwan
- fix psp compilation
2009-09-08 13:23:22 +00:00
wagic.the.homebrew@gmail.com
f9a2d8283a Erwan
- A few card fixes
2009-09-08 13:07:19 +00:00
wagic.jeck
c76d8a3976 Jeck - Separated GameStateDeckViewer.h code into GameStateDeckViewer.cpp. 2009-09-08 07:53:54 +00:00
wagic.jeck
ad7006e2de Jeck - Profile and cache improvements, booster duplicate likelihood reduced.
* Cache now tracks missing textures for RetrieveQuad, not just RetrieveCard/RetrieveTexture.
* Profile options are no longer overwritten when switching profiles.
* Main menu notifies of alternate profile- "Database: X" becomes "Profile: Y of X cards."
* Boosters iterates through cards, replacing duplicates. Stops after 15 tries to prevent infinite loops on small sets.
* Very simplistic theme switcher, only displays when alternate themes are present.
2009-09-08 03:23:19 +00:00
jean.chalard
e7fb9282ce J :
* Fix the last tests that didn't work, Rampage ability.
2009-09-07 16:40:03 +00:00
jean.chalard
5b473a1505 J :
* Fix almost all tests.
* This version "nearly" works.
2009-09-07 14:37:32 +00:00
wagic.the.homebrew@gmail.com
8771ee7579 Erwan
-Various card fixes
2009-09-06 09:55:11 +00:00
wagic.the.homebrew@gmail.com
5a2a4a7617 Erwan
- display name of cards in the shop, when it loads, and any time by pressing triangle
2009-09-06 06:35:29 +00:00
wagic.the.homebrew@gmail.com
1d4b8ef177 Erwan
-Bug fix: Selesnya Guildmage ability ueot
2009-09-06 04:55:05 +00:00
wagic.the.homebrew@gmail.com
d73951ecfc Erwan
-some bug fixes (test suite)
2009-09-06 02:50:54 +00:00
wagic.the.homebrew@gmail.com
c1accf5c6e Erwan
- fix global effect cards (wrath of god) VS protection 
- Removed/updated a few debug outputs
2009-09-06 01:11:51 +00:00
jean.chalard
b6781e82f1 J :
* Add the Trash facility and use it for CardViews.
* Fix a graphical bug with card shadows.
* Fix a graphical bug with limitors.
* Enhance the graphical appearance of cards going to graveyard.
2009-09-05 11:44:34 +00:00
wagic.the.homebrew@gmail.com
380014b2a6 Erwan
-removed memory leak introduced in r.789
-added "blocked" bool in MTGCardInstance
2009-09-05 09:17:30 +00:00
wagic.jeck
62be1e1c72 Jeck — Cache refresh functionality, forcing in situ reload of textures.
* Changing profiles will now reload graphics, in case the profile has a different theme/mode/whatever.
2009-09-04 22:33:39 +00:00
wagic.jeck
78b9d61baf Jeck - Crashfix for cache, proposed replacement for icon.png
* Please comment on new icon.png with any suggestions.
* Prevents RemoveOldestTexture from deleting things it shouldn't
2009-09-04 20:41:31 +00:00
jean.chalard
2e7570fdea J :
* Add some pretty printers to help debugging.
2009-09-04 13:22:15 +00:00
wagic.jeck
0689b01536 Jeck - WResourceManager now tracks filesystem misses for cards (up to MAX_CACHE_OBJECTS) and sfx, so disk use is much reduced. 2009-09-03 21:52:41 +00:00
wagic.jeck
b78d25d16b Jeck - Tempory fix for missing GuiHand.h. Please commit if your copy differs. 2009-09-03 20:14:29 +00:00
wagic.jeck
8340fdbd5b Jeck - It wasn't emptying the cache properly, so this is a step in the right direction. I'll keep looking for more issues, though. 2009-09-03 18:21:57 +00:00
wagic.jeck
f220d2e9b9 Jeck - Cache and resource manager merged, streamlined.
This is pretty major, so there'll probably be something wrong with it... even though I did spend a few hours looking.
NOTES:
 * If you've Retrieved it, don't delete it--- Use resources.Release(Whatever). 
    Textures automatically release subordinate quads.
 * Most of the time, use resources.RetrieveQuad to grab a quad. Should handle everything for you.
    RetrieveQuad will load the required texture, if needed.
    Only managed resources have a resource name ("back", "simon", etc). 
    Managed resources can be retrieved with GetTexture/GetQuad/GetWhatever.
    Non managed quads lookup by position/dimensions, defaulting to the whole texture.
 * Use resources.RetrieveTexture only when you need to do something special to it. 
    Calling retrieve texture with RETRIEVE_MANAGE will permanently add a texture to the manager
    RETRIEVE_LOCK and RETRIEVE_VRAM will lock a texture. It will not leave the cache until
    Release(JTexture*) is called, or as a last resort during cache overflow.
 * Try to only store (as a class member) pointers to textures retrieved with RETRIEVE_MANAGE. 
    All others may become invalid, although locked textures do have a high degree of stability. It's
    pretty safe to store a locked texture if you're not going to load much between uses.

There's a lot going on here, so I might have missed something... but it runs through the test suite alright.

TODO: 
 * When called without any arguments, RetrieveQuad sometimes leaves a thin border around the image. 
    This can be bypassed by specifying a quad one or two pixels less than the image size. Why?
 * I've had a crash while runing the Demo mode, something to do with receiveEventMinus? 
    This hasn't exactly reproduced on a clean SVN copy, (being a hang, rather than a crash) so 
    I've probably done something to worsen the problem somehow? I'll look into it tomorrow.
 * Clean up lock/unlock system, memory usage. Streamline interface, consider phasing out calls using GetWhatever() format.
2009-09-03 09:28:16 +00:00
jean.chalard
7214248494 J :
* Some more tweaking for combat.
* This still doesn't work, but it's closer.
2009-09-03 02:16:53 +00:00
wagic.the.homebrew@gmail.com
a7bef9142c Erwan
-removing unpackDamageStack/repackDamageStack obsolete functions
2009-09-02 12:59:55 +00:00
jean.chalard
336412f006 J :
* Fix PSP compilation errors
* This does not magically make it work
2009-08-31 16:55:03 +00:00
jean.chalard
f407fa31ef J :
* Display the avatar in the damaged list if the attacker has trample.
2009-08-31 12:35:16 +00:00
wagic.the.homebrew@gmail.com
0454fb20ec Erwan
- fixed textures cache bug
- fixed one card in TMP
2009-08-31 12:22:43 +00:00
wagic.the.homebrew@gmail.com
794eec8bb8 Erwan
-code cleanup
-fix one card in TSP
2009-08-31 10:17:28 +00:00
jean.chalard
6dab048a9e J :
* Interface for damage assignment.
2009-08-31 02:00:33 +00:00
wagic.the.homebrew@gmail.com
e4a2c39683 Erwan
-removed unneeded file
2009-08-30 10:08:29 +00:00
wagic.the.homebrew@gmail.com
89419f90a7 Erwan
-moved card backs to Cache instead of ResourceManager
2009-08-30 08:11:38 +00:00
wagic.the.homebrew@gmail.com
5afd1a45a2 Erwan
-some memory leaks fixes
2009-08-29 14:16:58 +00:00
jean.chalard
2ff279fad8 J :
* Order blocker interface.
2009-08-28 13:57:12 +00:00
wagic.the.homebrew@gmail.com
163d296bb5 Erwan
- removed useless "color=" lines
- Added color override for cards such as crimson kobolds (note: color should be after the "mana" line to avoid side effects)
2009-08-28 13:40:14 +00:00
jean.chalard
a8dfd62f3c J :
* Sync class/struct
2009-08-28 13:13:51 +00:00
wagic.jeck
d1f6cdcd96 Jeck - Some warnings cleanup. 2009-08-28 05:40:10 +00:00
jean.chalard
e5bbbb358f J :
* Fix a few compilation issues.
2009-08-28 01:58:57 +00:00
wagic.jeck
62e12380a4 Jeck - Stopgap update fixing WResourceManager slowdown until complete rewrite. 2009-08-27 23:24:55 +00:00
wagic.jeck
c5b530bd3b Jeck - Forgot to commit headers. Ooops. 2009-08-27 14:13:39 +00:00
wagic.the.homebrew@gmail.com
99aa284431 Erwan
-code cleanup
-memory leaks fixes
2009-08-27 13:32:12 +00:00
wagic.jeck
807eea7ddb Jeck - As prior, but for sounds and music as well. Use CommonRes->ssLoadMusic / CommonRes->ssLoadSample. 2009-08-27 06:31:38 +00:00
wagic.jeck
5e14efed3c Jeck - CommonRes transparently finds themed versions of files. Use JRenderer::LoadTexture for unthemed files, and CommonRes::LoadTexture for themed files. Res/graphics/back.jpg renamed to Res/graphics/backdrop.jpg due to collision with sets/back.jpg. 2009-08-27 05:58:26 +00:00