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

3415 commits

Author SHA1 Message Date
Oleg Agafonov
a5dfe3ba14 * Cards: updated old sets with new scryfall numbers (fixed images download); 2021-06-30 16:51:01 +04:00
Oleg Agafonov
e05a315495 * Cards: updated old sets with new scryfall numbers, fixed set codes; 2021-06-30 03:02:19 +04:00
Evan Kranzler
bb591dd038
[AFR] Implementing dungeon mechanic (ready for review) (#7937) 
* added dungeon and dungeon room class

* [AFR] Implemented Tomb of Annihilation

* [AFR] Implemented Shortcut Seeker

* [AFR] Implemented Gloom Stalker

* [AFR] Implemented Nadaar, Selfless Paladin

* added room triggers

* added more venturing code, currently untested

* fixed error

* moved venture into dungeon from player class to game class

* removed unnecessary sourceobject from dungeon

* fixed npe error

* added dungeon completion

* fixed concurrent modification exception

* added logging

* added proper copy methods

* added views

* updated room text generation

* added some missing code

* finished implementing CompletedDungeonCondition

* [AFR] Implemented Ellywick Tumblestrum

* [AFR] Implemented Lost Mine of Phandelver

* added choice dialog for dungeons

* [AFR] Implemented Dungeon of the Mad Mage

* small text fix

* added initial dungeon test

* [AFR] Implemented Cloister Gargoyle

* [AFR] Implemented Dungeon Crawler

* small text change for dungeon rooms

* added more tests

* some simplification to dungeon props

* updated testing helper functions

* added currently failing test for venturing on separate steps and turns

* added tests for dungeon completion

* fixed missing trigger visual and dungeons not persisting through turns

* some text updates

* added rollback test

* added a test for multiple dungeons at once

* added one more condition test
 2021-06-29 06:57:43 -04:00
Oleg Agafonov
67ee6fbf25 * GUI: improved cards auto-sorting in deck editor, fixed some sorting bugs for separate mode (#7789); 2021-06-28 00:39:26 +04:00
spjspj
9366e8c0b7
Update TableModel.java 2021-06-18 00:39:25 +10:00
spjspj
ae2787f119 Add in color identity as a sortable option in the deck editor and draft editor 2021-06-18 00:36:38 +10:00
Evan Kranzler
df6acb697d [H1R] changed set from RMH1 to H1R (fixes #7903) 2021-06-12 18:50:55 -04:00
Evan Kranzler
9fba3be2d5 [RMH1] added set 2021-06-02 21:41:31 -04:00
Evan Kranzler
d49cbede43 [STA] added image support 2021-05-24 19:53:56 -04:00
Evan Kranzler
b3b5ee418f added some image support 2021-05-24 09:31:14 -04:00
Evan Kranzler
7665977434 fixed a test failure 2021-05-01 18:47:32 -04:00
Michael Lee
af59cea62c
Fixing issue with GUI events being triggered prematurely when loading prefs (#7785) 2021-04-29 19:02:25 +04:00
Michael Lee
a4f195c0c6 Resizing GUI elements live from the preference menu 2021-04-28 16:41:10 -04:00
Evan Kranzler
a61d5543fa replaced all instances of converted mana cost with mana value 2021-04-17 17:02:27 -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
sprangg
81f12c3f45
Add possibility to play less rounds of swiss than xmage suggests (#7729) 
* Make it possible to adjust the number of rounds in a swiss tournament to be less than the number of rounds suggested by xmage.

Co-authored-by: sprangg <a@b.c>
Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-04-14 09:54:29 +04:00
Oleg Agafonov
1373675073 [KLR] added images support 2021-04-02 11:33:11 +04:00
Evan Kranzler
043aae6dff updated phrasing on player choice messages 2021-03-23 19:46:47 -04:00
Oleg Agafonov
ccc85c1acb [TSR] added tokens 2021-03-07 03:08:17 +04:00
Oleg Agafonov
d3b787b9a6 [TSR] added images download 2021-03-07 03:08:17 +04:00
Oleg Agafonov
9d72dad674 [ZNE] added images download 2021-02-27 22:16:19 +04:00
Oleg Agafonov
608f6f7bd8 [STX] added images download 2021-02-27 22:03:20 +04:00
ddzn
0f91524c26 Add Eurolander to others button in tables panel 2021-02-21 14:09:01 +01:00
Oleg Agafonov
b6cb5cef9c Refactor: removed default comment headers 2021-02-21 08:15:16 +04:00
Oleg Agafonov
2dfde7f41a Refactor: correct predicate packages 2021-02-21 08:00:21 +04:00
Oleg Agafonov
4f10fa6d01 * GUI: fixed outdated description of "show ability picker" option in preferences (#7582); 2021-02-15 12:42:31 +04:00
Oleg Agafonov
eb64a7bb73 GUI: fixed broken add lands and random deck dialogs in deck editor (#7562); 2021-02-13 20:26:06 +04:00
Oleg Agafonov
1239a0299b GUI: fixed rare NPE error on images loading in the games; 2021-02-13 17:03:15 +04:00
Oleg Agafonov
42364f7e27 Server: fixed NPE error on wrong AI usage in new game dialogs (fixes #7556); 2021-02-13 14:54:13 +04:00
Oleg Agafonov
10e557b873 * Performance: memory usage optimization for deck editor (part 2 of removed bloated usage of ManaCosts -> ManaColor objects, see #7515); 2021-02-12 22:12:18 +04:00
Oleg Agafonov
c1dea5b21e * Performance: memory usage optimization for deck editor (improved search for low end computers, see #7177); 2021-02-12 22:00:16 +04:00
Oleg Agafonov
275e996c08 * Performance: memory usage optimization for deck editor (removed bloated usage of ManaCosts -> ManaColor objects, see #7515); 2021-02-12 22:00:16 +04:00
Oleg Agafonov
f9b840e3b5 * Images: added download support of localized images for double faces cards; 
* Images: fixed wrong second side image after localized images download (you must re-download KHM and ZNR sets to fix it);
 2021-02-11 09:15:55 +04:00
Oleg Agafonov
c9f4e949fa * Images: added more download stats (now you can see a progress of prepare stage); 2021-02-11 08:12:55 +04:00
Gabriel Sturtevant
3e8df481db Removed layout info 2021-02-09 16:28:25 -08:00
Gabriel Sturtevant
aa56bf22ce Added 2004 World Championship decks 2021-02-09 16:24:15 -08:00
Oleg Agafonov
ea577e2070 GUI: fixed booster tooltip in deck editor; 2021-02-08 19:38:57 +04:00
Oleg Agafonov
b2b88bf2e8 Improved card icons (fix ambiguous interpretation of vigilance, first and double strikes, #7471); 2021-02-07 23:11:35 +04:00
Oleg Agafonov
cf216c6802 Prepare new release 2021-02-07 22:24:40 +04:00
Oleg Agafonov
0eac8eb530
Merge pull request #7511 from spjspj/master 
Final line of jumpstart should be blank
 2021-02-07 01:14:17 +01:00
spjspj
6056a6adb4 Final line of jumpstart should be blank or final pack won't be added in to pool. Add a sample (the original jumpstart.txt) file for users to more easily modify if necessary. 2021-02-07 11:05:16 +11:00
Oleg Agafonov
03952ae0d6 [KHC] added tokens and download support; 2021-02-06 20:54:32 +04:00
Oleg Agafonov
f7bc745f10 [KHM] added tokens and download support; 2021-02-06 20:30:19 +04:00
Oleg Agafonov
abe65411b6 GUI: fixed errors in card viewer for some combinations of emblems and tokens, simplified draw code; 2021-02-06 20:28:54 +04:00
Oleg Agafonov
c256aa59f7 GUI: fixed error on closing dialogs/games (#7507); 2021-02-05 20:54:21 +04:00
spjspj
b64806606c Adding in Jumpstart Custom (requested fixes) 2021-02-06 00:19:36 +11:00
spjspj
1e428105d5 Adding in Jumpstart Custom 2021-02-04 23:55:59 +11:00
Oleg Agafonov
4b9de96a6b Test framework: added support to put mdf cards on battlefield by cheats or unit tests; 2021-02-03 14:23:50 +04: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
3b7e01d687 GUI: fixed that the playable card mark is not displayed for the second side after day/night button click; 2021-02-03 11:30:24 +04:00
Oleg Agafonov
f5bb3a3b9a [KHC] added images download 2021-02-03 10:37:47 +04:00
Oleg Agafonov
5f2e06e1ff Game: improved wrong charset logs on startup 2021-02-03 10:30:34 +04:00
Oleg Agafonov
bc72384f0d * GUI: added cards and mana amount info to player's panel hint (example: move mouse over mana icons); 2021-02-02 04:43:49 +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
2fe2f05b60 GUI: added preferences settings for card icons (enable abilities icons and playable icon); 2021-01-30 17:34:10 +04: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
dacf30f4b9
Refactoring subtypes to make Maskwood Nexus work (ready for review) (#7432) 
* removed and renamed SubTypeList

* updated subtype test

* refactored Changeling to be an ability that actually does something

* moved isAllCreatureTypes into SubTypes class

* renamed copyTo method to copyFrom

* added removeAllCreatureTypes where usable

* replaced some subtype methods

* replaced some more subtype methods

* replaced subtype mass add/remove methods

* updated more subtype methods

* fixed some errors

* made common shared creature type predicate

* refactored another card involving subtypes

* Added usage of object attribute in subTypes's write operations;

* Refactor: use same param styles in subtype methods

* Refactor: simplified usage of copy appliers;

* Refactor: fixed code usage in CopyApplier

Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-01-26 08:52:35 -05:00
Jeff
c98329c822 - added 1998 WC deck Draw Go by Randy Buehler 2021-01-09 10:35:34 -06:00
ddzn
dd8e489fcb Add new deck type European Highlander 2021-01-07 13:31:08 +01:00
Oleg Agafonov
577ab1aa9a
Merge pull request #7300 from magefree/2020_commander_decks 
2020 Commander precon decklists
 2020-12-27 10:35:08 +01:00
Mike Simons
f408f533f7 remove layout from sample decks 2020-12-26 22:36:43 -05:00
Oleg Agafonov
b6e9c3edc2 Sample decks clean up from layout settings 2020-12-27 06:55:12 +04:00
Mike Simons
9a6d520ebc 2020 Commander precon decklists 2020-12-26 20:06:38 -05:00
Oleg Agafonov
fed97c040a * GUI: fixed that cast/played card can be visible in hand zone until end of the game or re-connect (#7297); 2020-12-27 01:39:18 +04:00
Oleg Agafonov
b8b2dd2c9b * GUI: fixed that abilities and triggers on the stack were not highlighted as valid target; 2020-12-24 21:43:17 +04:00
Oleg Agafonov
dd7c1939d3 * Game: fixed that Snow-Covered lands can be added to auto-generated or submitted/timeout decks (#7222); 2020-12-23 10:26:49 +04:00
Oleg Agafonov
b506c7fb53 Merge fix 2020-12-22 17:33:36 +04:00
Oleg Agafonov
0ac4a9d87a * Activate spell's ability on the stack - fixed that it can't be activated by humans (example: Lightning Storm); 2020-12-22 17:13:00 +04:00
Oleg Agafonov
d5377599cc * Images: updated Duels of the Planeswalkers Promo sets (year incremented; 2011 -> 2012, etc); 2020-12-21 11:10:54 +04:00
Oleg Agafonov
cc5fce4256 Prepare new release 2020-12-19 23:59:44 +04:00
Oleg Agafonov
9dd09c970a [CMR] added tokens support, added tokens download 2020-12-19 21:42:31 +04:00
Oleg Agafonov
74d96b98cf [KHM] added images download 2020-12-17 03:30:31 +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
Oleg Agafonov
be227defdc
Merge pull request #7088 from magefree/dependabot/maven/org.ocpsoft.prettytime-prettytime-4.0.6.Final 
Bump prettytime from 4.0.5.Final to 4.0.6.Final
 2020-11-20 19:29:31 +01:00
Oleg Agafonov
ae4f84655e Changed error report link to github 2020-11-20 17:59:12 +04:00
MusaBrt
e078644caf
removing unnecessary condition 
L152, null checking for initialized final field
 2020-11-18 01:11:31 +03:00
Oleg Agafonov
ea46afbe62 Prepare new release 2020-11-10 13:11:45 +04:00
Oleg Agafonov
5578437dde * GUI: increased ignore list max size from 100 to 500; 2020-11-09 00:42:43 +04:00
Oleg Agafonov
8fa0ba1cfd [ZNC] Added images and tokens support/download 2020-11-05 12:55:08 +04:00
Oleg Agafonov
6bc040ef6c [ZNR] Added tokens support and download 2020-11-05 12:22:55 +04:00
Oleg Agafonov
4893c5b1ac [ZNR] Improved modal double faces cards in GUI (#7012) 2020-11-01 10:03:09 +01:00
Oleg Agafonov
898d271c36 [ZNR] Improved GUI for modal double faces cards (#7012) 2020-11-01 10:03:09 +01:00
Oleg Agafonov
c60bf3ccef [ZNR] Added images download for modal double faces cards (#7012) 2020-11-01 10:03:09 +01:00
Evan Kranzler
5c65506720 [SLD] consolidated PSLD into main set 2020-10-05 21:39:53 -04:00
Gösta
43dcd13d16 added option to hide ability text overlay 2020-10-02 00:32:35 +02:00
dependabot[bot]
f38fd4e198
Bump prettytime from 4.0.5.Final to 4.0.6.Final 
Bumps [prettytime](https://github.com/ocpsoft/prettytime) from 4.0.5.Final to 4.0.6.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-09-28 05:28:11 +00:00
Oleg Agafonov
0cc39b26d7
Merge pull request #7053 from magefree/dependabot/maven/org.apache.xmlgraphics-batik-transcoder-1.13 
Bump batik-transcoder from 1.11 to 1.13
 2020-09-22 08:31:25 +02:00
Oleg Agafonov
cb2ae0295f * Performance: improved memory usage for images (now xmage will not eat all available memory on 2GB+ settings, see #6375); 2020-09-09 16:47:45 +04:00
vyacheslav.raskulin
b3dc0f5eca excessive lambda usage 2020-09-09 15:06:49 +03:00
vyacheslav.raskulin
8b31333d9d Collection creation is simplified 2020-09-09 15:03:01 +03:00
vyacheslav.raskulin
7da043afd0 comparation simplified 2020-09-09 15:00:30 +03:00
vyacheslav.raskulin
022c1407ed C-style arrays declaration should be replaced to java-style 2020-09-09 14:53:03 +03:00
vyacheslav.raskulin
b23ccb8191 since these branches are identical we may collapse them 2020-09-09 14:48:21 +03:00
vyacheslav.raskulin
e03b446601 explicit parameters are not needed 2020-09-09 14:47:47 +03:00
vyacheslav.raskulin
96b2094370 equals method can be simplified 2020-09-09 14:46:46 +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
Oleg Agafonov
9f0772fb65 Additional image files check after download 2020-09-08 18:23:11 +04:00
Oleg Agafonov
f670de09d9 * Images: added cleanup routine on startup (app will fix and delete all broken or temporary images files, see #6267); 2020-09-08 17:58:46 +04:00
dependabot[bot]
a0be42ed7b
Bump batik-transcoder from 1.11 to 1.13 
Bumps batik-transcoder from 1.11 to 1.13.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-07 05:57:07 +00:00
Bruno Chevalier
9b89eecab5 S3Uploader.java: Remove redundant null check 2020-08-31 13:50:23 +02:00