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

1367 commits

Author SHA1 Message Date
gleeb
6d11b7f3e8 Add Rich Man Swiss Draft 2021-05-06 00:13:20 -07: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
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