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

7730 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
51e4caca19 Tables panel - check for null value of date finished. 2013-07-06 15:15:20 +02:00
LevelX2
bb06591f53 Finished changes for priority timer, works now per match and match will be continiued after first game is finished. 2013-07-06 15:14:15 +02:00
North
200a565a9d Merged DeckValidator interface with DeckValidatorImpl 2013-07-06 11:08:36 +03:00
North
4657268476 fixed bug where one couldn't create a sideboard in the deck editor 2013-07-06 10:46:18 +03:00
North
d9b37cc12a extracted method for loading a card in Deck class 2013-07-06 10:46:02 +03:00
LevelX2
9e5f3887bf Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-06 00:44:43 +02:00
LevelX2
0f32fc72de Solution for the deck editor / sideboarding / construct - mockcards problem. 2013-07-06 00:44:13 +02:00
LevelX2
0eaf9dd268 Some change to match timer (in progress). 2013-07-06 00:43:39 +02:00
Nicolas
ff5d16e132 Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-05 18:51:20 +02:00
LevelX2
f540e78045 Fixed some display problems with emblems and there abilities on the stack. 2013-07-05 18:49:42 +02:00
LevelX2
3b8a75588b Fixed a problem, that images of copied tokens were not shown. 2013-07-05 18:48:55 +02:00
Plopman
e3ab68bb37 Added M14 in ConstructedFormats 2013-07-05 18:48:40 +02:00
Plopman
d7f6084e4d Fixed Return from graveyard 2013-07-05 18:47:42 +02:00
Jeff
2a8e21fdb7 - Added Mage Slayer, Arsenal Thresher, and Sages of the Anima. 2013-07-05 09:21:15 -05:00
LevelX2
42dc0d142c Improved Emblem handling. Added a MageObjectType to CardView (in progress). 2013-07-05 15:29:55 +02:00
LevelX2
b586518bef * Venser, the Sojourner - Made target of first ability mandatory. 2013-07-05 15:28:40 +02:00
LevelX2
5897f764e5 Fixed a NPE bug when calling the test.dck. 2013-07-04 23:36:51 +02:00
LevelX2
c502abab75 [CHK] 6 cards with Splice onto Arcane. 2013-07-04 08:27:12 +02:00
LevelX2
9d5327da7a * Rag Dealer / Serene Reembrance - Fixed target handling for AI. 2013-07-04 08:26:26 +02:00
Plopman
f43b3d1ee2 Added "tapped" option for putOntoBattlefield. Fixed amulet of vigor 2013-07-03 21:24:47 +02:00
Plopman
ba09f43f56 Fixed pay life cost 2013-07-03 21:20:57 +02:00
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