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

32152 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ingmar Goudt
51af4e7e1d new m21 tests, tests failing for Conspicuous Snoop and Chandras Magmutt. New testmethods: assertTopCardRevealed and assertAbilityCount that can check on a ability class 2020-07-28 21:22:36 +02:00
LevelX2
307d4a6283 Merge origin/master 2020-07-28 16:31:46 +02:00
LevelX2
9903944804 * Reworked retrieving spell characteristics (related to 98ebcc07ca). 2020-07-28 16:29:44 +02:00
LevelX2
c1ac2ac6ae * Conduit of Ruin - Fixed a problem with the spell cost reduction not working (#6698). 2020-07-28 16:28:23 +02:00
Oleg Agafonov
a5a5256cff Code cleanup 2020-07-28 18:15:32 +04:00
LevelX2
af5a0bb405 * Fixed available mana generation of Jungle Patrol, Kydele Chosen of Kruphix, Kykar Winds Fury and Mana Cache (#6698). 2020-07-28 14:41:49 +02:00
LevelX2
0458778c44 * Fixed bug of Druids Repository (related to b5c93cf2da), 2020-07-28 13:28:24 +02:00
LevelX2
7e771a2fc3 * Changes to execute stop assert and execute assert again a single test (e.g. druidsRepositoryTest()). 2020-07-28 13:27:31 +02:00
jeffwadsworth
2665cf2eb6 - Fixed #6855. There are other examples of this issue that will be fixed as well. 2020-07-27 20:52:31 -05:00
jeffwadsworth
72b1cb549e - Fixed #6855. There are other examples of this issue that will be fixed as well. 2020-07-27 20:50:40 -05:00
Oleg Agafonov
8c5b2b6e01 Added comments for some dependency usage (#6799) 2020-07-28 05:30:31 +04:00
Oleg Agafonov
93182913d0
Merge pull request #6902 from ketsuban/unesh 
Fix Unesh, Criosphinx Sovereign
 2020-07-28 03:21:45 +02:00
Thomas Winwood
2d8853b977 Address review comments 2020-07-28 02:06:50 +01:00
Oleg Agafonov
02aa3b333f Removed db-files from client distribution; 2020-07-28 04:56:33 +04:00
Oleg Agafonov
f986bd69a4
Merge pull request #6896 from magefree/dependabot/maven/com.google.code.gson-gson-2.8.6 
Bump gson from 2.8.5 to 2.8.6
 2020-07-28 02:38:39 +02:00
Oleg Agafonov
fc1e0806c4
Merge pull request #6897 from magefree/dependabot/maven/com.google.oauth-client-google-oauth-client-java6-1.31.0 
Bump google-oauth-client-java6 from 1.28.0 to 1.31.0
 2020-07-28 02:38:30 +02:00
Oleg Agafonov
0eb9f458b7
Merge pull request #6898 from magefree/dependabot/maven/org.xerial-sqlite-jdbc-3.32.3.1 
Bump sqlite-jdbc from 3.25.2 to 3.32.3.1
 2020-07-28 02:38:14 +02:00
Oleg Agafonov
0689cfee14
Merge pull request #6899 from magefree/dependabot/maven/org.ocpsoft.prettytime-prettytime-4.0.5.Final 
Bump prettytime from 4.0.2.Final to 4.0.5.Final
 2020-07-28 02:37:58 +02:00
Oleg Agafonov
fdc32f891e * Raid abilities - added card hints about raid condition, fixed missing ability words; 2020-07-28 04:25:43 +04:00
Oleg Agafonov
3810a6230d Tests: fixed random fail (if player got Entreat the Dead on the draw) 2020-07-28 03:59:52 +04:00
LevelX2
b5c93cf2da * Fixed available mana generation of Druids Repository, Workhouse, Iceberg, Krak Clan Ironworks, Rasputin Dreamweaver and Sirk Prospector (#6698). 2020-07-28 01:03:33 +02:00
LevelX2
82a9726a35 * Fixed available mana generation of Virdian Joiner (#6698). 2020-07-27 23:50:07 +02:00
LevelX2
8e27ca31cd * Fixed available mana generation of Gemstone Array, Pentad Prism and 
Utopia Mycon (#6698).
 2020-07-27 23:00:39 +02:00
Thomas Winwood
a2fbfa87bc Fix Unesh, Criosphinx Sovereign 
Unesh incorrectly defaulted to the first opponent in multiplayer rather
than letting the player choose an opponent.
 2020-07-27 21:33:58 +01:00
LevelX2
82dfd76ee3 * Fervent Champion - Fixed that it's possible to equip the Champion also without having the regular mana (#6698). 2020-07-27 22:27:11 +02:00
LevelX2
6e68e038b6 * Bartered Cow - Fixed that it does nothing when discarded (fixes #6884). 2020-07-27 21:47:31 +02:00
LevelX2
f297f78cbc Merge origin/master 2020-07-27 18:57:08 +02:00
Oleg Agafonov
96155ec799 Cheat engine: fixed that it doesn't init effects and other staff from battlefield permanents (#6888); 2020-07-27 20:46:21 +04:00
LevelX2
7d7defe2c3 * Obosh, the Preypiercer - Fixed that the damage doubling was always done (fixes #6871). 2020-07-27 16:46:52 +02:00
LevelX2
e5529d5835 * Demon's Horn - Added test (#6890). 2020-07-27 16:02:05 +02:00
LevelX2
8402c6afb1 * Norn' s Annex - Updated test. 2020-07-27 12:49:58 +02:00
dependabot[bot]
fd79906b06
Bump sqlite-jdbc from 3.25.2 to 3.32.3.1 
Bumps [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.25.2 to 3.32.3.1.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](https://github.com/xerial/sqlite-jdbc/compare/3.25.2...3.32.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 09:47:56 +00:00
dependabot[bot]
62d563b11f
Bump prettytime from 4.0.2.Final to 4.0.5.Final 
Bumps [prettytime](https://github.com/ocpsoft/prettytime) from 4.0.2.Final to 4.0.5.Final.
- [Release notes](https://github.com/ocpsoft/prettytime/releases)
- [Changelog](https://github.com/ocpsoft/prettytime/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/ocpsoft/prettytime/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 09:47:56 +00:00
dependabot[bot]
ed616e1b07
Bump google-oauth-client-java6 from 1.28.0 to 1.31.0 
Bumps [google-oauth-client-java6](https://github.com/googleapis/google-oauth-java-client) from 1.28.0 to 1.31.0.
- [Release notes](https://github.com/googleapis/google-oauth-java-client/releases)
- [Changelog](https://github.com/googleapis/google-oauth-java-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-oauth-java-client/compare/v1.28.0...v1.31.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 09:47:53 +00:00
dependabot[bot]
525654392c
Bump gson from 2.8.5 to 2.8.6 
Bumps [gson](https://github.com/google/gson) from 2.8.5 to 2.8.6.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.5...gson-parent-2.8.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 09:47:50 +00:00
Oleg Agafonov
c709aa038e
Merge pull request #6895 from magefree/dependabot/maven/com.amazonaws-aws-java-sdk-s3-1.11.827 
Bump aws-java-sdk-s3 from 1.11.498 to 1.11.827
 2020-07-27 11:31:22 +02:00
Oleg Agafonov
df5a1307bd
Merge pull request #6894 from magefree/dependabot/maven/com.google.protobuf-protobuf-java-4.0.0-rc-2 
Bump protobuf-java from 3.7.0-rc1 to 4.0.0-rc-2
 2020-07-27 11:23:14 +02:00
Oleg Agafonov
c17b0e88ae
Merge pull request #6893 from magefree/dependabot/maven/org.reflections-reflections-0.9.12 
Bump reflections from 0.9.11 to 0.9.12
 2020-07-27 11:20:41 +02:00
Oleg Agafonov
b46f3a1754
Merge pull request #6891 from magefree/dependabot/maven/org.glassfish.jaxb-jaxb-runtime-2.3.3 
Bump jaxb-runtime from 2.3.2 to 2.3.3
 2020-07-27 11:06:27 +02:00
dependabot[bot]
7dc4d2eb79
Bump aws-java-sdk-s3 from 1.11.498 to 1.11.827 
Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.498 to 1.11.827.
- [Release notes](https://github.com/aws/aws-sdk-java/releases)
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.11.498...1.11.827)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 06:44:10 +00:00
dependabot[bot]
cc66aeeb9b
Bump protobuf-java from 3.7.0-rc1 to 4.0.0-rc-2 
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.7.0-rc1 to 4.0.0-rc-2.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.7.0rc1...v4.0.0-rc2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 06:44:07 +00:00
dependabot[bot]
21d4a4b6a8
Bump reflections from 0.9.11 to 0.9.12 
Bumps [reflections](https://github.com/ronmamo/reflections) from 0.9.11 to 0.9.12.
- [Release notes](https://github.com/ronmamo/reflections/releases)
- [Commits](https://github.com/ronmamo/reflections/compare/0.9.11...0.9.12)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 06:44:03 +00:00
dependabot[bot]
402ef6c232
Bump jaxb-runtime from 2.3.2 to 2.3.3 
Bumps jaxb-runtime from 2.3.2 to 2.3.3.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 06:43:58 +00:00
Ingmar Goudt
134bb63185 add m21 tests for B 2020-07-26 12:32:21 +02:00
LevelX2
7a78be8c6a * Some target pointer changes and code clean up. 2020-07-26 00:16:14 +02:00
Ingmar Goudt
142681c354 new m21 tests 2020-07-25 23:49:58 +02:00
Ingmar Goudt
ffb649b414 Merge branch 'master' of https://github.com/magefree/mage 2020-07-25 22:22:07 +02:00
Ingmar Goudt
40f73375da add comments, strictmode and assertAllCommandsUsed to m21 tests 2020-07-25 22:21:53 +02:00
LevelX2
85d18899b1 * Fixed a problem that conditional mana could not be correctly used with AsThoughEffects (fixes #6880). 2020-07-25 22:11:30 +02:00
jeffwadsworth
202e25208e - Fixed text Feedback. 2020-07-25 10:11:42 -05:00