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

32263 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Chevalier
21c80a3caa Effects.java: remove redundant check. When in the else part, the lastRule already is guaranteed to not end on a dot 2020-08-31 13:54:09 +02:00
Bruno Chevalier
9b89eecab5 S3Uploader.java: Remove redundant null check 2020-08-31 13:50:23 +02:00
LevelX2
61315ec741 * Improved some FixedTarget initializations. 2020-08-31 10:54:59 +02:00
LevelX2
50668a548f * FixedTarget - Added check for missing init of zoneChangeCounter on use of getFirstTargetPermanentOrLKI (this fixes the problem with missing counter for Pelt Collector). 2020-08-31 10:54:08 +02:00
Bruno Chevalier
1dccb62d10 Rename BasicSaheekiSublimeArtificerTest.java to BasicSaheeliSublimeArtificerTest.java 2020-08-31 10:51:24 +02:00
Oleg Agafonov
eb442d22f5
Merge pull request #7029 from magefree/dependabot/maven/com.google.apis-google-api-services-gmail-v1-rev20200824-1.30.10 
Bump google-api-services-gmail from v1-rev20190120-1.28.0 to v1-rev20200824-1.30.10
 2020-08-31 09:31:51 +02:00
Oleg Agafonov
f8a686a61f
Merge pull request #7000 from magefree/dependabot/maven/org.apache.shiro-shiro-core-1.6.0 
Bump shiro-core from 1.4.2 to 1.6.0
 2020-08-31 09:31:27 +02:00
Oleg Agafonov
5a5c7f6224
Merge pull request #6998 from magefree/dependabot/maven/com.github.os72-protoc-jar-maven-plugin-3.11.4 
Bump protoc-jar-maven-plugin from 3.6.0.1 to 3.11.4
 2020-08-31 09:31:20 +02:00
Oleg Agafonov
9488d6f3a3
Merge pull request #6975 from magefree/dependabot/maven/junit-junit-4.13 
Bump junit from 4.13-beta-2 to 4.13
 2020-08-31 09:31:07 +02:00
LevelX2
bbf30c6f74
Merge pull request #7026 from acabaca24/branch-for-issue6643 
Duplicated code in "return to its owner's hand" effect
 2020-08-31 09:18:10 +02:00
dependabot[bot]
ddc971a167
Bump google-api-services-gmail 
Bumps google-api-services-gmail from v1-rev20190120-1.28.0 to v1-rev20200824-1.30.10.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-31 06:31:29 +00:00
André Cabaça
7926c7c7d7
Missing 's' in effect 
In the line 'sb.append(" to their owners' hand");' changed "hand" to "hands".
 2020-08-31 00:56:30 +01:00
LevelX2
5eea756e28 * Fixed a bug that prevented to display some triggered abilities (concerning human players) to select the order they are going to the stack. 2020-08-30 14:10:24 +02:00
Andre Cabaca
36a3008f4c Optimized "Return to hand" effect text 
Signed-off-by: Andre Cabaca <andre.cabaca24@gmail.com>
 2020-08-30 12:49:24 +01:00
Andre Cabaca
0f6b8bbe9e Fixing an issue with the "return to its owner's hand" that was duplicating the target text. 
Signed-off-by: Andre Cabaca <andre.cabaca24@gmail.com>
 2020-08-30 11:54:13 +01:00
LevelX2
323b4f8880 * Fixed wrong Kard name in MTGO Legacy Cube July 2019 (Kozilek, Butcher of Truth), added a test. 2020-08-30 12:07:23 +02:00
LevelX2
905458e473 * Lurrus of the Dream-Den - Fixed that it was also possible to cast non permanent spells. 2020-08-30 11:37:19 +02:00
Oleg Agafonov
6b457f5265 Prepare new release 2020-08-30 00:05:03 +04:00
Oleg Agafonov
7b19956bb1
Merge pull request #7003 from ketsuban/war-of-the-spark-mythic-edition 
Update Mythic Edition set with War of the Spark cards
 2020-08-29 21:36:43 +02:00
Oleg Agafonov
0cad4acf31
Merge pull request #7017 from acabaca24/branch-for-issue6643 
Correcting some M21 text issues
 2020-08-29 21:34:59 +02:00
