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

16326 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
LevelX2
9cf9d69c55 Fixed minor problem of Volrath's Laboratory. Added combat flag to LIFE_LOST event. 2016-09-28 08:00:32 +02:00
fireshoes
9676f24752 Added some promo cards. 2016-09-27 21:05:38 -05:00
spjspj
bc5a53632f Merge pull request #2395 from Fr33dan/master 
Fix Fairgrounds Trumpeter triggering only on controller's end step.
 2016-09-28 09:42:05 +10:00
LevelX2
68464198dc Fixed minor problem of Volrath's Laboratory. 2016-09-28 00:08:04 +02:00
LevelX2
923f4a1bb5 [SWS] Fixed Sith Ravager, added missing import to Maintenance Hangar. 2016-09-28 00:05:13 +02:00
Fr33dan
6898313f0f Fix Fairgrounds Trumpeter triggering only on controller's end step. 2016-09-27 18:01:27 -04:00
Clint Herron
a363749b2f Tabs and spaces once again. 2016-09-27 15:53:25 -04:00
Clint Herron
73235fad37 Attempting to implement Riptide Replicator. 2016-09-27 15:52:56 -04:00
Lymia Aluysia
bd1f7dd32a
Merge branch 'master' of https://github.com/magefree/mage 2016-09-27 11:25:48 -05:00
LevelX2
05f6224f8b Merge origin/master 2016-09-27 17:32:07 +02:00
LevelX2
4619f45771 [SWS] Fixed No Contest. 2016-09-27 17:31:26 +02:00
spjspj
d2f560ba24 Merge pull request #2390 from spjspj/master 
spjspj - Fix Maintenance Droid
 2016-09-28 01:10:59 +10:00
spjspj
6eead24f0a spjspj - Fix Maintenance Droid 2016-09-28 01:09:54 +10:00
spjspj
62ba94e721 Merge pull request #2389 from spjspj/master 
spjspj - Implement Jango Fett (SWS - Custom set)
 2016-09-28 01:01:23 +10:00
spjspj
a6028f2e76 spjspj - Implement Jango Fett (SWS - Custom set) 2016-09-28 01:00:24 +10:00
LevelX2
2c0234d842 Merge pull request #2388 from Eirkei/HeadGamesJestersMaskImplemented 
Head Games and Jester's Mask implemented
 2016-09-27 16:24:00 +02:00
Eirkei
871e9741c0 Jester's Mask Implemented 2016-09-27 15:50:17 +02:00
Eirkei
92dbc55379 Head Games Implemented 2016-09-27 15:49:58 +02:00
Eirkei
840e55b949 effect for "Target opponent puts the cards from his or her hand on top of his or her library. Search that player's library for that many cards. The player puts those cards into his or her hand, then shuffles his or her library" 2016-09-27 15:49:41 +02:00
LevelX2
a5b1db4ec1 [SWS] Fixed Ravenous Wampa and casting cost of Gamorream Enforcer. 2016-09-27 15:44:00 +02:00
LevelX2
91aa36e707 [SWS] Fixed Ravenous Wampa and casting cost of Gamorream Enforcer. 2016-09-27 15:43:55 +02:00
LevelX2
33bc95082c [SWS] Implemented Sabacc Game, Fixed A-Wing. 2016-09-27 12:35:22 +02:00
LevelX2
86f2007945 Merge pull request #2384 from Styxo/master 
Star Wars Set implemented
 2016-09-27 11:30:08 +02:00
spjspj
240c7950d0 Merge pull request #2386 from spjspj/master 
spjspj - Add in energy/experience counters
 2016-09-27 17:50:26 +10:00