Commit Graph

  • 79ea403273 Commented out GLUT dependency xawotihs 2015-10-11 15:54:32 +02:00
  • 397d7fa6c8 Added build of SDL2 in UNIX config xawotihs 2015-10-11 15:31:58 +02:00
  • ac787a6f51 Added SDL2DIR env variable. xawotihs 2015-10-11 15:20:27 +02:00
  • 0418e77d34 Removed tabs xawotihs 2015-10-11 14:29:59 +02:00
  • a2c6a3669b Reactivated SDL2 download xawotihs 2015-10-11 14:27:40 +02:00
  • b8d22240a8 Fixed typo xawotihs 2015-10-11 14:21:09 +02:00
  • b458d570a1 Deactivated again Android build, added a SDL build xawotihs 2015-10-11 14:15:43 +02:00
  • 5022df0d14 Moved tgz unpackaging away from android SDK update. xawotihs 2015-10-11 12:34:52 +02:00
  • 220b48b144 Updated android SDK and build tools versions xawotihs 2015-10-11 12:14:58 +02:00
  • 8aeed46181 Reactivates android build xawotihs 2015-10-11 11:54:40 +02:00
  • 38b34eae2f Split macosx config from unix one. xawotihs 2015-10-11 11:38:32 +02:00
  • 648b21f972 Trying something else with new repositories xawotihs 2015-10-11 10:38:40 +02:00
  • 09717a966b Added install of cmake 3.3 on Travis. xawotihs 2015-10-11 10:08:33 +02:00
  • 4c86cae7fe disabled wood & gold texture, backdrop size 480x272 Anthony Calosa 2015-10-11 14:29:36 +08:00
  • eef46fe743 Revert previous change and just removed inline on the function xawotihs 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 xawotihs 2015-10-10 18:35:33 +02:00
  • c83a476ebe Put SwizzlePlot in the WFont header. xawotihs 2015-10-10 18:23:59 +02:00
  • 954bba274c Tries to fix includes xawotihs 2015-10-10 18:08:45 +02:00
  • d370a5c13d Fixed png include in JGE xawotihs 2015-10-10 16:15:45 +02:00
  • 181189bee0 Fixed boost include path xawotihs 2015-10-10 16:05:34 +02:00
  • c678f5e85a Fixed vram xawotihs 2015-10-10 15:32:01 +02:00
  • 0fabf83c62 Fixed decoder_prx xawotihs 2015-10-10 15:25:08 +02:00
  • b7e8d19290 Fix for travis build xawotihs 2015-10-10 15:15:43 +02:00
  • 6376596e49 increase battlefield "hot area" size, opponent phase ring uses darker glyph vs human Anthony Calosa 2015-10-10 20:54:41 +08:00
  • 91053965be Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2015-10-10 20:52:37 +08:00
  • d0db71602a Deactive android build as travis does not like it those days Xawotihs 2015-10-10 14:51:40 +02:00
  • 4f9ee17ff9 Everywhere Xawotihs 2015-10-10 14:35:53 +02:00
  • 2461b39fb7 Update android SDK to 24.3.4 to try fixing travis Xawotihs 2015-10-10 14:35:22 +02:00
  • ff7634a8ac Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2015-10-10 20:30:19 +08:00
  • 6c41ae8e8e Update android build tools to 23.0.1 to try fixing travis Xawotihs 2015-10-10 14:19:22 +02:00
  • 52803cf57c fix crash bug when buying a card pack Anthony Calosa 2015-10-10 04:59:22 +08:00
  • 03f5ba430c resized Anthony Calosa 2015-10-09 21:46:25 +08:00
  • 91e317a497 added placeholder for large icons Anthony Calosa 2015-10-09 21:17:46 +08:00
  • a0b4d0f348 added scaling of background Anthony Calosa 2015-10-09 21:06:58 +08:00
  • 112efddb4e Removed typo Xawotihs 2015-10-09 13:32:51 +02:00
  • 4cea81e564 Moved SDL2 download away from the Android SDK download Xawotihs 2015-10-09 07:56:44 +02:00
  • 3a40a34566 should fix script syntax Xawotihs 2015-10-08 23:33:17 +02:00
  • a4ff87a7d5 Replaced libsdl2-dev dependency by a direct download Xawotihs 2015-10-08 23:29:47 +02:00
  • 797077c47b Various fixes and activated cmake in travis. xawotihs 2015-10-08 23:08:09 +02:00
  • 674f4d5062 transformed Planeswalker Anthony Calosa 2015-10-08 11:24:04 +08:00
  • 5cc2f5b645 border p/t Anthony Calosa 2015-10-08 09:51:52 +08:00
  • 3ca8aefad7 fix bug where walls that can attack activated vs moat in play Anthony Calosa 2015-10-07 20:59:17 +08:00
  • 1d1b663f55 menutitle scaling Anthony Calosa 2015-10-07 18:10:00 +08:00
  • 6a64b09452 replaced fillroundrect border Anthony Calosa 2015-10-07 18:08:00 +08:00
  • c2c9e180ea code cleanup Anthony Calosa 2015-10-07 11:06:59 +08:00
  • fb89183767 support scaling of avatar texture - multiples of 35x50 Anthony Calosa 2015-10-07 10:57:08 +08:00
  • 45b570b6f7 border highlighter Anthony Calosa 2015-10-07 10:53:11 +08:00
  • 075d950249 Got SDL2 version compiling on Mac. xawotihs 2015-10-06 23:25:40 +02:00
  • 8e8e5d8da8 Merge remote-tracking branch 'WagicProject/master' Anthony Calosa 2015-10-06 10:57:26 +08:00
  • f59a7872b3 Merge pull request #640 from kevlahnota/master Anthony Calosa 2015-10-06 10:53:49 +08:00
  • 022c6fccf5 Merge remote-tracking branch 'WagicProject/master' Anthony Calosa 2015-10-06 10:52:08 +08:00
  • b750cf1f33 fix alpha/transparency on rendered border Anthony Calosa 2015-10-06 10:47:08 +08:00
  • 5495d772ea Merge pull request #639 from kevlahnota/master Anthony Calosa 2015-10-06 01:21:29 +08:00
  • 664589c642 Visual Targeting Indicator, Borders Anthony Calosa 2015-10-05 22:03:30 +08:00
  • 22d14b2a4f - Updated SDL dependency to SDL2 - fixed compilation issues with cmake and visual studio 2015 xawotihs 2015-10-04 23:10:45 +02:00
  • 6e9c965279 Merge remote-tracking branch 'WagicProject/master' Anthony Calosa 2015-10-03 21:50:02 +08:00
  • 87e9ed8191 Merge pull request #638 from kevlahnota/master Anthony Calosa 2015-10-03 21:43:01 +08:00
  • a5a0aa859a reverted build Anthony Calosa 2015-10-03 21:39:54 +08:00
  • 78693685d8 Merge pull request #637 from kevlahnota/master Anthony Calosa 2015-10-03 11:27:28 +08:00
  • f39d4a688a build number Anthony Calosa 2015-10-03 08:54:18 +08:00
  • 0c30a4ba53 High Tide fix Anthony Calosa 2015-10-03 08:15:05 +08:00
  • 7db8b89b89 Merge remote-tracking branch 'WagicProject/master' Anthony Calosa 2015-10-03 07:37:04 +08:00
  • ec4a9ead74 revised produceextra, added producecolor Anthony Calosa 2015-10-03 07:36:52 +08:00
  • d31f112967 Merge pull request #636 from kevlahnota/master Anthony Calosa 2015-10-02 01:12:38 +08:00
  • 4098c306e2 removed unused variable. Anthony Calosa 2015-10-01 22:56:42 +08:00
  • ddee2c08e2 added stack check, modified life check Anthony Calosa 2015-10-01 22:25:26 +08:00
  • e1c02c8bf5 produceextra, lki(last known information) for power, toughness and basic abilities Anthony Calosa 2015-09-30 23:45:54 +08:00
  • 956d21d431 Merge remote-tracking branch 'WagicProject/master' Anthony Calosa 2015-09-29 22:29:08 +08:00
  • 8b3f474bca Merge pull request #635 from kevlahnota/master Anthony Calosa 2015-09-29 21:29:38 +08:00
  • 8eddcfb639 added converge keyword Anthony Calosa 2015-09-29 15:09:29 +08:00
  • 9b79602134 Moved modifiedbAbi block Anthony Calosa 2015-09-29 14:31:31 +08:00
  • 0bab560e89 Fix Cloner and Copier abilities Anthony Calosa 2015-09-29 10:42:29 +08:00
  • 4272e2e2b2 Activated zlib build only on windows xawotihs 2015-09-28 19:39:26 +02:00
  • 6458b46437 Merge remote-tracking branch 'WagicProject/master' Anthony Calosa 2015-09-28 21:27:48 +08:00
  • 021343ca02 fix for recover cards, preliminary support for madness Anthony Calosa 2015-09-28 21:27:27 +08:00
  • 34279cfacf Additional work with cmake on Windows, still does not work xawotihs 2015-09-27 23:23:31 +02:00
  • 86a5890c36 Merge pull request #634 from kevlahnota/master Anthony Calosa 2015-09-27 10:12:57 +08:00
  • 04e53f2002 increase the players life indicator(scale to 1.3f), fix init vars Anthony Calosa 2015-09-27 09:52:35 +08:00
  • 5dccd4b05f Merge remote-tracking branch 'WagicProject/master' Anthony Calosa 2015-09-27 08:56:31 +08:00
  • 85f4a4c36a Started to merge @ZobyTwo cmake branch xawotihs 2015-09-26 21:52:07 +02:00
  • 9e77899535 Adds missing breaking macosx compilation without boost xawotihs 2015-09-26 09:44:11 +02:00
  • 4185923d04 Replaced C++ types by C ones Xawotihs 2015-09-25 21:46:37 +02:00
  • a19ccb6b49 Should fix g++ compilation issue Xawotihs 2015-09-25 21:01:09 +02:00
  • 5ae9d42480 Fixed compilation issue with clang xawotihs 2015-09-25 20:21:10 +02:00
  • f282a3346c Merge branch 'no-boost' of https://github.com/WagicProject/wagic into no-boost xawotihs 2015-09-25 20:04:42 +02:00
  • ac8881a097 Merge pull request #633 from kevlahnota/master Anthony Calosa 2015-09-25 19:26:48 +08:00
  • 41daa83e3e Merge remote-tracking branch 'WagicProject/master' Anthony Calosa 2015-09-25 17:39:48 +08:00
  • 2869460a7f Fixed some card primitives, added support for "other" parsing power, toughness and converted cost, added Ingest Anthony Calosa 2015-09-25 17:39:35 +08:00
  • 0f168922d8 Fixed compilation issue of config without Qt xawotihs 2015-09-24 23:47:16 +02:00
  • b8b5362ba5 Removed dependency on boost when Qt is used. xawotihs 2015-09-24 23:20:52 +02:00
  • b4e0f2c991 Merge pull request #632 from kevlahnota/master Anthony Calosa 2015-09-24 19:55:13 +08:00
  • 201b6d9cfa bypassTC turn off Anthony Calosa 2015-09-24 14:45:26 +08:00
  • a6ec3e0a68 added type check on aura if the card it enchant is legal Anthony Calosa 2015-09-24 14:14:00 +08:00
  • 64578787a0 NULL check Anthony Calosa 2015-09-24 12:14:58 +08:00
  • d068388e7f added aura targets for castcard putinplay Anthony Calosa 2015-09-24 09:53:10 +08:00
  • 606d18aa6e bypassTC on playertarget Anthony Calosa 2015-09-24 06:24:17 +08:00
  • 106bcec7cf bypass targetchooser Anthony Calosa 2015-09-24 06:02:46 +08:00
  • 179e973b4e typo Anthony Calosa 2015-09-23 21:44:29 +08:00
  • 2223cd4f30 modified castcard to support put into play Anthony Calosa 2015-09-23 21:36:05 +08:00
  • 7db5345f9a attempt to fix "notatarget" Anthony Calosa 2015-09-23 12:14:47 +08:00