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

1011 commits

Author SHA1 Message Date
Oleg Agafonov
6b457f5265 Prepare new release 2020-08-30 00:05:03 +04: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
LevelX2
445f824424 * Added column hints to the headers of the list of active tables. Added some more details to the info column about rollback, spectators or planechase activated. 2020-08-22 00:48:13 +02:00
Oleg Agafonov
1045f352bc GUI: fix that cheat button shows for all players instead current user only (related to #5289); 2020-07-29 20:22:25 +04:00
dependabot[bot]
525654392c
Bump gson from 2.8.5 to 2.8.6 
Bumps [gson](https://github.com/google/gson) from 2.8.5 to 2.8.6.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.5...gson-parent-2.8.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 09:47:50 +00:00
LevelX2
bd9738f128 * Fixed a problem where for copies of cards/permanent the included spell ability was not correctly copied and the copied card had the spell ability twice. That could cause in some rare cases problems with spell ids of copies (this fixes #6824) or did allow on the other side some unproper handling of things (Animate Dead). 2020-07-14 21:30:30 +02:00
Oleg Agafonov
c4f028ffa0 Prepare new release 2020-07-10 16:50:38 +04:00
arcox
9c7982e8f6 Update *.sh and *.java files to use Unix line endings 2020-07-09 13:07:26 -04:00
18ths
13f7f2a035 Revert "removed some of unused dependencies" 
This reverts commit d6ad722266.
 2020-07-08 17:16:16 +02:00
18ths
d6ad722266 removed some of unused dependencies 2020-07-07 20:11:45 +02:00
LevelX2
84370ee5ab * Allow to addd hint texts to stack abilities. Swicthed to html text format for text box of stack abilites. 2020-07-02 00:53:46 +02: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
LevelX2
99a651876a * Fixed that Morph put face up ability was shown twice in the tooltip rule text (fixes #6663). 2020-06-26 12:22:35 +02:00
Oleg Agafonov
3f2a5fc362 Prepare new release 2020-06-20 11:36:13 +04:00
John Hitchings
1695e6767d add jumpstart swiss and elimiation tournament formats. 2020-06-18 23:45:02 -07:00
LevelX2
ff3a51cc22 * Some minor code clean up. 2020-06-16 10:42:53 +02:00
LevelX2
2788eab082 * Fixed card type displaying order (fixes #6055). 2020-06-15 21:11:54 +02:00
Oleg Agafonov
6b5108770c * UI: fixed wrong ability text capitalization in mode choose dialog; 2020-05-19 00:27:42 +04:00
Oleg Agafonov
0c2e08f54e * UI: choose spell to cast dialog - added card name for spell abilities (split, adventure, additional spell, etc, see #6549); 2020-05-18 06:46:39 +04:00
SpeedProg
f36792be93 make jboss remoting2 work with openjdk11 2020-05-08 21:29:42 +02:00
Oleg Agafonov
3c4f93c44d Prepare new hotfix release 2020-04-19 01:50:00 +04:00
emerald000
c3684a732b [IKO] Implement Companion and 2 companions 
Keruga, the Macrosage and Umori, the Collector
 2020-04-12 08:29:25 -04:00
Oleg Agafonov
1b60dfc258 Prepare new release 2020-03-04 20:33:30 +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
169d9bf761 * Non basic mana abilities - fixed rollback errors in AI games (#6300); 2020-02-25 12:41:45 +04:00
Oleg Agafonov
bca181f2dc Prepare new release 2020-02-21 12:41:47 +04:00
Oleg Agafonov
e12db6d8ae Prepare new release 2020-02-15 14:40:38 +04:00
Ingmar Goudt
ae7919cd07 program towards Interface rather than implementations 2020-02-10 10:40:06 +01:00
Oleg Agafonov
b708494647 Prepare new release 2020-02-01 13:57:16 +04:00
Oleg Agafonov
f4a0c70cf3 Server: improved ping info (added last activity time) 2020-02-01 10:49:00 +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
2ca1643b54 * Delay triggered abilities - fixed that copied spell with multiple delayed triggered abilities can freeze the game or missing from stack (#5437); 2020-01-23 07:04:19 +04:00
Oleg Agafonov
eaaa37db11 Card render testing dialog improves: 
* Added chooseable render testing (click by mouse on cards);
* Added column style render testing (many cards mode);
* Added tapped, face down and manifested render testing for permanents;
* CardView: fixed missing copy data (NPE for transformed cards);
* CardArea: added support to draw permanents;
* CardArea: added support of offsets between cards/columns;
 2020-01-22 00:44:25 +04:00
Oleg Agafonov
0f0b9798a0 Prepare new release 2020-01-18 11:42:31 +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
Oleg Agafonov
12aec087b2 Prepare new release 2020-01-16 18:26:38 +04:00
Oleg Agafonov
dae2c57c45 fixed Heliod's Punishment (counters not removes after tap); 2020-01-14 09:34:41 +04:00
Oleg Agafonov
11976b5c89 Refactor: move player.damage params to default (same as permanent.damage); 2020-01-14 09:15:33 +04:00
Oleg Agafonov
b366a83a45 Prepare new release 2020-01-09 08:55:26 +04:00
Oleg Agafonov
339c419d4b * UI: multiple improves for adventure/split cards: 
* Split cards shows left and right mana cost (in deck editor, hand, etc);
 * Adventure cards shows adventure and normal cost (in deck editor, hand, etc);
 * Adventure cards shows adventure spell name in deck editor's list;
 * Fixed missing loading cursor in deck editor searching;
 2020-01-07 11:49:55 +04:00
LevelX2
8854871c15 * Fixed problems of Yixlid Jailer that removed abilities from cards in graveyard permanently (fixes #1147). 2020-01-03 15:23:52 +01:00
Oleg Agafonov
0faecb2fb6 Server: fixed missing data compress for some server's responses; 2019-12-31 04:11:23 +04:00
LevelX2
1dc8f37d20 * Expropriate - Fixed a strange problem that the prompt text of the select permanent selection to get the control of the permanent was not shown. Still not clear what the exact reason was but using a player list to save the voters seemed to cause the problem. 2019-12-27 23:22:32 +01:00
Oleg Agafonov
9d2dfc048d Prepare new release 2019-12-24 03:42:38 +04:00
Oleg Agafonov
d26fde8dbc Prepare new release 2019-12-21 18:23:15 +04:00
Oleg Agafonov
cde9957f54 * UI: added playable card marks in look-at windows; 2019-12-18 22:44:42 +04:00
Oleg Agafonov
240c5834af Prepare new release 2019-12-07 20:57:11 +04:00
ssouders412
2d3247d732
Updated pronouns to reflect current rules and oracle text 
Replaced all instances of "her or she", "him or her", and "his or her", with "they", "them", and "their", or sometimes "that player". Updated verbs where appropriate.
 2019-12-06 14:29:36 -05:00
Oleg Agafonov
7469d59eee Prepare new release 2019-11-30 01:32:54 +04:00
Oleg Agafonov
f719503a89 Prepare new release 2019-09-27 21:19:03 +04:00
Oleg Agafonov
8dc6e152af Prepare next release 2019-09-10 00:33:47 +04:00
Oleg Agafonov
127af50427 Prepare next release 2019-09-09 23:40:22 +04:00
Ingmar Goudt
5ba206111a add missing Override annotations 2019-07-14 20:28:48 +02:00
Oleg Agafonov
cb2730e0d5 Strict version required (empty hand bug in old versions) 2019-07-13 19:56:56 +04:00
Oleg Agafonov
683f0fd3fe Prepare hotfix 2019-07-13 18:47:57 +04:00
Ingmar Goudt
178da75e4d Sonar fixes 2019-07-09 21:57:55 +02:00
Oleg Agafonov
769756a548 Prepare hotfix 2019-07-08 08:41:42 +04:00
Oleg Agafonov
bce01ce053 Sonar's fixes 2019-07-06 13:09:27 +04:00
Oleg Agafonov
1be96e94d3 Prepare hotfix 2019-07-05 16:18:15 +04:00
Oleg Agafonov
21f7c1dde7 Prepare new hotfix 2019-07-02 13:27:11 +04:00
Oleg Agafonov
716b929877 Prepare new release 2019-06-30 18:33:29 +04:00
Oleg Agafonov
f6123037ec * UI: added playable/activatable cards highlight in all zone and windows (mana abilities, commander, graveyard, revealed, etc); 2019-06-28 03:30:57 +04:00
Oleg Agafonov
7204feaa17 Prepare new release 2019-06-22 06:37:37 +04:00
Oleg Agafonov
53d4dd6f0a Prepare hotfix 2019-06-08 09:40:24 +04:00
Oleg Agafonov
e913346a35 Prepare hotfix 2019-06-07 22:37:54 +04:00
Oleg Agafonov
55bc61000a Prepare new release 2019-06-06 23:03:38 +04:00
Oleg Agafonov
eb6478cd59 * UI: fixed duplicated names in related objects list on card hint; 2019-06-03 16:35:17 +04:00
Oleg Agafonov
9a9b304fd5 * UI: improved hand request dialog (users can ask your hand once per game, reset it by re-activate button); 2019-05-28 13:46:29 +04:00
Oleg Agafonov
94e7f76e14 Prepare next release 2019-05-19 11:18:08 +04:00
Oleg Agafonov
d34fa0ef22 Prepare next release 2019-05-11 17:40:23 +04:00
Oleg Agafonov
c45f64bdec UI: improved card render test dialog (added render mode and size choose); 2019-05-06 23:16:58 +04:00
Oleg Agafonov
af574443f8 Prepare 35v4 hotfix 2019-05-03 10:29:06 +04:00
Oleg Agafonov
fc1fa70e0d Prepare hotfix and fix empty hands on startup (versions compatibility problem) 2019-04-30 14:42:23 +04:00
Oleg Agafonov
311532a6e7 Prepare hotfix 2019-04-29 01:14:58 +04:00
Oleg Agafonov
21c99fae3b Prepare hotfix release 2019-04-24 23:13:51 +04:00
Oleg Agafonov
bbf1c1343a Prepare release 1.4.35 2019-04-23 23:32:54 +04:00
Oleg Agafonov
fe9c3fbae8 Fixed bloated connection errors in logs; 
Fixed that data update tasks runs after disconnect;
 2019-04-12 15:38:33 +04:00
Oleg Agafonov
f81142459d * UI: fixed wrong server reconnect on multiple apps runs (#5495); 2019-04-12 12:15:48 +04:00
Oleg Agafonov
5a0f01c14a * UI: improved connects and disconnects processing: 
* fixed app freeze on broken server;
 * fixed app freeze on cancel button clicks;
 * fixed wrong still connected dialogs on app close or connect;
 * fixed missing wrong versions message;
 * improved error logs and messages.
 2019-04-11 12:14:18 +04:00
Oleg Agafonov
718bfb0a52 Fixed NPE error on connection startup freeze; 2019-04-11 08:25:16 +04:00
Oleg Agafonov
c6e262b0ed Refactor: fixed duplicated class name 2019-04-03 13:00:24 +04:00
Oleg Agafonov
fef7f6f208 Current version is incompatible with previous 2019-04-01 07:37:32 +04:00
Oleg Agafonov
896a2ff001 Prepare for hotfix 2019-03-30 10:21:26 +04:00
Oleg Agafonov
65bb9b2161 Prepare new release 1.4.34 2019-03-29 18:31:00 +04:00
Oleg Agafonov
0e6dbb4eed * UI: improved and fixed possible targets highlighting: 
* added blockers highlighting on declare blockers step;
   * fixed that blocker targets highlights all attackers instead real;
   * fixed wrong attackers draw in images render mode;
 2019-03-28 09:29:15 +04:00
Oleg Agafonov
c58b28f94f UI: fixed rare error with wrong dialog position after multiple popups (#4318); 2019-03-28 09:19:16 +04:00
Oleg Agafonov
270ec615af Sync old changes 2019-03-22 21:51:26 +04:00
Oleg Agafonov
2a0d2d125b * UI: fixed error message window for long text (auto-size), improved wrong version message; 2019-03-18 09:00:27 +04:00
Oleg Agafonov
7088cbb8c2 Current code is incompatible with last 33v4 release; 2019-03-11 20:37:41 +04:00
Oleg Agafonov
ba407dcdae Fixed NPE error on connection problem; 2019-03-08 15:11:06 +04:00
Oleg Agafonov
e68b79336a Typo fix 2019-03-06 14:06:47 +04:00
Ingmar Goudt
45f665eb1d Sonar cleanups 03032019 2019-03-04 10:43:20 +01:00
Ingmar Goudt
8319fbf9ad replace public fields with encapsulation 2019-03-03 09:51:14 +01:00
Oleg Agafonov
d76c764d64 Fixed wrong date format on client/server databases; 2019-03-01 21:59:14 +04:00
Oleg Agafonov
89f8d57935 Prepare new release 2019-03-01 20:46:09 +04:00
Oleg Agafonov
f788af1f6a * Improved connection performance on new release, no more empty cards on startup; 2019-03-01 18:55:20 +04:00
Ingmar Goudt
3359c1f3f1 sonar 220219, criticals 2019-02-22 12:06:11 +01:00
Ingmar Goudt
056226d83c Sonar fixes 19022019 2019-02-19 21:51:45 +01:00