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

5824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xawotihs
ed4871548e Decreased optimisation level to avoid crashes 2016-06-23 07:48:11 +02:00
xawotihs
1284b8da8b Should fix emscripten build in Travis 2016-06-22 22:19:09 +02:00
Xawotihs
95455603a1 Tries to build emscripten on linux as macosx fails 2016-06-21 23:45:37 +02:00
xawotihs
813c54a166 Removed GL_CLAMP usage, update of the Android cmake package file 2016-06-19 12:46:17 +02:00
xawotihs
fa2a2d51a5 Fixed Downloader. 2016-06-19 12:08:45 +02:00
xawotihs
4b68b636ce Merge branch 'master' into cmake 2016-06-19 11:39:56 +02:00
xawotihs
0a01b0af69 Tries to fix SDL and Qt builds, introduces Emscripten in Travis. 2016-06-19 10:25:22 +02:00
xawotihs
e4e809f3fe Emscripten seems to work, should also fix PSP and Qt builds 2016-06-19 00:41:35 +02:00
xawotihs
1667b79fa8 Improved Emscripten port... still not there yet. 2016-06-18 17:24:51 +02:00
Anthony Calosa
c22c674de1 Merge pull request #701 from kevlahnota/master 
Some Fix
 2016-06-18 22:36:52 +08:00
Anthony Calosa
de3ce6f676 add description 2016-06-18 21:58:24 +08:00
Anthony Calosa
cd34c4ebdf Modified test 
Replenish + other enchantments
 2016-06-18 21:55:14 +08:00
Anthony Calosa
ba0cab3743 Revert test 2016-06-18 21:21:08 +08:00
Anthony Calosa
a73030ac9b Overlooked this 
Should be fine now, reverted the test
 2016-06-18 21:20:30 +08:00
Anthony Calosa
f57bba22cc Merge branch 'master' of https://github.com/kevlahnota/wagic 2016-06-18 20:22:55 +08:00
Anthony Calosa
e315cad0f5 Revert to previous 2016-06-18 20:22:50 +08:00
Anthony Calosa
3f40a6db4b Update Replenish.txt 2016-06-18 20:06:36 +08:00
Anthony Calosa
eb99680986 Modified 2016-06-18 19:55:58 +08:00
Anthony Calosa
2aa4f2da2d Merge branch 'master' of https://github.com/kevlahnota/wagic 2016-06-18 12:41:29 +08:00
Anthony Calosa
a48568526b Update _tests.txt 2016-06-18 12:39:20 +08:00
Anthony Calosa
7247abd5f1 Create Show_and_Tell.txt 2016-06-18 12:38:30 +08:00
Anthony Calosa
bae2502d8f Create Replenish.txt 2016-06-18 12:37:52 +08:00
Anthony Calosa
cd645b33b2 Fix for Aura's that are put into play 2016-06-18 12:31:23 +08:00
Anthony Calosa
07ad69c08f Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-18 09:12:02 +08:00
Anthony Calosa
6bc7de3370 Minor Fix 2016-06-18 09:11:57 +08:00
Anthony Calosa
f3ca247865 Merge pull request #699 from kevlahnota/master 
Force Mounting 2
 2016-06-17 17:47:43 +08:00
Anthony Calosa
0167cf052d Merge branch 'master' of https://github.com/kevlahnota/wagic 2016-06-17 17:03:52 +08:00
Anthony Calosa
9a3b3013a3 Update SDLActivity.java 2016-06-17 17:03:37 +08:00
Anthony Calosa
0f9bbc1561 Update DeckImporter.java 2016-06-17 17:00:44 +08:00
Anthony Calosa
3ef6b3a76a Force Mounting 2 
If you have root then most likely you have write access to secondary storage. If not then use the app-specific folder. You may create the folder via built-in file manager > Android/data/net.wagic.app/files/Wagic/Res
 2016-06-17 16:58:15 +08:00
Anthony Calosa
3c7ccddfcc Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-17 07:48:15 +08:00
Anthony Calosa
42019917ce Merge pull request #698 from kevlahnota/master 
Common color
 2016-06-16 19:17:29 +08:00
Anthony Calosa
68b632857d Most Common Color 2016-06-16 18:14:48 +08:00
Anthony Calosa
eaf7b72dc7 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-16 17:30:07 +08:00
Anthony Calosa
ff9cc83ef0 Merge pull request #697 from kevlahnota/master 
Import Deck Options
 2016-06-16 12:14:09 +08:00
Anthony Calosa
4e3dffad98 Import deck options 2016-06-16 11:37:25 +08:00
Anthony Calosa
7662d974b9 Deck Importer 2016-06-16 11:36:23 +08:00
Anthony Calosa
a78bdc4912 Force Mounting 
Force mounting sdcard0 and sdcard1 if possible for kitkat and above
 2016-06-16 11:31:20 +08:00
Anthony Calosa
6b84de3ccd Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-16 11:29:28 +08:00
Anthony Calosa
fda537635e Merge pull request #696 from kevlahnota/master 
Imprint Class
 2016-06-16 10:18:01 +08:00
Anthony Calosa
c633ceb695 Current Imprinted card only 2016-06-16 09:48:20 +08:00
Anthony Calosa
a4c536740e Revised Imprint 2016-06-16 09:14:37 +08:00
Anthony Calosa
923ebbc3c8 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-16 07:15:35 +08:00
Anthony Calosa
9d79a85b96 Imprint Class 2016-06-16 07:15:24 +08:00
Anthony Calosa
7b972142ba Merge pull request #695 from kevlahnota/master 
Block Cost Rule
 2016-06-15 23:09:56 +08:00
Anthony Calosa
b38275123a Block Cost Rule 
Update rules folder
 2016-06-15 22:26:55 +08:00
Anthony Calosa
a2249a7392 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-15 19:08:51 +08:00
Anthony Calosa
c0a6fd2288 Merge pull request #694 from kevlahnota/master 
Some changes
 2016-06-14 21:31:28 +08:00
Anthony Calosa
149af25d22 fix unused variable error 2016-06-14 20:50:31 +08:00
Anthony Calosa
b33ae0c92f Revised 2016-06-14 19:40:28 +08:00