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

5809 commits

This branch
This branch
All branches
Author SHA1 Message Date
North
96ff08dc9a Merge branch 'decouple-client' 
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
 2013-07-03 21:42:40 +03:00
LevelX2
023ae007a5 DeathtouchAbility - Added reminder text. 2013-07-03 20:19:37 +02:00
LevelX2
cf10d391f6 Faithful Squire - Removed the incorrect EntersTheBattlefieldAbility (gave two counters on netering the battlefield. 2013-07-03 20:18:54 +02:00
LevelX2
83ad29b0a9 Added missing change for quit match. 2013-07-02 23:49:07 +02:00
LevelX2
c28bdf8a02 Added alternate part as commets to get UI editor to run. 2013-07-02 23:48:02 +02:00
LevelX2
05b221fbbf Added a check to TableController. 2013-07-02 23:42:33 +02:00
LevelX2
7b260c960b Added a quit match option. FFA game gets no more killed if host left mage or quitted match. 2013-07-02 22:15:49 +02:00
North
5809e7783b added auto-update of database on connect 2013-07-02 22:29:35 +03:00
North
5e3970a0e0 added method for updating cards database 2013-07-02 22:29:06 +03:00
Backfir3
ec9bb538ed Added 5 cards 
[USG] Attunement, Bereavement, Pariah
[DRK] Barl's Cage
[PCY] Verdant Field
 2013-07-02 17:26:46 +02:00
LevelX2
6505410512 Call leave inTwoPlayerDuel because for disconnect this was missing. 2013-07-02 17:02:40 +02:00
LevelX2
35433e55b8 Show match time value in table view. 2013-07-02 17:02:03 +02:00
LevelX2
a71285a768 Remove table if a user disconnects only if state is waiting or starting. 2013-07-02 17:00:57 +02:00
LevelX2
d39a581df9 Sample Deck: Craig Wescoe's WR Aggro 2013-07-02 07:54:15 +02:00
Jeff
941613e0be - Added Breath of Malfegor, Sanity Gnawers, and Vedalken Ghoul. 2013-07-01 17:27:25 -05:00
North
e4ea8adf94 added method for updating expansions database 2013-07-02 00:32:25 +03:00
Jeff
fdb38b886d - Added Tainted Sigil, Singe-Mind Ogre, and Sigil Captain. 2013-07-01 16:27:41 -05:00
North
d541779d66 Removed embedded server from Session 2013-07-01 23:58:29 +03:00
North
ae86414658 Removed getAllCards method from CardRepository 2013-07-01 23:46:27 +03:00
North
240650f889 removed netbeans license from pom 2013-07-01 23:23:58 +03:00
LevelX2
729dbc698b Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-01 20:27:43 +02:00
LevelX2
ef811ff0bf Improved state handling of tournament panel. 2013-07-01 20:26:55 +02:00
LevelX2
469e9f3519 Fixed a bug of AffinityForArtifactsAbility causing bug if artifact had an activated ability. 2013-07-01 20:26:18 +02:00
Jeff
e102000d03 - Added Cloven Casting, Intimidation Bot, and Spellbound Dragon. 2013-07-01 11:55:58 -05:00
LevelX2
06163d6ac5 Adding Player state to TournamentPlayer and TournamentPanel. 2013-07-01 17:11:44 +02:00
LevelX2
7c5f1efe71 * Advent of the Wurm - Removed the expansion reference to RTR of the token. That led to showing the card as RTR card. 2013-07-01 14:25:09 +02:00
LevelX2
319135b8ed Cleanup preferences dialog. 2013-07-01 12:41:13 +02:00
LevelX2
7ef8753183 Cleanup wrong includes in TournamentPanel. 2013-07-01 10:13:31 +02:00
LevelX2
4c129706ca Cleanup layout of preferences dialog. 2013-07-01 08:27:33 +02:00
Jeff
2ff213ca32 - Added Fight to the Death, Giant Ambush Beetle, Jund Hackblade, Morbid Bloom, and Slave of Boras. 2013-06-30 18:17:19 -05:00
LevelX2
30be9afebe Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-01 00:13:28 +02:00
LevelX2
f18a4a618b [mino] tooltip text change. 2013-07-01 00:09:30 +02:00
LevelX2
71e3670d0c * Prowl ability - Fixed the bug, that creatures with Changeling did not count for Prowl. 2013-07-01 00:08:46 +02:00
Jeff
ef5056fac2 - Added Crystallazation, Messenger Falcons, Bant Sureblade, Naya Hushblade. 2013-06-30 16:28:04 -05:00
LevelX2
093bc5e0e9 * Amrou Seekers - Fixed the not working can't be blocked ability. 2013-06-30 22:23:16 +02:00
LevelX2
0acce10d9d * KithkinGreatheart - Fixed that the second ability (first strike) was not conditional. 2013-06-30 22:16:31 +02:00
LevelX2
4e3e418524 * Blinding Beam - Fixed second mode where target was missing. 2013-06-30 22:05:31 +02:00
Li REN
df6f43761e Merge pull request #257 from Noahsark/master 
update
 2013-06-30 12:07:20 -07:00
Li REN
70ebb6bfbc add UI to adjust BGM path 2013-06-30 15:05:30 -04:00
LevelX2
9615b52a9d * Fixed tooltip text of 4 hatchling creatures. 2013-06-30 19:43:06 +02:00
LevelX2
dfb74a604e Merge branch 'master' of https://github.com/magefree/mage.git 2013-06-30 19:33:06 +02:00
LevelX2
3a38a3f8d1 * Sunhome Guildmage & Assemble the Legion - Fixed that the token is only white and not red. 2013-06-30 19:32:03 +02:00
Jeff
4c423c6e7e - Added Esper Stormblade, Grixis Grimblade, and Thopter Foundry. 2013-06-30 11:59:31 -05:00
Jeff
6992c92760 - Little fix 2013-06-30 11:32:16 -05:00
LevelX2
eaf55be919 * Draft tournament - NPE on draft construct deck start. 2013-06-30 16:40:11 +02:00
North
1fccbd6b87 Merge remote-tracking branch 'origin/master' into decouple-client 
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
 2013-06-30 11:26:40 +03:00
LevelX2
64bb951cc6 * Prison Term - Fixed tht the enchantment did not move to new creature caused by bug in EntersBattlefieldAllTriggeredAbility. 2013-06-30 08:35:51 +02:00
LevelX2
8ca1641c12 * Leechridden Swamp - Fixed missing tap source cost. 2013-06-29 23:51:51 +02:00
LevelX2
17c893799f Added a close button, tournament header infos, name in window item and movable divider bars to the tournament panel. 2013-06-29 22:30:43 +02:00
LevelX2
4cb4a377d2 Changed message of the day panel to full width. 2013-06-29 22:28:52 +02:00