Anthony Calosa
|
e88edd11af
|
Merge pull request #4 from WagicProject/master
pull 4
|
2016-06-25 21:20:24 +08:00 |
|
Anthony Calosa
|
0b1be02c38
|
Update CHANGELOG.md
up to latest commit 6/23/16
|
2016-06-25 20:52:17 +08:00 |
|
Anthony Calosa
|
b98b8b6f2e
|
Update CHANGELOG.md
|
2016-06-25 20:32:42 +08:00 |
|
xawotihs
|
83e55b1074
|
Merge branch 'cmake' of https://github.com/WagicProject/wagic into cmake
|
2016-06-25 11:50:54 +02:00 |
|
xawotihs
|
1f87ed77e4
|
Fixed windows package and but in SDL frontend
|
2016-06-25 11:50:07 +02:00 |
|
Xawotihs
|
93b7d210dc
|
Should fix indentation issue
|
2016-06-24 19:32:32 +02:00 |
|
xawotihs
|
10d9d84f84
|
Fixed emscripten memory and updated python upload script to include cmake branch
|
2016-06-23 23:32:57 +02:00 |
|
xawotihs
|
fc9a4d5431
|
Removed redudant builds and removed -j4 to try to compile emscripten
|
2016-06-23 21:20:12 +02:00 |
|
Anthony Calosa
|
154358efd4
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-06-23 21:14:09 +08:00 |
|
Anthony Calosa
|
63c710047b
|
Merge pull request #704 from kevlahnota/master
Fix producecolor:color
|
2016-06-23 18:22:57 +08:00 |
|
Anthony Calosa
|
d0f4eeff1f
|
Merge branch 'master' of https://github.com/kevlahnota/wagic
|
2016-06-23 17:44:58 +08:00 |
|
Anthony Calosa
|
4d3277f41b
|
fix produce color
when you produce the chosen color, add mana of that color.
|
2016-06-23 17:44:50 +08:00 |
|
Anthony Calosa
|
7c9d52abbf
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-06-23 15:50:58 +08:00 |
|
Xawotihs
|
4b3a2531a6
|
Switched to debug emscripten build
|
2016-06-23 08:20:24 +02:00 |
|
Xawotihs
|
ed4871548e
|
Decreased optimisation level to avoid crashes
|
2016-06-23 07:48:11 +02:00 |
|
Anthony Calosa
|
cf6eccf565
|
Update _cards.dat
|
2016-06-23 05:30:40 +08:00 |
|
xawotihs
|
1284b8da8b
|
Should fix emscripten build in Travis
|
2016-06-22 22:19:09 +02:00 |
|
Anthony Calosa
|
1499baf8d9
|
Merge pull request #703 from kevlahnota/master
Change Basic Land Rarity for Modern sets
|
2016-06-22 20:56:46 +08:00 |
|
Anthony Calosa
|
37a0e95675
|
Rarity for Basic Lands
Changed to L rarity
|
2016-06-22 20:39:00 +08:00 |
|
Anthony Calosa
|
fd62705fd7
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-06-22 17:36:39 +08:00 |
|
Anthony Calosa
|
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 |
|
Anthony Calosa
|
70165a8c62
|
Merge pull request #702 from kevlahnota/master
BFZ, OGW, SOI _cards.dat
|
2016-06-22 09:14:32 +08:00 |
|
Anthony Calosa
|
68f888baf0
|
Update _cards.dat
|
2016-06-22 08:52:12 +08:00 |
|
Anthony Calosa
|
3a8bc599ee
|
Update _cards.dat
|
2016-06-22 08:51:26 +08:00 |
|
Anthony Calosa
|
9d79021678
|
Update _cards.dat
|
2016-06-22 08:28:42 +08:00 |
|
Anthony Calosa
|
7d339ccc23
|
add soi tokens
|
2016-06-22 07:04:06 +08:00 |
|
Xawotihs
|
95455603a1
|
Tries to build emscripten on linux as macosx fails
|
2016-06-21 23:45:37 +02:00 |
|
Anthony Calosa
|
3dd839c8bf
|
add plant token
|
2016-06-21 21:31:51 +08:00 |
|
Anthony Calosa
|
7db5b6fbda
|
added bfz tokens
|
2016-06-21 21:27:22 +08:00 |
|
Anthony Calosa
|
1b7d199744
|
Create _cards.dat
|
2016-06-21 18:37:29 +08:00 |
|
Anthony Calosa
|
6bac099369
|
Create _cards.dat
|
2016-06-21 18:34:54 +08:00 |
|
Anthony Calosa
|
d5cc1b970f
|
Create _cards.dat
|
2016-06-21 18:29:02 +08:00 |
|
Anthony Calosa
|
06f8fb0406
|
Merge pull request #3 from WagicProject/master
Pull
|
2016-06-21 18:25:02 +08:00 |
|
Anthony Calosa
|
7b6de7bbd8
|
Update StorageOptions.java
forcemount if you have forcemount file
|
2016-06-20 03:03:35 +08:00 |
|
zethfoxster
|
503159ff6f
|
adding hints that seemed to have disappeared
|
2016-06-19 09:25:41 -04: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 |
|