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

31247 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
8db0c00b42 * Some comments removed. 2020-07-11 01:06:53 +02:00
LevelX2
89249888b5 * Added handling of triggered mana to available mana calculation (fixes #585). 2020-07-11 00:53:47 +02:00
jeffwadsworth
5be6e9398a - Fixed #6803 2020-07-10 16:14:05 -05:00
jeffwadsworth
4c34210d64 - Fixed #6821 2020-07-10 15:23:29 -05:00
jeffwadsworth
bb453de525 - Fixed #6813 2020-07-10 10:39:02 -05:00
jeffwadsworth
90987372b7 - Fixed #6817 2020-07-10 10:31:21 -05:00
jeffwadsworth
9b803cf833 - Fixed #6803 2020-07-10 09:43:51 -05:00
Oleg Agafonov
ac0bb713d7 * GUI: fixed auto-generated names for AI in new tournament dialog; 2020-07-10 17:57:56 +04:00
Oleg Agafonov
1cf57e0840 Fixed that AI can't play games in Jumptstart tourneys 2020-07-10 17:40:59 +04:00
Oleg Agafonov
c4f028ffa0 Prepare new release 2020-07-10 16:50:38 +04:00
Oleg Agafonov
06b6e482a0 * Exile and return to battlefield - fixed that some cards can return commander from command zone but they shouldn't (example: Cloudshift, Conjurer's Closet, see #5151, #5278); 2020-07-10 14:37:46 +04:00
Oleg Agafonov
589866c6a6 Fixed random test fail (Oath) 2020-07-10 14:34:18 +04:00
Oleg Agafonov
4598d7efb0 * Ice Cauldron - fixed rollback error on cast (#6815); 2020-07-10 12:04:29 +04:00
Oleg Agafonov
c011ff92ad GUI: fixed that jumpstart tournament don't show up in the tables list (#6816); 2020-07-10 11:51:26 +04:00
LevelX2
40b7d723ef * Some minor code clean up and a test. 2020-07-10 09:06:25 +02:00
Evan Kranzler
15719fea0f fixed Subira, Tulzidi Caravannder ability text 2020-07-09 20:12:34 -04:00
Oleg Agafonov
c73183edd7 Additional line endings fixes for #6812 2020-07-09 22:30:47 +04:00
Oleg Agafonov
cb574619cc
Merge pull request #6812 from arcox/unix-line-endings 
Update *.sh and *.java files to Unix line endings
 2020-07-09 20:21:09 +02:00
arcox
9c7982e8f6 Update *.sh and *.java files to use Unix line endings 2020-07-09 13:07:26 -04:00
jeffwadsworth
a6d03c925f - Fixed #6806 2020-07-09 11:10:28 -05:00
Eric Nelson
77eadf92a5
Fix Mudbutton Clanger (#6810) 
* Fix Mudbutton Clanger

Should get +1/+1 until end of turn, not +1/+1 counters.

* Update MudbuttonClanger.java

Fix imports.

* Update MudbuttonClanger.java

Also import Duration (and remove CounterType, which is no longer needed)
 2020-07-08 21:52:39 -04:00
Oleg Agafonov
cb3757d0db
Merge pull request #6795 from magefree/dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.2.0 
Bump build-helper-maven-plugin from 1.12 to 3.2.0
 2020-07-09 01:38:49 +02:00
Oleg Agafonov
8b1c353112 Merge remote-tracking branch 'origin/master' 2020-07-09 03:09:04 +04:00
Oleg Agafonov
6c3162f140 Optimized sql for deck editor 2020-07-09 03:08:44 +04:00
Oleg Agafonov
2ea614b978
Merge pull request #6756 from arcox/circling-vultures 
Implement Circling Vultures from WTH
 2020-07-09 00:44:39 +02:00
Oleg Agafonov
99ceeb5076 Tokens improves: 
* [M21] added tokens;
 * [M21] added tokens download support;
 * Fixed wrong images for some tokens (Angel, Beast, Bird, Cat, etc);
 2020-07-09 02:38:37 +04:00
arcox
4bcffe6bcb newline at eof 2020-07-08 18:27:49 -04:00
arcox
27af985288 Make Circling Vulture discard effect a special action without cost 2020-07-08 18:25:10 -04:00
Jakob
4dc99fbb58
Fixed Thousand-Year Storm and added hints to Aetherflux Reservoir and Sentinel Tower (#6645) 2020-07-08 11:10:09 -05:00
18ths
13f7f2a035 Revert "removed some of unused dependencies" 
This reverts commit d6ad722266.
 2020-07-08 17:16:16 +02:00
Evan Kranzler
e8649a226f removed temporary test skips 2020-07-08 10:03:30 -04:00
Oleg Agafonov
1db523518b
Merge pull request #6800 from gp66/iko-essence-symbiote 
Iko essence symbiote
 2020-07-07 21:22:56 +02:00
Oleg Agafonov
fba4f24061
Merge pull request #6799 from magefree/unused_dependencies 
removed some of unused dependencies
 2020-07-07 21:08:58 +02:00
gp66
a30e628b2d add essence symbiote 2020-07-07 13:41:24 -05:00
gp66
a5e3b93048 add essence symbiote 2020-07-07 13:35:47 -05:00
Oleg Agafonov
d9fef33b06 Additional fixes for #6785 (July 2020 Vintage Cube) 2020-07-07 22:12:02 +04:00
18ths
d6ad722266 removed some of unused dependencies 2020-07-07 20:11:45 +02:00
Oleg Agafonov
81452833f6
Merge pull request #6785 from aidan-coward/master 
Add July 2020 Vintage Cube decklist
 2020-07-07 20:08:46 +02:00
Oleg Agafonov
6b59fd6168
Merge pull request #6796 from magefree/dependabot/maven/com.sun.xml.bind-jaxb-impl-2.3.3 
Bump jaxb-impl from 2.3.2 to 2.3.3
 2020-07-07 20:06:50 +02:00
Oleg Agafonov
989bd4f98d
Merge pull request #6793 from magefree/dependabot/maven/org.jsoup-jsoup-1.13.1 
Bump jsoup from 1.11.3 to 1.13.1
 2020-07-07 20:05:25 +02:00
Oleg Agafonov
3544dc0e0e
Merge pull request #6792 from magefree/dependabot/maven/org.apache.commons-commons-lang3-3.10 
Bump commons-lang3 from 3.8.1 to 3.10
 2020-07-07 20:05:14 +02:00
18ths
543ac206be Added hint to monstrous. Fixes #6765 2020-07-07 17:57:25 +02:00
jeffwadsworth
181eb871fe - Fixed #6790 2020-07-07 10:34:09 -05:00
LevelX2
019bbafd20 * Aven Mimeomancer - Fixed that P/T setting persists after target zone change (fixes #6782). 2020-07-07 16:41:34 +02:00
dependabot[bot]
68cf61fc92
Bump jaxb-impl from 2.3.2 to 2.3.3 
Bumps jaxb-impl from 2.3.2 to 2.3.3.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-07 08:55:35 +00:00
dependabot[bot]
66e47d8910
Bump build-helper-maven-plugin from 1.12 to 3.2.0 
Bumps [build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) from 1.12 to 3.2.0.
- [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/build-helper-maven-plugin-1.12...build-helper-maven-plugin-3.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-07 08:55:33 +00:00
dependabot[bot]
17df993657
Bump jsoup from 1.11.3 to 1.13.1 
Bumps [jsoup](https://github.com/jhy/jsoup) from 1.11.3 to 1.13.1.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.11.3...jsoup-1.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-07 08:55:25 +00:00
dependabot[bot]
c149f4376c
Bump commons-lang3 from 3.8.1 to 3.10 
Bumps commons-lang3 from 3.8.1 to 3.10.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-07 08:55:24 +00:00
18ths
ba0bbd02e7
Update dependabot.yml 
fixed dependabot package-ecosystem
 2020-07-07 10:54:47 +02:00
18ths
091f7c5a42
Merge pull request #6786 from fearphage/dependabot 
Enable dependabot updates
 2020-07-07 10:44:51 +02:00