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

972 commits

Author SHA1 Message Date
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
Oleg Agafonov
8cf681dff2 Updated libraries to latest versions and code compatibility fixes; 2019-02-17 16:12:57 +04:00
Oleg Agafonov
f778d95f54 Prepare next release 2019-02-09 17:42:46 +04:00
Oleg Agafonov
942882bb90 Prepare new release 2019-02-01 20:57:11 +04:00
Oleg Agafonov
0c8fdfcaf2 UI: added draft rating info in card viewer 2019-02-01 18:32:22 +04:00
Oleg Agafonov
cfff0f8116 * UI: added game name and seats number columns to tables list; 2019-01-22 18:32:27 +04:00
Oleg Agafonov
f223bdab31 Added new client-server incompatible checks: 
* added strict mode (client and server versions must be same, see MAGE_VERSION_MINOR_PATCH_MUST_BE_SAME);
 * you must enable string mode after github code changes in serializeable classes (see #4459);
 * added client-side version checks;
 * added error message on wrong version disconnects.
 2019-01-18 13:32:37 +04:00
Oleg Agafonov
14f66029f8 Missing v33 commit 2019-01-16 20:59:45 +04:00
Oleg Agafonov
b313ab3b7c Fixed missing watchers on game start, added error on missing watcher; 2019-01-08 13:50:19 +04:00
Oleg Agafonov
f01b3d3ca3 Improved new version cleanup and more: 
* fixed db cleanup on new version (sets + cards);
 * fixed empty sets list after update;
 * fixed NPE errors in sets list on new install/version;
 * added joke sets filter to deckeditor.
 2019-01-06 15:41:30 +04:00
Oleg Agafonov
2e3fabb161 Fixed NPE error in lobby 2018-12-22 20:41:42 +04:00
Oleg Agafonov
20a3b0b777 Added cards database cleanup on new builds/releases run (client/server sides); 2018-12-21 23:11:43 +04:00
John Hitchings
7e621ee8af Make draft logs compatible with MTGO format #5450 - https://github.com/magefree/mage/issues/5450 2018-12-19 19:41:44 -08:00
Oleg Agafonov
0a2f312da7 Added build time to version info, cleanup manifest files; 2018-12-15 18:29:10 +04:00
LevelX2
e6ce58d6bf XMage 1.4.32V0 2018-11-26 19:30:22 +01:00
LevelX2
e7d129a074
Merge branch 'master' into add-minimum-rating-option 2018-11-26 17:18:35 +01:00
Oleg Agafonov
0df97e5d4b * Server: fixed error on missing xmage.properties file settings on feedback receive; 2018-10-12 22:17:24 +04:00
LevelX2
29f6f1c4b8 XMage 1.4.31V4 2018-09-30 23:15:58 +02:00
Aaron Miller
5cd57199c7 Merge branch 'master' into add-minimum-rating-option 2018-09-29 19:15:46 -07:00
Aaron Miller
81c2a62250 Add "minimum rating" option to matches and tournaments 2018-09-29 19:14:39 -07:00
Ingmar Goudt
48a1386b8f make nested class static 2018-09-28 15:44:17 +02:00
Ingmar Goudt
22c072ad93 make inputstream auto-closeable 2018-09-28 15:29:41 +02:00
LevelX2
6e26719367 XMage 1.4.31V3 2018-09-23 19:43:26 +02:00
LevelX2
0be9867257 XMage 1.4.31V2 2018-09-22 22:55:10 +02:00
Ingmar Goudt
f04d7c9b03 remove redundant null checks before instanceof 2018-09-17 21:09:42 +02:00
Oleg Agafonov
38a45c2e8e Refactor: removed outdated code for non implemented cards 2018-09-09 16:06:40 +04:00
LevelX2
5703a49c81 XMage 1.4.31V1 2018-08-25 14:37:08 +02:00
LevelX2
deb675a74a Xmage 1.4.30V0 2018-08-15 11:35:40 +02:00
LevelX2
2429425fd2 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/s/SalvageTrader.java
	Mage.Sets/src/mage/cards/t/ThermalDetonator.java
 2018-08-15 10:51:21 +02:00
igoudt
9f06046f22 add isOwned and isControlled methods. remove some null-checks, remove some unnecessary casts 2018-07-04 14:24:11 +02:00
LevelX2
ca21f32009 Xmage 1.4.30V6 2018-06-24 21:26:52 +02:00
LevelX2
e04c132dfe Xmage 1.4.30V5 2018-06-21 23:13:17 +02:00
LevelX2
174e3794fb XMage 1.3.30V4 2018-06-10 08:00:17 +02:00
LevelX2
80a6057980 XMage 1.4.30V3 2018-06-06 23:49:27 +02:00
GrayedFox
3953f3dbdd
remove all MIT copyright notices from files 2018-06-02 17:59:49 +02:00
LevelX2
e4a9604086 XMage 1.4.30V2 2018-05-31 14:16:23 +02:00
LevelX2
1f522f874a xmage 1.4.30V1 2018-05-27 23:55:25 +02:00
LevelX2
a19c257e50 XMage 1.4.30V0 2018-05-27 01:28:42 +02:00
LevelX2
cfe712efc6 XMage 1.4.29V5 2018-05-27 01:00:55 +02:00
LevelX2
e767c79429 XMage 1.4.29V4 2018-05-01 01:20:52 +02:00