Commit Graph

7104 Commits

Author SHA1 Message Date
Anthony Calosa 7b5b25d113 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2015-10-14 20:04:35 +08:00
Anthony Calosa 3635137906 fix legend rule
704.5k If a player controls two or more legendary permanents with the
same name, that player
chooses one of them, and the rest are put into their owners’ graveyards.
This is called the
“legend rule.”

bury is destroy without regenerate, so when two legends of the same name
has indestructible, bury will have no effect... I changed it to put into
owners graveyard instead using mover...
2015-10-14 20:04:29 +08:00
xawotihs 3e7b9e68d5 Fixed compilation issue with Qt. 2015-10-13 23:32:56 +02:00
Xawotihs 4a52139457 Update g++ to 4.8 2015-10-13 23:04:58 +02:00
Anthony Calosa 7ea02a316e Merge pull request #642 from kevlahnota/master
urza lands fix, polished action stack & static mana display
2015-10-13 21:19:47 +08:00
Anthony Calosa 9a66b0c6e4 some fix and polished static mana and action stack
I moved the target quad near the source card and moved the action string
forward so there is no overlapping of action string and the target quad
if the action string is too long...
2015-10-13 19:27:25 +08:00
Anthony Calosa 8fe5000ce1 polished action stack 2015-10-12 19:54:03 +08:00
Anthony Calosa 82fac5f80e Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2015-10-12 13:02:57 +08:00
Anthony Calosa 94620504da fix urza lands
the alias is used for checking of "urzatron". revised this because when
using if then else in the activation makes the mana ability goes to the
stack
2015-10-12 13:00:05 +08:00
Anthony Calosa 59cab65fcf Merge pull request #641 from kevlahnota/master
Fix crash bug, support doubled res texture for background, avatars, menutitle
2015-10-12 06:46:53 +08:00
Anthony Calosa c7b9e6f9b8 fix avatar scaling on guicombat, border on combat 2015-10-11 23:04:28 +08:00
xawotihs 79ea403273 Commented out GLUT dependency 2015-10-11 15:54:32 +02:00
xawotihs 397d7fa6c8 Added build of SDL2 in UNIX config 2015-10-11 15:31:58 +02:00
xawotihs ac787a6f51 Added SDL2DIR env variable. 2015-10-11 15:20:27 +02:00
xawotihs 0418e77d34 Removed tabs 2015-10-11 14:29:59 +02:00
xawotihs a2c6a3669b Reactivated SDL2 download 2015-10-11 14:27:40 +02:00
xawotihs b8d22240a8 Fixed typo 2015-10-11 14:21:09 +02:00
xawotihs b458d570a1 Deactivated again Android build, added a SDL build 2015-10-11 14:15:43 +02:00
xawotihs 5022df0d14 Moved tgz unpackaging away from android SDK update. 2015-10-11 12:34:52 +02:00
xawotihs 220b48b144 Updated android SDK and build tools versions 2015-10-11 12:14:58 +02:00
xawotihs 8aeed46181 Reactivates android build 2015-10-11 11:54:40 +02:00
xawotihs 38b34eae2f Split macosx config from unix one. 2015-10-11 11:38:32 +02:00
xawotihs 648b21f972 Trying something else with new repositories 2015-10-11 10:38:40 +02:00
xawotihs 09717a966b Added install of cmake 3.3 on Travis. 2015-10-11 10:08:33 +02:00
Anthony Calosa 4c86cae7fe disabled wood & gold texture, backdrop size 480x272
blending of wood and/or gold texture on some resolutions(mobile,
tablets, etc) draws line which can be distracting. The backdrop is now
full size of PSP resolution (480x272, 2x res can be loaded like 960x544)
2015-10-11 14:29:36 +08:00
xawotihs eef46fe743 Revert previous change and just removed inline on the function 2015-10-10 18:41:43 +02:00
xawotihs 5f91566fa7 Move vrelptr implementation in header file so that it can be used outside of JGE lib 2015-10-10 18:35:33 +02:00
xawotihs c83a476ebe Put SwizzlePlot in the WFont header. 2015-10-10 18:23:59 +02:00
xawotihs 954bba274c Tries to fix includes 2015-10-10 18:08:45 +02:00
xawotihs d370a5c13d Fixed png include in JGE 2015-10-10 16:15:45 +02:00
xawotihs 181189bee0 Fixed boost include path 2015-10-10 16:05:34 +02:00
xawotihs c678f5e85a Fixed vram 2015-10-10 15:32:01 +02:00
xawotihs 0fabf83c62 Fixed decoder_prx 2015-10-10 15:25:08 +02:00
xawotihs b7e8d19290 Fix for travis build 2015-10-10 15:15:43 +02:00
Anthony Calosa 6376596e49 increase battlefield "hot area" size, opponent phase ring uses darker glyph vs human 2015-10-10 20:54:41 +08:00
Anthony Calosa 91053965be Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2015-10-10 20:52:37 +08:00
Xawotihs d0db71602a Deactive android build as travis does not like it those days 2015-10-10 14:51:40 +02:00
Xawotihs 4f9ee17ff9 Everywhere 2015-10-10 14:35:53 +02:00
Xawotihs 2461b39fb7 Update android SDK to 24.3.4 to try fixing travis 2015-10-10 14:35:22 +02:00
Anthony Calosa ff7634a8ac Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2015-10-10 20:30:19 +08:00
Xawotihs 6c41ae8e8e Update android build tools to 23.0.1 to try fixing travis 2015-10-10 14:19:22 +02:00
Anthony Calosa 52803cf57c fix crash bug when buying a card pack
This fixes the shop crashing the game when you buy a card packs in the
shop. The targeting indicator looks at the stack so it needs to be
enabled only when you're in the "game"...
2015-10-10 04:59:22 +08:00
Anthony Calosa 03f5ba430c resized
doubled res... you need to replace this with a higher detailed icons...
2015-10-09 21:46:25 +08:00
Anthony Calosa 91e317a497 added placeholder for large icons 2015-10-09 21:17:46 +08:00
Anthony Calosa a0b4d0f348 added scaling of background 2015-10-09 21:06:58 +08:00
Xawotihs 112efddb4e Removed typo 2015-10-09 13:32:51 +02:00
Xawotihs 4cea81e564 Moved SDL2 download away from the Android SDK download 2015-10-09 07:56:44 +02:00
Xawotihs 3a40a34566 should fix script syntax 2015-10-08 23:33:17 +02:00
Xawotihs a4ff87a7d5 Replaced libsdl2-dev dependency by a direct download 2015-10-08 23:29:47 +02:00
xawotihs 797077c47b Various fixes and activated cmake in travis. 2015-10-08 23:08:09 +02:00