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

6592 commits

Author SHA1 Message Date
L_J
0982d6b10e
Name typo 2018-02-13 20:56:05 +00:00
L_J
c37ecff939
Small rewrite 2018-02-13 19:56:46 +00:00
L_J
e7301e2c08
Implemented banding (#41) 2018-02-13 20:36:25 +01:00
LevelX2
a85fa82de0 * Bestow - Fixed a problem that if the target of a bestow enchantment aura got illegal, the bestow permanent did not chnage back to be a creature. 2018-02-12 15:49:16 +01:00
LevelX2
f0f407457e * Subtypes of tokens were not set back correctly after a subtype changing effect did end (e.g. Arcane Adaptation). 2018-02-12 14:45:05 +01:00
LevelX2
6d848e2059 * Fixed a bug that turn rollback did not work correctly, if player was in a buy cost process that included possible rollback (fixes #4510). 2018-02-12 11:41:01 +01:00
LevelX2
c9603d1994 * Some fixes to token image downloading. 2018-02-11 23:30:15 +01:00
LevelX2
d66d8d47fb Some rework of Keeper of the Light. 2018-02-10 00:05:54 +01:00
LevelX2
82e104f9df * Fixed a problem that instead putting cards to library bottom the cards cease to exist (e.g. Ancient Stirrings). 2018-02-08 22:42:34 +01:00
spjspj
90e830cc84
Merge pull request #4498 from spjspj/master 
Implementing Snow Mercy (HHO) - Christmas Special Occasion card
 2018-02-08 01:28:08 +11:00
spjspj
7dcbc0f441 Implementing Snow Mercy (HHO) - Christmas Special Occasion card 2018-02-08 01:14:25 +11:00
LevelX2
eeb938af94 * Fixed a bug that could lock the game if you should pick more cards from shown cards from your library than cards left in your library (e.g. Dig Through Time). 2018-02-07 14:24:17 +01:00
LevelX2
c13b16fa84 Xmage 1.4.27V3 2018-02-06 23:49:41 +01:00
LevelX2
0a28ab2d5a * Fixed a bug when token permanents were put on top or buttom of library (e.g. using activated ability of a copied Timestream Navigator). 2018-02-06 23:33:44 +01:00
Oleg Agafonov
c556ea5b12 Fixed #4490 - Layout Mismatch 2018-02-06 17:25:15 +04:00
L_J
d1c5fe3f0f
Ponder fix (#4484 #4481) 2018-02-06 10:46:10 +00:00
L_J
28a3f75f4d
Merge pull request #4478 from Zzooouhh/Zzooouhh-cards 
Implemented Nebuchadnezzar, Spy Network, Carrionette, Stangg
 2018-02-05 09:27:09 +01:00
LevelX2
88d4e2b965 * Bushido - Fixed that it triggerd wrongly for each blocker instead of only once if blocked. 2018-02-04 21:13:07 +01:00
Oleg Agafonov
5722b51d6e * Fixed "layout mismatch" error on open some decks (#4311); 2018-02-04 22:15:27 +04: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
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
L_J
a533352f0d
Implemented Stangg 2018-02-03 22:30:53 +00: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
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
Oleg Agafonov
66eb1de7f1 Fixed v1 server incompatible with v0 clients (freezes on game startup) 2018-01-28 17:57:55 +04:00
LevelX2
62a40ab459 Xmage 1.7.27V1 2018-01-28 01:15:19 +01:00
LevelX2
afaa1149e7
Merge pull request #4450 from BenDawes/bugfix/becomesCreateAllEffectSetCalculation 
Fix becomesCreatureAllEffect set calculation
 2018-01-27 19:03:54 +01:00
LevelX2
8c2185019c * Ascend - Fixed that not all types of permanets were counted (e.g. Planeswalker). 2018-01-27 18:54:10 +01:00
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
Ben Dawes
2f4b6ca713 BecomeCreatureAllEffect used to always calculate the permanent set to apply to every time it is applied 
Now we calculate it either at init-time (for abilities with affected object sets) OR at apply-time (Static abilities etc.)
 2018-01-27 11:51:16 +00:00
Oleg Agafonov
9268281c4b Tests: fixed random gen deck 2018-01-27 15:49:24 +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
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
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
af48b17451 Fix M15 colors for GW (was WG), GU (was UG), RW (was WR) 2018-01-19 20:30:12 +11: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
1dceae4e95
Implemented Lurker 2018-01-17 20:34:35 +00:00
Achilles
6da1112a89 - Code by Noxx to address the Blood Moon/Urborgtoy layering issue. Layer test updated. 2018-01-15 18:47:42 -06:00
Oleg Agafonov
98cc704592 Fixed visible empty sets in new tournament dialog (#4415) 2018-01-14 20:54:42 +04:00
igoudt
7f319c2751 fix null-check in raging river and a watcher 2018-01-13 23:26:35 +01:00
LevelX2
ed3742b1e4 Merge origin/master 2018-01-13 22:55:44 +01:00
LevelX2
40afa04b24 xmage 1.4.27V0 2018-01-13 22:54:53 +01:00
Zzooouhh
d4e2b70cf3
Added hunger counter 2018-01-13 19:14:39 +00:00
LevelX2
9a760670dd * Fixed that Explore did not trigger if it was initiated from a instant or sorcery. 2018-01-13 19:37:36 +01:00
LevelX2
2e3ba7e104 Added designation names to player tooltip. 2018-01-13 18:55:07 +01:00
LevelX2
6693929557 * Some refactoring. 2018-01-13 14:45:50 +01:00
Oleg Agafonov
9a0b48e9b7 Little fix on filter 2018-01-13 14:58:43 +04:00
LevelX2
393f8dc9f4 * World at War - Fixed that its extra Main Phase was not executed (fixes #4382). 2018-01-13 11:14:13 +01:00
LevelX2
524541040f * Daretti, Ingenious Iconoclast - Fixed wrong third text (fixes #4405). 2018-01-13 10:20:35 +01:00
LevelX2
83528369ee * Daretti, Ingenious Iconoclast - Fixed wrong third text (fixes #4405). 2018-01-13 09:25:31 +01:00
Achilles
7ade17595d - Aftermath keyword works again. Added test for Aftermath keyword. 2018-01-12 23:58:38 -06:00
Oleg Agafonov
4771ad2c63 Fixed UGL test, rename new token 2018-01-13 02:27:16 +04:00
Oleg Agafonov
9b740b8cbb
Merge pull request #4363 from SpikesCafe-google/master 
Implement "Pure Reflection" card from Invasion.
 2018-01-13 02:23:30 +04:00
Oleg Agafonov
bbdf762775
Merge pull request #4404 from Zzooouhh/Zzooouhh-sporogenesis 
Implemented Sporogenesis & some The Dark cards
 2018-01-13 01:10:30 +04:00
Oleg Agafonov
36dcae63b3 For last fix 2018-01-12 21:28:10 +04:00
Oleg Agafonov
7c2511355e Tests: added checks for errors on card loading (see #4402) 2018-01-12 21:10:10 +04:00
Zzooouhh
c6f623ea41
Added fungus counter 2018-01-12 16:40:53 +00:00
LevelX2
a63f87da2c Little fix. 2018-01-12 17:04:51 +01:00
LevelX2
f798a25b3b Added some mechanism that helps to prevent unintended changes to StaticFilters. 2018-01-12 15:27:52 +01:00
igoudt
267100d3d6 fix for #4402 2018-01-12 15:03:54 +01:00
Radoslaw Sypen
29a889b236 Merge branch 'master' of github.com:rsypen/mage into fix_tests_not_passing 2018-01-12 10:42:50 +01:00
Radoslaw Sypen
88527987cc Fixed ItThatBetrays and Barrin, Master Wizard broken effects, added new test for Emrakul's annihilator trigger 2018-01-12 10:33:11 +01:00
Zzooouhh
ca46a8872a
Moved PermanentInListPredicate to common predicates 2018-01-11 17:53:32 +00:00
spjspj
ab4490e476
Merge pull request #4398 from spjspj/master 
Add 5 cards  (UGL)
 2018-01-12 00:06:39 +11:00
spjspj
d9bcfa3f31 Add 5 cards (UGL) 2018-01-11 23:55:37 +11:00
spjspj
8a1619f9b4
Merge pull request #4396 from spjspj/master 
Add 3 cards  (UGL)
 2018-01-11 17:56:55 +11:00
spjspj
96e6a917b4 Add 3 cards (UGL) 2018-01-11 17:43:33 +11:00
LevelX2
4c9ed95662 Xmage 1.4.26V11d 2018-01-11 07:14:49 +01:00
LevelX2
2685d9f8b4 Fixed some possible null pointer exceptions (found in server log). Market Festival, Kindred Summons, Profane Processions, New Blood, Kindred Charge , Bishop of Binding, Metzal Tower of Triumph, Chrome Mox 2018-01-11 06:12:27 +01:00
Zzooouhh
a38ec84581
Removed slipped beta Blaze of Glory code 
in case it could break something, as it's still buggy
 2018-01-10 19:49:15 +00:00
Zzooouhh
8f9356533d
Fixed undoing individual blocker declarations for multi-blockers 
One more #4172 fix
 2018-01-10 19:44:48 +00:00
ciaccona007
470bb69a7e Implement Timmy, Power Gamer 2018-01-09 14:14:34 -08:00
ciaccona007
3e87a50b4d Implement Krazy Kow 2018-01-09 13:25:46 -08:00
ciaccona007
79c18d28e2 Implement Chicken Egg 2018-01-09 12:40:39 -08:00
LevelX2
fef0ef83ec xmage 1.4.26V11c 2018-01-08 22:59:35 +01:00
Zzooouhh
1109d2b246
Made Changeling take effect in all zones 
Still doesn't fix Path of Ancestry interaction of Dr. Julius Jumblemorph though
 2018-01-08 17:23:12 +00:00
SpikesCafe-google
645b4ac47b
Rename PermanentReflectionToken.java to PureReflectionToken.java 2018-01-07 20:59:00 -05:00
SpikesCafe-google
99b4b427f0
Create PermanentReflectionToken.java 2018-01-07 20:45:30 -05:00
igoudt
ec5b34be04 Merge branch 'master' of https://github.com/magefree/mage 2018-01-07 22:39:40 +01:00
igoudt
27ec3431ee rewrite with staticfilter 2018-01-07 22:39:31 +01:00
igoudt
6d16e41ec3 use some staticfilters, rewrite some lines to java8 streams 2018-01-07 22:38:54 +01:00
LevelX2
995c58e381 * Reckless Rage - Fixed damge dealing to the creatures. 2018-01-07 22:11:12 +01:00
LevelX2
86857e2e0f Merge origin/master 2018-01-07 18:05:23 +01:00
LevelX2
46bcad2ada Mage 1.4.26V11 2018-01-07 18:04:59 +01:00
Zzooouhh
9c77a5db7a
Added currency counter 2018-01-07 16:13:34 +00:00
LevelX2
0e119ffa01 [RIX] Fixed set card [RIX] Added 5 cards. 2018-01-07 13:29:40 +01:00
LevelX2
3480d47d11 [RIX] Added 7 cards. 2018-01-07 10:54:15 +01:00
LevelX2
15081f7d0e Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-07 02:41:49 +01:00