Oleg Agafonov
1967f9f6fa * GUI: added Historic set filter in deck editor; 2020-08-29 23:32:37 +04:00
Oleg Agafonov
29242ec759 * Monarch designations - improved effects stability after game rollback or in AI games; 2020-08-29 21:21:13 +04:00
Oleg Agafonov
e1c7943636 * God-Eternal dies abilities - fixed rollback error in rare cases 2020-08-29 21:17:06 +04:00
Oleg Agafonov
87d8383eb8 * Undercity Reaches - fixed rollback error on plane's draw trigger 2020-08-29 20:40:02 +04:00
Oleg Agafonov
30fe344e23 Test framework: added planes support in tests (command: addPlane) 2020-08-29 20:38:57 +04:00
Oleg Agafonov
d9344093dd
Merge pull request #7021 from magefree/pvs-studio-2020-fixes 
Fixes from pvs-studio's article
 2020-08-29 17:18:19 +02:00
Oleg Agafonov
ede06098e0 Fixed typos in tests and additional refactor 2020-08-29 19:04:26 +04:00
Oleg Agafonov
4d8369afbc Fixed missing special rare cards from Dragon's Maze boosters; 2020-08-29 18:15:33 +04:00
Oleg Agafonov
ab8a4eb26a Little fixes and code refactor 2020-08-29 18:09:44 +04:00
Oleg Agafonov
c67e937dfb GUI: fixed wrong options in download images dialog for some sources 2020-08-29 18:07:14 +04:00
LevelX2
f819340297 * Added Entwine Test. 2020-08-28 17:17:02 +02:00
LevelX2
c47bb347f1 * Vesuvan Shapeshifter - Fixed that creature with hexproof could not be selected to copy. 2020-08-28 15:47:12 +02:00
LevelX2
83ac7f7bc2 * Nim Deathmantle - Fixed that creature was not returned to battlefield (fixes #7018). 2020-08-28 13:46:21 +02:00
LevelX2
cd5c1c282c * Angel of Jubilation - Fixed possible Null Pointer Exception in Player.canPayLifeCost method (fixed #7019). 2020-08-28 09:26:38 +02:00
Oleg Agafonov
8419b67caa Updated readme file (more resources, removed outdated links) 2020-08-28 09:01:00 +04:00
Oleg Agafonov
d515bedd42 Updated readme file (added faq section, updated card stats, improved formatting) 2020-08-28 08:41:55 +04:00
Oleg Agafonov
a0c16dc4e1 Added charset check and hint in startup logs (related to #7020) 2020-08-28 08:34:01 +04:00
Oleg Agafonov
b610d0a31a Added default charset information in startup logs 2020-08-28 07:33:42 +04:00
Andre Cabaca
1e889c6a6d Fixed KaervekTheSpiteful's oracle in #6643 
Signed-off-by: Andre Cabaca <andre.cabaca24@gmail.com>
 2020-08-27 20:23:42 +01:00
Andre Cabaca
c069cf4235 Fixed Caged Zombie in issue #6643 
Fixed also cards with the same condition in an activated ability like Skirsdag High Priest

Signed-off-by: Andre Cabaca <andre.cabaca24@gmail.com>
 2020-08-27 20:23:41 +01:00
Andre Cabaca
219cfdc583 Fixed BarrinTolarianArchmage oracle in #6643 
Fixed all the "return up to one (...) to **their** owners and" to "return up to one (...) to **its** owners and" found in cards like Teferi Time Raveler or Barrin Tolarian Archmage

Signed-off-by: Andre Cabaca <andre.cabaca24@gmail.com>
 2020-08-27 20:23:39 +01:00
Evan Kranzler
57dba8c02a updated a few cards which replace draws and which draw and reveal 2020-08-27 12:48:21 -04:00
Evan Kranzler
f4da18df89 [ZNR] Implemented Nahiri, Heir of the Ancients 2020-08-27 12:07:43 -04:00
Oleg Agafonov
278e316e27 Merge fix 2020-08-27 15:54:53 +04:00
Oleg Agafonov
95b61c081a Fixed wrong card numbers in SLD 2020-08-27 15:52:32 +04:00
LevelX2
e32396bbb6
Merge pull request #6991 from acabaca24/equipped_creature_dies_errata 
Changed description of "when equipped creature dies"
 2020-08-27 08:50:05 +02:00
Evan Kranzler
233c67cebe fixed verify error 2020-08-26 19:53:12 -04:00
Evan Kranzler
f1272ee8ac fixed a few more errors 2020-08-26 19:28:12 -04:00
Evan Kranzler
cc84efa017 fixed an error 2020-08-26 18:57:35 -04:00
Evan Kranzler
6903dad861 Implemented Jace, Mirror Mage 2020-08-26 18:48:59 -04:00