Brock Fanning
|
2a55122e21
|
Power/toughness for Enchanted Carriage
|
2019-09-28 11:41:13 -04:00 |
|
Sol
|
fc4828a2b3
|
Merge branch 'eldOracle' into 'master'
Eld Oracle
See merge request core-developers/forge!2190
|
2019-09-28 11:44:50 +00:00 |
|
CCTV-1
|
152693655f
|
update ELD cards translation
|
2019-09-28 18:50:15 +08:00 |
|
Hanmac
|
00aea6e647
|
cards: update Noble creature Type
|
2019-09-28 12:46:32 +02:00 |
|
Hanmac
|
74558a88cd
|
some cards got their effect reverted
|
2019-09-28 12:36:05 +02:00 |
|
Hanmac
|
bde30f4eb7
|
cards: update Xantcha and other enter under opponents control
|
2019-09-28 12:35:05 +02:00 |
|
Valerio Maggio
|
1f23097910
|
Merge remote-tracking branch 'upstream/master'
|
2019-09-28 11:09:57 +01:00 |
|
Michael Kamensky
|
2d86d240a7
|
Merge branch 'master' into 'master'
Add ELD achievements by Marek14.
See merge request core-developers/forge!2189
|
2019-09-28 08:26:11 +00:00 |
|
Agetian
|
a59b911c56
|
- Add ELD achievements by Marek14.
|
2019-09-28 10:14:41 +03:00 |
|
CCTV-1
|
1d44d02ac1
|
update simplified chinese translation
|
2019-09-28 12:07:41 +08:00 |
|
Sol
|
406c82c5a2
|
Merge branch 'throne-edition-updates' into 'master'
ELD updates
See merge request core-developers/forge!2187
|
2019-09-28 02:32:00 +00:00 |
|
Sol
|
9512728374
|
Merge branch 'migrate-upcoming-throne' into 'master'
Migrate throne
See merge request core-developers/forge!2186
|
2019-09-28 02:23:58 +00:00 |
|
Chris H
|
fc676f25d7
|
ELD updates
|
2019-09-27 22:23:35 -04:00 |
|
Chris H
|
fc8d235529
|
Migrate throne
|
2019-09-27 21:54:10 -04:00 |
|
swordshine
|
7e7951d567
|
Merge branch 'abilitytranslation' into 'master'
Translated new settings option 'Ability Icons'
See merge request core-developers/forge!2184
|
2019-09-28 00:45:06 +00:00 |
|
swordshine
|
ffc7567081
|
Merge branch 'patch-1' into 'master'
Update volatile_claws.txt - All Creature Types didn't happen...
See merge request core-developers/forge!2185
|
2019-09-28 00:43:36 +00:00 |
|
Computica
|
b2f5b55c0e
|
Update volatile_claws.txt - All Creature Types didn't happen...
|
2019-09-27 23:39:07 +00:00 |
|
Ryan1729
|
a3355ba05a
|
remove imports
|
2019-09-27 17:27:36 -06:00 |
|
Ryan1729
|
4728b5ad76
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into start_replacement_run_keys_refactor
|
2019-09-27 17:17:26 -06:00 |
|
Ryan1729
|
df4b0b03b9
|
remove runOld and getReplacementListOld
|
2019-09-27 17:13:44 -06:00 |
|
Peter
|
7bb4e8f6d2
|
Translated new settings option 'Ability Icons'
|
2019-09-27 19:46:38 +02:00 |
|
Anthony Calosa
|
beec859cec
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2019-09-27 21:04:13 +08:00 |
|
Hans Mackowiak
|
939a902f43
|
Merge branch 'newBranch' into 'master'
Add feature request
See merge request core-developers/forge!2179
|
2019-09-27 12:16:07 +00:00 |
|
Anthony Calosa
|
6551ebcce5
|
Add feature request
Can duplicate tokens with summoning sickness not be in same pile as
tokens without it OR the ones without it be on the top? It's really
annoying on Android to equip/enchant a token that can attack this turn
(need to zoom in, then out).
(https://www.slightlymagic.net/forum/viewtopic.php?f=26&t=1516&start=2190#p230560)
|
2019-09-27 12:16:07 +00:00 |
|
Anthony Calosa
|
77d6bde4e5
|
Moved fireevent on changekeywords
|
2019-09-27 20:00:24 +08:00 |
|
Anthony Calosa
|
3ae7887cb8
|
Update 3
|
2019-09-27 19:28:17 +08:00 |
|
Anthony Calosa
|
98ce8e6a1e
|
Update
|
2019-09-27 19:14:38 +08:00 |
|
Anthony Calosa
|
454e0e2c48
|
Update code
|
2019-09-27 18:56:52 +08:00 |
|
Ryan1729
|
a3b0d8ac3c
|
do the remaining easy repRunParams changeovers
|
2019-09-27 01:25:04 -06:00 |
|
Anthony Calosa
|
8ee9d3ff13
|
Update stacking, works with blessed breath on bunch of tokens
|
2019-09-27 14:52:34 +08:00 |
|
Anthony Calosa
|
2f6b204005
|
Update token stacking on phases
|
2019-09-27 09:29:55 +08:00 |
|
Anthony Calosa
|
b1678390cd
|
Removed tapped stacking, it doesn't work all the time
|
2019-09-27 08:56:26 +08:00 |
|
Anthony Calosa
|
fa8abb6d7c
|
We need to pass it as a list to update correctly
|
2019-09-27 08:37:43 +08:00 |
|
Anthony Calosa
|
4fe152efb4
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2019-09-27 07:02:41 +08:00 |
|
Anthony Calosa
|
5e90679d76
|
Refactor Event
|
2019-09-27 06:46:40 +08:00 |
|
swordshine
|
2d32369082
|
Merge branch 'patch' into 'master'
Fix Garenbrig Carver
See merge request core-developers/forge!2182
|
2019-09-26 16:02:06 +00:00 |
|
swordshine
|
ec96e1f0c1
|
Fix Garenbrig Carver
|
2019-09-26 23:57:20 +08:00 |
|
swordshine
|
c55c083ca2
|
Merge branch 'patch' into 'master'
Fix Fae of Wishes
See merge request core-developers/forge!2181
|
2019-09-26 15:23:09 +00:00 |
|
swordshine
|
cba9366b14
|
Fix Fae of Wishes
|
2019-09-26 23:10:23 +08:00 |
|
swordshine
|
c16014bb93
|
Merge branch 'patch' into 'master'
Fix Midnight Clock
See merge request core-developers/forge!2180
|
2019-09-26 14:43:39 +00:00 |
|
swordshine
|
c83f81be4a
|
Fix Midnight Clock
|
2019-09-26 22:39:06 +08:00 |
|
Anthony Calosa
|
f6df44510b
|
Fix event finally
|
2019-09-26 21:28:32 +08:00 |
|
Anthony Calosa
|
10e59c0ad7
|
revert previous implementation (doesn't work correctly on Android)
|
2019-09-26 20:58:16 +08:00 |
|
Hans Mackowiak
|
a9e97d6508
|
Update Player: use some mapFromAffected
|
2019-09-26 12:29:52 +00:00 |
|
Anthony Calosa
|
117f3b1273
|
removed unused import
|
2019-09-26 20:06:05 +08:00 |
|
Anthony Calosa
|
a30a1e49bc
|
Much better implementation
|
2019-09-26 20:04:01 +08:00 |
|
Anthony Calosa
|
01dd12ec7e
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2019-09-26 12:09:16 +08:00 |
|
Anthony Calosa
|
36b8e652a5
|
Add feature request
Can duplicate tokens with summoning sickness not be in same pile as
tokens without it OR the ones without it be on the top? It's really
annoying on Android to equip/enchant a token that can attack this turn
(need to zoom in, then out).
(https://www.slightlymagic.net/forum/viewtopic.php?f=26&t=1516&start=2190#p230560)
|
2019-09-26 12:02:48 +08:00 |
|
Ryan1729
|
786448e14e
|
Merge branch 'start_replacement_run_keys_refactor' of git.cardforge.org:Ryan1729/forge into start_replacement_run_keys_refactor
|
2019-09-25 19:50:47 -06:00 |
|
Ryan1729
|
c9b66d9743
|
add mapFromAffected convenience function
|
2019-09-25 19:50:00 -06:00 |
|