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

969 commits

Author SHA1 Message Date
LevelX2
a4c2e51ab3 * Added some missing AI target logic. 2018-02-13 10:33:33 +01:00
JRHerlehy
fcfb431290 Feb 12, 2018 B&R Update 
Modern - Jace, the Mind Sculptor UNBANNED, Bloodbrade Elf UNBANNED

All other formats - No Changes
 2018-02-12 13:29:24 -05:00
LevelX2
61c3798b83 Removed some system.out debug lines. 2018-02-12 11:38:35 +01:00
LevelX2
b752eacfaa * Optimized handling and call of player.choose choice to prevent problems if a player disconnects or left a game (#4263). 2018-02-04 17:51:12 +01:00
LevelX2
4dd196f373 * Fixed some problems with getting cards at random from collection that could cause loops. 2018-02-04 12:27:08 +01:00
Oleg Agafonov
8596a92ed8 Added error logs for freezes ignoring timer (see #4476) 2018-02-03 13:54:39 +04:00
spjspj
aebc16dc82
Merge pull request #4476 from spjspj/master 
Scenario I was testing for this fix:
 2018-02-03 18:45:52 +11:00
Oleg Agafonov
3bfe5ec5d3 Fixed game and/or timer freeze on another player concede with 3+ games (see #4476) 2018-02-03 08:26:01 +04:00
spjspj
b924f4bb6b Scenario I was testing for this fix. 
Local Server, EDH game with Player1, Player2, Player3.
Player1 has 2 mana reflections out, cast Torment of Hailfire for 15 and is tapping mana for it.
The 'choose replacement effect' popup comes up.
Whilst this is happening, Player2 concedes.
This will currently lock up the game and sits forever in waitResponseOpen.
 (With the time out now there, it will time out after 30 seconds or so.
 2018-02-03 13:21:47 +11:00
LevelX2
db0fc1b439 * Some changes to skip handling. 2018-02-02 00:27:12 +01:00
Oleg Agafonov
6f175981ce Small fix 2018-01-28 15:12:41 +04:00
Oleg Agafonov
c2d661eca7 Fixed freeze on end game 2018-01-28 06:47:53 +04:00
LevelX2
b60cd3d40e Removed debug command. 2018-01-28 01:14:50 +01:00
LevelX2
2f016c8ea6 Fixed some more exception and/or logging problems. 2018-01-27 13:19:20 +01:00
Oleg Agafonov
7b90201099 Merge remote-tracking branch 'production/master' into production_master 2018-01-27 14:03:08 +04:00
Oleg Agafonov
ba4fee11f6 Fixed weird errors with server lost of player priority on lagged games (see #4448) 2018-01-27 13:59:38 +04:00
Oleg Agafonov
9d131f6bde Random generated decks improvements and fixes for AI: 
* added generation of only basic lands decks;
 * fixed wrong color cards selection;
 2018-01-27 13:19:03 +04:00
LevelX2
09582eafc3 Added banned standard cards of 2018-01-15. 2018-01-27 10:14:37 +01:00
Jeff
9cd3c010fd - Cleanup of AI classes. 2018-01-19 16:37:09 -06:00
LevelX2
40afa04b24 xmage 1.4.27V0 2018-01-13 22:54:53 +01:00
igoudt
2564f61182 HumanPlayer constructor missed a reference to attribute 2018-01-07 21:47:00 +01:00
Oleg Agafonov
3d53d28f5e Fixed AI infinite loop on wrong answers input (tests affected) 2018-01-04 18:14:22 +04:00
Oleg Agafonov
d1475f28b4 Fixed not working response result from key-value choice dialogs 2018-01-04 00:32:17 +04:00
Oleg Agafonov
3dda5712db AI: fixed not working choice with key-value dialogs, random refactor 2018-01-04 00:23:20 +04:00
Oleg Agafonov
e9012a8eda Added MTGO Vintage Cube December 2017, fixed typos 2017-12-30 07:26:19 +04:00
LevelX2
acc4c70f24 Added block formats. 2017-12-29 11:30:00 +01:00
Zzooouhh
3a6974c0b0
NullPointerException fix 2017-12-23 19:42:02 +01:00
spjspj
fe02e3fba3 Fix points for Aus 7pt Highlander 2017-12-12 01:02:51 +11:00
Evan Kranzler
93ad59ab4a updated the Duel Commander banlist 2017-11-28 13:59:12 -05:00
Evan Kranzler
34c31834c5 fixed an error 2017-11-26 17:23:39 -05:00
spjspj
a2e78cd3e4
Merge pull request #4200 from spjspj/master 
spjspj - Add a version of Freeform Commander
 2017-11-26 00:26:47 +10:00
LevelX2
603e625d8d Fixed a problem with AI opponent selection, 2017-11-25 12:55:26 +01:00
spjspj
46db9973c9 spjspj - Add a version of Freeform Commander (any creature or legendary permanent can be commander, no ban list) 2017-11-25 22:36:56 +11:00
spjspj
44b9d89974 spjspj - Add a version of Freeform Commander (any creature or legendary permanent can be commander, no ban list) 2017-11-25 22:35:47 +11:00
spjspj
00eb481004 spjspj - Add a version of Freeform Commander (any creature or legendary permanent can be commander, no ban list) 2017-11-25 22:14:20 +11:00
spjspj
7292683604
Merge pull request #4171 from spjspj/master 
spjspj - Add in a new way to allow just the Face Art for cards to be shown
 2017-11-18 10:30:44 +11:00
Oleg Agafonov
2a12e788d5 clean git source 2017-11-11 13:02:49 +04:00
spjspj
19c9689f89 Apostrophes 2017-11-11 12:39:42 +11:00
Evan Kranzler
83231c8992 updated Canadian Highlander points list 2017-11-08 15:34:47 -05:00
LevelX2
0d46c68924 * Fixed some problems for handling concede during game init. 2017-11-04 18:19:41 +01:00
LevelX2
9700445fae
Merge branch 'master' into master 2017-11-02 11:29:47 +01:00
LevelX2
f1bbb37c81 Merge origin/master 2017-11-02 10:29:04 +01:00
jerekwilson
5d34a2304d Merge branch 'master' into master 2017-10-22 20:09:26 -04:00
Jerek Wilson
8f49988bbf JW-TalonOfPain: Implemented Talon of Pain 2017-10-22 19:37:53 -04:00
theelk801
0ac6bf93b8 Merge pull request #4119 from Faxn/feature/momirFFA 
Add Momir Basic Free for All
 2017-10-21 16:11:44 -04:00
LevelX2
919ec2fade Merge origin/master 2017-10-21 16:14:14 +02:00
LevelX2
58d3fc2328 Fixed player leaving/conceding handling. 2017-10-21 16:13:45 +02:00
Evan Kranzler
d52f46323b Updated Adam Styborski's Pauper Cube 2017-10-19 13:55:16 -04:00
Faxn
51ea9972e0 Merge branch 'master' into feature/momirFFA 2017-10-19 13:08:13 -04:00
Jerek Wilson
be7d23d15c JW-Dead-Iron_Sledge: Implemented Dead-Iron Sledge 2017-10-18 23:53:04 -04:00
Jerek Wilson
12f14ea488 JW-RhysticCave: Implemented Rhystic Cave 2017-10-15 11:17:23 -04:00
Jerek Wilson
1afcf67e8d JW-IceFloe: Implemented Ice Floe 2017-10-10 00:12:26 -04:00
Jerek Wilson
50d9cb5568 JW-JaggedPoppet: Implemented Jagged Poppet 2017-10-09 22:04:30 -04:00
Evan Kranzler
901a640592 updated MTGO 1v1 Commander banlist 2017-10-09 12:30:36 -04:00
Evan Kranzler
93f01af87e fixed SOI block being incorrectly included in standard, removed unnecessary bans 2017-10-02 13:51:52 -04:00
Faxn
31d4be7a1c Momir Multiplayer Might just work. 2017-09-28 18:21:47 -04:00
Benjamin Maitland
f22d64df82 Fixed Zendikar release date. 2017-09-27 23:13:06 -04:00
Evan Kranzler
c8457aec49 updated Duel Commander banlist 2017-09-26 08:50:55 -04:00
LevelX2
3ac7fc2726 * Some fixes to possible exceptions. 2017-09-23 23:48:25 +02:00
LevelX2
2d6bcd83f4 xmage 1.4.26V4 2017-09-16 16:55:58 +02:00
LevelX2
2117bfc17c Merge ReworkImageDownload 2017-09-15 23:23:49 +02:00
LevelX2
3fc3d96fe0 Some updates to image download. 2017-09-15 23:18:40 +02:00
LevelX2
5996aa12e6 Trove of Temptation working for Human. 2017-09-15 17:51:54 +02:00
LevelX2
d9c601dd26 Trove of Temptation - Basic some changes to Combat and Human 2017-09-14 17:50:00 +02:00
Evan Kranzler
252c941b4f Refactored more subtypes usages to enum 2017-09-08 09:57:51 -04:00
LevelX2
23fc43fafe Merge master into ReworkImageDownload 2017-09-08 13:58:09 +02:00
LevelX2
b2496e3d7f Fixed Vintage restricted list. 2017-09-05 16:19:53 +02:00
Evan Kranzler
26e4e2672e Updated Vintage restricted list 2017-09-04 12:11:47 -04:00
LevelX2
d003cd898f Image download by set with source restriction to supported sets. 2017-09-04 07:57:10 +02:00
LevelX2
5bf12d227c Some minor changes. 2017-09-01 23:50:07 +02:00
LevelX2
cba7a510ea * Fixed a bug if casting split cards from other players e.g with Mindclaw Shaman (fixes #3867). 2017-08-30 00:30:46 +02:00
LevelX2
e909f5c801 C17 Added Portal Mage. 2017-08-28 16:50:00 +02:00
theelk801
22d253acd7 Merge pull request #43 from magefree/master 
merge
 2017-08-26 19:59:51 -04:00
Evan Kranzler
942e1cce9a Updated Canadian Highlander points list 2017-08-26 18:03:26 -04:00
LevelX2
52897094b3 * Some chnages to chat, user and player handling. 2017-08-26 18:26:55 +02:00
LevelX2
db93e3f672 * C17 Enchantment Curses - Fixed a bug that could create game errors (index out of bounds). 2017-08-17 21:36:55 +02:00
LevelX2
1fb24116ae xmage 1.4.26V0 2017-08-15 01:27:06 +02:00
spjspj
6435b9950a Add in Penny Dreadful EDH format (plus filter options for deck editor). 2017-08-04 17:13:25 +10:00
LevelX2
69e239d2ed Xmage 1.4.25V0 (update because of Log problem) 2017-07-30 08:54:37 +02:00
LevelX2
fe2ee5dfec Xmage 1.4.25V0 2017-07-29 20:35:16 +02:00
LevelX2
400bbba8e1 * Deactivated macro button, becuase it's not working correctly (#2147). 2017-07-29 17:39:13 +02:00
LevelX2
ea3d00a430 * Fixed that testing framework does not support snow mana payment (fixes #3751). 2017-07-28 12:47:00 +02:00
Jeff
e4c81df35e Fixed Bug #3711 2017-07-24 11:12:20 -05:00
LevelX2
878ba90625 * Fixed a bug that prevented players from paying costs during spell resolution (e.g. Mana Leak) - (fixes #3715). 2017-07-23 19:48:04 +02:00
LevelX2
ee890418c5 * Added missing imports. 2017-07-23 16:59:20 +02:00
LevelX2
4806738cfb * Some more use of StaticFilter objects. 2017-07-23 14:59:13 +02:00
fireshoes
382476206c Restored inadvertently deleted line in DuelCommander.java 2017-07-19 16:33:57 -05:00
fireshoes
71f1acc90c Updated Duel Commander banlist. 2017-07-17 16:33:51 -05:00
ingmargoudt
09f0c9ad97 huge rework on subtypes (#3668) 
* huge rework on subtypes

* update for coat of arms

* fix test
 2017-07-16 16:57:39 -05:00
LevelX2
1fe841e6d9 Merge branch 'master' into master 2017-07-10 13:18:58 +02:00
fireshoes
48413a956a Added MTGO 1v1 Commander and Amonkhet Block Constructed formats. Fixed a typo in the Duel Commander banlist. 2017-07-09 16:51:57 -05:00
Benjamin Maitland
8e16cf0bd6 Added the Old School 93/94 Format. Uses original rules. 2017-07-08 23:40:27 -04:00
Benjamin Maitland
1869777634 Fixed bug Historical Type 2 Issues #3417. 
Shards of Alara had an incorrect release date.
Nemisis had the wrong set code in the hardcoded standards.
 2017-07-08 14:54:44 -04:00
LevelX2
7d911ae803 XMage 1.4.24V0 2017-07-08 16:33:09 +02:00
Devon Richards
ba80bf9227 Merge pull request #6 from ruler501/master 
Merge Master In
 2017-07-06 09:21:46 -05:00
Ben Homer
612d863883 Fixed bug where PlayerResponse toString throws an error sometimes. 2017-06-27 17:42:36 -05:00
fireshoes
1d183736c8 Added Vintage Cube June 2017. Added some HOU and XLN spoilers to mtg-cards-data.txt. 2017-06-26 20:31:02 -05:00
Devon Richards
fee630a0ac Small cleanup 2017-06-24 11:23:58 -05:00
Devon Richards
63382aed93 Some stylistic fixes for code review 2017-06-21 23:51:59 -05:00
Devon Richards
0d98514550 Added better UI and made it work with most categories of combos 2017-06-21 01:09:54 -05:00