Commit Graph

  • bdc1ada090 Update README.md Xawotihs 2014-07-23 00:17:07 +02:00
  • 2efc24a1ce Merge branch 'develop' into feature/ios-update-xcode5.1 Michael Nguyen 2014-04-13 11:50:16 -07:00
  • 63561e6122 update Xcode build preferences as recommended by XCode. Michael Nguyen 2014-04-13 11:39:40 -07:00
  • d2390b1227 updated project file for iOS to work with current codebase - added missing source/headers (GameView.h, CarouselView.h, etc ) - removed dependency on admob static library - removed CardEffect.h and CardEffect.cpp from project reference - removed -no_implicit_dylibs flag (apparently no longer supported) - added -fno-objc-arc (turns off ARC compilation for entire project) - added -DTIXML_USE_STL Michael Nguyen 2014-04-13 08:34:21 -07:00
  • d0799ea3f2 updating to latest code from master Michael Nguyen 2014-04-13 08:26:53 -07:00
  • 44cbfbb1fb Merge pull request #601 from ZobyTwo/cleanup_3 Xawotihs 2014-03-13 20:20:12 +01:00
  • b078dd1f6a Fix android makefile Tobias Loose 2014-03-11 17:31:25 +01:00
  • 225dd23753 Fix makefile Tobias Loose 2014-03-11 17:17:36 +01:00
  • 25c844c1f5 Activates SDL build in travis SDL_build xawotihs 2014-02-10 22:57:53 +01:00
  • 51b4755242 Update README.md Rolzad73 2014-02-05 23:39:57 -05:00
  • 34492d9096 Adds Threading implementation on SDL xawotihs 2014-02-03 23:08:17 +01:00
  • 8f233b3027 Avoid circular initialization Tobias Loose 2014-02-03 19:44:51 +01:00
  • 197540763e Remove unused Effects.h/.cpp and class Effect Tobias Loose 2014-02-03 13:52:40 +01:00
  • 5d7667dc01 Cleaned Phonon vs QtMultimedia config xawotihs 2014-01-31 21:53:27 +01:00
  • 18383579e9 Fixed android compilation xawotihs 2014-01-27 06:31:23 +01:00
  • 03d4f8ffa1 Added Qt Multimedia support in order to replace Phonon. Currently does not work on Mac. xawotihs 2014-01-26 23:56:15 +01:00
  • 541698f98e Merge branch 'master' into minmax xawotihs 2014-01-24 23:49:30 +01:00
  • 30d92eb68c Should fix issue #497 with the broken freezing the game. xawotihs 2014-01-18 22:50:16 +01:00
  • 6e6a0fd5c2 OMG I so hate shells xawotihs 2014-01-18 16:00:14 +01:00
  • cd4a980182 More debug xawotihs 2014-01-18 15:26:09 +01:00
  • aad54fd98d Adds debug in build script xawotihs 2014-01-18 14:57:23 +01:00
  • 6b7a49506c Should fix the stringifying issue xawotihs 2014-01-18 14:23:26 +01:00
  • 7ecf67c176 And again xawotihs 2014-01-18 13:37:43 +01:00
  • 77aeb2d0ac Fixed release name xawotihs 2014-01-18 13:29:50 +01:00
  • 7a9f989104 Adds some URL error log xawotihs 2014-01-18 12:46:27 +01:00
  • ae06bebd24 Merge branch 'github_downloader' xawotihs 2014-01-18 12:11:08 +01:00
  • 042fb7b376 Tries to fix Android compilation xawotihs 2014-01-18 11:18:27 +01:00
  • c3583ade01 Updated resource name and URL for android project xawotihs 2014-01-17 23:25:48 +01:00
  • f97d9805dd Removed build number in released filename and added computation of resource URL based on release name. xawotihs 2014-01-17 21:50:10 +01:00
  • 1d33de59a9 Fixed compilation issue xawotihs 2014-01-12 22:56:53 +01:00
  • 0c4b09891b Removed hardcoded testing values and used 32 bits file size instead of 64 bits. xawotihs 2014-01-12 22:40:45 +01:00
  • 25955303e7 Adds a Downloader component to JGE able to download and cache files. xawotihs 2014-01-12 22:16:35 +01:00
  • 27b75eecb0 Merge pull request #600 from WagicProject/android_build_update Rolzad73 2014-01-09 12:33:11 -08:00
  • e40921cf13 update android build tools version Rolzad73 2014-01-09 14:57:06 -05:00
  • 083cebcc7e updated credits text Rolzad73 2014-01-09 14:46:58 -05:00
  • a722736335 Merge pull request #599 from WagicProject/android_travis_explicit Rolzad73 2014-01-08 08:40:47 -08:00
  • c483c20c81 attempt to make android tools fetching for TravisCI explicit and futureproof Rolzad73 2014-01-08 11:14:47 -05:00
  • dec1caa43c Revert "Fixed issue with multiple basic abilities in TargetChooser" Dmitry Panin 2014-01-04 18:40:59 -08:00
  • 9526e22118 Fixed grave pact Dmitry Panin 2014-01-04 18:14:15 -08:00
  • d9816c7ad0 Fixed issue with multiple basic abilities in TargetChooser Dmitry Panin 2014-01-04 18:11:40 -08:00
  • 8e327a27df Fixed formatting Dmitry Panin 2014-01-04 10:03:19 -08:00
  • 43fe67d7d8 Adds executioners_swing tests in _tests.txt xawotihs 2013-12-31 18:38:30 +01:00
  • a63991bb4e Merge pull request #598 from bjornsnoen/master Xawotihs 2013-12-31 09:11:20 -08:00
  • 14d4bede9a Linked mingw32 rcc qt_resources xawotihs 2013-12-31 17:45:01 +01:00
  • 8636a99d0d Activates qt resources only on windows as g++ seems to crash on Travis VM. xawotihs 2013-12-31 17:18:14 +01:00
  • 73cdbd6b88 And again xawotihs 2013-12-31 16:58:17 +01:00
  • 3482afeb84 Should fix the build of the graphics versions xawotihs 2013-12-31 16:08:59 +01:00
  • de40146462 Something is weird with the -- in the travis build script... xawotihs 2013-12-31 15:49:21 +01:00
  • 94d5a85043 Tries to remove weird characters in travis build file xawotihs 2013-12-31 00:08:46 +01:00
  • 4811fbcc9f Activates qt resources into graphics Qt build xawotihs 2013-12-30 23:41:50 +01:00
  • 6fd136a211 Fixed JSfx with JMOD. xawotihs 2013-12-29 18:37:26 +01:00
  • d98640fc01 Fixed android JGfx compilation xawotihs 2013-12-29 12:38:35 +01:00
  • 685317b457 Installs psp HGE lib xawotihs 2013-12-28 18:02:32 +01:00
  • a9a59d7b8e Tries to build PSP HGE lib xawotihs 2013-12-28 17:52:37 +01:00
  • fe9ad84ee5 More PSP compilation fixes. xawotihs 2013-12-28 12:15:52 +01:00
  • 3f43648b22 More PSP fixes. xawotihs 2013-12-28 11:44:00 +01:00
  • afb4c4605b Fixed PSP cross compilation issues. xawotihs 2013-12-28 01:05:53 +01:00
  • fec4468aea Updated JFileSystem implementation to be compatible with Qt resources. xawotihs 2013-12-28 00:38:02 +01:00
  • b09db0c60f Removed c++11 warning. xawotihs 2013-12-22 21:26:06 +01:00
  • 928ca3497a More code compliance. New tests. Bjørn Snoen 2013-12-21 19:31:32 +01:00
  • 60219411f6 Coding style compliance Bjørn Snoen 2013-12-21 14:33:44 +01:00
  • 642f5bb515 Fixed indentation mistakes Bjørn Snoen 2013-12-21 11:18:18 +01:00
  • 20e878a102 Made damager keyword work. Fixed Executioner's Swing in mtg.txt Bjørn Snoen 2013-12-21 11:05:15 +01:00
  • da31371d86 Include c++11 threading xawotihs 2013-12-20 18:39:02 +01:00
  • 0df408793a Tries to fix android sdk installation in Travis xawotihs 2013-12-20 14:09:30 +01:00
  • 9630bcd56b Removed file wrongly added. xawotihs 2013-12-20 12:37:25 +01:00
  • 3c38e21b25 Merge branch 'master' into Qt5.2_macx xawotihs 2013-12-20 11:14:10 +01:00
  • caec886e22 Fixed issues found by XCode. xawotihs 2013-12-20 00:24:08 +01:00
  • 927f8955e9 Merge pull request #596 from bjornsnoen/master Dmitry Panin 2013-12-19 02:44:38 -08:00
  • d4e0296d2b Fixed wrong rarity on millstone in M14 Bjørn Snoen 2013-12-18 09:37:20 +01:00
  • 8eb664f93d Fixed grammatical then/than error. Bjørn Snoen 2013-12-18 05:50:30 +01:00
  • f03fb82e25 Included all the wp8 current missing files xawotihs 2013-12-17 22:01:55 +01:00
  • b180c3d1a7 Fixed Qt5 mingw32 build xawotihs 2013-12-16 22:11:28 +01:00
  • db9f18a644 Added _cards.dat for M14 (taken from forum) Dmitry Panin 2013-12-15 22:39:08 +04:00
  • 95805ea387 Fixed QT mingw cross compile with QT4.8 xawotihs 2013-12-15 00:26:04 +01:00
  • 4765890d0a Fixed mouse input with retina display xawotihs 2013-12-14 23:46:23 +01:00
  • 2e13f29945 Update README.md Xawotihs 2013-12-14 19:13:26 +01:00
  • 22b1c3b5d8 Fixed zip permission while rezipping PSP package xawotihs 2013-12-14 14:40:26 +01:00
  • c7bae65697 Fixed core unzip xawotihs 2013-12-14 13:18:11 +01:00
  • 2381f0306c Fixed paths xawotihs 2013-12-14 12:06:51 +01:00
  • b12e15e4ff Tries to arrange a bit the PSP binary package to make it more usual for users. xawotihs 2013-12-14 11:55:12 +01:00
  • 9e21751e12 Fixed windows build upload xawotihs 2013-12-13 22:54:40 +01:00
  • db60c38eda Added windows build xawotihs 2013-12-13 23:07:17 +01:00
  • 1a4327a2e6 Fixed mingw32 build linking xawotihs 2013-12-13 21:54:43 +01:00
  • 88095c67b8 Fixed mingw32 compilation xawotihs 2013-12-13 21:27:40 +01:00
  • ec34380668 Fixed mingw gcc package name xawotihs 2013-12-13 00:12:32 +01:00
  • 89dcd6c71d Added some windows cross compiling of the Qt flavor. xawotihs 2013-12-12 17:54:43 -05:00
  • fd3cf574cf Remove previous tag "latest-master" before uploading new one Dmitry Panin 2013-12-12 21:08:39 +04:00
  • f21452feec Fixed some Cards: Dmitry Panin 2013-12-11 02:25:16 +04:00
  • 0f85471216 Enabled automatic releases for each commit in master Dmitry Panin 2013-12-12 02:20:14 +04:00
  • 0bb6cf4a4a Removing previous releases in order to upload new one releasing-master Dmitry Panin 2013-12-12 01:53:46 +04:00
  • 8691e7e2c7 Excluding tag latest-master from build Dmitry Panin 2013-12-12 01:26:23 +04:00
  • 8717e148bf One more test upload Dmitry Panin 2013-12-12 01:12:55 +04:00
  • 9faca83e18 changed git tag Dmitry Panin 2013-12-12 00:18:59 +04:00
  • fd081c4ad2 hacking releases Dmitry Panin 2013-12-11 23:58:00 +04:00
  • 650fdeb676 Merge branch 'master' into wp8 xawotihs 2013-12-11 20:44:01 +01:00
  • 5d92553017 Fix bug where the phase wheel got out of sync Tobias Loose 2013-12-11 01:47:13 +01:00
  • 7f94e4db31 Merge branch 'master' into wp8 xawotihs 2013-12-10 23:36:46 +01:00
  • f0e6d820c7 Fixed GuiPhaseBar logics. xawotihs 2013-12-10 22:23:28 +01:00
  • b15b4c6c90 Merge branch 'master' into wp8 xawotihs 2013-12-10 21:00:00 +01:00