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

22127 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
c401a7f5ea Fixed some exception problems. 2018-01-27 18:29:47 +01:00
LevelX2
84a815eb73 Merge origin/master 2018-01-27 17:57:27 +01:00
LevelX2
f5499531c7 Fixed that combat damage triggered abilities go to stack during the related combat step. 2018-01-27 17:56:46 +01:00
Quercitron
ad74ddd981 * Infernal Genesis - Fix that incorrect Minion creature token was used (closes #4445) 2018-01-27 18:35:43 +03:00
LevelX2
2f016c8ea6 Fixed some more exception and/or logging problems. 2018-01-27 13:19:20 +01:00
Oleg Agafonov
9268281c4b Tests: fixed random gen deck 2018-01-27 15:49:24 +04:00
Oleg Agafonov
78ff3c3714 Tests: added game start mode to load testing 2018-01-27 14:52:34 +04:00
LevelX2
020beb1bf6 Merge origin/master 2018-01-27 11:43:01 +01:00
LevelX2
6b90c1fd7f Fixed some exception problems. 2018-01-27 11:42:43 +01:00
LevelX2
9eb71e24be Jack-in-the-Mox set undo pissible to false. 2018-01-27 11:41:28 +01:00
Oleg Agafonov
7b90201099 Merge remote-tracking branch 'production/master' into production_master 2018-01-27 14:03:08 +04:00
Oleg Agafonov
85d8d665aa Tests: rewrite load tests for server stability and performance testing (see #4448) 2018-01-27 14:02:24 +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
1b191a5f93 Fixed temporary effects copy between game states, fixed concurrent access errors while execute some cheat commands; 2018-01-27 13:26:04 +04:00
Oleg Agafonov
c69b3f4609 Fixed wrong players compare (not by UUID -- see #4407) 2018-01-27 13:23:03 +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
Oleg Agafonov
2870c3ab2a Cleanup 2018-01-27 12:54:16 +04:00
spjspj
cea82e9b7c
Merge pull request #4444 from spjspj/master 
Update connection dialog to point to Xmage.us from xmage.woogerworks.com
 2018-01-27 15:51:33 +11:00
spjspj
71a1097b1c Update connection dialog to point to Xmage.us from xmage.woogerworks.com 2018-01-27 11:28:46 +11:00
Quercitron
17851099d6 * Slaughter the Strong - Fix that controller chooses targets for all players (closes #4436) 2018-01-27 00:28:05 +03:00
Jeff
1b9ee1c6c4 - Fixed text on Akki Coalflinger 2018-01-26 11:30:33 -06:00
spjspj
0c63fc04b4 Update connection dialog to point to Xmage.us from xmage.woogerworks.com 2018-01-27 01:52:31 +11:00
Oleg Agafonov
74f988ce1d Cheats: added 2 new special commands, see #4334: 
* show opponent hand
  * show opponent library
  * added params to special commands to show more or less info:
    - pt;
    - color;
    - abilities count;
    - abilities list.
 2018-01-26 06:42:23 +04:00
Oleg Agafonov
44c647a3b5 Fix missing import 2018-01-25 13:36:11 +04:00
Oleg Agafonov
937a814ba6
Merge pull request #4443 from Ketsuban/fix-unified-strike-2 
Fix Unified Strike 2
 2018-01-25 13:35:37 +04:00
Oleg Agafonov
321a45140b UI: added more info on card's tooltip delay/disable 2018-01-25 08:15:12 +04:00
Thomas Winwood
87c16cb09f Fix Unified Strike for real this time 2018-01-25 02:55:31 +00:00
Oleg Agafonov
299f78d710
Merge pull request #4441 from Ketsuban/fix-unified-strike 
Fix Unified Strike
 2018-01-25 03:34:39 +04:00
Thomas Winwood
1baf29d194
Fix Unified Strike 
Unified Strike currently does nothing at all because the Outcome is set wrong.
 2018-01-24 13:45:37 +00:00
Oleg Agafonov
938bb26974
Merge pull request #4429 from Zzooouhh/Zzooouhh-purgatory 
Implemented Purgatory
 2018-01-23 16:20:12 +04:00
Oleg Agafonov
a0b6c36512
Merge pull request #4437 from SpikesCafe-google/master 
Fix Reyhan death trigger (fixes #4055)
 2018-01-23 16:03:24 +04:00
SpikesCafe-google
7d6e9c51e3
Update ReyhanLastOfTheAbzan.java 2018-01-21 10:37:32 -05:00
SpikesCafe-google
f0e1eaa8e8
Update ReyhanLastOfTheAbzan.java 2018-01-21 00:26:57 -05:00
SpikesCafe-google
b899ca3b5f
Update ReyhanLastOfTheAbzan.java 2018-01-21 00:16:24 -05:00
SpikesCafe-google
57a9c04032
Merge pull request #2 from SpikesCafe-google/SpikesCafe-google-reyhan 
Fix Reyhan death trigger (fixes #4055)
 2018-01-20 23:40:29 -05:00
SpikesCafe-google
04b8dd839c
Fix Reyhan death trigger (fixes #4055) 2018-01-20 23:24:10 -05:00
spjspj
7d12532eca
Merge pull request #4433 from spjspj/master 
Implement Keeper of the Dead (EXO)
 2018-01-20 18:20:23 +11:00
spjspj
cc12bb4713 Implement Keeper of the Dead (EXO) 2018-01-20 17:56:49 +11:00
Jeff
9cd3c010fd - Cleanup of AI classes. 2018-01-19 16:37:09 -06:00
spjspj
8db20dbe8d
Merge pull request #4430 from spjspj/master 
Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)
 2018-01-19 22:20:03 +11:00
spjspj
d095f83d8a Fix M15 colors for GW (was WG), GU (was UG), RW (was WR) 2018-01-19 21:28:47 +11:00
spjspj
b26cd21f02 Fix M15 colors for GW (was WG), GU (was UG), RW (was WR) 2018-01-19 20:33:17 +11:00
spjspj
af48b17451 Fix M15 colors for GW (was WG), GU (was UG), RW (was WR) 2018-01-19 20:30:12 +11:00
L_J
0a5e693697
Significant remake 2018-01-18 23:58:32 +00:00
Jeff
095d32cb1d - Little AI fix Orim's Chant. 2018-01-18 17:15:46 -06:00
L_J
1d64208497
Implemented Purgatory 2018-01-18 23:13:29 +00:00
L_J
fe6dd22d14
Implemented Purgatory 2018-01-18 23:12:25 +00:00
Oleg Agafonov
89f5967441 * [RIX] Added missing tokens (tokens.mtg.onl is updated with 150+ images too); 2018-01-18 07:02:02 +04:00
L_J
36a77c76e4
Merge pull request #4425 from Zzooouhh/Zzooouhh-thedark 
Implemented The Dark cards
 2018-01-17 22:23:50 +01:00