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

850 commits

Author SHA1 Message Date
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
LevelX2
329116669a * Fixed a problem with stack abilities created by Designations eg. Monarch triggered ability (fixes #4457). 2018-04-26 23:35:26 +02:00
LevelX2
758634f5bb XMage 1.4.29V3 2018-04-24 23:43:24 +02:00
LevelX2
52ae0a9be6 XMage 1.4.29V2 2018-04-21 23:04:50 +02:00
LevelX2
4280d92a37 Xmage 1.4.29V1 2018-04-20 00:09:32 +02:00
LevelX2
fe2220e19e Xmage 1.4.29V0 2018-04-19 21:07:14 +02:00
spjspj
d97a3ebf04 Continuing implementation of Planechase. 2018-04-13 01:20:10 +10:00
spjspj
c8b741f0bf Continuing implementation of Planechase. 2018-04-12 00:07:24 +10:00
spjspj
e932c139d9 Beginning of implementation of Planechase. 
10 or so initial planes that (mostly) have been tested, no phenomenons as yet and no modifying yet of chaos rolls.  Also no support for a user to be able to set if it is planechase (able to do so via the cheat button).
 2018-04-09 08:44:48 +10:00
LevelX2
ecbe7e68a6 * Fixed that second or higher level of attachments was not shown correctly on battlefield (fixes #892 fixes #4539 fixes #785 fixes #258). 2018-04-08 20:38:26 +02:00
Marc Zwart
1053db617b fixed missing linebreaks 2018-04-03 14:31:59 +02:00
Marc Zwart
3e32287f00 fixed Token/TokenImpl imports and references 2018-04-03 14:05:41 +02:00
Marc Zwart
532a190587 closed resources in savegame method of gamecontroller 2018-03-20 13:52:23 +01:00
Marc Zwart
4bc5a9bd61 Merge branches 'hotfix/close-unclosed-resources-mage-client', 'hotfix/close-streams-in-updater', 'hotfix/fix-non-closed-scanner' and 'hotfix/manapiechart-potential-zero-division' into feature/SonarqubeFixes 2018-03-20 13:03:28 +01:00
Marc Zwart
9912a23007 added quiet closing method in new streamutils class, used to clean up the connectdialog 2018-03-20 12:46:53 +01:00
LevelX2
b073ce1c42 * Added to all toUpperCase/toLowerCase calls the Locale.ENGLISH to prevent problems with some languages (e.g. Turkish). Removed some unused import statements. (#4634). 2018-03-18 18:18:54 +01:00
LevelX2
b046428f8c XMage 1.4.28V1 2018-03-17 23:59:34 +01:00
LevelX2
5925bdf259 * Fixed a problem that Spell objects were not handled always correctly in game view. 2018-03-16 18:25:28 +01:00
LevelX2
bd56b074a0 * Some minor changes to game end window. 2018-03-13 18:01:26 +01:00
LevelX2
fed2d1a259 XMage 1.4.28V0 2018-03-10 20:42:29 +01:00
LevelX2
b60522f9e4 Added option to activate/deactivate JSON game log. Added logic to write the logs to subdirectory. Some changes to SEND_PLAYER_ACTION type logging. 2018-03-10 00:04:56 +01:00
LevelX2
51c68842aa Some minor changes to JSON game log (#4587). 2018-03-08 23:40:55 +01:00
LevelX2
fedf254219
Merge pull request #4554 from hooptie45/topic/json-logs 
[WIP] Consumable JSON game logs
 2018-03-08 17:32:32 +01:00