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

7573 commits

Author SHA1 Message Date
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
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
Oleg Agafonov
d97229cbcd Fix 2019-02-09 12:41:21 +04:00
Oleg Agafonov
7e4767fd30 Hints: removed duplicated hints from popup; 2019-02-09 12:28:29 +04:00
Oleg Agafonov
f341d35ece Hints: disable card hints in m15 render mode; 2019-02-09 12:00:24 +04:00
Jeff
24e24a968e - Added Phantasmal Sphere and Misfortune. 2019-02-08 17:25:28 -06:00
Oleg Agafonov
60a0ec03c0 Fixed NPE errors in canBlock restrict checks; 2019-02-09 02:48:11 +04:00
Oleg Agafonov
454d76e30b Fixed NPE errors in canAttack restrict checks; 2019-02-08 17:30:47 +04:00
Oleg Agafonov
dd2cf5a939 Added gate you control hint for cards; 2019-02-08 17:17:40 +04:00
Oleg Agafonov
0d4e6772ed Added ferocious hint for cards (you control reature with power 4); 2019-02-08 03:32:52 +04:00
Oleg Agafonov
1b32793388 Added restrict effect hints to permanents; 2019-02-08 03:08:28 +04:00
Oleg Agafonov
92ce8be91d Added hints to cards; 2019-02-07 15:21:01 +04:00
Oleg Agafonov
ae410d4d8d Added creatures you control hint 2019-02-07 03:55:30 +04:00
Oleg Agafonov
cb289b1b04 Refactor creature/s you control to use static filters and values 2019-02-06 21:28:26 +04:00
Jeff
e28bb36b72 - Fixed #5572. Reverted #5566. 2019-02-06 10:52:46 -06:00
Oleg Agafonov
f0c76eb529 Added spectacle hints to cards (opponents lost life) 2019-02-06 18:27:23 +04:00
Oleg Agafonov
283b101a08 Refactor OpponentsLostLifeCount to enum 2019-02-06 17:31:34 +04:00
Oleg Agafonov
d3f9e1d2f2 Refactor 2019-02-05 23:36:47 +04:00
Oleg Agafonov
4ffc40ff69 Added dynamic value hints for cards 2019-02-05 23:35:39 +04:00
Oleg Agafonov
6a7253d22f Added delirium hint as enum 2019-02-05 23:12:42 +04:00
Oleg Agafonov
0e61a0adeb Added city blessing hint as enum 2019-02-05 17:38:36 +04:00
Oleg Agafonov
043a7af086 Added condition hints with good/bad icons for cards 2019-02-05 13:05:10 +04:00
Oleg Agafonov
2a63314714 Added condition hints for cards 2019-02-05 02:43:13 +04:00
Oleg Agafonov
13ed3c6dbd Added static and colored hints for cards 2019-02-04 18:48:45 +04:00
Brik Royster
fce93c66e1 Fixed NullPointerException when Accursed Witch transforms (#5571) 
* Fixed NullPointerException when Accursed Witch transforms

Feedback issue: #5529
Aura replacement code tried to remove the second face from the original zone which had ownerId == null. Now, we remember the first face (the original card) and remove it from the old zone before creating a permanent out of the second face.

* Accursed Witch's death trigger now requires targetting opponent instead of using aura replacement effects

Feedback issue: #5529
Previously you could attach Infectious Curse to either player and get around hexproof
The ability text has also been updated to match the Oracle text of Accursed Witch.
 2019-02-03 19:40:46 -06:00
Oleg Agafonov
b36465e5c9 Refactor: removed unused custom set filters in SubType requests; 2019-02-04 00:53:51 +04:00
Oleg Agafonov
e9c6c4fefa Fixed that choose creature type dialog don't shows custom sets (#5569) 2019-02-04 00:51:35 +04:00
Ingmar Goudt
2cd9e25229 better use of the CardsImpl constructor 2019-02-03 21:08:31 +01:00
Evan Murawski
5fe5fd01c3 Replace single slash with double slash in split card names when importing with TxtDeckImporter.java 2019-02-02 18:43:11 -05:00
Evan Murawski
ec02774818 Replace single slash with double slash in split card names when importing with TxtDeckImporter.java 2019-02-02 18:41:56 -05:00
Ingmar Goudt
dc112215d4 change looping over maps (Sonar) 2019-02-02 22:37:02 +01:00
Ingmar Goudt
63718e7a6e Sonar fixes 
remove the deprecated GameState.getWatchers()
 2019-02-02 22:09:55 +01:00
Jeff
cd23125664 - Fixed #5566 2019-02-01 10:04:46 -06:00
Oleg Agafonov
0697cbe24c UI: added draft rating column to deck editor 2019-02-01 18:57:24 +04:00
Oleg Agafonov
7eba755666 Refactor card ratings, fixed rare error exception "comparison method violates its general contract" (different ratings in same card); 2019-02-01 17:41:29 +04:00
Evan Kranzler
c46b268819 Implemented Energy Vortex 2019-01-30 16:28:26 -05:00
Oleg Agafonov
53f4241518 Fixed NPE error on empty library 2019-01-30 20:38:53 +04:00
Jeff
3595a7fa79 - Fixed #5560. Eventually I will get to the other similar effects. 2019-01-29 16:13:27 -06:00
Evan Kranzler
f4401b32f9 fixed High Alert allowing opposing defenders to attack 2019-01-28 18:58:02 -05:00
Oleg Agafonov
d18325b268 Missing from last release 2019-01-27 22:19:35 +04:00
Evan Kranzler
22971b63fa fixed Benthic Biomancer triggered ability being optional 2019-01-27 10:49:13 -05:00
L_J
7ffbb939a1
Implemented Brine Hag, Venarian Gold, Wall of Shadows 2019-01-27 08:55:39 +01:00
jeffwadsworth
d07415e08c - Fixed #5440 2019-01-26 16:19:44 -06:00
Evan Kranzler
9a5ac6a848 fixed several of my old implementations 2019-01-26 14:19:19 -05:00
Evan Kranzler
bd652632f9 various em dash text fixes 2019-01-26 13:44:39 -05:00
Evan Kranzler
34e3bb42db fixed Rhythm of the Wild not giving Riot to creatures that weren't cast 2019-01-25 10:32:29 -05:00
Jeff
e1292a0ea3 - Fixed #5547 #5546 2019-01-24 11:58:13 -06:00
Oleg Agafonov
d25bca748d Fixed Arrays.asList code 2019-01-23 19:15:03 +04:00
Evan Kranzler
9b94b27e54 updated Flagbearer ability to reflect rules change 2019-01-22 19:13:21 -05:00
Evan Kranzler
1431e69b43 updated some oracle text 2019-01-22 19:07:15 -05:00
Oleg Agafonov
8e84df23b7 Prepare new release 2019-01-22 18:32:51 +04:00
Jeff
1ef5d878c6 - added some null checks. #5537 2019-01-21 10:33:42 -06:00
Oleg Agafonov
ff5839860e Improved target messages for users: added extra hints; 
Applied Biomancy - added target's choose hints;
 2019-01-21 12:53:02 +04:00
LevelX2
678118c79d * Fixed a problem with commander game resatrt from Karn Liberated. 2019-01-20 19:40:38 +01:00
LevelX2
fa859a6bfd * Aftermath - Fixed that aftermath cards were no longer castable from graveyard (fixes #5539). 2019-01-20 19:39:40 +01:00
Evan Kranzler
6466acb70a fixed Growth-Chamber Guardian not triggering when it enters with counters 2019-01-20 11:28:22 -05:00
L_J
fe3cafc121
Merge pull request #5473 from Zzooouhh/Zzooouhh-urza 
Implemented Urza, Academy Headmaster
 2019-01-20 08:44:24 +01:00
Evan Kranzler
fa0e295932 updated Ajani's Pridemate to reflect recent errata 2019-01-17 17:40:15 -05:00
Ingmar Goudt
dbdd9c00a3 Merge branch 'master' of https://github.com/magefree/mage 2019-01-17 18:22:19 +01:00
Ingmar Goudt
8a05db7fd8 small text fix 2019-01-17 18:22:07 +01:00
Evan Kranzler
908d8acc9f
Merge pull request #5532 from magefree/coinFlips 
Added support for multiple copies of Krark's Thumb
 2019-01-17 11:12:02 -05:00
Evan Kranzler
cbc814d38e some log message changes 2019-01-17 10:57:53 -05:00
Evan Kranzler
837503d8f4 reworked coin doubling again for some reason 2019-01-17 10:32:02 -05:00
Ingmar Goudt
7c2f55eda0 couple of sonar fixes 2019-01-17 12:03:22 +01:00
Evan Kranzler
1144bf3b4f finished adding support for multiple copies of Krark's Thumb 2019-01-16 18:20:36 -05:00
Evan Kranzler
21d7bef21f fixed Domri, Chaos Bringer's emblem not triggering 2019-01-16 15:24:16 -05:00
Evan Kranzler
b21f60bc0f
Merge pull request #5531 from magefree/master 
merge
 2019-01-16 15:12:30 -05:00
Evan Kranzler
74c1cbf6d9 begin fix for multiple copies of Krark's Thumb 2019-01-16 15:11:14 -05:00
Oleg Agafonov
975cff93e3 Merge remote-tracking branch 'origin/master' 2019-01-16 21:04:00 +04:00
Oleg Agafonov
14f66029f8 Missing v33 commit 2019-01-16 20:59:45 +04:00
Evan Kranzler
63fb5964d4
Merge pull request #5527 from magefree/coinFlips 
Fixing coin flip implementation (WIP - Do Not Merge)
 2019-01-16 11:44:01 -05:00
Oleg Agafonov
68177b9fe4 Fixed SacrificeTargetCost text 2019-01-16 05:52:19 +04:00
Evan Kranzler
335dab7160 fixed broken tests 2019-01-15 19:43:41 -05:00
Evan Kranzler
c34f611279 updated Krark's Thumb, still doesn't work in multiples 2019-01-15 16:55:45 -05:00
Evan Kranzler
57a362ae29 updated abilities which trigger off of a coin flip 2019-01-15 16:16:56 -05:00
Evan Kranzler
535fe221e3 rewrote how coins are flipped 2019-01-15 15:56:40 -05:00
Jeff
da3fdee621 - more text fixes 2019-01-15 11:07:53 -06:00
Evan Kranzler
f5fffcf417 initial refactor 2019-01-15 11:51:49 -05:00
Oleg Agafonov
1d43b38a5f Karn Liberated - fixed watchers errors on game restart ability 2019-01-15 20:48:21 +04:00
Jeff
14018a4004 - little text fix for OneOrMoreCountersAddedTriggeredAbility 2019-01-15 08:59:24 -06:00
jeffwadsworth
efe0c222c4 - little text fix on AfterlifeAbility 2019-01-15 02:28:52 -06:00
Oleg Agafonov
0b648343bc Fixed AddCountersTargetEffect text for cards with target pointers (#5523) 2019-01-14 11:37:02 +04:00
Ingmar Goudt
4e4d46437c update riot test 2019-01-14 00:18:21 +01:00
Ingmar Goudt
3b5b535de1 change Riot option to +1/+1 counter 2019-01-13 23:15:01 +01:00
Ingmar Goudt
1eb668b608 fix tooltip for Gate Colossus, update the Riot ability choose popup 2019-01-13 23:12:14 +01:00
Evan Kranzler
fd7b8f29ca made many dynamicvalues into singleton enums 2019-01-12 21:29:02 -05:00
L_J
23456d4fce
Implemented more Legends cards 2019-01-13 02:14:58 +01:00
Ingmar Goudt
661eae6d1f exclude one 2019-01-13 00:20:34 +01:00
Ingmar Goudt
5759957aad fix generating text for Priest Of Forgotten Gods 2019-01-12 23:56:57 +01:00
Ingmar Goudt
c1f9586948 Add a space in the generated rules text 2019-01-12 23:27:54 +01:00
Evan Kranzler
0ca71a2616 fixed Sentinel's Mark trigger 2019-01-12 17:25:34 -05:00
Evan Kranzler
0311ca8c6e fixed Mass Manipulation targeting issues 2019-01-12 17:18:31 -05:00
Evan Kranzler
8629977f14 refactored many other predicates to singleton enums 2019-01-12 16:30:49 -05:00
Evan Kranzler
dc409c9a9e refactored ColorlessPredicate to singleton enum 2019-01-12 16:15:19 -05:00
Evan Kranzler
e6b99215e1 refactored AnotherPredicate to singleton enum 2019-01-12 16:12:51 -05:00
Evan Kranzler
92b5535a0e fixed an issue with cost adjusters 2019-01-12 15:48:52 -05:00
Evan Kranzler
3483b3a181
Merge branch 'targetAdjustment' into master 2019-01-12 14:42:58 -05:00
Oleg Agafonov
2f32951707 Domri, Chaos Bringer - fixed wrong emblem creature; 2019-01-12 23:09:44 +04:00
Oleg Agafonov
1b55cbd44c [RNA] added tokens and download support from scryfall; 2019-01-12 21:13:56 +04:00
Evan Kranzler
581db3d6e0 Implemented Tin Street Dodger 2019-01-12 10:19:54 -05:00
LevelX2
0e19ffd173 * Fixed a problem with TapEnchantedEffect that could cause cast exceptions (fixes #5509). 2019-01-12 15:18:53 +01:00
L_J
bec74bbd4a
Added missing Legends counters 2019-01-12 11:51:22 +01:00
Jeff
da7b91095c - correct spelling 2019-01-11 16:23:30 -06:00
Evan Kranzler
f239e8dd44 Implemented Haazda Officer 2019-01-11 15:09:57 -05:00
Oleg Agafonov
c3848b7530
Merge pull request #5503 from hitch17/add-cockatrice-deck-format-5493 
Adding o8d deck format.
 2019-01-11 08:14:38 +04:00
John Hitchings
1e6e279bc8 Merge branch 'add-cockatrice-deck-format-5493' of github.com:hitch17/mage into add-cockatrice-deck-format-5493 2019-01-10 19:40:54 -08:00
John Hitchings
aac3e3fdc1 add importer for o8d and some more decks to test. 2019-01-10 19:33:42 -08:00
Oleg Agafonov
8f0351896c
Merge pull request #5502 from ZeldaZach/address_mage_stuff 
Address Json Tests
 2019-01-11 07:24:56 +04:00
Oleg Agafonov
11f93cf762
Merge pull request #5501 from hitch17/add-cockatrice-deck-format-5493 
UI: add cockatrice deck format support for import (*.cod)
 2019-01-11 07:17:48 +04:00
Zach Halpern
163a5e45d3 update wordings so they are not blank 2019-01-10 22:14:29 -05:00
Zach Halpern
1712b05c33 Merge branch 'master' into address_mage_stuff 2019-01-10 21:35:12 -05:00
Zach Halpern
8a5f2288f9 Address crash points of JSON tests 2019-01-10 21:27:38 -05:00
Evan Kranzler
7a89d22880 Implemented Sphinx of the Guildpact 2019-01-10 19:05:38 -05:00
Ingmar Goudt
d5003a6f8f add null check 2019-01-11 01:04:34 +01:00
Ingmar Goudt
d7e68cf932 clean up cipherEffect 2019-01-11 01:02:45 +01:00
Evan Kranzler
88374751b1 Implemented Forbidding Spirit 2019-01-10 18:08:35 -05:00
Evan Kranzler
acf34f9429 Implemented Plaza of Harmony 2019-01-10 17:59:47 -05:00
Evan Kranzler
3ff26721e8 Implemented Charging War Boar 2019-01-10 17:01:26 -05:00
John Hitchings
5bf748e2b5 Move tests to the Mage directory and stub out looking up cards by names for tests. 2019-01-10 11:04:00 -08:00