swordshine
4701371b17
Merge branch 'raid' into 'master'
...
Raid wording change
Closes #1357
See merge request core-developers/forge!2768
2020-04-28 00:37:54 +00:00
Tim Mocny
11c5b00130
Raid wording change
2020-04-28 00:37:54 +00:00
Michael Kamensky
e0f2d09dfd
Merge branch 'master' into 'master'
...
Fix an issue with imprinting not working correctly in game states after the first game.
Closes #1383
See merge request core-developers/forge!2766
2020-04-27 17:23:59 +00:00
Agetian
2d355d4ea3
- Fix an issue with imprinting not working correctly in game states after the first game.
2020-04-27 20:18:35 +03:00
Michael Kamensky
bea46a7a8c
Merge branch 'fixes' into 'master'
...
Fixes - 27 April
See merge request core-developers/forge!2765
2020-04-27 17:13:07 +00:00
Tim Mocny
d13439500f
Fixes - 27 April
2020-04-27 17:13:07 +00:00
Michael Kamensky
bd54bbe026
Merge branch 'patch' into 'master'
...
Add The Ozolith
See merge request core-developers/forge!2764
2020-04-27 15:54:35 +00:00
Michael Kamensky
15f147ac9c
Merge branch 'removeSpellAbilityCache' into 'master'
...
Game: remove SpellAbilityCache
See merge request core-developers/forge!2763
2020-04-27 10:32:17 +00:00
Hans Mackowiak
c2248ef905
Game: remove SpellAbilityCache
2020-04-27 10:32:17 +00:00
swordshine
74c92590fc
Add The Ozolith
2020-04-27 16:16:11 +08:00
Michael Kamensky
552a7130a5
Merge branch '1380-selective-adaptation-triggers-excessive-memory-usage' into 'master'
...
Resolve "'Selective Adaptation' triggers excessive memory usage"
Closes #1380
See merge request core-developers/forge!2762
2020-04-26 15:54:16 +00:00
Hans Mackowiak
8d1c02012e
Resolve "'Selective Adaptation' triggers excessive memory usage"
2020-04-26 15:54:15 +00:00
Michael Kamensky
c4963821e5
Merge branch 'raptorBlockedFix' into 'master'
...
fix Labyrinth Raptor
Closes #1375
See merge request core-developers/forge!2761
2020-04-26 15:15:53 +00:00
Michael Kamensky
8a648c9ccf
Merge branch 'newBranch' into 'master'
...
Update Win/Lose Overlay (mobile)
Closes #1367 and #928
See merge request core-developers/forge!2760
2020-04-26 15:15:48 +00:00
Hans Mackowiak
a2b5bb911c
fix Labyrinth Raptor
2020-04-26 16:57:54 +02:00
Anthony Calosa
e7cbee211d
Update controls
2020-04-26 18:37:10 +08:00
Anthony Calosa
a553103e39
AI vs AI match shows Match Results (mobile)
2020-04-26 17:25:44 +08:00
Anthony Calosa
45a5e76e63
refactor CardAreaPanel.resetForNewGame
...
fix issue ##1367
2020-04-26 16:44:32 +08:00
Anthony Calosa
8122589842
Merge remote-tracking branch 'remotes/core/master' into newBranch
2020-04-26 15:26:14 +08:00
Anthony Calosa
d754c2c4d3
Update Win/Lose Overlay (mobile)
...
At the end of the match, user can minimize the overlay to see the last battlefield and browse other zones, to bring up the overlay, click game menu, and click Show WinLose Overlay.
Also fixes issue #928
2020-04-26 15:00:57 +08:00
swordshine
7e9843aae5
Merge branch 'heliodsp' into 'master'
...
Heliod's Punishment stack cleanup (ORIGINALHOST stack issue)
See merge request core-developers/forge!2647
2020-04-26 03:46:06 +00:00
Tim Mocny
2897d4304d
Heliod's Punishment stack cleanup (ORIGINALHOST stack issue)
2020-04-26 03:46:06 +00:00
swordshine
f5400d18bd
Merge branch 'extinctionfix' into 'master'
...
extinction_event.txt - fix
Closes #1377
See merge request core-developers/forge!2759
2020-04-26 00:48:39 +00:00
Tim Mocny
46983de66f
extinction_event.txt - fix
2020-04-26 00:48:39 +00:00
Michael Kamensky
049e129606
Merge branch 'fixXPaidZeroCyclingCastTrigger' into 'master'
...
fix Cycling for Zero with xPaid, also do Zaxara with xPaid
See merge request core-developers/forge!2758
2020-04-25 19:56:37 +00:00
Hans Mackowiak
b5deb0b252
fix Cycling for Zero with xPaid, also do Zaxara with xPaid
2020-04-25 19:56:37 +00:00
Michael Kamensky
0bb42a2794
Merge branch '1372-used-memory-grows-quadratic-in-the-number-of-triggered-spells' into 'master'
...
Resolve "Used memory grows quadratic in the number of triggered spells"
Closes #1372
See merge request core-developers/forge!2756
2020-04-25 17:36:50 +00:00
Hans Mackowiak
a9b5e1d112
Resolve "Used memory grows quadratic in the number of triggered spells"
2020-04-25 17:36:50 +00:00
Michael Kamensky
c1c9271458
Merge branch 'master' into 'master'
...
Add color requirement AI hints to the ELD land cycle that usually comes tapped.
See merge request core-developers/forge!2757
2020-04-25 15:52:43 +00:00
Agetian
44e4dfecca
- Add color requirement AI hints to the ELD land cycle that usually comes tapped and has a "comes untapped" effect.
2020-04-25 18:38:36 +03:00
swordshine
d809fa6b91
Merge branch 'mysticsubdual' into 'master'
...
IKO - mystic_subdual.txt
See merge request core-developers/forge!2754
2020-04-25 04:47:10 +00:00
Tim Mocny
c5a89747b8
IKO - mystic_subdual.txt
2020-04-25 04:47:10 +00:00
Michael Kamensky
36341a85cd
Merge branch 'move' into 'master'
...
Tweaks - 24 April
See merge request core-developers/forge!2753
2020-04-24 14:34:22 +00:00
Tim Mocny
253256799c
Tweaks - 24 April
2020-04-24 14:34:22 +00:00
Michael Kamensky
16fa79132b
Merge branch 'zaxara' into 'master'
...
Zaxara (C20)
See merge request core-developers/forge!2735
2020-04-24 14:33:18 +00:00
Tim Mocny
f02ab6c073
Zaxara (C20)
2020-04-24 14:33:18 +00:00
swordshine
ef208f3442
Merge branch 'fixes.4.23' into 'master'
...
Fixes - 23 April
See merge request core-developers/forge!2752
2020-04-24 00:23:42 +00:00
Northmoc
bdcaf785bd
labyrinth_raptor.txt - ChangeNum$ -> Amount$
2020-04-23 19:14:54 -04:00
Northmoc
318c4891a4
grave_betrayal.txt - RememberObjects$ TriggeredCard
2020-04-23 19:14:54 -04:00
Michael Kamensky
a6fcec519d
Merge branch 'master' into 'master'
...
Added an AI hint for Leyline of Abundance.
See merge request core-developers/forge!2750
2020-04-23 15:33:19 +00:00
Agetian
7f3bc8f7f9
- Added an AI hint for Leyline of Abundance.
2020-04-23 18:09:42 +03:00
Michael Kamensky
f2e7068706
Merge branch 'titansnest' into 'master'
...
Titans' Nest (IKO)
See merge request core-developers/forge!2708
2020-04-23 15:00:05 +00:00
Tim Mocny
67c0722db8
Titans' Nest (IKO)
2020-04-23 15:00:05 +00:00
Michael Kamensky
60ad4cf0d1
Merge branch 'master' into 'master'
...
Added a couple AI hints.
See merge request core-developers/forge!2749
2020-04-23 09:43:14 +00:00
Agetian
d76004509d
- Added a couple AI hints.
2020-04-23 11:02:51 +03:00
Michael Kamensky
bac8497bc3
Merge branch 'newBranch' into 'master'
...
Fix uncleared selectables when a player concedes and restarts next game
See merge request core-developers/forge!2748
2020-04-23 06:54:33 +00:00
Anthony Calosa
ac9636c44e
Fix uncleared selectables when a player concedes and restarts next game
2020-04-23 14:07:15 +08:00
Michael Kamensky
89b534a580
Merge branch 'master' into 'master'
...
Add basic AI logic for Capricopian.
See merge request core-developers/forge!2747
2020-04-22 18:16:28 +00:00
Agetian
daa982389e
- Add basic logic for Capricopian.
2020-04-22 21:05:37 +03:00
Michael Kamensky
e56ee38933
Merge branch 'capricopian' into 'master'
...
Capricopian (C20)
See merge request core-developers/forge!2742
2020-04-22 17:12:23 +00:00
