Michael Kamensky
bdff4a12e7
Merge branch 'master' into 'master'
...
Run the AI trigger code in case the SA is pre-targeted earlier in the code (fixes Nyx Herald) + improve AI Adventure support
See merge request core-developers/forge!2745
2020-04-22 16:25:43 +00:00
Agetian
f610203a53
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2020-04-22 19:19:53 +03:00
Agetian
37b7408163
- Improve support for AI casting Sorcery speed Adventure cards.
2020-04-22 19:16:30 +03:00
Agetian
67684fa4ec
- Don't cut short when checking whether to run the AI trigger code if the triggered ability was pre-targeted in earlier checks before doTrigger is called.
2020-04-22 18:43:22 +03:00
Michael Kamensky
5787bf7660
Merge branch 'xyris' into 'master'
...
Xyris (C20)
See merge request core-developers/forge!2734
2020-04-22 15:13:31 +00:00
Tim Mocny
e621972ad2
Xyris (C20)
2020-04-22 15:13:30 +00:00
Michael Kamensky
84146df00e
Merge branch 'manascape' into 'master'
...
Manascape Refractor (C20)
See merge request core-developers/forge!2737
2020-04-22 14:57:46 +00:00
Northmoc
a27673ef5b
manascape_refractor.txt
2020-04-22 10:46:40 -04:00
Michael Kamensky
4c8072afd2
Merge branch 'master' into 'master'
...
Added several new cubes ported from XMage + two submitted cubes
See merge request core-developers/forge!2744
2020-04-22 08:09:34 +00:00
Agetian
6340f92c95
- Added several new cubes ported from XMage + two cubes submitted on Slightlymagic (by thegreatone1357 and dolphi5).
2020-04-22 11:02:28 +03:00
Michael Kamensky
9349477f21
Merge branch 'newBranch' into 'master'
...
Improve Online Lobby (Mobile Port)
Closes #659 , #658 , #172 , and #914
See merge request core-developers/forge!2738
2020-04-22 04:24:19 +00:00
Anthony Calosa
96e243e4c9
Refactor stack -> Deque, add check for transformCount
2020-04-22 07:29:49 +08:00
Anthony Calosa
828885c9b0
Merge remote-tracking branch 'remotes/core/master' into newBranch
2020-04-22 05:55:38 +08:00
Michael Kamensky
4694ea8014
Merge branch 'mutual_destruction' into 'master'
...
Mutual Destruction fix :: AffectedZones -> EffectZone
See merge request core-developers/forge!2743
2020-04-21 18:29:05 +00:00
Tim Mocny
41d0fa9227
Mutual Destruction fix :: AffectedZones -> EffectZone
2020-04-21 18:29:05 +00:00
Michael Kamensky
7e158620f3
Merge branch 'nikara_yannik' into 'master'
...
Nikara and Yannik (C20)
See merge request core-developers/forge!2736
2020-04-21 18:28:38 +00:00
Tim Mocny
4ffbaf87a0
Nikara and Yannik (C20)
2020-04-21 18:28:37 +00:00
Michael Kamensky
0a32dcffa6
Merge branch 'cleanup' into 'master'
...
Cleanups - 21 April
See merge request core-developers/forge!2741
2020-04-21 17:06:24 +00:00
Tim Mocny
f20f4dcfe4
Cleanups - 21 April
2020-04-21 17:06:24 +00:00
Michael Kamensky
377e2dc9a6
Merge branch 'patch-2' into 'master'
...
Update alpine_moon.txt
See merge request core-developers/forge!2740
2020-04-21 16:56:01 +00:00
Michael Kamensky
a25404d029
Merge branch 'whenyoudo' into 'master'
...
Fixing triggers for "When you do" clause
See merge request core-developers/forge!2739
2020-04-21 16:55:53 +00:00
Tim Mocny
838c4daf25
Fixing triggers for "When you do" clause
2020-04-21 16:55:53 +00:00
Michael Kamensky
ef8533237e
Merge branch 'commandertohand' into 'master'
...
Netherborn Altar (C20) and Command Beacon update
See merge request core-developers/forge!2732
2020-04-21 16:52:30 +00:00
Tim Mocny
30cdf13d88
Netherborn Altar (C20) and Command Beacon update
2020-04-21 16:52:30 +00:00
Michael Kamensky
e739894759
Merge branch 'c20.20' into 'master'
...
C20 - 20 April
See merge request core-developers/forge!2733
2020-04-21 16:51:18 +00:00
Tim Mocny
dfd07d1d12
C20 - 20 April
2020-04-21 16:51:18 +00:00
Computica
3ae3ec003e
Update alpine_moon.txt
...
"AffectedZones$ All" to "AffectedZone$ All"
2020-04-21 15:55:04 +00:00
Anthony Calosa
f68ac2e43a
refactor stack -> deque
2020-04-21 20:31:41 +08:00
Anthony Calosa
8acb143fea
Improve Online Lobby (Mobile port)
2020-04-21 17:52:05 +08:00
Anthony Calosa
3cdbf3eb67
Update FControlGameEventHandler
...
some method don't exist on mobile port and are specifically for desktop so let those routine run for its specific platform
2020-04-21 17:50:25 +08:00
Michael Kamensky
1f7faa773c
Merge branch 'gavi' into 'master'
...
Gavi, Nest Warden
See merge request core-developers/forge!2656
2020-04-20 12:05:33 +00:00
Tim Mocny
f27748eeca
Gavi, Nest Warden
2020-04-20 12:05:32 +00:00
Michael Kamensky
789019fff1
Merge branch 'c20.19s' into 'master'
...
C20 - 19 April (Svaldan)
See merge request core-developers/forge!2727
2020-04-20 07:54:05 +00:00
Tim Mocny
88d768f8b7
C20 - 19 April (Svaldan)
2020-04-20 07:54:04 +00:00
Michael Kamensky
e2f7faa4d7
Merge branch 'drannithfix' into 'master'
...
Drannith Magistrate - stop command zone casting
See merge request core-developers/forge!2730
2020-04-20 07:49:08 +00:00
Tim Mocny
344792d91c
Drannith Magistrate - stop command zone casting
2020-04-20 07:49:08 +00:00
Michael Kamensky
879322d3b0
Merge branch 'c20.19' into 'master'
...
C20 - 19 April
See merge request core-developers/forge!2728
2020-04-20 07:43:45 +00:00
Tim Mocny
e9a93a0f8d
C20 - 19 April
2020-04-20 07:43:45 +00:00
Michael Kamensky
a9482c349e
Merge branch 'selective_adaptation' into 'master'
...
Selective Adaption - Causing lag?
See merge request core-developers/forge!2731
2020-04-20 04:52:44 +00:00
Tim Mocny
2c8bc0b582
Selective Adaption - Causing lag?
2020-04-20 04:52:44 +00:00
Michael Kamensky
62ba27d09f
Merge branch 'fireflux_squad' into 'master'
...
Fireflux Squad (C20)
See merge request core-developers/forge!2723
2020-04-20 04:15:20 +00:00
Tim Mocny
d6efcee188
Fireflux Squad (C20)
2020-04-20 04:15:19 +00:00
Michael Kamensky
4744f11e69
Merge branch 'newBranch' into 'master'
...
Update KeywordCard, add Flash Icon, try to prevent rotate bug
See merge request core-developers/forge!2715
2020-04-19 16:28:04 +00:00
Michael Kamensky
20549fe0ca
Merge branch 'martial_impetus' into 'master'
...
Martial Impetus and Frontier Warmonger (C20)
See merge request core-developers/forge!2722
2020-04-19 16:07:30 +00:00
Tim Mocny
8c023fbfea
Martial Impetus and Frontier Warmonger (C20)
2020-04-19 16:07:29 +00:00
Michael Kamensky
158711f7a9
Merge branch 'c20.17' into 'master'
...
C20 - 17 April
See merge request core-developers/forge!2721
2020-04-19 16:03:33 +00:00
Tim Mocny
5be2ab9358
C20 - 17 April
2020-04-19 16:03:33 +00:00
Anthony Calosa
99f07c1471
update changes
2020-04-19 21:16:23 +08:00
Michael Kamensky
f7b1a24fdd
Merge branch 'c20.18' into 'master'
...
C20 - 18 April
See merge request core-developers/forge!2724
2020-04-19 05:11:09 +00:00
Tim Mocny
610e0e546a
C20 - 18 April
2020-04-19 05:11:09 +00:00
