Commit Graph

  • 545fc21260 Merge branch 'more_easing' of https://github.com/ZobyTwo/wagic into ZobyTwo-more_easing xawotihs 2013-12-10 20:35:47 +01:00
  • 8b68568106 Merge pull request #585 from bjornsnoen/master Xawotihs 2013-12-10 11:12:33 -08:00
  • ce1bd535cb Fixed Qtconsole using WagicCore correctly. xawotihs 2013-12-09 23:59:03 +01:00
  • 739a5d9e2b Removed env traces and change the secure token as it was exposed. xawotihs 2013-12-09 22:39:25 +01:00
  • 4c627f74b6 Add easing to GuiPhaseBar, simplify math a bit. Tobias Loose 2013-12-09 22:17:19 +01:00
  • 1e610ff653 Add InQuadEasing and OutQuadEasing and make tasklists... Tobias Loose 2013-12-09 17:21:36 +01:00
  • 5d6557a49f Add easing to task list and fix a bug where Tobias Loose 2013-12-09 16:50:51 +01:00
  • 7528329a58 Add more debug in travis script xawotihs 2013-12-09 21:54:55 +01:00
  • c62597dce5 Add some debugging to Travis script xawotihs 2013-12-09 21:43:26 +01:00
  • d8dfcdba67 Merge pull request #583 from ZobyTwo/deck_viewer_1 Xawotihs 2013-12-09 11:51:40 -08:00
  • 7b5f00260b Added Avatar Tokens created by Ajani Goldmane. Bjørn Snoen 2013-12-09 16:55:31 +01:00
  • 66317766f1 Remove obsolete code in Qt console. xawotihs 2013-12-09 00:16:00 +01:00
  • 66ff598223 Fixed Qt console xawotihs 2013-12-08 23:42:17 +01:00
  • 8ce9f3dfdb Fixed Qt project xawotihs 2013-12-08 23:17:27 +01:00
  • f9dc551942 Fix logic error in grid view Tobias Loose 2013-12-08 23:05:06 +01:00
  • eff0b677fb Activates C++11 only when used with SDL and mingw xawotihs 2013-12-08 23:02:41 +01:00
  • 718ceca919 Do not allow that the selection moves outside in grid view. Tobias Loose 2013-12-08 22:43:03 +01:00
  • 28ec24430d Fixed SDL build with mingw. In particular, replaced boost dependency by c++11. xawotihs 2013-12-08 22:30:25 +01:00
  • 3af4546ef7 Merge branch 'master' into wp8 xawotihs 2013-12-08 14:17:42 +01:00
  • 89fb76a8e7 Updated scripts to remove any modified artifacts from Res directory. Not doing it causes side effects on the testsuite. xawotihs 2013-12-08 12:16:25 +01:00
  • 1cc65ab611 Enable rotating over multiple filters, add src code doc Tobias Loose 2013-12-08 12:03:13 +01:00
  • 3b22354ad9 Fixed testsuite xawotihs 2013-12-08 11:36:18 +01:00
  • 2b9977a334 Rename methods for consistency and add source code doc Tobias Loose 2013-12-08 10:48:15 +01:00
  • 12c5f31562 Add a buttonMode to grid view to enable it on pointerless devices. Tobias Loose 2013-12-08 09:11:44 +01:00
  • 8cfd887375 Fixed upload script alphas xawotihs 2013-12-08 01:10:29 +01:00
  • 292bf7b1d2 Merge branch 'ci_upload_binaries' alpha-195 xawotihs 2013-12-08 00:33:42 +01:00
  • 4041fe690b Create a release and parse its ID using jq. xawotihs 2013-12-08 00:16:52 +01:00
  • cb73e2b90d Merge branch 'master' into ci_upload_binaries Fixed Windows compilation. xawotihs 2013-12-07 22:08:54 +01:00
  • a1fa36a934 Merge pull request #578 from ZobyTwo/deck_viewer_1 ZobyTwo 2013-12-07 11:53:16 -08:00
  • bdd0e6c042 Reset positions and filters when reopening the editor Tobias Loose 2013-12-07 20:44:23 +01:00
  • ee217e94a8 Fixed carousel pull request with Visual Studio. xawotihs 2013-12-07 20:29:42 +01:00
  • 38e19f7d35 Removed mingw32-qt Merged SDL and QT .pro files Removed glu dependency in corewrapper and JGfx to enable mingw cross compilation. xawotihs 2013-12-07 18:57:57 +01:00
  • 0bbfd00d15 Tries to install mingw32-qt on Travis xawotihs 2013-12-07 18:31:02 +01:00
  • aaceb3c038 Remove unused declaration Tobias Loose 2013-12-07 13:33:16 +01:00
  • 5efa7e10bd Remove test debug output. Fix HUD fading. Tobias Loose 2013-12-07 13:01:14 +01:00
  • 14c164364e Cleanups and state reduction. Tobias Loose 2013-12-07 12:58:20 +01:00
  • 4514725aba Make the eased value a reference and add source code doc to Easing.h Tobias Loose 2013-12-07 10:05:26 +01:00
  • 2b0f50bb88 Remove redundancy and make control flow a bit simpler Tobias Loose 2013-12-07 09:04:24 +01:00
  • a65fc0c0f0 Merge branch 'master' into ci_upload_binaries sudo pip installation of pyjavaproperties xawotihs 2013-12-06 22:52:32 +01:00
  • 99db363253 Uses pip to install pyjavaproperties xawotihs 2013-12-06 22:41:09 +01:00
  • c25dfec67e Fixed python module installation xawotihs 2013-12-06 22:17:19 +01:00
  • dd7210d187 Install pyjavaproperties in travis. xawotihs 2013-12-06 21:59:29 +01:00
  • 904b7a6d86 Build and upload core resource package xawotihs 2013-12-06 21:21:01 +01:00
  • 31b353c5ec Use easing within the carousel view sliding Tobias Loose 2013-12-06 21:04:21 +01:00
  • 0d350af1b6 Use easing within the carousel views scrolling Tobias Loose 2013-12-06 20:40:34 +01:00
  • 3bc9c93bab Build and upload PSP binary archive. xawotihs 2013-12-06 20:40:02 +01:00
  • 2002bb4e16 Fix crash that occured when opening the editor a second time Tobias Loose 2013-12-06 20:13:30 +01:00
  • 7e9c4ddbdd Fix logic error in optimization introduced in last commit Tobias Loose 2013-12-06 19:53:38 +01:00
  • 12b71de63c Render small cards as thumbnails Tobias Loose 2013-12-06 19:51:42 +01:00
  • 15011961f4 Do only prefetch cards if resource management is threaded Tobias Loose 2013-12-06 16:43:09 +01:00
  • b851103711 Commented out the release creation and refered an existing release instead. xawotihs 2013-12-06 00:47:24 +01:00
  • 67b8af8d15 Merge branch 'ci_upload_binaries' of https://github.com/WagicProject/wagic into ci_upload_binaries xawotihs 2013-12-06 00:41:16 +01:00
  • 8100e390b1 I'm starting to understand the stuff, the upload only works with a releaseId... xawotihs 2013-12-06 00:10:36 +01:00
  • 72e6876001 Remove temporary and binary files Tobias Loose 2013-12-05 23:57:03 +01:00
  • 96aeaffa1b Style and logic error. Tobias Loose 2013-12-05 23:33:43 +01:00
  • 74faa35b91 Removed useless local file copy before upload. xawotihs 2013-12-05 23:27:40 +01:00
  • 8bb58ca3b1 Put boilerplate code into easing base class Tobias Loose 2013-12-05 23:27:28 +01:00
  • 93d1a637b6 Style guide Tobias Loose 2013-12-05 23:22:50 +01:00
  • 30e86ffcd8 Update script to handle better variables. xawotihs 2013-12-05 23:09:06 +01:00
  • cbe6c0c842 Parameterize animations in grid deck view Tobias Loose 2013-12-05 23:02:31 +01:00
  • 77eb7f2777 Add missing header Tobias Loose 2013-12-05 22:54:44 +01:00
  • 077ab10c05 Rename Button to ButtonPressed Tobias Loose 2013-12-05 22:11:48 +01:00
  • 1194463349 Let the deck view base class handle buttons Tobias Loose 2013-12-05 22:10:33 +01:00
  • 8de50532f2 Put easing code into Easing.h. Add easing to sliding Tobias Loose 2013-12-05 21:46:12 +01:00
  • 334454655d Add Easing code to make scrolling in grid view more fluid Tobias Loose 2013-12-05 21:20:45 +01:00
  • d8d52e185d Add another missing include Tobias Loose 2013-12-05 19:45:02 +01:00
  • 9f1d225259 Add additional source files to various build systems Tobias Loose 2013-12-05 19:26:45 +01:00
  • 0c72bfd4c4 Make deck views toggleable Tobias Loose 2013-12-05 16:41:54 +01:00
  • 55e0366f19 Move griddeckview implementation into source file Tobias Loose 2013-12-05 16:19:07 +01:00
  • 667b95f2b8 Refactor gamestatedeckviewer and add a grid view suited... Tobias Loose 2013-12-04 21:57:01 +01:00
  • e90f6fe224 Whitespaces and add button to toggle griv/scrolling view Tobias Loose 2013-12-04 20:21:58 +01:00
  • 2289fffb8d Do not ftbfs when in release mode (-weror, -wunused-.. combination) Tobias Loose 2013-12-04 19:45:00 +01:00
  • 826403a512 Fixed upload shell script xawotihs 2013-12-05 22:44:02 +01:00
  • 35fec3d9a0 Made upload-binaries executable xawotihs 2013-12-05 22:05:31 +01:00
  • e9eb86488e Redirect ant update errors to a file and push correct upload-binaries.sh xawotihs 2013-12-05 21:43:29 +01:00
  • ae97abbf96 Activates an automatic pre-release and binary upload from Travis. xawotihs 2013-12-05 21:21:08 +01:00
  • a8391112b0 Merge pull request #576 from ZobyTwo/directories_1 Xawotihs 2013-12-04 13:07:05 -08:00
  • 4257592568 Updated output of info about Android APIs Rolzad73 2013-12-04 12:58:22 -05:00
  • 657479e0e4 Do not specify the system directory in JGE Tobias Loose 2013-12-04 11:44:36 +01:00
  • 9e969881fd Added output of info about Android APIs Dmitry Panin 2013-12-04 12:04:54 +04:00
  • 2b434a7182 Merge pull request #575 from WagicProject/android_travis_sdk_downgrade Dmitry Panin 2013-12-04 00:02:49 -08:00
  • d2e41f98c3 Changed Travis build file to use Android API 10 and Android build tools 18.1.1 Rolz73 2013-12-03 02:36:11 -05:00
  • 318fc98a39 Merge pull request #574 from WagicProject/feature/play-from-grave Xawotihs 2013-12-02 12:34:52 -08:00
  • b7a4b7f6b9 Fixing Yawgmoth's will Dmitry Panin 2013-12-02 21:26:55 +04:00
  • ed03fb744d Added [Yawgmoth's Will] Dmitry Panin 2013-12-02 13:42:31 +04:00
  • 02be213d1e Test for keyword "CanPlayFromGraveyard" Dmitry Panin 2013-12-02 04:36:58 +04:00
  • 0d4db9ee54 Fixed bug in alternative cost when playing lands Dmitry Panin 2013-12-02 04:33:39 +04:00
  • ae927576c5 Draft of new feature: canplayfromgraveyard Dmitry Panin 2013-12-02 04:20:04 +04:00
  • f08ddac77b Fixed formatting Dmitry Panin 2013-12-02 04:16:25 +04:00
  • 746a486e7a Added some comments for the redo tests. xawotihs 2013-11-30 23:39:29 +01:00
  • 261a6e4780 Merge branch 'master' into minmax xawotihs 2013-11-30 23:10:24 +01:00
  • 9effa7c975 Slightly changed formatting while investigating src Dmitry Panin 2013-12-01 01:01:57 +04:00
  • a70259b5ba Fixed: Assembly-Worker didn't appear as creature type Dmitry Panin 2013-12-01 00:59:16 +04:00
  • bf0a0a1580 Build the graphics version in release instead of debug. xawotihs 2013-11-30 19:32:55 +01:00
  • eb8b22b2d5 Merge branch 'master' of https://github.com/WagicProject/wagic xawotihs 2013-11-30 12:21:43 +01:00
  • f550784973 Merge branch 'master' into wp8 xawotihs 2013-11-29 22:31:20 +01:00
  • 4095676b6b Fixed memory leak introduced in #555 xawotihs 2013-11-29 22:07:45 +01:00
  • bedd1e8da8 Merge branch 'valgrind' of https://github.com/ZobyTwo/wagic into ZobyTwo-valgrind xawotihs 2013-11-29 19:41:46 +01:00
  • 965d4f6d45 Fixes Windows project xawotihs 2013-11-29 19:31:23 +01:00
  • 0db2925e7a Fix initialization orders Tobias Loose 2013-11-29 18:44:30 +01:00