Commit graph

35545 commits

Author SHA1 Message Date
Phred Lane
998decd179
Merge branch 'master' into github-actions 2021-10-03 22:38:20 -05:00
Phred
5477846059
copying the Travis CI setup 2021-10-03 22:37:05 -05:00
Phred
d6699f62f0
disable jacoco.skip for testing step 2021-10-03 15:19:56 -05:00
Phred
44c4a0a40f
disabled actions/setup-java cache 2021-10-03 14:54:17 -05:00
Phred
0454fbead8
added verify phase 2021-10-03 12:34:37 -05:00
Phred
f05ba1e265
removed duplicate define 2021-10-03 12:17:44 -05:00
Oleg Agafonov
abdccf97da Dev: updated some libs to latest version; 2021-10-03 18:40:24 +04:00
Oleg Agafonov
58ab020065 Dev: pom clean up, improved parent/child structure; 2021-10-03 18:11:56 +04:00
Phred
b12e08453d
removed debug 2021-10-03 07:49:27 -05:00
Phred
bf5423cb6d
removed mvn clean 2021-10-03 07:46:59 -05:00
Alex W. Jackson
20fda878cd Fixed #8361 2021-10-03 06:11:25 -04:00
Oleg Agafonov
dc593b41b5
Github: added code coverage badge by sonarcloud 2021-10-03 11:42:03 +04:00
Phred
ae10901796
added jacoco.skip=false 2021-10-02 22:38:37 -05:00
Phred
7f2f6964f9
try reporting to coveralls 2021-10-02 22:21:16 -05:00
Alex W. Jackson
7dd0ba5ce1
Fixed #8173 and #8357 (#8358) 2021-10-02 13:07:09 -04:00
Evan Kranzler
b5033a3b7a updated various ban lists 2021-10-02 10:26:39 -04:00
Oleg Agafonov
08407eef25 Dev: migrated to single logger lib (replaced slf4j usage by log4j), clean up and documented pom files, updated some libs; 2021-10-02 11:09:09 +04:00
Jeff Wadsworth
16d20e73d2 - Fixed #8344. Works when blinked as well. 2021-10-01 17:03:54 -05:00
Jeff Wadsworth
c45f8c91a3 - Fixed #8329 2021-10-01 15:56:40 -05:00
Oleg Agafonov
074f26d199
Merge pull request #8351 from magefree/dependabot/maven/com.sun.xml.bind-jaxb-impl-3.0.2
Bump jaxb-impl from 2.3.3 to 3.0.2
2021-10-01 22:22:45 +04:00
Oleg Agafonov
93bc20ee5a
Merge pull request #7945 from magefree/dependabot/maven/com.j256.ormlite-ormlite-jdbc-5.6
Bump ormlite-jdbc from 5.1 to 5.6
2021-10-01 22:09:57 +04:00
Oleg Agafonov
af4b8e6eb6 Merge fix 2021-10-01 21:55:25 +04:00
Oleg Agafonov
301539d75b Server improves:
* Server: improved messages on register/reset dialogs;
* Tests: added database compatible tests on new code or libs (auth db);
2021-10-01 21:52:09 +04:00
Daniel Bomar
ec87af8d9a
[MIC] Implemented Ghouls' Night Out (#8345)
* [MIC] Implemented Ghouls' Night Out

* [MIC] Ghouls' Night Out - Made requested changes
2021-10-01 10:54:18 -05:00
Oleg Agafonov
1c6eb10bd1 Dev: migrated to single json lib (removed json-simple from deck import code), clean up guava lib usage in cards; 2021-10-01 17:57:54 +04:00
Phred
591d772654
removed parallelism from install 2021-10-01 06:35:58 -05:00
Oleg Agafonov
fa70af6131 Dev: removed test data from resources to data folder; 2021-10-01 14:10:39 +04:00
dependabot[bot]
4e6de42e71
Bump jaxb-impl from 2.3.3 to 3.0.2
Bumps jaxb-impl from 2.3.3 to 3.0.2.

---
updated-dependencies:
- dependency-name: com.sun.xml.bind:jaxb-impl
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 09:43:33 +00:00
Oleg Agafonov
c899c332b8 Dev: updated json lib, added tests; 2021-10-01 13:41:54 +04:00
Alex W. Jackson
fa29b8a2a2 Implement collation for Modern Masters (2013) and Eternal Masters 2021-10-01 02:10:39 -04:00
Evan Kranzler
1b36053b17 [AFC] added passing and failing tests for Belt of Giant Strength (#8347) 2021-09-30 20:46:03 -04:00
Evan Kranzler
7b1e3fae7b [MIC] Implemented Wall of Mourning 2021-09-30 08:52:24 -04:00
Evan Kranzler
f47aea4fba [MIC] Implemented Kurbis, Harvest Celebrant 2021-09-30 08:32:27 -04:00
Alex W. Jackson
b7c78d0758
Implement booster collation for DOM, WAR and MID (#8346) 2021-09-30 08:10:46 -04:00
Oleg Agafonov
30ec52a4f2 * GUI: improved connection dialog (removed ping popups in register/new dialog, fixed app freeze on register, etc); 2021-09-30 13:40:14 +04:00
Daniel Bomar
4943a16464
Merge pull request #8330 from weirddan455/prevent-damage
Removed game.preventDamage method (fixes #8280)
2021-09-29 15:32:50 -05:00
Jeff Wadsworth
970125c5c4 - small refactor Foretell ability 2021-09-29 09:45:08 -05:00
Oleg Agafonov
7d92ad45d9 Dev: updated zip libs 2021-09-29 17:06:18 +04:00
Alex W. Jackson
5044a8c603
Implement booster collation for Shards of Alara, Zendikar and Scars of Mirrodin (#8316) 2021-09-29 09:04:53 -04:00
Alex W. Jackson
edbb99f0ba
Implement booster collation for (original) Innistrad and Dark Ascension (#8339) 2021-09-29 09:03:46 -04:00
Oleg Agafonov
f9beed6a89 Dev: clear pom files, fixed wrong test packages and scope, added zip tests; 2021-09-29 16:01:36 +04:00
Jeff Wadsworth
6f76c3371e - Fixed #8334. Refactored and simplified some aspects of the Foretell ability. 2021-09-28 16:49:43 -05:00
Daniel Bomar
b37dd094e1
Merge pull request #8332 from awjackson/fix_skeletal_scrying
Fix Skeletal Scrying effect
2021-09-28 13:39:14 -05:00
dependabot[bot]
03e605de09
Bump junit-jupiter from 5.7.0 to 5.8.1 (#8328)
Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.7.0 to 5.8.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.8.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-28 20:25:54 +04:00
Alex W. Jackson
bc86c04dcd
Fix Flameshot and Ignite Disorder displayed rules text (#8333) 2021-09-28 11:23:39 -05:00
Alex W. Jackson
9d80417494 Fix Skeletal Scrying effect 2021-09-27 23:02:53 -04:00
Jeff Wadsworth
7ba3a8f637 Merge branch 'master' of https://github.com/magefree/mage 2021-09-27 16:35:23 -05:00
Jeff Wadsworth
7ca17020ef - Fixed #8317 2021-09-27 16:35:10 -05:00
Daniel Bomar
f0ae098b2e
[AFR] Fixed Monk Class level 3 interaction with MDFCs and lands 2021-09-27 16:33:43 -05:00
Daniel Bomar
eec3c44f1e
Removed game.preventDamage method (fixes #8280) 2021-09-27 16:01:28 -05:00