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

7768 commits

Author SHA1 Message Date
Evan Kranzler
7cea71d6f2
Merge branch 'master' into master 2019-04-20 08:52:33 -04:00
Oleg Agafonov
08616b6ec9 * Mind's Desire - improved exile windows; 2019-04-20 09:00:04 +04:00
Oleg Agafonov
8db2e63ae4 Fixed error with card texts 2019-04-19 19:35:16 +04:00
Oleg Agafonov
03795f1aae * Fixed AI game freeze on choose new targets (#5023); 2019-04-19 18:57:36 +04:00
Evan Kranzler
a2592ef36e implemented Sarkhan the Masterless 2019-04-19 08:36:52 -04:00
Oleg Agafonov
7912d217cb
Merge pull request #5714 from ketsuban/alliances 
Implement some Alliances cards
 2019-04-19 14:25:43 +02:00
antonig@sas.upenn.edu
fcf3fb672b implemented and tested Finale of Devastation. 2019-04-19 02:42:30 -04:00
Oleg Agafonov
ec202e1bc3 Fixed proliferate texts 2019-04-19 09:24:22 +04:00
Oleg Agafonov
ac286a586d Fixed mode text, added 4 modes support; 2019-04-19 09:03:16 +04:00
Oleg Agafonov
03b28cfc1c Fixed amass text 2019-04-19 08:40:35 +04:00
Evan Kranzler
41acfbb2fd Implemented Planewide Celebration 2019-04-18 22:26:36 -04:00
Evan Kranzler
d2a74e9062 Implemented Ugin, the Ineffable 2019-04-18 19:51:25 -04:00
Evan Kranzler
45526c5cc9 Implemented God-Eternal Oketra 2019-04-18 08:08:25 -04:00
Oleg Agafonov
184af3f681 * Fixed AI game freeze on put cards to library (#5023); 2019-04-18 15:46:48 +04:00
Oleg Agafonov
886b96072e God-Eternal Bontu - fixed game freeze with NPE error 2019-04-18 08:44:44 +04:00
Evan Kranzler
e6138d7e7f Implemented Finale of Glory 2019-04-17 18:27:44 -04:00
Evan Kranzler
892a39a2ed Implemented Huatli, Heart of the Sun 2019-04-16 08:47:38 -04:00
Oleg Agafonov
108fba8ab6 Firemind Vessel - fixed AI game freeze, improved choose logic (#5023); 2019-04-16 10:52:48 +04:00
Evan Kranzler
fe83f6ac25 Implemented The Elderspell 2019-04-15 19:14:09 -04:00
Evan Kranzler
254972be77 Implemented Ashiok, Dream Render 2019-04-15 14:10:06 -04:00
LevelX2
c1b2ffdaa7 Merge origin/master 2019-04-14 19:19:25 +02:00
LevelX2
8c11ab8505 * Some minor rule text fixes to WAR cards. 2019-04-14 19:18:46 +02:00
Oleg Agafonov
688a3fa516 * Fixed AI game freeze on random targets selection (#5023); 2019-04-14 18:52:09 +04:00
Evan Kranzler
a4d035100c fixed Revel of the Fallen God creating incorrect tokens (fixes #5715) 2019-04-13 20:59:14 -04:00
Thomas Winwood
fad76ba4e0 Implement Rogue Skycaptain 2019-04-14 01:47:40 +01:00
Evan Kranzler
0b11df3a00 broke out LookAtTopCardOfLibraryAnyTimeEffect into its own class 2019-04-13 15:03:54 -04:00
Evan Kranzler
c780838d29 Implemented God-Eternal Rhonas 2019-04-13 13:15:39 -04:00
Evan Kranzler
b28bef8f62 Implemented Nissa, Who Shakes the World 2019-04-13 12:56:33 -04:00
Evan Kranzler
15d389a5ba Implemented Tamiyo, Collector of Tales 2019-04-13 12:01:31 -04:00
Evan Kranzler
09bf817f1a Implemented God-Eternal Bontu 2019-04-13 11:02:01 -04:00
Oleg Agafonov
bd06d3df51
Merge pull request #5711 from hitch17/draft-log-deck-importer 
Ability to import draft logs as decks.
 2019-04-13 05:23:33 +02:00
Oleg Agafonov
ba54654ac1 * UI: added support to import deck without card amount numbers (txt-format and clipboard); 2019-04-13 05:48:04 +04:00
John Hitchings
61d40902ab Ability to import draft logs as decks. 2019-04-11 22:27:21 -07:00
Oleg Agafonov
35f705e07b Fixed copy 2019-04-12 08:53:58 +04:00
Oleg Agafonov
9eb8dd6ce5 * Delve ability - improved text; 2019-04-12 08:45:12 +04:00
Evan Kranzler
708b1a6dc9 Implemented Gideon's Company 2019-04-11 22:05:56 -04:00
Evan Kranzler
785917deb6 Implemented Chandra, Fire Artisan 2019-04-10 16:14:34 -04:00
Jeff
59deea27e3 - added message to inform players of a Proliferate event. 2019-04-09 11:55:19 -05:00
Evan Kranzler
ed2612e01a Implemented Tolsimir, Friend to Wolves 2019-04-09 10:55:14 -04:00
Jeff
6e681ab615 - Fixed #5697 2019-04-09 09:50:48 -05:00
Oleg Agafonov
42f5847ba7
Merge pull request #5694 from ketsuban/unglued 
Implement two Unglued cards
 2019-04-09 03:31:19 +02:00
Evan Kranzler
7e2724ed59 Implemented Kasmina, Enigmatic Mentor 2019-04-08 18:26:19 -04:00
Thomas Winwood
4881b8b08b Set customSet=true for Lady of Proper Etiquette type 2019-04-08 19:24:42 +01:00
Evan Kranzler
53fbe7e502 updated WAR booster checking to guarantee exactly one walker in every pack 2019-04-08 13:43:28 -04:00
Oleg Agafonov
98f29f7c8a * UI: increased richman draft time limits from 75->25 to 70->40 (#5672); 2019-04-08 20:59:03 +04:00
Oleg Agafonov
7a556ea58f * UI: added save/load packs list in random/richman mode (#5672); 2019-04-08 20:15:34 +04:00
Thomas Winwood
44214d65fc Implement Miss Demeanour 2019-04-08 05:10:32 +01:00
Evan Kranzler
36f5fd365e Implemented Tenth District Legionnaire 2019-04-05 20:14:50 -04:00
Evan Kranzler
ec9b6ac135 Implemented Courage in Crisis 2019-04-05 14:18:39 -04:00
Evan Kranzler
2ec5a47f05 Merge branch 'master' of https://github.com/magefree/mage 2019-04-05 08:00:33 -04:00
Oleg Agafonov
57283c3cca * UI: fixed infinite popup messages about illegal action while skip button activated (#4685); 2019-04-05 13:11:27 +04:00
Evan Kranzler
0b703b1be0 Implemented Role Reversal 2019-04-04 22:15:33 -04:00
Evan Kranzler
997bf86f20 small change to last update 2019-04-03 11:21:30 -04:00
Evan Kranzler
e0ce04c436 updated damage triggers to include planeswalker damage 2019-04-03 11:18:11 -04:00
Oleg Agafonov
6c3b48b2a7 [WAR] - added token image; 2019-04-03 13:02:21 +04:00
Oleg Agafonov
3ca57533b5 Fixed wrong class package, pom config and broken code (visual studio code compatibility) 2019-04-03 02:45:52 +04:00
Evan Kranzler
25627183a2
Merge pull request #5671 from ketsuban/proliferate 
Proliferate now doesn't choose a type of counter
 2019-04-02 08:14:33 -04:00
Thomas Winwood
be2898d2f9 Proliferate now doesn't choose a type of counter 2019-04-02 03:46:15 +01:00
Evan Kranzler
3e18305890 Implemented Angrath's Wrath 2019-04-01 22:44:38 -04:00
Evan Kranzler
86f651b871 Implemented Teyo, the Shieldmage 2019-04-01 19:03:25 -04:00
Evan Kranzler
7fec2e9837 Implemented Davriel, Rogue Shadowmage 2019-04-01 18:52:22 -04:00
Evan Kranzler
9b43285df4 Implemented The Wanderer 2019-04-01 16:32:57 -04:00
Oleg Agafonov
ef4c223bcf * Jace's Archivist - fixed AI freeze the game (#5023); 2019-04-01 21:52:11 +04:00
Thomas Winwood
dfcb795ada Implement some WAR cards 2019-04-01 18:33:16 +01:00
Jeff
8fea509ed7 - little text fix. 2019-04-01 11:48:33 -05:00
Oleg Agafonov
de4befb9c2 * Sideboarding: fixed that it possible to auto-submit 40 cards deck instead 60 in constructed formats (#5579); 
Sideboarding: fixed that cheated deck with sideboard can be used instead lose the game;
 2019-04-01 07:34:46 +04:00
Evan Kranzler
3dd6836559 Implemented Vraska, Swarm's Eminence 2019-03-31 20:13:39 -04:00
Evan Kranzler
54a1010c36 updated WAR details 2019-03-31 17:59:28 -04:00
Evan Kranzler
c4efb77e1f Implemented Tibalt, Rakish Instigator 2019-03-31 16:02:37 -04:00
Evan Kranzler
fb20ac0998 Implemented Dreadhorde Invasion 2019-03-31 13:32:34 -04:00
Evan Kranzler
ffef19fe43 Implemented Invade the City 2019-03-31 12:43:00 -04:00
Evan Kranzler
bebc8a8ac4 implemented Herald of the Dreadhorde 2019-03-31 12:29:23 -04:00
Oleg Agafonov
b8782d572d Tests: added test to check copy() methods removes; 2019-03-30 20:26:35 +04:00
Oleg Agafonov
6f4d000518
Merge pull request #5643 from magefree/copy-rewrite 
initial rewrite for copy method
 2019-03-30 11:45:57 +01:00
Oleg Agafonov
65bb9b2161 Prepare new release 1.4.34 2019-03-29 18:31:00 +04:00
Oleg Agafonov
ff640a942e UI: improved skips and stops for declare blocker step: 
* added options to STOP skip on any or zero blockers available;
 * added auto-stop before declare blockers step (e.g. user can cast instants and crew abilities);
 2019-03-29 18:10:00 +04:00
Oleg Agafonov
893e9384b1 * Urza, Academy Headmaster - fixed that it freeze the game (#5589); 2019-03-28 19:59:38 +04:00
Jeff
5a3fd7c558 - Added requested card Mercadian Lift. 2019-03-27 15:48:05 -05:00
Jeff
07adaa06ab - Fixed #5654 2019-03-25 11:02:37 -05:00
Oleg Agafonov
70f41c7807 Little fixes 2019-03-23 15:44:55 +04:00
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
3330680e81
Merge pull request #5644 from hitch17/additional-mulligan-support-5600 
Additional mulligan support #5600
 2019-03-22 22:48:18 +01: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
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
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
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
Ingmar Goudt
75dbdbdd32 initial rewrite for copy method 2019-03-19 23:35:38 +01:00
Oleg Agafonov
a260030069 Fix tests 2019-03-19 21:44:06 +04:00
John Hitchings
4a232b148c Add mulligan options to NewTableDialog, passing mulligan information to games. 2019-03-19 06:08:12 -07: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
Jeff
a5197ec954 - Fixed the emblem of Garruk, Apex Predator. 2019-03-18 15:23:13 -05: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
410fd68996 Fixed that triggered abilities shows cancel button in target definition; 2019-03-18 06:10:08 +04:00
John Hitchings
0ea73b19df Refactor Sets.saveDeck into a deck exporter series of classes. 2019-03-17 14:58:05 -07:00
Oleg Agafonov
83d8f5a538 * UI: improved mulligan dialog with color, added free mulligan info in game log; 2019-03-17 06:11:20 +04:00
Oleg Agafonov
bf2861c309 * UI: improved skip buttons and preferences: 
* added new setting for STACK skip button: stops on full empty stack (default) or on new objects added;
 * added new dynamic hints for skip buttons to see current settings and modes;
 * fixed that some skip buttons not de-activated after goal was achieved;
 * fixed wrong default render mode for cards, MTGO must be default (#4409);
 2019-03-17 04:38:31 +04:00
Ingmar Goudt
c4eeec1bb2 changed the constructor for a Watcher. Before, you had to explictly pass the name of the watcher as an argument. But most of the time this was the name of the class itself. So the watcher now determines internally its name. The method 'getBasicKey' can be overridden. Also updated some encapsulation 2019-03-16 08:35:26 +01:00
Jeff
5c1f41f3a7 - First steps towards fixing Phased/Phased indirectly permanents. 2019-03-15 10:01:02 -05:00
Oleg Agafonov
b6f075c505 * UI: added drag & drop text to deck editor (like drag & drop deck file); 2019-03-13 04:21:31 +04:00
Jeff
678f77c2a3 - little spelling fix 2019-03-12 11:43:16 -05:00
Oleg Agafonov
0f4c6c0260 Improved scry and surveils text dialog; 2019-03-11 18:18:40 +04:00
Jeff
c784753ee6 - little fixes. #5625 2019-03-11 08:50:05 -05:00
Oleg Agafonov
3fb18b334d * Tap cost abilities - added cancel button; 2019-03-11 02:04:49 +04:00
Oleg Agafonov
dab481ee17 * UI: added cancel button for all target definition abilities; 2019-03-10 23:31:11 +04:00
Oleg Agafonov
904660e624 Fixed freeze while disconnects on choose target and card in library dialogs; 2019-03-10 16:04:25 +04:00
Oleg Agafonov
9d5fade2fb * Abilities with sacrifice cost - added cancel button to sacrifice target dialog; 2019-03-10 15:55:33 +04:00
Oleg Agafonov
b432b4b431 Fixed freeze and npe error while disconnects on choose target dialog; 2019-03-10 15:53:53 +04:00
Oleg Agafonov
83afca8bda * Crew ability - added selected and needed power info while choosing, colorozing; 2019-03-10 15:33:04 +04:00
Oleg Agafonov
e08fe53672
Merge pull request #5612 from hitch17/dnd-deck-lists 
Ability to drag-and-drop decklists onto DeckEditorPanel in deck editor.
 2019-03-08 01:03:07 +01:00
Oleg Agafonov
fa75ac2727 Typo fix 2019-03-07 12:14:27 +04:00
Jeff
5220e44b16 - little fixes 2019-03-06 17:11:45 -06:00
Oleg Agafonov
e68b79336a Typo fix 2019-03-06 14:06:47 +04:00
Jeff
26fd9f6088 - Fixed #5614 2019-03-04 17:38:52 -06:00
Ingmar Goudt
553d263526 add missing diamond operators 2019-03-04 11:57:53 +01:00
Ingmar Goudt
45f665eb1d Sonar cleanups 03032019 2019-03-04 10:43:20 +01:00
Oleg Agafonov
d9fb1d3706 Prepare hotfix release 2019-03-04 06:47:30 +04:00
Oleg Agafonov
f0e56ae71c Merge fix 2019-03-04 05:18:56 +04:00
Oleg Agafonov
e30eecead3 Refactor set's legality, Modern Horizons now available for modern formats; 2019-03-04 04:49:49 +04:00
Oleg Agafonov
6bfea7bfd9 Fixed NPE error in momir emblem; 2019-03-04 03:07:29 +04:00
Oleg Agafonov
8df43cfbb6 Refactor set's legality 2019-03-04 02:31:51 +04:00
John Hitchings
13efdd5b0b Ability to drag-and-drop decklists onto DeckEditorPanel in deck editor. 2019-03-03 13:48:51 -08:00
Ingmar Goudt
8319fbf9ad replace public fields with encapsulation 2019-03-03 09:51:14 +01:00
Evan Kranzler
1724a13f44 Implemented Serra the Benevolent 2019-03-01 19:41:57 -05:00
Oleg Agafonov
d76c764d64 Fixed wrong date format on client/server databases; 2019-03-01 21:59:14 +04:00
Oleg Agafonov
842d3d2ba1 Prepare new release 2019-03-01 20:12:21 +04:00
Oleg Agafonov
f788af1f6a * Improved connection performance on new release, no more empty cards on startup; 2019-03-01 18:55:20 +04:00
Oleg Agafonov
6846db75f4 * Fixed cards with skip untap optional ability that cause game freezes (#5606) 2019-03-01 18:10:32 +04:00
Ingmar Goudt
132e322d6e fix NPE, both spellAbility and spellAbility.getTarget could be null. resolves #5599 2019-02-24 08:13:28 +01:00
Ingmar Goudt
59f8c94af7 nullpointer fix, resolves issue #5602 2019-02-24 08:06:27 +01:00
Ingmar Goudt
3359c1f3f1 sonar 220219, criticals 2019-02-22 12:06:11 +01:00
Ingmar Goudt
c45fe5c701 rename from battlefield to graveyard event comparing to .isDiesEvent 2019-02-20 10:20:07 +01:00
Ingmar Goudt
056226d83c Sonar fixes 19022019 2019-02-19 21:51:45 +01:00
Oleg Agafonov
8cf681dff2 Updated libraries to latest versions and code compatibility fixes; 2019-02-17 16:12:57 +04:00
Oleg Agafonov
971a98061d Fixed SQL errors on non escaped symbols in usernames/emails/passwords; 2019-02-17 16:09:00 +04:00
Ingmar Goudt
f2c64629a5 couple of Sonar fixes 2019-02-15 13:31:10 +01:00
Jeff
ac4e51ce0d - Fixed Rivals' Duel 2019-02-13 10:19:07 -06:00
Oleg Agafonov
f778d95f54 Prepare next release 2019-02-09 17:42:46 +04:00
Oleg Agafonov
00ad61b6bd Added new Mythic Edition (MED) set (16 cards, scryfall download) 2019-02-09 16:45:27 +04:00
Oleg Agafonov
c29b68f030 Disabled cards rating and classes preloading on startup (lags problem); 2019-02-09 16:09:07 +04:00
Oleg Agafonov
e285b2770d * Curse cards - fixed that it triggers on planeswalker attack only (#5566); 2019-02-09 15:40:23 +04:00
Oleg Agafonov
c6f0239bcd
Merge pull request #5570 from EvanMurawski/splitcardimport 
Recognize split card names in mtggoldfish format
 2019-02-09 14:46:21 +04:00
Oleg Agafonov
c52a3c8a48
Merge pull request #5580 from magefree/5497-dynamic-hints-for-cards 
UI: Add dynamic hints for cards
 2019-02-09 14:44:42 +04:00