theelk801
|
27a4ef8322
|
Merge pull request #25 from theelk801/master
merge
|
2017-08-13 22:22:44 -04:00 |
|
theelk801
|
83dbc70ff0
|
Merge pull request #24 from magefree/master
merge
|
2017-08-13 17:55:08 -04:00 |
|
theelk801
|
ab280682cc
|
Merge pull request #23 from theelk801/morecrads
merge
|
2017-08-13 17:53:02 -04:00 |
|
theelk801
|
a5f0e31724
|
Merge pull request #22 from theelk801/morecrads2
merge
|
2017-08-13 17:51:59 -04:00 |
|
Saga\Robert
|
e0bbe2da7e
|
- fixed it so controller doesn't get benefit twice if attacking
|
2017-08-13 20:19:33 +02:00 |
|
Saga\Robert
|
478a0b8ea8
|
- updated available set info of Zombie and Gold tokens
- added Curse of Vitality
- added Curse of Verbosity
- added Curse of Disturbance
- added Curse of Opulence
- added Curse of Bounty
- added Curse cycle to C17
|
2017-08-13 17:52:48 +02:00 |
|
LevelX2
|
1694daa4ab
|
Merge pull request #3801 from theelk801/master
Implemented Charmed Griffin, Chieftain en-Dal, Chill Haunting, Chime of Night, Cleansing, and Coiling Woodwurm
|
2017-08-13 16:28:10 +02:00 |
|
LevelX2
|
76ab2f7bd6
|
Merge pull request #3804 from Eleros/master
Implemented Bloodsworn Steward, Hungry Lynx & Herald's Horn
|
2017-08-13 16:26:48 +02:00 |
|
LevelX2
|
30ec306489
|
Merge branch 'master' into master
|
2017-08-13 16:26:17 +02:00 |
|
LevelX2
|
bae7f154df
|
Changed user disconnect handling. The user in the server is no longer deleted directly after connection problem, disconnect or quit. The user object remains now for 8 minutes so the rejoin not possible after disconnect problem should be solved (I hope so). We will see. Also fixed the problem, that the table panel was not shown, if a player disconected and reconected.
|
2017-08-13 16:22:18 +02:00 |
|
ingmargoudt
|
5dbb89772e
|
Merge pull request #3809 from ingmargoudt/master
fixes 3806
|
2017-08-13 15:55:00 +02:00 |
|
igoudt
|
195bf90889
|
Merge https://github.com/magefree/mage
|
2017-08-13 15:54:12 +02:00 |
|
igoudt
|
f658765722
|
fixes #3806
|
2017-08-13 15:53:39 +02:00 |
|
spjspj
|
15990c5d64
|
Merge pull request #3808 from spjspj/master
Fix
|
2017-08-13 23:17:19 +10:00 |
|
spjspj
|
ae95bd6e16
|
Fix
|
2017-08-13 23:06:17 +10:00 |
|
spjspj
|
0adf583884
|
Merge pull request #3807 from spjspj/master
Crimson Honor Guard (C17)
|
2017-08-13 23:05:18 +10:00 |
|
spjspj
|
cf95e5fa08
|
Merge branch 'master' of https://github.com/spjspj/mage
Conflicts:
Mage.Sets/src/mage/sets/Commander2017.java
|
2017-08-13 23:04:01 +10:00 |
|
spjspj
|
a39ceae9a1
|
Implement Crimson Honor Guard (C17)
|
2017-08-13 22:59:45 +10:00 |
|
Saga
|
3ad7c71b42
|
Update HungryLynx.java
|
2017-08-13 14:37:48 +02:00 |
|
Christian
|
df07c7fa0c
|
Created Kindred Dominance
|
2017-08-12 20:54:53 -04:00 |
|
Saga\Robert
|
ce0dded9ca
|
- removed unused imports
|
2017-08-13 00:24:27 +02:00 |
|
Saga\Robert
|
497f6a9342
|
- added Herald's Horn
- added Horn to C17
|
2017-08-13 00:20:48 +02:00 |
|
Saga\Robert
|
b49f46dcf6
|
- added Bloodsworn Steward
- added Hungry Lynx
- added both cards to C17
|
2017-08-12 19:22:51 +02:00 |
|
Saga\Robert
|
9a2ea73ec0
|
- added Rat token with Deathtouch
|
2017-08-12 19:19:35 +02:00 |
|
spjspj
|
20d4fced25
|
Merge pull request #3803 from spjspj/master
Implement Nazahn, Revered Bladesmith (C17)
|
2017-08-12 17:58:30 +10:00 |
|
spjspj
|
10e4d20e47
|
Merge branch 'master' into master
|
2017-08-12 17:58:24 +10:00 |
|
spjspj
|
f41effe979
|
Implement Nazahn, Revered Bladesmith (C17)
|
2017-08-12 17:56:55 +10:00 |
|
spjspj
|
e152fda404
|
Merge pull request #3802 from spjspj/master
Implement Patron of the Vein / Qasali Slingers (C17)
|
2017-08-12 17:06:15 +10:00 |
|
spjspj
|
c83ad3a4ed
|
Implement Patron of the Vein / Qasali Slingers (C17)
|
2017-08-12 17:05:33 +10:00 |
|
Evan Kranzler
|
53f194552c
|
Implemented Consuming Ferocity, Crash Landing, Credit Voucher, Crooked Scales and Deathmark Prelate
|
2017-08-11 18:40:53 -04:00 |
|
theelk801
|
967b9da1bb
|
Merge pull request #21 from theelk801/morecrads2
merge
|
2017-08-11 18:38:45 -04:00 |
|
Justin Herlehy
|
4e15194d08
|
Merge pull request #3784 from Eleros/feature/HASCON2017Promos
Implemented Grimlock, Dinobot Leader // Grimlock, Ferocious King & Balan, Wandering Knight
|
2017-08-11 15:26:23 -07:00 |
|
theelk801
|
ff47290039
|
Merge pull request #20 from magefree/master
merge
|
2017-08-11 18:20:53 -04:00 |
|
theelk801
|
cfdf83929e
|
Implemented Chain of Acid, Chain of Silence, Chain of Smog and Chain Stasis (#3796)
* Implement Epicenter
* Implement Infested Roothold
* Implement Brown Ouphe
* Implement Rust
* Implement Ouphe Vandals
* Implement Fatal Attraction
* Implement Fighting Chance
* Implement Arcbound Fiend
* Implement Carry Away
* Implement Caverns of Despair
* Implement Amulet of Unmaking
* Implement Aphetto Exterminator
* Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor
* Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman
* Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter
* Implement Brown Ouphe
* Implemented Break Open
* Implemented Carrion
* Implemented Cephalid Pathmage
* Implemented Cephalid Inkshrouder
* Implemented Ceremonial Guard
* Implemented Chain of Acid, Chain of Silence, and Chain of Smog
* Implemented Chain of Acid, Chain of Silence, and Chain of Smog
* Implemented Chain Stasis
|
2017-08-11 17:01:57 -05:00 |
|
spjspj
|
edef93d860
|
Merge pull request #3800 from spjspj/master
Implement Scalelord Reckoner (C17)
|
2017-08-12 01:13:19 +10:00 |
|
spjspj
|
04037a6d70
|
Implement Scalelord Reckoner (C17)
|
2017-08-12 01:12:30 +10:00 |
|
spjspj
|
ee73b72f19
|
Merge pull request #3799 from spjspj/master
C17 - Implement 3 cards
|
2017-08-11 19:58:51 +10:00 |
|
spjspj
|
10159cd157
|
Implement Taigam, Sidisi's Hand (C17)
|
2017-08-11 19:56:25 +10:00 |
|
spjspj
|
7d2c4b9ab3
|
Implement Teferi's Protection (C17)
|
2017-08-11 17:28:03 +10:00 |
|
spjspj
|
625620efcc
|
Implement Traverse the Outlands (C17)
|
2017-08-11 16:50:57 +10:00 |
|
spjspj
|
1b00198b5a
|
Merge pull request #3798 from spjspj/master
C17 spoilers (201708)
|
2017-08-11 14:19:41 +10:00 |
|
spjspj
|
8b88e9eed4
|
C17 spoilers (201708)
|
2017-08-11 14:18:44 +10:00 |
|
Evan Kranzler
|
82fbb18c0d
|
Implemented Dark Triumph
|
2017-08-10 13:55:30 -04:00 |
|
Evan Kranzler
|
fbc5d9a0ff
|
Implemented Crookclaw Elder
|
2017-08-10 10:04:23 -04:00 |
|
Evan Kranzler
|
91a52a8b8f
|
Implemented Complex Automaton
|
2017-08-10 09:50:22 -04:00 |
|
theelk801
|
b116e446f1
|
Merge pull request #19 from theelk801/morecrads2
merge
|
2017-08-10 09:36:49 -04:00 |
|
Evan Kranzler
|
1e1bb6c3ba
|
Implemented Chime of Night
|
2017-08-10 09:34:03 -04:00 |
|
Evan Kranzler
|
da77fbf90b
|
Implemented Cleansing
|
2017-08-10 09:28:20 -04:00 |
|
Evan Kranzler
|
4038aa3408
|
Implemented Chill Haunting
|
2017-08-10 09:03:19 -04:00 |
|
Evan Kranzler
|
976f2ff1ac
|
Implemented Coiling Woodworm
|
2017-08-10 08:52:16 -04:00 |
|