Anthony Calosa
|
ac9636c44e
|
Fix uncleared selectables when a player concedes and restarts next game
|
2020-04-23 14:07:15 +08: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 |
|
Michael Kamensky
|
eb02f4acec
|
Merge branch 'cyclingIKO' into 'master'
Cycling: add YouCycledThisTurn, OnlyFirst for Trigger and ValidCause for ReplaceDraw
Closes #1344
See merge request core-developers/forge!2725
|
2020-04-19 03:24:10 +00:00 |
|
Hans Mackowiak
|
ef95f02fa2
|
Cycling: add YouCycledThisTurn, OnlyFirst for Trigger and ValidCause for ReplaceDraw
|
2020-04-19 03:24:10 +00:00 |
|
Sol
|
6b38bc4b7f
|
Merge branch 'update-formats' into 'master'
Update IKO into Format files
See merge request core-developers/forge!2726
|
2020-04-19 00:39:34 +00:00 |
|
friarsol
|
57e788a69d
|
Update IKO into Format files
|
2020-04-18 20:29:06 -04:00 |
|
Anthony Calosa
|
e2c28897d1
|
update additional
|
2020-04-18 22:13:24 +08:00 |
|
Anthony Calosa
|
34cb7ff9de
|
updated code
|
2020-04-18 20:57:18 +08:00 |
|
Anthony Calosa
|
07123286aa
|
add reset (on libgdx discord they said before transforming, you need to reset)
|
2020-04-18 19:39:57 +08:00 |
|
Anthony Calosa
|
017f9f1984
|
revert previous attempt to fix the rotate bug
|
2020-04-18 18:11:27 +08:00 |
|
Anthony Calosa
|
06b9143d57
|
update endtransform
|
2020-04-18 17:43:13 +08:00 |
|
Anthony Calosa
|
b1e9f4a110
|
startRotateTransform
|
2020-04-18 16:14:49 +08:00 |
|