xawotihs
|
48ec51a923
|
Shold fix travis script
|
2017-09-03 12:49:31 +02:00 |
|
xawotihs
|
9936962c56
|
Should fix cmake issues on linux
|
2017-09-03 12:44:30 +02:00 |
|
xawotihs
|
15111d1b20
|
Merge branch 'master' of https://github.com/WagicProject/wagic into cmake
|
2017-09-02 21:15:47 +02:00 |
|
Anthony Calosa
|
07e6d90c98
|
Merge pull request #975 from kevlahnota/master
Some fixes
latest-master
|
2017-08-06 13:33:07 +08:00 |
|
Anthony Calosa
|
85231cda01
|
Fix Nissa's Chosen
Code seems workaround, it needs hardcoded...
|
2017-08-05 22:09:49 +08:00 |
|
Anthony Calosa
|
8549b7b1b4
|
Interrupt targetted abilities
This should have an option...
|
2017-08-05 18:52:27 +08:00 |
|
Anthony Calosa
|
9f58ef9916
|
small fixes for primitives
|
2017-08-05 18:16:47 +08:00 |
|
Anthony Calosa
|
c734ee9fd1
|
Add exert Indicator
"*" signifies exert
|
2017-08-05 18:16:24 +08:00 |
|
Anthony Calosa
|
77d87902d9
|
Add restriction for exert
hasexerted and notexerted
|
2017-08-05 18:15:44 +08:00 |
|
Anthony Calosa
|
b5c8656ac9
|
Fix Blink
|
2017-08-05 18:15:13 +08:00 |
|
Anthony Calosa
|
28f6b73da6
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2017-08-03 20:03:26 +08:00 |
|
Anthony Calosa
|
521b505543
|
Merge pull request #974 from kevlahnota/master
Fix morbid
|
2017-08-03 19:54:35 +08:00 |
|
Anthony Calosa
|
c5a3310103
|
quick Fix for zerodead
|
2017-08-03 18:32:16 +08:00 |
|
Anthony Calosa
|
0c053c713a
|
fix morbid
also added zerodead restriction - returns true if you dont have any
creature that died this turn
|
2017-08-03 18:27:45 +08:00 |
|
Anthony Calosa
|
bc06f93aae
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2017-08-03 15:52:56 +08:00 |
|
Anthony Calosa
|
8e919aeeb1
|
Merge pull request #973 from kevlahnota/master
Support for AKH/HOU Mechanics
|
2017-08-03 10:36:15 +08:00 |
|
Anthony Calosa
|
6bd09e42e0
|
Add support for Amonkhet Mechanics
and fix some cards.
Added exerted trigger, event and add removemc keyword inside transforms
ability so we can soft code Embalm and Eternalize...
|
2017-08-03 09:49:37 +08:00 |
|
Anthony Calosa
|
1f670b9919
|
Merge pull request #12 from WagicProject/master
Update unsuported cards, set a condition for showing poison counters …
|
2017-08-03 09:16:30 +08:00 |
|
punkeduard
|
c805a58fb0
|
Update unsuported cards, set a condition for showing poison counters and energy counter, added tribal al card type check, show the amount o
|
2017-08-02 18:42:52 -05:00 |
|
Anthony Calosa
|
34517004df
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2017-05-09 12:38:59 +08:00 |
|
Anthony Calosa
|
b0506bcd96
|
Merge pull request #968 from kevlahnota/master
readded fixes by punkeduard
|
2017-05-09 12:29:16 +08:00 |
|
Anthony Calosa
|
7a3a6c04a6
|
readded fixes by punkeduard
|
2017-05-09 12:28:07 +08:00 |
|
Anthony Calosa
|
54e4b08e1f
|
Merge pull request #11 from WagicProject/master
test pull
|
2017-05-09 12:25:45 +08:00 |
|
Anthony Calosa
|
67c22c5186
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2017-05-09 12:09:12 +08:00 |
|
punkeduard
|
87aba86fa8
|
Revert "Fixing bugs in the primitives"
This reverts commit 665f8ce755.
|
2017-05-08 22:17:27 -05:00 |
|
Rolzad73
|
28ea300f42
|
- fix forward declaration
|
2017-05-08 19:39:32 -04:00 |
|
Rolzad73
|
858c26b46a
|
Merge pull request #966 from WagicProject/key_bind_changes
Key bind changes
|
2017-05-08 19:03:03 -04:00 |
|
Rolzad73
|
70a6c7149c
|
- semi cleanup
|
2017-05-08 19:01:41 -04:00 |
|
Rolzad73
|
b4a34216c8
|
- updated Qt keybinding translation
|
2017-05-08 18:58:47 -04:00 |
|
Anthony Calosa
|
3868f4eb98
|
Merge pull request #965 from kevlahnota/master
Minor Corrections
|
2017-05-08 12:15:44 +08:00 |
|
Anthony Calosa
|
44304ee5b3
|
minor corrections
|
2017-05-08 11:41:00 +08:00 |
|
Anthony Calosa
|
9f4b8d65c8
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2017-05-08 11:33:57 +08:00 |
|
punkeduard
|
665f8ce755
|
Fixing bugs in the primitives
Daring Sleuth was crashing the game in the collection
|
2017-05-03 14:42:10 -05:00 |
|
Anthony Calosa
|
e1d5348f23
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2017-03-20 11:37:01 +08:00 |
|
Anthony Calosa
|
b596dc9eea
|
Merge pull request #964 from kevlahnota/master
Add some cards
|
2017-03-20 06:09:04 +08:00 |
|
Anthony Calosa
|
eb8370b86b
|
add some cards
also added countb() - countedbamount..
|
2017-03-19 21:57:59 +08:00 |
|
Anthony Calosa
|
fa69686f0a
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2017-03-19 08:59:21 +08:00 |
|
Rolzad73
|
3fe5372d28
|
non-commit to test build
|
2017-03-18 11:27:20 -04:00 |
|
Anthony Calosa
|
3058d42b49
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2017-03-16 20:58:36 +08:00 |
|
Anthony Calosa
|
4975ee0028
|
Merge pull request #963 from kevlahnota/master
Bushido, Modular points
|
2017-03-16 17:53:14 +08:00 |
|
Anthony Calosa
|
d4e1d809f3
|
Bushido & Modular
add Bushido and Modular points
|
2017-03-16 16:58:56 +08:00 |
|
Anthony Calosa
|
44cb0d995e
|
support some cards discarded by opponent
|
2017-03-16 10:58:27 +08:00 |
|
Anthony Calosa
|
c73d08187b
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2017-03-16 06:11:27 +08:00 |
|
Anthony Calosa
|
4382c34539
|
Merge pull request #962 from kevlahnota/master
minor fixes
|
2017-03-15 12:54:44 +08:00 |
|
Anthony Calosa
|
cb173b7bf9
|
update unsupported
|
2017-03-15 11:46:47 +08:00 |
|
Anthony Calosa
|
b5d4674471
|
unused variable
|
2017-03-15 11:23:53 +08:00 |
|
Anthony Calosa
|
be1803dfb6
|
unearth rule
|
2017-03-15 06:35:30 +08:00 |
|
Anthony Calosa
|
417c1af21e
|
hide action stack
if there's a human player and a menu object
|
2017-03-15 06:31:39 +08:00 |
|
Anthony Calosa
|
00bccd02da
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2017-03-15 06:16:46 +08:00 |
|
punkeduard
|
8596443da5
|
Fixing card primitives
Add flying to an angel and corrected some values on mana costs
|
2017-03-14 12:53:29 -06:00 |
|