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

16750 commits

This branch
This branch
All branches
Author SHA1 Message Date
JOAC69
adf9c1bfe0 Refactor - changed SnappingDrake and EagleOfTheWatch to only derive from one version for card reorg 2016-09-29 19:58:11 -05:00
JOAC69
671fca15d6 Refactor - changed visibility of effects that would class on card reorg 2016-09-29 19:58:11 -05:00
JOAC69
15478460f9 Refactor - changed visibility of DragonToken classes used in separate Card classes in prep for card reorg 2016-09-29 19:58:11 -05:00
JOAC69
0d3b18c70d Refactor - Changed visibility of HellionToken classes used in separate Card classes in prep for card reorg 2016-09-29 19:58:11 -05:00
JOAC69
ecde8dd0b3 Refactor - remove duplicate SkeletonToken classes 2016-09-29 19:58:11 -05:00
JOAC69
a9e479f7dd Refactor - made card specific effects to attack random opponent shared effects 2016-09-29 19:58:11 -05:00
JOAC69
568044261c Refactor - remove duplicate TargetPlayerCardsInHand classes and made CardsInTargetHandCount shared 2016-09-29 19:58:11 -05:00
JOAC69
4cd4dbfcd2 Refactor - rename different empblems that were named the same 2016-09-29 19:58:11 -05:00
JOAC69
3e2c3a6ab2 Refactor - Rename Override card class to OverrideCard to not conflict with java.lang.Override. 2016-09-29 19:58:11 -05:00
JOAC69
d1f18ced96 Refactor - remove duplicate CantBeBlockedByWallsEffect and replace with CantBeBlockedByCreatureAttachedEffect 2016-09-29 19:58:11 -05:00
JOAC69
d4f8224ee9 Refactor - remove duplicate DamageCantBePreventedEffect classes 2016-09-29 19:58:11 -05:00
JOAC69
541c9727ff Refactor - remove duplicate AdditionalAttackPhaseEffect classes 2016-09-29 19:58:11 -05:00
LevelX2
ca414417e3 [SWS] Fixed some bugs of starwars cards. 2016-09-30 01:22:56 +02:00
LevelX2
81b74c1519 [SWS] Fixed a bug of Hungry Dragonsnake. 2016-09-29 18:00:00 +02:00
LevelX2
daf34c6bf0 Some fixes to Emblems of Starwars set and Elspeth, Sun Champion. 2016-09-29 17:31:20 +02:00
LevelX2
3516dc75e4 Updated POM to use Java 8. Updated some tool versions in the POMs. 2016-09-29 16:21:32 +02:00
LevelX2
ca39289a3a Fixed a possible null pointer exception. 2016-09-29 16:20:29 +02:00
LevelX2
e49c92e80c Added "E" to the to be replaced symbols with icon in rule text. 2016-09-29 16:20:13 +02:00
spjspj
6ad012fa87 Merge pull request #2405 from spjspj/master 
spjspj - Player Panel
 2016-09-29 23:05:47 +10:00
