d5b8337121
support importing forge decks
2016-06-26 19:26:52 +08:00
a23b96ba75
Merge branch 'master' into cmake
2016-06-26 11:25:23 +02:00
47704f7591
Changed git add cmd
2016-06-26 10:28:50 +02:00
b816facf44
Merge branch 'master' of https://github.com/kevlahnota/wagic
2016-06-26 07:57:52 +08:00
a6a5cf8755
Card Id Indicator
...
Indicates Card Id, Useful for cards/tokens to determine their correct Id
in the primitives. Its much easier to fix missing images. Update your
modrules.xml
2016-06-26 07:56:07 +08:00
83f7ed56fa
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-06-26 06:00:07 +08:00
755f90f38b
Updated repo cleanup
2016-06-25 22:53:18 +02:00
8a56406c19
Added missing REPO variable
2016-06-25 21:03:43 +02:00
887ea94a4d
Add execution right to the new script
2016-06-25 20:11:24 +02:00
499b3ddf3e
Added a script to upload emscripten build automatically to gh_pages
2016-06-25 16:54:35 +02:00
e88edd11af
Merge pull request #4 from WagicProject/master
...
pull 4
2016-06-25 21:20:24 +08:00
0b1be02c38
Update CHANGELOG.md
...
up to latest commit 6/23/16
2016-06-25 20:52:17 +08:00
b98b8b6f2e
Update CHANGELOG.md
2016-06-25 20:32:42 +08:00
83e55b1074
Merge branch 'cmake' of https://github.com/WagicProject/wagic into cmake
2016-06-25 11:50:54 +02:00
1f87ed77e4
Fixed windows package and but in SDL frontend
2016-06-25 11:50:07 +02:00
93b7d210dc
Should fix indentation issue
2016-06-24 19:32:32 +02:00
10d9d84f84
Fixed emscripten memory and updated python upload script to include cmake branch
2016-06-23 23:32:57 +02:00
fc9a4d5431
Removed redudant builds and removed -j4 to try to compile emscripten
2016-06-23 21:20:12 +02:00
154358efd4
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-06-23 21:14:09 +08:00
63c710047b
Merge pull request #704 from kevlahnota/master
...
Fix producecolor:color
2016-06-23 18:22:57 +08:00
d0f4eeff1f
Merge branch 'master' of https://github.com/kevlahnota/wagic
2016-06-23 17:44:58 +08:00
4d3277f41b
fix produce color
...
when you produce the chosen color, add mana of that color.
2016-06-23 17:44:50 +08:00
7c9d52abbf
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-06-23 15:50:58 +08:00
4b3a2531a6
Switched to debug emscripten build
2016-06-23 08:20:24 +02:00
ed4871548e
Decreased optimisation level to avoid crashes
2016-06-23 07:48:11 +02:00
cf6eccf565
Update _cards.dat
2016-06-23 05:30:40 +08:00
1284b8da8b
Should fix emscripten build in Travis
2016-06-22 22:19:09 +02:00
1499baf8d9
Merge pull request #703 from kevlahnota/master
...
Change Basic Land Rarity for Modern sets
2016-06-22 20:56:46 +08:00
37a0e95675
Rarity for Basic Lands
...
Changed to L rarity
2016-06-22 20:39:00 +08:00
fd62705fd7
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-06-22 17:36:39 +08:00
dc5fc2b544
add "files" path
...
try to fix saving profiles on forcemounted path. Transfer your wagic/res to /Android/data/net.wagic.app/files
2016-06-22 17:00:30 +08:00
70165a8c62
Merge pull request #702 from kevlahnota/master
...
BFZ, OGW, SOI _cards.dat
2016-06-22 09:14:32 +08:00
68f888baf0
Update _cards.dat
2016-06-22 08:52:12 +08:00
3a8bc599ee
Update _cards.dat
2016-06-22 08:51:26 +08:00
9d79021678
Update _cards.dat
2016-06-22 08:28:42 +08:00
7d339ccc23
add soi tokens
2016-06-22 07:04:06 +08:00
95455603a1
Tries to build emscripten on linux as macosx fails
2016-06-21 23:45:37 +02:00
3dd839c8bf
add plant token
2016-06-21 21:31:51 +08:00
7db5b6fbda
added bfz tokens
2016-06-21 21:27:22 +08:00
1b7d199744
Create _cards.dat
2016-06-21 18:37:29 +08:00
6bac099369
Create _cards.dat
2016-06-21 18:34:54 +08:00
d5cc1b970f
Create _cards.dat
2016-06-21 18:29:02 +08:00
06f8fb0406
Merge pull request #3 from WagicProject/master
...
Pull
2016-06-21 18:25:02 +08:00
7b6de7bbd8
Update StorageOptions.java
...
forcemount if you have forcemount file
2016-06-20 03:03:35 +08:00
503159ff6f
adding hints that seemed to have disappeared
2016-06-19 09:25:41 -04:00
813c54a166
Removed GL_CLAMP usage, update of the Android cmake package file
2016-06-19 12:46:17 +02:00
fa2a2d51a5
Fixed Downloader.
2016-06-19 12:08:45 +02:00
4b68b636ce
Merge branch 'master' into cmake
2016-06-19 11:39:56 +02:00
0a01b0af69
Tries to fix SDL and Qt builds, introduces Emscripten in Travis.
2016-06-19 10:25:22 +02:00
e4e809f3fe
Emscripten seems to work, should also fix PSP and Qt builds
2016-06-19 00:41:35 +02:00
Anthony Calosa
xawotihs
Xawotihs
zethfoxster