Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,104 Commits 14 Branches 14 Tags
abfff205eeea5758c6b526bc8a2f154ba9fa7132
Commit Graph

7104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitry Panin 0f85471216 Enabled automatic releases for each commit in master 2013-12-12 02:20:14 +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
xawotihs 739a5d9e2b Removed env traces and change the secure token as it was exposed. 2013-12-09 22:39:25 +01: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 7528329a58 Add more debug in travis script 2013-12-09 21:54:55 +01:00
xawotihs c62597dce5 Add some debugging to Travis script 2013-12-09 21:43:26 +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
xawotihs 3b22354ad9 Fixed testsuite 2013-12-08 11:36:18 +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 8cfd887375 Fixed upload script 2013-12-08 01:10:29 +01:00
xawotihs 292bf7b1d2 Merge branch 'ci_upload_binaries' alpha-195 2013-12-08 00:33:42 +01:00
xawotihs 4041fe690b Create a release and parse its ID using jq. 2013-12-08 00:16:52 +01:00
xawotihs cb73e2b90d Merge branch 'master' into ci_upload_binaries 
Fixed Windows compilation.
 2013-12-07 22:08:54 +01:00
ZobyTwo a1fa36a934 Merge pull request #578 from ZobyTwo/deck_viewer_1 
Reset positions and filters when reopening the editor. These changes are trivial so I will merge them.
 2013-12-07 11:53:16 -08: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
xawotihs 0bbfd00d15 Tries to install mingw32-qt on Travis 2013-12-07 18:31:02 +01:00
Tobias Loose aaceb3c038 Remove unused declaration 2013-12-07 13:33:16 +01:00
Tobias Loose 5efa7e10bd Remove test debug output. Fix HUD fading. 2013-12-07 13:01:14 +01:00
Tobias Loose 14c164364e Cleanups and state reduction. 
This mainly moves datamembers around and tries to avoid caching of
results of calculations when the calculations are cheap.
 2013-12-07 12:58:20 +01:00
Tobias Loose 4514725aba Make the eased value a reference and add source code doc to Easing.h 
This allows to apply multiple easings to the same variable.
 2013-12-07 10:05:26 +01:00
Tobias Loose 2b0f50bb88 Remove redundancy and make control flow a bit simpler 2013-12-07 09:04:24 +01:00
xawotihs a65fc0c0f0 Merge branch 'master' into ci_upload_binaries 
sudo pip installation of pyjavaproperties
 2013-12-06 22:52:32 +01:00
xawotihs 99db363253 Uses pip to install pyjavaproperties 2013-12-06 22:41:09 +01:00
xawotihs c25dfec67e Fixed python module installation 2013-12-06 22:17:19 +01:00
xawotihs dd7210d187 Install pyjavaproperties in travis. 2013-12-06 21:59:29 +01:00
xawotihs 904b7a6d86 Build and upload core resource package 2013-12-06 21:21:01 +01:00
Tobias Loose 31b353c5ec Use easing within the carousel view sliding 2013-12-06 21:04:21 +01:00
Tobias Loose 0d350af1b6 Use easing within the carousel views scrolling 
It is visible if you scroll more than one card
 2013-12-06 20:51:18 +01:00
xawotihs 3bc9c93bab Build and upload PSP binary archive. 2013-12-06 20:40:02 +01:00
Tobias Loose 2002bb4e16 Fix crash that occured when opening the editor a second time 2013-12-06 20:13:30 +01:00
Tobias Loose 7e9c4ddbdd Fix logic error in optimization introduced in last commit 2013-12-06 19:53:38 +01:00
Tobias Loose 12b71de63c Render small cards as thumbnails 2013-12-06 19:51:42 +01:00
Tobias Loose 15011961f4 Do only prefetch cards if resource management is threaded 2013-12-06 16:43:09 +01:00
xawotihs b851103711 Commented out the release creation and refered an existing release instead. 2013-12-06 00:47:24 +01:00
xawotihs 67b8af8d15 Merge branch 'ci_upload_binaries' of https://github.com/WagicProject/wagic into ci_upload_binaries 2013-12-06 00:41:16 +01:00
xawotihs 8100e390b1 I'm starting to understand the stuff, the upload only works with a releaseId... 2013-12-06 00:10:36 +01:00