external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,780 Commits 31 Branches 187 Tags
b183862e8d7f5e7ab8c9e48535e9af705cda2d5c
Commit Graph

43780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
116ab5da29 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!2188
 2019-09-30 07:26:25 +00:00
swordshine
37d0d52d51 Merge branch 'eldtranslation' into 'master' 
Updated Throne of Eldraine card translations

See merge request core-developers/forge!2194
 2019-09-30 07:25:35 +00:00
Michael Kamensky
264a7e7b23 Merge branch '1169-sedge-sliver-isn-t-working-correct-with-pt-boost' into 'master' 
Resolve "Sedge Sliver isn't working correct with PT boost"

Closes #1169

See merge request core-developers/forge!2196
 2019-09-30 04:55:08 +00:00
CCTV-1
37f33f1c07 Merge remote-tracking branch 'upstream/master' 2019-09-30 08:09:02 +08:00
Hanmac
3c3a7f3f62 GameAction: ignore isTemporary StaticAbilities 2019-09-29 22:03:23 +02:00
Michael Kamensky
cf2811132a Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.29.001

See merge request core-developers/forge!2195
 2019-09-29 15:54:18 +00:00
Jamin W. Collins
59b01aba8f - Preparing Forge for Android publish 1.6.29.001 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2019-09-29 08:54:32 -06:00
Peter
608d84dc4d Updated Throne of Eldraine card translations 2019-09-29 14:00:35 +02:00
Alessandro Coli
8bde4d5f92 Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-09-29 09:29:19 +02:00
Blacksmith
821f95f483 Clear out release files in preparation for next release 2019-09-29 00:29:38 +00:00
Blacksmith
d028cd2918 [maven-release-plugin] prepare for next development iteration 2019-09-29 00:23:27 +00:00
Blacksmith
4803d74c33 [maven-release-plugin] prepare release forge-1.6.29 forge-1.6.29 2019-09-29 00:23:21 +00:00
Blacksmith
403d3a6aec Update README.txt for release 2019-09-29 00:20:17 +00:00
Sol
521a3c3b7b Merge branch '1157-questing-beast-and-damage-prevention' into 'master' 
Resolve "Questing Beast and Damage Prevention"

Closes #1157

See merge request core-developers/forge!2183
 2019-09-29 00:03:10 +00:00
Hans Mackowiak
398796999f Resolve "Questing Beast and Damage Prevention" 2019-09-29 00:03:10 +00:00
Hans Mackowiak
f347786f3d Merge branch 'enchanged-carriage-stats' into 'master' 
Power/toughness for Enchanted Carriage

See merge request core-developers/forge!2191
 2019-09-28 17:03:11 +00:00
Hans Mackowiak
52843a3ba6 Merge branch 'resolute-rider-text-fix' into 'master' 
Text fix for Resolute Rider

See merge request core-developers/forge!2192
 2019-09-28 17:02:58 +00:00
Hans Mackowiak
ce3546393a Merge branch 'irencrag-pyromancer-trigger-fix' into 'master' 
Fix for Irencrag Pyromancer trigger

See merge request core-developers/forge!2193
 2019-09-28 17:02:00 +00:00
Brock Fanning
5b8ab80cb0 Fix for Irencrag Pyromancer trigger 2019-09-28 11:57:47 -04:00
Brock Fanning
9ee5989553 Text fix for Resolute Rider 2019-09-28 11:43:55 -04:00
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