Commit Graph

5885 Commits

Author SHA1 Message Date
xawotihs
af0861877a Merge branch 'master' into cmake 2016-06-29 21:36:47 +02:00
Anthony Calosa
db19fa507e Merge pull request #708 from kevlahnota/master
Try to fix IOS Builds
2016-06-29 15:11:14 +08:00
Anthony Calosa
27fd1942d0 Try to Fix IOS Build 2016-06-29 15:03:36 +08:00
Anthony Calosa
975df3625d Corrections 2016-06-29 15:03:24 +08:00
Anthony Calosa
92a37e1e44 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-29 13:09:46 +08:00
Anthony Calosa
cd33754a3c Merge pull request #707 from kevlahnota/master
Updated Primitives and Hide Highlight Border
2016-06-29 12:17:43 +08:00
Anthony Calosa
69d92bc0ea Unused Variable
MTGRules.cpp:1361:11: error: unused variable ‘player’
[-Werror=unused-variable]
2016-06-29 11:38:51 +08:00
Anthony Calosa
6d09c12f93 Try to fix compilation 2016-06-29 11:08:55 +08:00
Anthony Calosa
ba0f4dbcf5 Update changes 2016-06-29 10:54:44 +08:00
Anthony Calosa
e1bf3b4b82 Updated Primitives
Updated cards that use reveal keywords, Updated Borderline and
Unsupported
2016-06-29 10:45:35 +08:00
Anthony Calosa
d647309587 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-29 09:57:00 +08:00
Anthony Calosa
140ee7b183 Hide Highlight Border
When revealing cards, Hide Highlight Border
2016-06-29 08:59:58 +08:00
zethfoxster
745eaf8a17 the following adds 965 cards primitives, I did not alphabetically sort these and can not justify alphabetical sorting as it has no effect on the game engine. 2016-06-28 20:58:52 -04:00
Anthony Calosa
b16e70c363 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-29 08:26:31 +08:00
zethfoxster
6ee00c138c Pretty huge patch here(sorry old habits never die :( )
lots of changes, many bug fixes,
first
added auto=count(targetchooser)
and countedamount wparsed int
they work together for cards where it is difficult to get working without knowing in advance how many we had ie: exile blah creatures, for each creature you exiled do effect.
auto=count(creature|mybattlefield)
auto=moveto(exile)
auto=draw:countedamount
it takes into account token creatures, which our old methods did not.

second, added "freeze" which is a "frozen" that automatically taps your target for you, for use when nesting or whenever needed where it was difficult to nest the ability with tap included.

added devotion for "iroas"

added reveal:x and scry x
reveal contains optionone/optiononeend ; optiontwo/optiontwoend ; repeat; afterrevealed/afterrevealed end.

this ability has heavy use of targetListIsSet(<amount>) and upto:amount, you MUST be certain that all cards being revealed have an action that removes them from reveal either in the first, second, or 3rd ability.
there are over 300 examples in the new card code, the ability is VERY easy to understand.

scry contains automatic put on top, put on bottom, then scrycore/scrycoreend which is an ability to fire.
it also contains keywords, dontshow which is nested in scrycore, scry reveals, puts on top or bottom, then reveal AGAIN, and does an effect, dontshow eliminates the 2nd revealing.
is also contains "delayed" keyword, which delays the ability until AFTER the core fires.

added bestow. update rules mtg.txt!!!!
examples are in primitives, every bestow card was supported.

added a new lord based on varibles and restrictions
while(restriction{morbid})
while(varible:blah)
this simplifies and expands on this(, allowing you to even use while(cantarget together and check if a card is targetable by the variable. examples are in primitives

added token(by card name)
auto=token(Eldrazi Scion) 
will search primitives and card dats for this card and give it to you as a token.
valid card dat info is still required.

added variable delirium
added restriction madnessplayed to allow checking if the card was played with madness.

added restriction "geared" for checking if a card has equipment on it.

added abilities words
skulk

menace <--cant be blocked except by 2 or more, if you dont block it with 2 or more we automatically unassign the single blocker and the creature is considered not blocked.

nosolo <--cant attack alone

mustblock <---if you dont assign as a blocker, we assign automatically the first thing it can block legally.

changed iscolorless back to "colorless"

enjoy, cards coming soon, theyre coded but im debating on not alpha sorting, cards being added this patch 965 uniques.

there is a section of the commit which was just VS2016 normalizing line ends, sorry if it makes it a cluster mess.
2016-06-28 18:40:55 -04:00
Anthony Calosa
0a4da47492 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-27 15:34:49 +08:00
Anthony Calosa
9439b347c9 Merge pull request #705 from kevlahnota/master
CardID Indicator, Add Missing Tokens, Support Importing dck for Android
2016-06-27 09:04:16 +08:00
Anthony Calosa
e24eb30c98 Update Changelog 2016-06-27 09:02:43 +08:00
Anthony Calosa
f53573261e missing tokens 2016-06-27 08:44:13 +08:00
Anthony Calosa
d5b8337121 support importing forge decks 2016-06-26 19:26:52 +08:00
xawotihs
a23b96ba75 Merge branch 'master' into cmake 2016-06-26 11:25:23 +02:00
Xawotihs
47704f7591 Changed git add cmd 2016-06-26 10:28:50 +02:00
Anthony Calosa
b816facf44 Merge branch 'master' of https://github.com/kevlahnota/wagic 2016-06-26 07:57:52 +08:00
Anthony Calosa
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
Anthony Calosa
83f7ed56fa Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-06-26 06:00:07 +08:00
Xawotihs
755f90f38b Updated repo cleanup 2016-06-25 22:53:18 +02:00
Xawotihs
8a56406c19 Added missing REPO variable 2016-06-25 21:03:43 +02:00
xawotihs
887ea94a4d Add execution right to the new script 2016-06-25 20:11:24 +02:00
xawotihs
499b3ddf3e Added a script to upload emscripten build automatically to gh_pages 2016-06-25 16:54:35 +02:00
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