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

28619 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Agafonov
42658d5cff UI: added mulligan option to new tournament dialog, added mulligan type saving; 2019-03-23 05:49:21 +04:00
Oleg Agafonov
b925977efd Fixed new table/tournament dialogs compatibility with NetBeans editor; 2019-03-23 05:07:05 +04:00
Oleg Agafonov
3330680e81
Merge pull request #5644 from hitch17/additional-mulligan-support-5600 
Additional mulligan support #5600
 2019-03-22 22:48:18 +01:00
Jeff
f7557d76f4 - Fixed #5647 2019-03-22 15:29:47 -05:00
Oleg Agafonov
270ec615af Sync old changes 2019-03-22 21:51:26 +04:00
Oleg Agafonov
caf1a98759 * UI: added deck export to MTG Arena format (#4243); 2019-03-22 20:33:36 +04:00
Oleg Agafonov
dc0da80d82 * UI: added deck export to clipboard (#4243); 2019-03-22 20:14:24 +04:00
Oleg Agafonov
b26132f300 Fixed text deck import (empty lines); 2019-03-22 20:12:35 +04:00
Oleg Agafonov
a2feda38ce Fixed mtgo deck export (sorting, empty lines); 2019-03-22 20:12:06 +04:00
Oleg Agafonov
4fde77b05e * UI: added paste button to import from clipboard dialog; 2019-03-22 18:22:07 +04:00
Oleg Agafonov
e471fc9888 UI: improved import from clipboard dialog and fixed compatibility with NetBeans; 2019-03-22 08:04:28 +04:00
Jeff
263c9acfcc - Fixed #5538 and #5629 2019-03-21 16:21:46 -05:00
Oleg Agafonov
04cb20f46a UI: improved deck editor exports: 
* added deck export to files (#4243);
 * fixed wrong card sorting in deck files after save (#3719);
 2019-03-21 19:17:41 +04:00
John Hitchings
1ca876c2ed Fixed LondonMulligan to give mulligan choice after discarding to bottom, which fixes the interaction with Serum Powder. 2019-03-20 23:23:28 -07:00
Oleg Agafonov
8b5993805a * UI: improved deck editor buttons and dialogs, prepared for export; 2019-03-21 05:20:57 +04:00
Oleg Agafonov
b848bbfb65 Fixed broken Deck Editor form -- now it's possible to load and edit by NetBeans 2019-03-21 00:11:17 +04:00
John Hitchings
47c9aab877 Merge branch 'master' into additional-mulligan-support-5600 2019-03-19 23:39:39 -07:00
John Hitchings
f7d785e406 Add rules comments and handle mulliganing to less than 0 cards for London. 2019-03-19 23:32:18 -07:00
John Hitchings
d77ad0ce1f Add mulligan tests. 2019-03-19 23:31:22 -07:00
Ingmar Goudt
75dbdbdd32 initial rewrite for copy method 2019-03-19 23:35:38 +01:00
Jeff
f74e4118e0 - Fixed #5641 2019-03-19 16:39:10 -05:00
Jeff
468ad04255 - Fixed #5640 2019-03-19 15:01:31 -05:00
Oleg Agafonov
a50884f31d * Images - fixed token images source from tokens.mtg.onl 2019-03-19 23:20:17 +04:00
Oleg Agafonov
a260030069 Fix tests 2019-03-19 21:44:06 +04:00
Jeff
3b142d7e79 - Fixed #5634 2019-03-19 08:39:36 -05:00
John Hitchings
4a232b148c Add mulligan options to NewTableDialog, passing mulligan information to games. 2019-03-19 06:08:12 -07:00
Oleg Agafonov
ae5cdad951 * Jango Fett - fixed wrong damage ability instead boost; 2019-03-19 09:13:41 +04:00
Oleg Agafonov
7140a41445
Merge pull request #5636 from hitch17/deck-exporters 
Refactor Sets.saveDeck into a deck exporter series of classes.
 2019-03-19 03:32:54 +01:00
Oleg Agafonov
490d207efe Tests: added checks that planeswalkers must be legendary; 2019-03-19 06:27:55 +04:00
Oleg Agafonov
e5759127ac
Merge pull request #5639 from rscoates/master 
Add Legendary SuperType to Star Wars Planeswalkers
 2019-03-19 03:26:31 +01:00
Oleg Agafonov
1b4f126026 * Bull Rancor - fixed missing trample ability; 2019-03-19 06:07:03 +04:00
Richard Coates
c154a44bcf
Update AurraSingBaneOfJedi.java 
Added import Supertype.
 2019-03-18 23:38:39 +01:00
Richard Coates
025f1f37a4
Update YodaJediMaster.java 
Added import supertype.
 2019-03-18 22:58:17 +01:00
Richard Coates
72a792f829
Update DarthSidiousSithLord.java 
Added import supertype.
 2019-03-18 22:57:57 +01:00
Richard Coates
e4feb29322
Update ObiWanKenobi.java 
Added import supertype
 2019-03-18 22:57:28 +01:00
Richard Coates
00ce434b6d
Update DarthTyranusCountOfSerenno.java 
Added Supertype import.
 2019-03-18 22:56:33 +01:00
Richard Coates
053d6e25ea
Update YodaJediMaster.java 
Added Legendary Supertype
 2019-03-18 22:45:39 +01:00
Richard Coates
a85ed75c2d
Update DarthSidiousSithLord.java 
Added Legendary Supertype
 2019-03-18 22:44:34 +01:00
Richard Coates
6029808a27
Update ObiWanKenobi.java 
Added Legendary Supertype
 2019-03-18 22:43:53 +01:00
Richard Coates
7c6d8c4211
Update DarthTyranusCountOfSerenno.java 2019-03-18 22:43:10 +01:00
Richard Coates
a894e98342
Update AurraSingBaneOfJedi.java 
Add Legendary to Aurra Planeswalker
 2019-03-18 22:42:00 +01:00
Richard Coates
e1ffbd56e2
Merge pull request #1 from magefree/master 
Merge from Master
 2019-03-18 22:40:50 +01:00
Jeff
a5197ec954 - Fixed the emblem of Garruk, Apex Predator. 2019-03-18 15:23:13 -05:00
Jeff
68181515de - Fixed #5638 2019-03-18 14:23:35 -05:00
Ingmar Goudt
bcf02e692c rewrite to immutable list builder 2019-03-18 16:28:00 +01:00
Ingmar Goudt
72c8c267a1 move Google Guava to mage-root pom in dependencyManagement, so other modules can use it 2019-03-18 15:48:35 +01:00
Jeff
efb357747d - Fixed #5637 2019-03-18 09:18:39 -05:00
Ingmar Goudt
b638ef4fad delete old performance debug code 2019-03-18 12:54:19 +01:00
John Hitchings
7885a42168 Refactor mulligans out of GameImpl and add Paris, Vancouver, London, and Canadian Highlander. Refactor GameImpls to use their specific mulligan. 2019-03-17 23:23:52 -07:00
Oleg Agafonov
2a0d2d125b * UI: fixed error message window for long text (auto-size), improved wrong version message; 2019-03-18 09:00:27 +04:00