bf416b0d36
Fixed Qt Creator project for Qt version on Windows.
Xawotihs
2011-07-13 20:07:13 +00:00
a8837e95c6
fixed a heap corruption caused in atransformer was a mistake in the code. also, if ai is adding counters and we're greater then or equal to the max amount that counter ability allows, eff = o.
omegablast2002@yahoo.com
2011-07-13 18:39:51 +00:00
69e55dfcbf
Corrected Decree of Justice.
guzhenjie1@gmail.com
2011-07-13 13:43:47 +00:00
d834d20c24
Fixed an incorrect card line the game was complaining about
wagic.the.homebrew
2011-07-13 13:16:22 +00:00
fe98b3ca68
Removing the feature that loads the "big" card instead of the thumbnail when the thumbnail does not exist. Too many people using incorrect HQ packages are complaining about performance issues, so this will make the problem go away, and force people creating those packages to make them correctly
wagic.the.homebrew
2011-07-13 12:58:21 +00:00
7775a1e39f
bringer of the red dawn:changed test to include a clean up step
omegablast2002@yahoo.com
2011-07-12 17:10:23 +00:00
dab1d92a0d
edited the original test to allow "clean up" phase to do its thing.
omegablast2002@yahoo.com
2011-07-12 16:51:18 +00:00
9ad4f8b8cd
Corrected Well of Discovery and Well of Life.
guzhenjie1@gmail.com
2011-07-12 15:30:26 +00:00
cbebe0d4e8
-Fix for issue 710 (can't tap mana in story mode). Update your rules and campaigns folders! -- Zeth, please verify that I didn't break your mods if you have time -- The test suite does NOT pass in this revision (see issue 711), but I verified that the problem does not come from my change, so we need to dig -- Campaigns creators will have to update their campaigns to make them compatible with Wagic 0.16. It consists in adding "include mtg.txt" at the top of each one of their rules.txt file.
wagic.the.homebrew
2011-07-12 15:02:41 +00:00
9827e3f915
- Attempt at "fixing" issue 705: loading card frames (used for text mode) in 16bits instead of 32
wagic.the.homebrew
2011-07-11 15:09:39 +00:00
9d9db7198e
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). This helps a lot in the deck selection menus (duel and deck editor). That, added to my previous fix, fixes issue 693 for me. In general, we should try to avoid 512x512 32bits textures on the PSP. That happens with a 480x272 png image. One solution is to convert the file to a jpeg, and load it in 551 mode whenever possible. Another solution is what I did: use a 450x255 image instead. The best is of course to cumulate both, which divides the size in Ram by 4 on the PSP. I'm ok with distributing lower res graphics on the psp, and higher res on other platforms, if that helps. Main culprits are 480x272 images (when there's too many of them)
wagic.the.homebrew
2011-07-11 14:34:12 +00:00
1646ad4221
Added meta data for M12.
guzhenjie1@gmail.com
2011-07-11 14:30:10 +00:00
ff1a1dde86
updated a piece i forgot for type( restriction. this fixes feast for blood.
omegablast2002@yahoo.com
2011-07-11 12:59:44 +00:00
706c8c8883
- Added 181 new cards.
solo81@web.de
2011-07-10 21:36:15 +00:00
3148a25f3a
- 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 :(
wagic.the.homebrew
2011-07-10 13:51:39 +00:00
bf4e0d8908
- minor tweaks: -- Res is the default folder in Res.txt, in case it exists, to avoid confusion when debugging -- added sign_prx in the makefile, harmless if you have the default build.mak, but signs the app for you if you have the correct files -- uninitialized variable warning fixed in Rules.cpp
wagic.the.homebrew
2011-07-10 07:55:08 +00:00
acca910248
- Fix for issue 699 (sound effects stop working after a few minutes on the PSP)
wagic.the.homebrew
2011-07-10 07:51:03 +00:00
0661918ed6
- Additional fix for issue 465 -- The problem was that the previous fix for keybindings actually fixed dead code for the PSP version... the real call to Defaultbindings was still happening in JGE's code...so the fix made the call twice. -- Note: shouldn't we use ResetBindings instead of JGECreateDefaultBindings? The former resets the bindings before assigning the default ones...
wagic.the.homebrew
2011-07-10 06:52:07 +00:00
f28638f12e
Corrected subtype of Skywatcher Adept.
guzhenjie1@gmail.com
2011-07-10 05:50:01 +00:00
4a6529ea55
- Reverting r3744. This fixes issue 707 -- I will open a new issue for the problem that r3744 was fixing
wagic.the.homebrew
2011-07-10 04:36:55 +00:00
e84ad44e47
- Extended TutorialMessages into a message system that shows up every time a new game is started. -- instead of tutorial(my message), use message(my message) for such messages. -- Counting on people to use it, now that it's here ;)
wagic.the.homebrew
2011-07-10 01:55:20 +00:00
e5dfb81fb9
added the missing types into types filtering. http://code.google.com/p/wagic/issues/detail?id=706 these types were converted into part of the "types" enum and are no longer considered a subtype in the engine. as they appear before Subtypes::LAST_TYPE they are to return "" as their subtype search result. i figured there was no harm in including them in the types list filtering as they were moved from subtypes becuase they were some of the most frequently used subtypes.
omegablast2002@yahoo.com
2011-07-09 20:33:07 +00:00
991bacbec5
Fixed issue 679. Filters now work with mouse and touch.
Xawotihs
2011-07-09 10:51:49 +00:00
d23a826fef
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.
wrenczes@gmail.com
2011-07-09 04:30:18 +00:00
979840dd4e
Fixed issue 676 (was not related to mouse support at all)
Xawotihs
2011-07-08 21:26:21 +00:00
700ee1a7db
reinstated target coloring, added text display for stonehewer and hermit mode unlock.
omegablast2002@yahoo.com
2011-07-08 19:39:47 +00:00
665f533ac8
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.
omegablast2002@yahoo.com
2011-07-08 17:43:19 +00:00
7fdac02b71
changed avatar of mights code.
omegablast2002@yahoo.com
2011-07-08 10:48:09 +00:00
dbbf5e4cb6
added the support to fix avatar of might...you can now do otherrestriction=type(creature|mybattlefield)~lessthan~type(creature|opponentbattlefield)-3
omegablast2002@yahoo.com
2011-07-08 10:47:28 +00:00
a3c22ddd32
updated mytypemin to use the new syntax, the restriction should now work correctly again when comparing values between players.
omegablast2002@yahoo.com
2011-07-07 11:40:15 +00:00
f88178f2cf
refactored the typemin: cast restriction, there was a reported bug with it and while debugging it screamed refactor. so i converted it from string comparisons and counting the battlefield..into targetchoosers with declarable operator. simplified the code from the mess it was before into something alot easier to card code with.
omegablast2002@yahoo.com
2011-07-07 11:39:06 +00:00
463a64521f
Switched another case of the psp icons to (explicitly) use the managed cache.
wrenczes@gmail.com
2011-07-07 08:26:01 +00:00
c5963c3c23
Three improvements involving image caching:
wrenczes@gmail.com
2011-07-07 07:37:17 +00:00
93d96fe52b
Revert a careless change
jean.chalard
2011-07-07 03:41:51 +00:00
52b83a135c
- Added TutorialMessage ability -- Tutorial Messages are an ability like any other, except it can only be displayed once. Subsequent calls are ignored, the ability is removed from the game as soon as it is added -- This allows to add event triggered messages ingame. Messages are either text, or images (I don't have an image sample, but rules/classic.txt has a few examples that might help) -- only tested on Windows, although I made sure the PSP version compiles. Hopefully I also made the necessary for it to work in the touch version (touching the screen should be enough to close the tuto message) -- Room for improvement: possibility to choose a title in text mode, possibility to have some messages depending on others (e.g.: don't show message X until message Y has been shown), improve some of the abilities and triggers to give more flexibility, add events outside of game, to allow tuto messages in deck creator, etc...
wagic.the.homebrew
2011-07-03 08:47:51 +00:00
72c795c24b
Afterlife - Change the logic, the caster of the spell used to get the spirit, it should be the controller of the creature Faceless Devourer - It should not be able to target itself Sunscape Familiar - abilities=flying -> defender diamond valley - Sacrifice only creatures you control Vow of Lightning - typo in the name Sporeback Troll - fixed mana cost Crovax the Cursed - fixed card text
punkeduard@gmail.com
2011-07-03 05:46:12 +00:00
7bb49068b1
Use Will's scrolling support to add next phase (scroll up) and interrupt (scroll down) in the duel state.
Xawotihs
2011-06-26 20:51:45 +00:00
bac4050de7
Corrected Dread Cacodemon and text of Acorn Catapult and Champion's Helm.
guzhenjie1@gmail.com
2011-06-25 13:57:32 +00:00
4eb9df29ef
Corrected some typos and wrong ID in CMD.
guzhenjie1@gmail.com
2011-06-25 13:14:25 +00:00
81b50e0c19
Corrected text of Kiki-Jiki, Mirror Breaker.
guzhenjie1@gmail.com
2011-06-25 12:53:40 +00:00
4b4c6f4981
Fixed my last commit.
solo81@web.de
2011-06-25 11:50:16 +00:00
e8f1314d0f
Added Magic the Gathering: Commander (22 new cards).
solo81@web.de
2011-06-25 11:40:26 +00:00
5820124662
Corrected two typos and added missed Dragon Whelp in KVD.
guzhenjie1@gmail.com
2011-06-25 04:21:32 +00:00
a1fd7bd508
Added a simple hack so that '1 Player' will show up as the default selection for the Play menu instead of the last item in the list - in my case, the Test Suite.
wrenczes@gmail.com
2011-06-22 05:06:54 +00:00
741f662bb0
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.
wrenczes@gmail.com
2011-06-15 09:52:11 +00:00
e1dc1afa74
Another usability improvement to the touch interface: added a timer for the delta between finger down/up. A 'tap' has to be under a 1/4 second for it to act as a double-click.
wrenczes@gmail.com
2011-06-15 09:01:26 +00:00
c49595bbf2
Corrected Shrine of Burning Rage and Shrine of Loyal Legions.
guzhenjie1@gmail.com
2011-06-14 15:31:27 +00:00
9e6154076b
Added the concept of a 'flick' gesture. This uses the VelocityTracker object in Android and passes the velocity info down as an SDL joystick trackball event. We can then reinterpret this event in whatever way we like, such as up/down swipes in the deck editor (that was my initial thought, at any rate).
wrenczes@gmail.com
2011-06-11 10:30:38 +00:00
b2eaa3cb8d
Multiple finger events now translate correctly into an SDL_MULTIGESTURE. I still haven't mapped this into anything meaningful, but all least the wiring is now present.
wrenczes@gmail.com
2011-06-11 09:03:21 +00:00
56a8bed0e3
More work on Android touch events. Fixed the issues I was having with busted float coords, and added some logic for a different way to deal with selection. Doubleclicking is no longer required; instead, if you generate a finger up event within 50 pixels of where you fingered down, this will be treated as an JGE_BTN_OK event. I think this feels more natural, as you can drag around in a menu or to various cards; then when you find your selection, simply touching it again once triggers the selection.
wrenczes@gmail.com
2011-06-11 06:59:32 +00:00
97dfc9f4bc
Fix up passing by address on the float values. This is leftover crud from my attempts to pass float* instead of by value. I still can't make sense of what's wrong with the FingerDown calls - the mouse calls pass values in correctly, but the touch calls seem to corrupt the stack.
wrenczes
2011-06-08 09:57:43 +00:00
c859d35c0b
More incremental work on getting touch commands on Android. I've pinpointed a nasty problem that looks possibly like a compiler bug - the float values that are passed into SDL_SendFingerDown() are coming out junk on the other end. Probably an extra push of something on the stack, as when I tried using pointers to floats instead, the y value showed up in the x position.
wrenczes@gmail.com
2011-06-07 16:43:44 +00:00
f7cad41013
Checkpoint on getting touch events to come through SDL. This (deliberately) breaks the mouse emulation & cripples input on Android, as those calls are being replaced with real finger down/up/motion commands instead. More to come...
wrenczes
2011-06-07 00:32:26 +00:00
4bf255596f
Activated mouse tracking in option and award menus. Activated offset support in SimpleMenu, it should help for issue 674
Xawotihs
2011-06-04 16:22:45 +00:00
715d498bce
Added Shimmer Myr and a test for 'forcedalive'.
solo81@web.de
2011-06-03 20:16:41 +00:00
40208c4835
Fixed issue 674 for deck selection in menu by mouse/touch
Xawotihs
2011-06-03 20:01:50 +00:00
a4964f944c
Fixed my centering code - I forgot that we always draw in terms of psp sizes, so when I'd toggle to doublesize / full screen, the centering code was way off for the menu as it was using screen resolution instead.
wrenczes@gmail.com
2011-06-03 02:29:06 +00:00
bed971c84c
Last of my warning cleanup - as of this revision, all warnings in the windows build are gone. I've turned on the 'treat warnings as errors' option in the mtg project to mirror our makefile behaviour on psp.
wrenczes@gmail.com
2011-06-03 01:07:48 +00:00
cb9e5f2e95
as requested by doc, added a tag for lords to allow an over-ride for effect so theyre not removed from the game by GameObserver until the lords remove it themselves. ie: Card Name: Quick Sliver Mana Cost: Converted Mana Cost:2 Types:Creature — Sliver Card Text:Flash Any player may cast Sliver cards as though they had flash.
omegablast2002@yahoo.com
2011-06-02 23:46:44 +00:00
2b512f1f92
Stubbed out the auto-generated afx includes. They're not strictly needed for the icon inclusion.
wrenczes@gmail.com
2011-06-02 20:30:09 +00:00
842ba7aa56
Added a 'W' application icon for the Windows version. Could be improved - I didn't spend much time on it, and I also didn't bother with making versions for large icon mode, but better than nothing.
wrenczes@gmail.com
2011-06-02 18:29:23 +00:00
945c2601d0
Fixed the SimpleMenu to recenter itself as its default behaviour during construction. (You can still override it to position it explicitly if needed.) This fixes the bad alignment of the menu when you'd select single player & the hermit mode was unlocked.
wrenczes@gmail.com
2011-06-02 18:27:00 +00:00
7c65191faa
Fix the build - missed submitting a change that was a part of my warnings cleanup, was open in another changelist.
wrenczes@gmail.com
2011-06-02 17:11:10 +00:00
5b8ecd0cf7
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.
wrenczes@gmail.com
2011-06-02 07:01:42 +00:00
90b1058ad5
More warning cleanup (type to type conversion warnings).
wrenczes@gmail.com
2011-06-02 06:14:28 +00:00
4018d17370
more compiler warning cleanup.
wrenczes@gmail.com
2011-06-02 05:48:37 +00:00
382fb5969d
Reverted out changes to JFileSystem - WIP, not meant for the tree yet.
wrenczes@gmail.com
2011-06-02 05:39:06 +00:00
a06558be55
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.
wrenczes@gmail.com
2011-06-02 05:33:45 +00:00
dcfbff6216
Corrected a typo in Vampiric Sliver. Corrected rarity of Phyrexian Juggernaut, id of Glissa, the Traitor and Glissa's Courier in MBS _cards.dat.
guzhenjie1@gmail.com
2011-05-31 11:39:38 +00:00
040efab94c
enable file sharing for iOS port. This is allows users to copy RES files directly into application
techdragon.nguyen@gmail.com
2011-05-29 09:46:27 +00:00
d32ffc5e10
Moved a bunch of old tests related to (fixed) issues to the tests folder, and added them to the tests list
wagic.the.homebrew
2011-05-29 07:10:14 +00:00
4e86981231
fix for issue 642. noticed thier is a whole slew of bugs in story mode that didn't exist before. this mode has been neglected and we should consider taking some time to bring it back up to standard.
omegablast2002@yahoo.com
2011-05-28 23:31:45 +00:00
0476eaf5f3
Reimplemented the 3 way 'F' toggle for psp size / double psp size / fullscreen in the SDL code path.
wrenczes
2011-05-28 07:13:13 +00:00
68cffde7de
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.
wrenczes@gmail.com
2011-05-28 05:00:40 +00:00
15fa0e6c34
Fixed a loud warning.
wrenczes@gmail.com
2011-05-28 02:28:07 +00:00
58577bb7ec
Fixed SDL full screen mode. Couple of cleanups.
Xawotihs
2011-05-27 20:56:50 +00:00
aeaa7fc7bb
Corrected Lord of Shatterskull Pass.
guzhenjie1@gmail.com
2011-05-27 11:35:36 +00:00
fa1abdc9d4
Project filters to split the SDL sources into /inc & /src folders.
wrenczes
2011-05-27 04:58:21 +00:00
3397c3f785
Aligned SDL keybindings on Windows ones. Kept a couple of other ones for Android as well. Issue 671 is now fixed.
Xawotihs
2011-05-26 21:38:45 +00:00
Xawotihs
omegablast2002@yahoo.com
guzhenjie1@gmail.com
wagic.the.homebrew
solo81@web.de
wrenczes@gmail.com
jean.chalard
punkeduard@gmail.com
wrenczes
techdragon.nguyen@gmail.com