github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-27 03:00:13 +00:00
Code Issues Projects Releases Packages Wiki Activity
19728 commits 2 branches 0 tags 782 MiB
Commit graph

19728 commits

This branch
This branch
All branches
Author SHA1 Message Date
Evan Kranzler
110b237b58 Implemented Afiya Grove 2017-08-15 09:20:16 -04:00
Evan Kranzler
f2480ff5ca Implemented Aether Storm 2017-08-15 09:01:25 -04:00
LevelX2
6c9a6ab58a * Ulvenwald Tracker - Fixed rule text. 2017-08-15 12:49:10 +02:00
LevelX2
fc2ea909b6 * Earthshaker Khenra - Fixed that the power comparison was until now not done during resolution. 2017-08-15 08:31:52 +02:00
theelk801
2e31d55049 Merge pull request #27 from magefree/master 
merge
 2017-08-14 20:38:20 -04:00
LevelX2
118665dfd4 Minor change. 2017-08-15 01:56:48 +02:00
LevelX2
1fb24116ae xmage 1.4.26V0 2017-08-15 01:27:06 +02:00
LevelX2
5cf3e4ed12 Some minor changes. 2017-08-15 00:32:53 +02:00
LevelX2
6f216ee764 Merge pull request #3815 from theelk801/morecrads2 
Implemented Daru Healer, Daughter of Autumn, Daunting Defender, Delraich, Dermoplasm, Disempower and Divine Congregation
 2017-08-14 23:57:52 +02:00
theelk801
ee3d36f2cd Merge pull request #26 from magefree/master 
merge
 2017-08-14 17:35:16 -04:00
LevelX2
928427c6a2 Merge pull request #3811 from theelk801/master 
Implemented Complex Automaton, Consuming Ferocity, Crash Landing, Credit Voucher, Crookclaw Elder, Crooked Scales, Dark Triumph, and Deathmark Prelate
 2017-08-14 23:13:05 +02:00
LevelX2
4b8e9c1525 Merge pull request #3810 from Eleros/C17 
Implemented C17 Curse cycle
 2017-08-14 23:10:52 +02:00
LevelX2
6a365af144 Merge pull request #3814 from caldover/KindredDominance 
Implemented Kindred Dominance
 2017-08-14 23:08:50 +02:00
Christian
06806b6f64 Fixed typo in Kindred Dominance 2017-08-14 16:52:32 -04:00
Christian
214a585f8d Fixed merge conflicts 2017-08-14 16:13:35 -04:00
Christian
75712661de Updated Kindred Dominance with better code reuse 2017-08-14 16:08:35 -04:00
Christian
98ee5931a7 Implemented Kindred Dominance and added to Commander2017 Set 2017-08-14 15:57:43 -04:00
Evan Kranzler
c9be694f05 Fixed Credit Voucher 2017-08-14 15:54:24 -04:00
Christian
4838ad7e7a Added Kindred Dominance to Commander 2017 Set 2017-08-14 15:22:01 -04:00
Evan Kranzler
cb34678c70 Fixed Crooked Scales, Consuming Ferocity, Crash Landing and Crookclaw Elder 2017-08-14 13:12:32 -04:00
Saga\Robert
1f759f9291 - changed getPermanent to getPermanentOrLKIBattlefield 
- changed == operator to equals()
 2017-08-14 17:17:10 +02:00
spjspj
f2c89d4717 Merge pull request #3812 from spjspj/master 
Implement Fractured Identity (C17)
 2017-08-15 01:05:46 +10:00
spjspj
41eff642ba Implement Fractured Identity (C17) 2017-08-15 01:04:25 +10:00
LevelX2
6244046330 * Some minor changes. 2017-08-14 16:48:48 +02:00
Saga\Robert
8b427de2d3 - changed nonland filter to static filter 2017-08-14 15:15:36 +02:00
Evan Kranzler
60d3fb62ba Fixed bug #3797 2017-08-13 22:35:41 -04:00
Evan Kranzler
d6896984c1 Implemented Daru Healer, Daughter of Autumn, Daunting Defender, Delraich, Dermoplasm, Disempower and Divine Congregation 2017-08-13 22:25:15 -04:00
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