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

23188 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
b9ec919f06 Merge origin/master 2018-02-04 17:21:16 +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
ec5c8a01df UI: added different colors for current turn phase (same as buttons -- see #1201) 2018-02-04 12:48:50 +04:00
Oleg Agafonov
5947326a4f UI: added green colorized panel on player's priority (see #1201) 2018-02-04 12:09:21 +04:00
Oleg Agafonov
5fa20278b0 UI: improved ask dialog (same size for all buttons) 2018-02-04 09:53:40 +04:00
L_J
24461422ee
Added missing Fishliver Oil 2018-02-04 02:29:13 +00:00
L_J
a5c089fdc5
Fixed numbering of Revelation and Sentinel 2018-02-04 01:51:39 +00:00
L_J
8fd5d92152
Switched order of getRange and getDraws 2018-02-04 01:43:46 +00:00
L_J
1e0090e4a7
Included logging for range at game startup (fixes #3878) 2018-02-04 01:33:17 +00:00
LevelX2
4836f381ef * Sword of War and Peace - Fixed damage handling of triggered effect. 2018-02-04 01:28:21 +01:00
L_J
2d4a12ca7a
Implemented Stangg 2018-02-03 22:34:36 +00:00
L_J
1d5d9e981a
Implemented Stangg 2018-02-03 22:33:53 +00:00
L_J
6dde7cf1a0
Implemented Stangg 2018-02-03 22:32:53 +00:00
L_J
4ed109985b
Implemented Stangg 2018-02-03 22:31:31 +00:00
L_J
a533352f0d
Implemented Stangg 2018-02-03 22:30:53 +00:00
L_J
0f13e3428b
Added missing supertype 2018-02-03 21:55:28 +00:00
L_J
a19610cb57
Text fix 2018-02-03 21:15:25 +00:00
L_J
2a8693a089
Implemented Nebuchadnezzar 2018-02-03 21:12:38 +00:00
L_J
e550b638c5
Implemented Nebuchadnezzar 2018-02-03 21:11:55 +00:00
L_J
b0d1a91f44
Implemented Nebuchadnezzar 2018-02-03 21:11:30 +00:00
L_J
0b91886def
Implemented Spy Network 2018-02-03 21:09:46 +00:00
L_J
2d26552865
Implemented Carrionette 2018-02-03 21:07:11 +00:00
L_J
0ccd7e6eff
Implemented Spy Network 2018-02-03 21:05:04 +00:00
L_J
1eecec483c
Implemented Carrionette 2018-02-03 21:04:08 +00:00
L_J
e10e4f1b11
Implemented Nebuchadnezzar 2018-02-03 21:03:27 +00:00
L_J
3b7603d406
Merge pull request #38 from magefree/master 
Merge https://github.com/magefree/mage
 2018-02-03 22:02:21 +01:00
LevelX2
82defb2ab8 * Removed land set restriction on limited add land dialog (fixes #4373). 2018-02-03 18:35:47 +01:00
LevelX2
75b8a4b165 Merge origin/master 2018-02-03 17:55:51 +01:00
LevelX2
ced9cef1e1 * Lightning Storm - Fixed that abilities from stack abilities could be activated without cost paying (#4371). 2018-02-03 17:55:22 +01:00
L_J
27d99d4c1d
Fixed #4477 2018-02-03 16:52:02 +00:00
Oleg Agafonov
8596a92ed8 Added error logs for freezes ignoring timer (see #4476) 2018-02-03 13:54:39 +04:00
LevelX2
ac81c5bbd4 Changed callbackException handling. 2018-02-03 10:49:57 +01:00
LevelX2
55b66315af * Some formatting. 2018-02-03 10:49:08 +01: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
LevelX2
f9ca04dfbb * Wildfire Eternal - Fixed that the ability triggered multiple times if more than one player blocked during the turn (fixes #4466). 2018-01-31 00:10:02 +01:00
LevelX2
7afc157ba0 xmage 1.4.27V2 2018-01-31 00:08:05 +01:00
LevelX2
98f79e6a88 * Vermiculos - Fixed that its ability did only trigger for artifacts entering that are controlled by the controller of Vermiculos instead of all artifacts entering. 2018-01-29 16:57:25 +01:00
LevelX2
5d7532dff2 Reverted changes on Session locking. 2018-01-28 23:25:16 +01:00
LevelX2
7f17011bf0 Added logic to suppress failing callbacks to users that lost connection. 2018-01-28 18:05:43 +01:00
LevelX2
34a884546a Readded message if user lost connection. 2018-01-28 18:03:37 +01:00
Oleg Agafonov
66eb1de7f1 Fixed v1 server incompatible with v0 clients (freezes on game startup) 2018-01-28 17:57:55 +04:00
Oleg Agafonov
6f175981ce Small fix 2018-01-28 15:12:41 +04:00
Oleg Agafonov
b114eaa828 Tests: added ai vs ai load testing 2018-01-28 15:12:00 +04:00
Oleg Agafonov
c2d661eca7 Fixed freeze on end game 2018-01-28 06:47:53 +04:00
LevelX2
62a40ab459 Xmage 1.7.27V1 2018-01-28 01:15:19 +01:00
LevelX2
b60cd3d40e Removed debug command. 2018-01-28 01:14:50 +01:00