Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,108 Commits 14 Branches 14 Tags
30d92eb68ca5397ae4e6d91c862dd0bb33994f44
Commit Graph

4749 Commits

Author SHA1 Message Date
xawotihs 30d92eb68c Should fix issue #497 with the broken freezing the game. 2014-01-18 22:50:16 +01:00
xawotihs 6b7a49506c Should fix the stringifying issue 2014-01-18 14:23:26 +01:00
xawotihs 7ecf67c176 And again 2014-01-18 13:37:43 +01:00
xawotihs 77aeb2d0ac Fixed release name 2014-01-18 13:29:50 +01:00
xawotihs 7a9f989104 Adds some URL error log 2014-01-18 12:46:27 +01:00
xawotihs ae06bebd24 Merge branch 'github_downloader' 2014-01-18 12:11:08 +01:00
xawotihs c3583ade01 Updated resource name and URL for android project 2014-01-17 23:25:48 +01:00
xawotihs f97d9805dd Removed build number in released filename and added computation of resource URL based on release name. 2014-01-17 21:50:10 +01:00
xawotihs 25955303e7 Adds a Downloader component to JGE able to download and cache files. 2014-01-12 22:16:35 +01:00
Rolzad73 083cebcc7e updated credits text 2014-01-09 14:46:58 -05:00
Dmitry Panin dec1caa43c Revert "Fixed issue with multiple basic abilities in TargetChooser" 
This reverts commit d9816c7ad0.
 2014-01-04 18:40:59 -08:00
Dmitry Panin 9526e22118 Fixed grave pact 2014-01-04 18:14:15 -08:00
Dmitry Panin d9816c7ad0 Fixed issue with multiple basic abilities in TargetChooser 
E.g. card create[trample;haste] wasn't handled properly
 2014-01-04 18:13:22 -08:00
Dmitry Panin 8e327a27df Fixed formatting 2014-01-04 18:13:22 -08:00
xawotihs 43fe67d7d8 Adds executioners_swing tests in _tests.txt 2013-12-31 18:38:30 +01:00
Xawotihs a63991bb4e Merge pull request #598 from bjornsnoen/master 
Damager keyword
 2013-12-31 09:11:20 -08:00
Bjørn Snoen 928ca3497a More code compliance. New tests. 2013-12-21 19:31:32 +01:00
Bjørn Snoen 60219411f6 Coding style compliance 2013-12-21 14:33:44 +01:00
Bjørn Snoen 642f5bb515 Fixed indentation mistakes 2013-12-21 11:18:18 +01:00
Bjørn Snoen 20e878a102 Made damager keyword work. Fixed Executioner's Swing in mtg.txt 2013-12-21 11:05:15 +01:00
xawotihs 9630bcd56b Removed file wrongly added. 2013-12-20 12:37:25 +01:00
xawotihs 3c38e21b25 Merge branch 'master' into Qt5.2_macx 2013-12-20 11:14:10 +01:00
xawotihs caec886e22 Fixed issues found by XCode. 2013-12-20 00:24:08 +01:00
Bjørn Snoen d4e0296d2b Fixed wrong rarity on millstone in M14 2013-12-18 09:37:20 +01:00
Bjørn Snoen 8eb664f93d Fixed grammatical then/than error. 2013-12-18 05:50:30 +01:00
xawotihs b180c3d1a7 Fixed Qt5 mingw32 build 2013-12-16 22:11:28 +01:00
Dmitry Panin db9f18a644 Added _cards.dat for M14 (taken from forum) 2013-12-15 22:39:08 +04:00
xawotihs 88095c67b8 Fixed mingw32 compilation 2013-12-13 21:27:40 +01:00
Dmitry Panin f21452feec Fixed some Cards: 
Rune-Tail, Kitsune Ascendant
Shifting Sky
Flourishing Defenses (thanks to Shadowfireomega)
 2013-12-12 20:11:35 +04:00
Tobias Loose 5d92553017 Fix bug where the phase wheel got out of sync 
The phase wheel messures phases within another unit and not
mtg phases. It is important to map between those
 2013-12-11 01:53:05 +01:00
xawotihs f0e6d820c7 Fixed GuiPhaseBar logics. 2013-12-10 22:23:28 +01:00
xawotihs 545fc21260 Merge branch 'more_easing' of https://github.com/ZobyTwo/wagic into ZobyTwo-more_easing 2013-12-10 20:35:47 +01:00
Xawotihs 8b68568106 Merge pull request #585 from bjornsnoen/master 
Added Avatar Tokens created by Ajani Goldmane.
 2013-12-10 11:12:33 -08:00
Tobias Loose 4c627f74b6 Add easing to GuiPhaseBar, simplify math a bit. 2013-12-09 22:20:43 +01:00
Tobias Loose 1e610ff653 Add InQuadEasing and OutQuadEasing and make tasklists... 
easing more natural
 2013-12-09 22:20:43 +01:00
Tobias Loose 5d6557a49f Add easing to task list and fix a bug where 
opening the task list a second time was not possible
 2013-12-09 22:20:43 +01:00
Xawotihs d8dfcdba67 Merge pull request #583 from ZobyTwo/deck_viewer_1 
Cleanup, usability fixes and source code documentation for DeckView.h and GridDeckView.h
 2013-12-09 11:51:40 -08:00
Bjørn Snoen 7b5f00260b Added Avatar Tokens created by Ajani Goldmane. 2013-12-09 16:55:31 +01:00
Tobias Loose f9dc551942 Fix logic error in grid view 2013-12-08 23:05:06 +01:00
Tobias Loose 718ceca919 Do not allow that the selection moves outside in grid view. 2013-12-08 22:43:03 +01:00
xawotihs 89fb76a8e7 Updated scripts to remove any modified artifacts from Res directory. 
Not doing it causes side effects on the testsuite.
 2013-12-08 12:16:25 +01:00
Tobias Loose 1cc65ab611 Enable rotating over multiple filters, add src code doc 2013-12-08 12:03:13 +01:00
Tobias Loose 2b9977a334 Rename methods for consistency and add source code doc 
to DeckView.h
 2013-12-08 10:48:15 +01:00
Tobias Loose 12c5f31562 Add a buttonMode to grid view to enable it on pointerless devices. 2013-12-08 09:11:44 +01:00
xawotihs 292bf7b1d2 Merge branch 'ci_upload_binaries' 2013-12-08 00:33:42 +01:00
xawotihs cb73e2b90d Merge branch 'master' into ci_upload_binaries 
Fixed Windows compilation.
 2013-12-07 22:08:54 +01:00
Tobias Loose bdd0e6c042 Reset positions and filters when reopening the editor 2013-12-07 20:47:50 +01:00
xawotihs ee217e94a8 Fixed carousel pull request with Visual Studio. 2013-12-07 20:29:42 +01:00
xawotihs 38e19f7d35 Removed mingw32-qt 
Merged SDL and QT .pro files
Removed glu dependency in corewrapper and JGfx to enable mingw cross compilation.
 2013-12-07 18:57:57 +01:00
Tobias Loose aaceb3c038 Remove unused declaration 2013-12-07 13:33:16 +01:00