spjspj
1bbed6dc5f spjspj - Player Panel 2016-09-29 23:03:57 +10:00
Lymia Aluysia
09cc9646a0
Remove outdated comment. 2016-09-29 06:48:22 -05:00
Lymia Aluysia
da5abfe42d
Improved .gitignore 2016-09-29 06:13:23 -05:00
Lymia Aluysia
9a14265528
Removed db/* and mageclient.log files from base directory. 2016-09-29 06:09:08 -05:00
LevelX2
289606d25e Some minor fixes to Riptide Replicator and Elvish Guidance. 2016-09-29 12:58:56 +02:00
LevelX2
cd1832ecc4 Merge pull request #2393 from HanClinto/master 
Implementing Riptide Replicator
 2016-09-29 12:52:33 +02:00
LevelX2
152a4439ca Merge pull request #2404 from Eirkei/ElvishGuidanceImplemented 
Elvish Guidance Implemented
 2016-09-29 12:52:02 +02:00
Eirkei
762e034244 Elvish Guidance Implemented 2016-09-29 12:16:00 +02:00
spjspj
52f6d36063 Merge pull request #2403 from spjspj/master 
spjspj - Player Panel *fix offset of {W}*
 2016-09-29 17:39:51 +10:00
spjspj
fa627a3efb spjspj - Player Panel *fix offset of {W}* 2016-09-29 17:33:22 +10:00
Mark Langen
a018f2021b Fixed a bug with JFileChooser in the DeckEditorPanel 
* On specific platforms (it seems Windows 7-10, JRT 7+), under our specific configuration, in the case where the user selects the exact same file as they chose during a previous selection, JFileChooser reports that the user selected a file, but returns chosen file = null. This commit works around that by assuming they chose the same file as last time in that case.
 2016-09-28 23:27:46 -06:00
Mark Langen
615b93f8c3 Finished the new Drag & Drop deck view. It is currently implemented in main deck editor, and limited deck construction. 
Still to do:
* Integrate it into the draft view
 2016-09-28 20:57:23 -06:00
Mark Langen
56a3c6dc8c Mostly working Drag n Drop deck editor 
* Still trying to iron out how to signal back events from cards moving between different drag and drop targets to the DeckEditorPane
 2016-09-28 20:57:22 -06:00
Mark Langen
3c2c793f5d Drag n Drop Deck Editor WIP 
* Working standalone proof-of-concept application in DragCardGrid.

* Still needs listener functionality in order to integrate it into the existing DeckEditorPanel class.
 2016-09-28 20:57:22 -06:00
Mark Langen
2d55ccc73c Change "Ask for graveyard order" setting to not ask by default 
* The cases where graveyard order matters are so staggeringly few that that the setting should almost certainly default to false.
 2016-09-28 20:57:21 -06:00
LevelX2
814f4b4989 * Karn Liberated - Fixed that also already dead players were alive if Karn restarted the game. 2016-09-29 00:38:16 +02:00
LevelX2
1066472491 * Fixed a bug that modal spells did not work correctly (fixes #2397). 2016-09-28 23:31:52 +02:00
LevelX2
a5af6c3a1d Minor rework of transform. 2016-09-28 22:37:20 +02:00
LevelX2
b6816e1374 Fixed one missing change of transform rework. 2016-09-28 19:04:55 +02:00
LevelX2
d7408a4531 Merge origin/master 2016-09-28 18:08:47 +02:00
LevelX2
8564ebbbc5 * Reworked some parts of transform handling. 2016-09-28 18:08:10 +02:00
LevelX2
210bbeeda7 [SWS] Fixed March of the Droids. 2016-09-28 18:07:55 +02:00
spjspj
90b9c620ff Merge pull request #2400 from spjspj/master 
spjspj - Implement Grand Moff Tarkin (SWS)
 2016-09-29 02:04:28 +10:00
spjspj
3ad68f0697 spjspj - Implement Grand Moff Tarkin (SWS) 2016-09-29 02:03:34 +10:00
LevelX2
86648c7190 * Reworked some parts of transform handling. Fixes #2396. 2016-09-28 17:02:37 +02:00
Lymia Aluysia
e57da7598e
Merge branch 'master' of https://github.com/magefree/mage 2016-09-28 09:27:06 -05:00
spjspj
f0e08a0801 Merge pull request #2399 from spjspj/master 
spjspj - Further changes to height of Player Panel.
 2016-09-28 23:28:06 +10:00
spjspj
458cbfa71a spjspj - Further changes to height of Player Panel. 2016-09-28 23:27:15 +10:00
spjspj
e7b4c62cf3 Merge pull request #2398 from spjspj/master 
spjspj - Make zero values less noticeable on player panel
 2016-09-28 22:59:39 +10:00
spjspj
5b941d4c5e spjspj - Make zero values less noticeable on player panel 2016-09-28 22:58:55 +10:00
LevelX2
c703ebaa9d Reworked Hate condition. 2016-09-28 08:30:31 +02:00