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

1413 commits

Author SHA1 Message Date
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
Oleg Agafonov
81e0cc6403
Merge pull request #7158 from fburato/app-wiring-refactor 
Application wiring refactor and externalise configuration path for server
 2020-12-26 07:42:46 +01:00
Oleg Agafonov
c020d7b1e9
Merge pull request #7203 from magefree/dependabot/maven/com.google.api-client-google-api-client-1.31.1 
Bump google-api-client from 1.30.10 to 1.31.1
 2020-12-25 21:39:40 +01:00
Oleg Agafonov
ed5142727d
Merge pull request #7202 from magefree/dependabot/maven/com.google.oauth-client-google-oauth-client-jetty-1.31.2 
Bump google-oauth-client-jetty from 1.31.0 to 1.31.2
 2020-12-25 21:39:02 +01:00
Oleg Agafonov
a87c0b1ff6 Fixed potentially rollback errors with missing game data (#7273); 2020-12-24 23:43:53 +04:00
Oleg Agafonov
a10dcc6bda * Game: added MTGO Vintage Cube December 2020; 2020-12-20 01:28:29 +04:00
Oleg Agafonov
cc5fce4256 Prepare new release 2020-12-19 23:59:44 +04:00
Oleg Agafonov
db239a1055 Refactor: replaced sourceId by source and introduced source param in some methods; 2020-12-12 20:23:19 +04:00
dependabot[bot]
62c5054928
Bump google-api-client from 1.30.10 to 1.31.1 
Bumps [google-api-client](https://github.com/googleapis/google-api-java-client) from 1.30.10 to 1.31.1.
- [Release notes](https://github.com/googleapis/google-api-java-client/releases)
- [Changelog](https://github.com/googleapis/google-api-java-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-api-java-client/compare/v1.30.10...v1.31.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-23 05:28:59 +00:00
dependabot[bot]
920e340d99
Bump google-oauth-client-jetty from 1.31.0 to 1.31.2 
Bumps [google-oauth-client-jetty](https://github.com/googleapis/google-oauth-java-client) from 1.31.0 to 1.31.2.
- [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.31.0...v1.31.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-23 05:28:53 +00:00
Oleg Agafonov
55e3fb8f8e
Merge pull request #7087 from magefree/dependabot/maven/com.google.apis-google-api-services-gmail-v1-rev20200919-1.30.10 
Bump google-api-services-gmail from v1-rev20200824-1.30.10 to v1-rev20200919-1.30.10
 2020-11-20 19:29:40 +01:00
Oleg Agafonov
cd9cce1336
Merge pull request #7089 from magefree/dependabot/maven/org.apache.commons-commons-lang3-3.11 
Bump commons-lang3 from 3.10 to 3.11
 2020-11-20 19:29:20 +01:00
Francesco Burato
6e3750d50a [app-wiring-refactor]: Apply review comments: 
- Add reference to original library in `FluentBuilder`.
- Change `I<Name>` notation to `<Name>Impl` notation.
- Move error config to test resources
- Add comment with config instruction
- Add config to the documentation
 2020-11-12 20:12:50 +00:00
Francesco Burato
e8bb8ae24b [app-wiring-refactor]: Externalise configuration path 2020-11-12 20:12:49 +00:00
Francesco Burato
d0c2135e17 [app-wiring-refactor]: Remove static initialisation 
- Remove all enum static managers
- Introduce interfaces for the managers
- Define new application wiring class (`ManagerFactory`)
- Externalise the configuration
 2020-11-12 20:12:48 +00:00
Francesco Burato
cf3dd2d94c [app-wiring-refactor]: Define external configuration 2020-11-12 20:12:48 +00:00
Oleg Agafonov
ea46afbe62 Prepare new release 2020-11-10 13:11:45 +04:00
dependabot[bot]
2158ed4ddf
Bump commons-lang3 from 3.10 to 3.11 
Bumps commons-lang3 from 3.10 to 3.11.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-28 05:28:19 +00:00
dependabot[bot]
c57ee1d22b
Bump google-api-services-gmail 
Bumps google-api-services-gmail from v1-rev20200824-1.30.10 to v1-rev20200919-1.30.10.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-28 05:28:08 +00:00
Oleg Agafonov
52047c046b
Merge pull request #7052 from magefree/dependabot/maven/com.google.api-client-google-api-client-1.30.10 
Bump google-api-client from 1.28.0 to 1.30.10
 2020-09-22 08:31:44 +02:00
Oleg Agafonov
8d61e2ef34
Merge pull request #7055 from magefree/dependabot/maven/com.google.oauth-client-google-oauth-client-jetty-1.31.0 
Bump google-oauth-client-jetty from 1.28.0 to 1.31.0
 2020-09-22 08:31:03 +02:00
Oleg Agafonov
a95e92455c Fixed NPE on freeze fix in non started games 2020-09-18 22:00:11 +04:00
vyacheslav.raskulin
8b31333d9d Collection creation is simplified 2020-09-09 15:03:01 +03:00
Oleg Agafonov
5831ba81fc
Merge pull request #7030 from BrunoChevalier/master 
Additional fixes for pvs-studio report, see #7021 
* Rename BasicSaheekiSublimeArtificerTest.java to BasicSaheeliSublimeArtificerTest.java
* S3Uploader.java: Remove redundant null check
* Effects.java: remove redundant check. When in the else part, the lastRule already is guaranteed to not end on a dot
* TableController.java: change warning message when match == null to avoid nullpointer exception
* Reverted already fixed line from, see #7021
Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2020-09-08 23:04:30 +02:00
dependabot[bot]
3a39365162
Bump google-oauth-client-jetty from 1.28.0 to 1.31.0 
Bumps [google-oauth-client-jetty](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-09-07 05:57:25 +00:00
dependabot[bot]
1e084a3c8f
Bump google-api-client from 1.28.0 to 1.30.10 
Bumps [google-api-client](https://github.com/googleapis/google-api-java-client) from 1.28.0 to 1.30.10.
- [Release notes](https://github.com/googleapis/google-api-java-client/releases)
- [Changelog](https://github.com/googleapis/google-api-java-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-api-java-client/compare/v1.28.0...v1.30.10)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-07 05:57:02 +00:00
Oleg Agafonov
fb1c230761 * Server: added comments support in news feed (server.msg.txt), removed outdated code; 2020-09-04 02:48:07 +04:00
Oleg Agafonov
cf640b734b * Server: added stats about correctly ended tourneys and games in news feed; 2020-09-04 02:46:30 +04:00
Bruno Chevalier
672b78982f TableController.java: change warning message when match == null to avoid nullpointer exception 2020-08-31 14:14:25 +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
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
Oleg Agafonov
30fe344e23 Test framework: added planes support in tests (command: addPlane) 2020-08-29 20:38:57 +04:00
Oleg Agafonov
ede06098e0 Fixed typos in tests and additional refactor 2020-08-29 19:04:26 +04:00
Oleg Agafonov
ab8a4eb26a Little fixes and code refactor 2020-08-29 18:09:44 +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
Oleg Agafonov
6787688610 Tests: fixed random failed test testMysteryBooster1, removed redundant logs; 2020-08-26 14:20:39 +04:00
dependabot[bot]
259863f11e
Bump shiro-core from 1.4.2 to 1.6.0 
Bumps [shiro-core](https://github.com/apache/shiro) from 1.4.2 to 1.6.0.
- [Release notes](https://github.com/apache/shiro/releases)
- [Changelog](https://github.com/apache/shiro/blob/master/RELEASE-NOTES)
- [Commits](https://github.com/apache/shiro/compare/shiro-root-1.4.2...shiro-root-1.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-24 06:47:05 +00:00
Oleg Agafonov
920697d2e5 Prepare new release 2020-08-23 01:52:55 +04:00
LevelX2
d51acbf090 * Removed unused imports. 2020-08-22 11:51:34 +02:00
dependabot[bot]
4ecf7fd0dc
Bump sqlite-jdbc from 3.32.3.1 to 3.32.3.2 
Bumps [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.32.3.1 to 3.32.3.2.
- [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.32.3.1...3.32.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-03 07:21:00 +00:00
Oleg Agafonov
e95b9f145c GUI: deck legality improves: 
* Added partly valid status for deck legality panel (if all cards are fine but user must add more cards to complete, see #6854);
 * Improved legality errors sorting (important errors visible at the top now, e.g. commander's errors);
 2020-08-03 02:03:54 +04: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
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
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]
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]
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
Oleg Agafonov
3abe5e796a Server: removed unnecessary logs, extra comments 2020-07-25 19:06:38 +04:00
18ths
99d5eafc8a
GUI enchancements (themes, sound notification, deck validation) (#6755) 
GUI enchancements (themes, sound notification, deck validation)
 2020-07-17 19:15:02 +02:00
mikalinn777
bf293ca939 Add Historic format and Historic Anthologies 2020-07-11 12:06:01 +02:00
Oleg Agafonov
165d7362b0 Fixed version info in local server (#6828); 2020-07-11 06:08:04 +04:00
Oleg Agafonov
c4f028ffa0 Prepare new release 2020-07-10 16:50:38 +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
d9fef33b06 Additional fixes for #6785 (July 2020 Vintage Cube) 2020-07-07 22:12:02 +04: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
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]
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
Oleg Agafonov
adbe84c540 Improved freeze checks and canRespond/isInGame usage 2020-07-01 13:48:22 +04:00
Oleg Agafonov
fc7431b97b Fixed jumpstart config (#6669) 2020-06-30 08:31:08 +04:00
Oleg Agafonov
d5616a86f9
Merge pull request #6669 from hitch17/jumpstart-tournament-formats 
Add jumpstart swiss and elimination tournament formats.
 2020-06-30 06:29:33 +02:00
Oleg Agafonov
3f2a5fc362 Prepare new release 2020-06-20 11:36:13 +04:00
John Hitchings
c54c100b4d add docs/links for jumpstart, tweak the jumpstart packs file. 2020-06-19 22:10:09 -07:00
John Hitchings
1695e6767d add jumpstart swiss and elimiation tournament formats. 2020-06-18 23:45:02 -07:00
LevelX2
f0080462fa * Allow player names with space for the init.txt test help. 2020-06-12 16:10:07 +02:00
Oleg Agafonov
44b84bfbbc Code cleanup 2020-06-10 00:22:48 +04:00
LevelX2
b0ad0126ca * Phase info added to the /Fix command. Some code cleanup. 2020-06-05 10:24:29 +02:00
Oleg Agafonov
cce467a5ec Additional fix and simplified for playable abilities (see comments b94344341b) 2020-06-04 03:21:18 +04:00
John Hitchings
a18951c27a Add Vintage Cube 2020. See https://magic.wizards.com/en/articles/archive/vintage-cube-cardlist 2020-05-26 14:23:22 -07:00
SpeedProg
f36792be93 make jboss remoting2 work with openjdk11 2020-05-08 21:29:42 +02:00
Oleg Agafonov
0dd4e821b9 Fixed missing MTGA Cube 2020 April in configs (related to #6396); 2020-04-19 00:00:07 +04:00
Oleg Agafonov
79c5c7a6a5 Test framework improves (Monte Carlo AI): 
* Added support to test Monte Carlo AI (CardTestPlayerBaseWithMonteCarloAIHelps - any aiXXX commands);
* Added Quick Start button to test Monte Carlo AI games (MCTS);
 2020-04-14 20:09:36 +04:00
Oleg Agafonov
823d677068 Planechase: refactor planes; 2020-04-13 21:50:40 +04:00
Oleg Agafonov
2e73f9d1c5 * UI: added turn number and step info in game logs 2020-02-28 20:27:07 +04:00
Oleg Agafonov
67cf4bc535 Cheat engine: added support of @ref command (replace @ref by commands from another group) 2020-02-27 03:07:28 +04:00
Oleg Agafonov
d202df1649 Code cleanup 2020-02-21 19:34:04 +04:00
Oleg Agafonov
459524b565 * Game: improved forced join on connection problem (player must leave game, more info in join message); 2020-02-21 12:41:20 +04:00
Oleg Agafonov
58d7a96031 * Game: improved fix command (more info and fixes); 
* Game: improved game startup message (more info about private messages and players stats);
 2020-02-21 12:10:54 +04:00
Ingmar Goudt
ae7919cd07 program towards Interface rather than implementations 2020-02-10 10:40:06 +01:00
dependabot[bot]
72e9424113
Bump shiro-core from 1.4.0 to 1.4.2 in /Mage.Server 
Bumps [shiro-core](https://github.com/apache/shiro) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/apache/shiro/releases)
- [Changelog](https://github.com/apache/shiro/blob/master/RELEASE-NOTES)
- [Commits](https://github.com/apache/shiro/compare/shiro-root-1.4.0...shiro-root-1.4.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-02-04 23:22:50 +00:00
Oleg Agafonov
f4a0c70cf3 Server: improved ping info (added last activity time) 2020-02-01 10:49:00 +04:00
Oleg Agafonov
2079065af3 * Server: added /pings chat command to show players and watchers ping info; 2020-01-31 22:30:31 +04:00
Oleg Agafonov
2db9419ff1 * Flicker of Fate - fixed that it return permanents tapped; 2020-01-30 05:38:23 +04:00
Oleg Agafonov
4ac88ad289 * Cheat engine: added command to activate opponent's playable ability 
* AI can't activate or play some things, but you can instruct it to do that;
 * insert special command in init.txt to enable it: [@activate opponent ability]
 * use cheat button to activate that command;
 * you will see all playable abilities for your opponent;
 * select any ability to activate (it will be activated by opponent);
 * maybe buggy as all other cheat engine commands;
 2020-01-29 07:44:48 +04:00
Oleg Agafonov
ffdc884949 Logs cleanup (removed database logs) 2020-01-27 06:01:56 +04:00
Oleg Agafonov
ab2fb29270 Code cleanup (removed unused log4j setting files, added extra info, samples and instructions, removed java logs) 2020-01-26 16:30:42 +04:00
Oleg Agafonov
e883ab0d97 Code cleanup (removed outdated server's config.properties settings) 2020-01-26 15:20:37 +04:00
Oleg Agafonov
b56587a383 Code cleanup (removed outdated client's config.properties settings) 2020-01-26 15:19:22 +04:00
michaelrfarcasin
c3cb54f371 Add Freeform Unlimited Commander game type 
Currently there's no multiplayer format that allows players to cast
spells from the command zone and also allows any deck size.

This is a problem for players who want to test EDH Cube decks. These
decks:
- can have any size - often between 40 and 100 - with no standard
- can have cards outside the commander's color identity
- may break the singleton rule

Create a game and deck type to accommodate these types of decks.

Notable differences from Freeform Commander in addition to the above:
- Decks can have any number of cards in the maindeck or sideboard
- Sideboard cards can be any type
- There are no illegal expansions
- Games can have a minimum 2 players
 2020-01-20 22:47:27 -06:00
Oleg Agafonov
56c0dc485c Return old working version of force join (join all the time) 2020-01-18 09:52:07 +04:00
Oleg Agafonov
ce60a9d75b * UI: choose ability to play improves (see 8add25fa12) 2020-01-18 08:02:31 +04:00
Oleg Agafonov
8add25fa12 * UI: choose modes dialog improves: 
* Added hotkeys to select options (1-9 for choice, SPACE/ENTER for done, ESC for cancel);
 * "Up to" modes choose dialog - added "done" button in dialog;
 * "Up to" modes choose dialog - fixed that user can't cancel if already selected one mode;
 * Added extra info about source object, selected and remaining modes to select, ability number for hotkey;
 * Fixed that mode choose dialog doesn't close on cancel (#6199);
 2020-01-18 06:30:44 +04:00