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

1406 commits

Author SHA1 Message Date
DeepCrimson
4546623fb6
Refactor: Fix spelling of DENY_PERMISSION_TO_ROLLBACK_TURN (#9114) 2022-06-16 22:16:03 -04:00
TheBear
1021ff5ab0
Added Khans Expanded Cube to draft cube list (#8961) 2022-05-15 09:00:45 -06:00
Oleg Agafonov
47726ebbea Fixed miss config for MTGO Khans Expanded Cube 2022-04-09 20:36:27 +04:00
The Bear
9e60e98fb5
Added the Khans Expanded Cube for booster draft (#8780) 
* Added the MTGO Khans Expanded Cube for boosterdraft.

* Fixed Obscuring Aether character
 2022-03-19 10:33:38 -04:00
Oleg Agafonov
7aceffcc6c Fixed miss config settings from #8731 2022-03-12 09:21:47 +04:00
Jackie Ng
2e44b3246c
Add Feb 2022 vintage cube (#8731) 
* Add Feb 2022 vintage cube (source: https://magic.wizards.com/en/articles/archive/magic-online/vintage-cube-february-update-2022-02-15)

* Fix 3 card typos
 2022-03-02 20:18:15 -05:00
Oleg Agafonov
6177896a07
Merge pull request #8577 from magefree/dependabot/maven/com.google.oauth-client-google-oauth-client-jetty-1.33.0 
Bump google-oauth-client-jetty from 1.31.2 to 1.33.0
 2022-01-21 23:45:55 +04:00
dependabot[bot]
c4e09f33a9
Bump google-oauth-client-jetty from 1.31.2 to 1.33.0 
Bumps [google-oauth-client-jetty](https://github.com/googleapis/google-oauth-java-client) from 1.31.2 to 1.33.0.
- [Release notes](https://github.com/googleapis/google-oauth-java-client/releases)
- [Changelog](https://github.com/googleapis/google-oauth-java-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-oauth-java-client/compare/v1.31.2...v1.33.0)

---
updated-dependencies:
- dependency-name: com.google.oauth-client:google-oauth-client-jetty
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-21 19:44:09 +00:00
dependabot[bot]
4aa2a8d310
Bump google-oauth-client-java6 from 1.31.0 to 1.33.0 
Bumps [google-oauth-client-java6](https://github.com/googleapis/google-oauth-java-client) from 1.31.0 to 1.33.0.
- [Release notes](https://github.com/googleapis/google-oauth-java-client/releases)
- [Changelog](https://github.com/googleapis/google-oauth-java-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-oauth-java-client/compare/v1.31.0...v1.33.0)

---
updated-dependencies:
- dependency-name: com.google.oauth-client:google-oauth-client-java6
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-21 19:43:16 +00:00
Oleg Agafonov
83d44b3e66 Dev: updated to latest ormlite lib, removed workaround for dirty logs from #8373; 2021-11-14 01:47:24 +04:00
Oleg Agafonov
71d5887106 Fixed unnecessary logs on app startup (#8373); 2021-10-06 12:01:50 +04:00
Oleg Agafonov
58ab020065 Dev: pom clean up, improved parent/child structure; 2021-10-03 18:11:56 +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
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
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
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
f9beed6a89 Dev: clear pom files, fixed wrong test packages and scope, added zip tests; 2021-09-29 16:01:36 +04:00
Oleg Agafonov
46081d9185 GUI related improves: 
* GUI: fixed that choose triggers/piles dialog doesn't close correctly before cast mode choose (#8225);
* GUI: fixed that some choose dialogs doesn't update battlefield state (example: choose amount, choose mana);
* Game: fixed duplicated json logs at the game's end;
 2021-09-20 02:17:22 +04:00
Phred
2b2f30a88a
corrected typo: prefered -> preferred 
ag -l prefered | xargs sed -i 's/refered/referred/g'
 2021-09-11 10:03:10 -05:00
Oleg Agafonov
5f70b92278
Merge pull request #8115 from magefree/dependabot/maven/org.glassfish.jaxb-jaxb-runtime-3.0.2 
Bump jaxb-runtime from 2.3.3 to 3.0.2
 2021-09-05 01:41:57 +04:00
Oleg Agafonov
8a5b0dca5b
Merge pull request #7974 from magefree/dependabot/maven/com.google.apis-google-api-services-gmail-v1-rev20210614-1.32.1 
Bump google-api-services-gmail from v1-rev20200919-1.30.10 to v1-rev20210614-1.32.1
 2021-09-05 01:39:35 +04:00
Oleg Agafonov
b57a9dd6df
Merge pull request #8163 from magefree/dependabot/maven/org.apache.shiro-shiro-core-1.8.0 
Bump shiro-core from 1.6.0 to 1.8.0
 2021-09-05 01:38:04 +04:00
Oleg Agafonov
5ded8468f7 * Game: fixed that server can close non started tables with one player by random (#8209); 2021-09-04 17:19:55 +04:00
Oleg Agafonov
2158d682cc Prepare new release 2021-08-30 14:44:03 +04:00
dependabot[bot]
d2318fb408
Bump shiro-core from 1.6.0 to 1.8.0 
Bumps [shiro-core](https://github.com/apache/shiro) from 1.6.0 to 1.8.0.
- [Release notes](https://github.com/apache/shiro/releases)
- [Changelog](https://github.com/apache/shiro/blob/main/RELEASE-NOTES)
- [Commits](https://github.com/apache/shiro/compare/shiro-root-1.6.0...shiro-root-1.8.0)

---
updated-dependencies:
- dependency-name: org.apache.shiro:shiro-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-27 16:52:55 +00:00
Oleg Agafonov
e488997124 * Server: fixed that multiplayer game can be closed on "1x human + 1x AI" remain (see #6178); 2021-08-19 01:42:35 +04:00
Oleg Agafonov
b8a83bbdcb * Game: added new draft cube MTGO Legacy Cube 2021 May; 2021-08-10 12:42:53 +04:00
dependabot[bot]
60bd3caaef
Bump jaxb-runtime from 2.3.3 to 3.0.2 
Bumps jaxb-runtime from 2.3.3 to 3.0.2.

---
updated-dependencies:
- dependency-name: org.glassfish.jaxb:jaxb-runtime
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-09 11:01:20 +00:00
Oleg Agafonov
649db04030 * Game: added new cube MTGO Vintage Cube July 2021; 2021-08-06 22:57:41 +04:00
Oleg Agafonov
f334b81de6 * GUI: fixed that users can select empty timing option in new tourney dialog; 2021-07-26 14:42:42 +04:00
Oleg Agafonov
c6a3d5e588 Prepare new release 2021-07-25 01:15:33 +04:00
Oleg Agafonov
c1db466d05 AI: fixed computer's errors if all players quit the game; 2021-07-24 05:52:02 +04:00
Oleg Agafonov
d41ccd11bc Game: fixed empty range error on game startup 2021-07-24 05:36:56 +04:00
Oleg Agafonov
28473c7bd0 * GUI: added popup menu to view player's outside/sideboard at any time (allows to view only own or computer's sideboards); 2021-07-21 13:44:35 +04:00
Oleg Agafonov
fc0ff6c22d Test framework: added support to test client side data in unit tests (getGameView -> CardView, etc); 2021-07-19 13:07:09 +04:00
Evan Kranzler
572104b8fc
Reworking card types in preparation for implementing Grist, the Hunger Tide (#7899) 
Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-07-09 07:28:43 +04:00
dependabot[bot]
8a306aca2d
Bump google-api-services-gmail 
Bumps google-api-services-gmail from v1-rev20200919-1.30.10 to v1-rev20210614-1.32.1.

---
updated-dependencies:
- dependency-name: com.google.apis:google-api-services-gmail
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 11:01:10 +00:00
arcox
30fd8f00e7
fix missing project.version for pioneer jar (#7816) 2021-05-12 19:42:40 -04:00
Daniel Bomar
600cac6fc7
[READY FOR REVIEW] Implement a "multi-amount" dialog (#7528) 
* Implemented chooseTargetAmount and new GUI dialog (distribute damage, distribute mana)
* Added tests and AI support;
* Test framework: added aliases support in TargetAmount dialogs;

Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-04-17 14:28:01 +04:00
Oleg Agafonov
cf216c6802 Prepare new release 2021-02-07 22:24:40 +04:00
Oleg Agafonov
b2593fd818 Server: fixed jumpstart custom config; 2021-02-07 04:43:18 +04:00
Oleg Agafonov
7670619fc6 Server: added loaded plugins stats and error message on outdated config.xml; 2021-02-07 04:39:48 +04:00
spjspj
1e428105d5 Adding in Jumpstart Custom 2021-02-04 23:55:59 +11:00
Oleg Agafonov
be77ecea84 GUI: fixed not working single and double clicks on the card's second side (draft, deck editor, see #7472); 2021-02-03 11:32:15 +04:00
Oleg Agafonov
ebbff82f82
Merge pull request #7335 from ddzn/feature/eurolanderDecks 
Add new deck type European Highlander
 2021-01-31 20:06:00 +01:00
Oleg Agafonov
a1da5ef437 * GUI: new reworked GUI and card render engine, card icons and dozens of other fixes (see full list in related PR); 2021-01-30 16:38:55 +04:00
Evan Kranzler
a535cb5adc
Refactoring methods which add counters to track which player adds the counters (ready for review) (#7448) 
* added parameter for player adding counters to players

* added parameter for player adding counters to cards/permanents

* updated methods to use new parameter

* fixed a few initial errors

* refactored instances of cards that add counters by a player other than the controller

* fixed some instances of incorrect arguments

* refactored abilities that trigger off of a particular player adding counters

* a few more cards that were missed

* [KHM] Implemented Vorinclex, Monstrous Raider

* added test for Vorinclex, Monstrous Raider

* fixed a test failure
 2021-01-26 19:06:13 -05:00
ddzn
dd8e489fcb Add new deck type European Highlander 2021-01-07 13:31:08 +01:00