Commit Graph

5828 Commits

Author SHA1 Message Date
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
Anthony Calosa 674f4d5062 transformed Planeswalker
When a Planeswalker transforms into a creature, it should be inline on
the battlefield positions along with other creatures.
2015-10-08 11:24:04 +08:00
Anthony Calosa 5cc2f5b645 border p/t 2015-10-08 09:51:52 +08:00
Anthony Calosa 3ca8aefad7 fix bug where walls that can attack activated vs moat in play 2015-10-07 20:59:17 +08:00
Anthony Calosa 1d1b663f55 menutitle scaling
can load 2x res...
2015-10-07 18:10:00 +08:00
Anthony Calosa 6a64b09452 replaced fillroundrect border 2015-10-07 18:08:00 +08:00
Anthony Calosa c2c9e180ea code cleanup 2015-10-07 11:06:59 +08:00
Anthony Calosa fb89183767 support scaling of avatar texture - multiples of 35x50
default was 35x50 avatar texture, if using 3x  (105x150), it will scale
it :)
2015-10-07 10:57:08 +08:00
Anthony Calosa 45b570b6f7 border highlighter 2015-10-07 10:53:11 +08:00
xawotihs 075d950249 Got SDL2 version compiling on Mac. 2015-10-06 23:25:40 +02:00
Anthony Calosa 8e8e5d8da8 Merge remote-tracking branch 'WagicProject/master' 2015-10-06 10:57:26 +08:00
Anthony Calosa f59a7872b3 Merge pull request #640 from kevlahnota/master
fix alpha/transparency on rendered border
2015-10-06 10:53:49 +08:00
Anthony Calosa 022c6fccf5 Merge remote-tracking branch 'WagicProject/master' 2015-10-06 10:52:08 +08:00
Anthony Calosa b750cf1f33 fix alpha/transparency on rendered border 2015-10-06 10:47:08 +08:00
Anthony Calosa 5495d772ea Merge pull request #639 from kevlahnota/master
Visual Targeting Indicator, Borders
2015-10-06 01:21:29 +08:00
Anthony Calosa 664589c642 Visual Targeting Indicator, Borders 2015-10-05 22:03:30 +08:00
xawotihs 22d14b2a4f - Updated SDL dependency to SDL2
- fixed compilation issues with cmake and visual studio 2015
2015-10-04 23:10:45 +02:00
Anthony Calosa 6e9c965279 Merge remote-tracking branch 'WagicProject/master' 2015-10-03 21:50:02 +08:00
Anthony Calosa 87e9ed8191 Merge pull request #638 from kevlahnota/master
reverted build
2015-10-03 21:43:01 +08:00
Anthony Calosa a5a0aa859a reverted build 2015-10-03 21:39:54 +08:00
Anthony Calosa 78693685d8 Merge pull request #637 from kevlahnota/master
revised producemana, added producecolor
2015-10-03 11:27:28 +08:00
Anthony Calosa f39d4a688a build number 2015-10-03 08:54:18 +08:00
Anthony Calosa 0c30a4ba53 High Tide fix 2015-10-03 08:15:05 +08:00
Anthony Calosa 7db8b89b89 Merge remote-tracking branch 'WagicProject/master' 2015-10-03 07:37:04 +08:00
Anthony Calosa ec4a9ead74 revised produceextra, added producecolor
producecolor:color look for the mana color when engaged
produceextra:selectmana acts like tappedformana(mytgt) so the ability
must be on the source
produceextra:{color}  ability on the otherhand, the ability must be on
the target
2015-10-03 07:36:52 +08:00
Anthony Calosa d31f112967 Merge pull request #636 from kevlahnota/master
LKI for power,  toughness and basic abilities,  produceextra ability, stack and life check, reduceto ability
2015-10-02 01:12:38 +08:00
Anthony Calosa 4098c306e2 removed unused variable. 2015-10-01 22:56:42 +08:00