daabce1d2f
Merge pull request #647 from ZobyTwo/opencv_leftovers
...
Remove some leftovers from OpenCV
2015-10-17 21:46:47 +02:00
1ad1bf7942
protection from colored spells
2015-10-18 00:20:32 +08:00
5885829585
Remove some leftovers from OpenCV
2015-10-17 18:12:31 +02:00
4e115a2326
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2015-10-17 22:41:54 +08:00
6900e60df0
Merge pull request #646 from kevlahnota/master
...
Fix issue #473 , #784
2015-10-17 21:37:23 +08:00
61881ad656
Fix issue #473 and #784
...
It seems when a zonechange event from inplay to inplay (player or
opponent), the card->view item values is recalculated... so it destroys
the GUI like missing card image, or moving it far off the screen... To
reproduce, cast Splinter Twin to Conquering Manticore and gain control
the same creature about 2 or 3 times...
2015-10-17 19:44:21 +08:00
d1e64a410b
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2015-10-17 16:38:54 +08:00
5e5de03055
Merge pull request #645 from kevlahnota/master
...
revert guiplay, castcard(putinplay) correction and modified AAcopier
2015-10-17 09:26:58 +08:00
f4bdfa43ca
Copied Morphed card
2015-10-16 18:50:05 +08:00
5ede956e7f
Reverted GuiPlay
...
reverted stacking issue
2015-10-16 18:19:42 +08:00
1cd27210ac
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2015-10-16 18:19:05 +08:00
2819ec01af
token is excluded...
...
for ABlink
2015-10-16 17:02:37 +08:00
ca113497b2
Merge pull request #644 from kevlahnota/master
...
Bug Fix: Planeswalker Rule, Populate & ABlink return to play ability for Aura cards
2015-10-15 20:01:00 +08:00
15725c0302
bug fix populate absolute value
...
forgot to add abs when adding negative bonuses...
2015-10-15 18:03:26 +08:00
851bd88de6
Fix Planeswalker Rule & ABlink
2015-10-15 12:23:32 +08:00
a207936231
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2015-10-15 12:22:47 +08:00
9cb40e41fa
Merge pull request #643 from kevlahnota/master
...
Bug Fix: legend rule, profile stat on main menu and aura curse update on player target
2015-10-14 23:24:41 +08:00
0f0bdd7d13
Fix Aura Curse
...
Aura Curse that targets a player should update its position after
casting.
2015-10-14 22:14:13 +08:00
297206b054
Fix update profile stat after buying cards
...
profile stats on the upper left of main menu should update after buying
some cards :)
2015-10-14 21:33:12 +08:00
626f0677f7
Fix profile status on upper left of main menu
...
The profile status on the upper left of main menu should update now when
changing user profiles...:)
2015-10-14 21:26:22 +08:00
7b5b25d113
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2015-10-14 20:04:35 +08:00
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
3e7b9e68d5
Fixed compilation issue with Qt.
2015-10-13 23:32:56 +02:00
4a52139457
Update g++ to 4.8
2015-10-13 23:04:58 +02:00
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
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
8fe5000ce1
polished action stack
2015-10-12 19:54:03 +08:00
82fac5f80e
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2015-10-12 13:02:57 +08:00
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
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
c7b9e6f9b8
fix avatar scaling on guicombat, border on combat
2015-10-11 23:04:28 +08:00
79ea403273
Commented out GLUT dependency
2015-10-11 15:54:32 +02:00
397d7fa6c8
Added build of SDL2 in UNIX config
2015-10-11 15:31:58 +02:00
ac787a6f51
Added SDL2DIR env variable.
2015-10-11 15:20:27 +02:00
0418e77d34
Removed tabs
2015-10-11 14:29:59 +02:00
a2c6a3669b
Reactivated SDL2 download
2015-10-11 14:27:40 +02:00
b8d22240a8
Fixed typo
2015-10-11 14:21:09 +02:00
b458d570a1
Deactivated again Android build, added a SDL build
2015-10-11 14:15:43 +02:00
5022df0d14
Moved tgz unpackaging away from android SDK update.
2015-10-11 12:34:52 +02:00
220b48b144
Updated android SDK and build tools versions
2015-10-11 12:14:58 +02:00
8aeed46181
Reactivates android build
2015-10-11 11:54:40 +02:00
38b34eae2f
Split macosx config from unix one.
2015-10-11 11:38:32 +02:00
648b21f972
Trying something else with new repositories
2015-10-11 10:38:40 +02:00
09717a966b
Added install of cmake 3.3 on Travis.
2015-10-11 10:08:33 +02:00
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
eef46fe743
Revert previous change and just removed inline on the function
2015-10-10 18:41:43 +02:00
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
c83a476ebe
Put SwizzlePlot in the WFont header.
2015-10-10 18:23:59 +02:00
954bba274c
Tries to fix includes
2015-10-10 18:08:45 +02:00
d370a5c13d
Fixed png include in JGE
2015-10-10 16:15:45 +02:00
Xawotihs
Anthony Calosa
Tobias Loose
xawotihs