Commit Graph

3722 Commits

Author SHA1 Message Date
guzhenjie1@gmail.com
c73de33c19 Corrected Wargate. 2011-06-18 10:05:16 +00:00
guzhenjie1@gmail.com
d9ee0e015a Added Sky Hussar. 2011-06-17 14:30:48 +00:00
guzhenjie1@gmail.com
fe3aaeabbf Corrected Brainspoil. 2011-06-16 15:08:02 +00:00
wrenczes@gmail.com
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. 2011-06-15 09:52:11 +00:00
wrenczes@gmail.com
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. 2011-06-15 09:01:26 +00:00
guzhenjie1@gmail.com
c49595bbf2 Corrected Shrine of Burning Rage and Shrine of Loyal Legions. 2011-06-14 15:31:27 +00:00
guzhenjie1@gmail.com
031d13b774 Corrected Dismember, Fleshwrither, Leonin Relic-Warder and Spire Monitor. 2011-06-13 12:26:16 +00:00
wrenczes@gmail.com
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).
TBD:  right now every up finger generates this event.  We probably want to throttle it to only be an event if the velocity exceeds some arbitrary threshold;  similarly, if we generate a flick event, we probably don't want to simultaneously generate a finger up action (ie JGE_BTN_OK).
2011-06-11 10:30:38 +00:00
wrenczes@gmail.com
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. 2011-06-11 09:03:21 +00:00
wrenczes@gmail.com
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. 2011-06-11 06:59:32 +00:00
wrenczes
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. 2011-06-08 09:57:43 +00:00
wrenczes@gmail.com
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. 2011-06-07 16:43:44 +00:00
guzhenjie1@gmail.com
4568f66a66 Corrected Storm World. 2011-06-07 12:22:36 +00:00
wrenczes
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... 2011-06-07 00:32:26 +00:00
wrenczes
92dd1f2d40 Cleanup - unused files. 2011-06-07 00:27:13 +00:00
Xawotihs
4bf255596f 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
solo81@web.de
715d498bce Added Shimmer Myr and a test for 'forcedalive'. 2011-06-03 20:16:41 +00:00
Xawotihs
40208c4835 Fixed issue 674 for deck selection in menu by mouse/touch 2011-06-03 20:01:50 +00:00
wrenczes@gmail.com
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. 2011-06-03 02:29:06 +00:00
wrenczes@gmail.com
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. 2011-06-03 01:07:48 +00:00
omegablast2002@yahoo.com
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.

without an over-ride testdestroy removes the observer before it can be any use to us.

i only enabled this for the lords/this'es....
2011-06-02 23:46:44 +00:00
wrenczes@gmail.com
2b512f1f92 Stubbed out the auto-generated afx includes. They're not strictly needed for the icon inclusion. 2011-06-02 20:30:09 +00:00
wrenczes@gmail.com
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. 2011-06-02 18:29:23 +00:00
wrenczes@gmail.com
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. 2011-06-02 18:27:00 +00:00
wrenczes@gmail.com
7c65191faa Fix the build - missed submitting a change that was a part of my warnings cleanup, was open in another changelist. 2011-06-02 17:11:10 +00:00
guzhenjie1@gmail.com
383e5ed9bb Corrected Sylvan Might and Troubled Healer. 2011-06-02 13:49:28 +00:00
wrenczes@gmail.com
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. 2011-06-02 07:01:42 +00:00
wrenczes@gmail.com
90b1058ad5 More warning cleanup (type to type conversion warnings). 2011-06-02 06:14:28 +00:00
wrenczes@gmail.com
4018d17370 more compiler warning cleanup. 2011-06-02 05:48:37 +00:00
wrenczes@gmail.com
382fb5969d Reverted out changes to JFileSystem - WIP, not meant for the tree yet. 2011-06-02 05:39:06 +00:00
wrenczes@gmail.com
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.
(One could argue that this ID is completely meaningless and could be entirely ripped out, as the IDs obviously never made it to their intended target...)
2011-06-02 05:33:45 +00:00
guzhenjie1@gmail.com
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.
2011-05-31 11:39:38 +00:00
techdragon.nguyen@gmail.com
040efab94c enable file sharing for iOS port. This is allows users to copy RES files directly into application 2011-05-29 09:46:27 +00:00
wagic.the.homebrew
d32ffc5e10 Moved a bunch of old tests related to (fixed) issues to the tests folder, and added them to the tests list 2011-05-29 07:10:14 +00:00
wagic.the.homebrew
34311a4499 - Removing "mCount" variable from GuiLayers 2011-05-29 04:40:13 +00:00
omegablast2002@yahoo.com
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.
i'll open some tickets for it later.
2011-05-28 23:31:45 +00:00
wrenczes
0476eaf5f3 Reimplemented the 3 way 'F' toggle for psp size / double psp size / fullscreen in the SDL code path. 2011-05-28 07:13:13 +00:00
wrenczes@gmail.com
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. 2011-05-28 05:00:40 +00:00
wrenczes@gmail.com
15fa0e6c34 Fixed a loud warning. 2011-05-28 02:28:07 +00:00
Xawotihs
58577bb7ec Fixed SDL full screen mode. Couple of cleanups. 2011-05-27 20:56:50 +00:00
guzhenjie1@gmail.com
aeaa7fc7bb Corrected Lord of Shatterskull Pass. 2011-05-27 11:35:36 +00:00
wrenczes
fa1abdc9d4 Project filters to split the SDL sources into /inc & /src folders. 2011-05-27 04:58:21 +00:00
Xawotihs
3397c3f785 Aligned SDL keybindings on Windows ones. Kept a couple of other ones for
Android as well. Issue 671 is now fixed.
2011-05-26 21:38:45 +00:00
Xawotihs
0e26368c89 Fixed JGE key binding in SDL config 2011-05-26 21:24:17 +00:00
guzhenjie1@gmail.com
5cf764310e Corrected Etched Monstrosity. 2011-05-26 15:27:03 +00:00
wagic.the.homebrew
a84eb8dc22 -Fix for issue 583 (fireball crash)
-- converted an array into a vector to avoid weird edge cases
-- fixed bugs with array "backupTargets"
2011-05-26 12:27:44 +00:00
wrenczes
ffda1d0548 style formatting, some warning cleanup. 2011-05-25 06:59:44 +00:00
guzhenjie1@gmail.com
3152f69088 Corrected a typo in Llawan, Cephalid Empress. 2011-05-24 14:16:02 +00:00
omegablast2002@yahoo.com
31ed7d38e6 removing unused variables... 2011-05-24 03:46:06 +00:00
Xawotihs
07ca0c19c3 Fixed postbuild event when path contains spaces 2011-05-23 20:28:18 +00:00