external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,880 Commits 32 Branches 187 Tags
64131f15e56cc7c470764a34e7d3258e987f1dcc
Commit Graph

45880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
64131f15e5 Encore keyword/reminder text 2020-10-30 18:44:09 -04:00
Northmoc
ea908ce5ad rest of Encore mechanic 2020-10-30 18:43:45 -04:00
Northmoc
dc8be8c0a0 Encore mechanic 2020-10-30 18:40:35 -04:00
Northmoc
fa619ee16e - small typo 2020-10-30 18:39:36 -04:00
Northmoc
347dfa05bf amphin_mutineer.txt and token 2020-10-30 14:22:25 -04:00
swordshine
3721873093 Merge branch 'cmr27' into 'master' 
CMR - 27 Oct

See merge request core-developers/forge!3296
 2020-10-30 04:37:07 +00:00
Michael Kamensky
5438abe24e Merge branch 'triggerDamageAllExtend' into 'master' 
TriggerDamageAll: add triggered objects for Sources and Targets, AbilityUtils supports Sets now

Closes #1620

See merge request core-developers/forge!3307
 2020-10-30 03:43:47 +00:00
Hans Mackowiak
ffc4cfebec TriggerDamageAll: add triggered objects for Sources and Targets, AbilityUtils supports Sets now 2020-10-29 14:32:47 +01:00
swordshine
8aabeb0d75 Merge branch 'profane' into 'master' 
CMR: Profane Transfusion and support

See merge request core-developers/forge!3302
 2020-10-29 11:16:58 +00:00
swordshine
16fac06695 Merge branch 'cmr28' into 'master' 
CMR :: 28 Oct

See merge request core-developers/forge!3305
 2020-10-29 11:14:46 +00:00
swordshine
0f95d631c2 Merge branch 'master' into 'master' 
CMR: Court of Cunning + support

See merge request core-developers/forge!3306
 2020-10-29 11:13:41 +00:00
Hythonia
322e26c7bf Revert "Add "isNotMonarch" property" 
This reverts commit ec0c826bf2
 2020-10-29 10:51:19 +00:00
Hythonia
79daf02db6 Fix "Count$Monarch" 2020-10-29 10:50:38 +00:00
Hythonia
e01fae1daf Fix Court of Cunning 2020-10-29 10:42:36 +00:00
Hythonia
fef9ca7690 Add court_of_cunning.txt 2020-10-29 09:08:20 +00:00
Hythonia
89186afff5 Enable "Count$Monarch.X.Y" 2020-10-29 09:02:07 +00:00
Hythonia
ec0c826bf2 Add "isNotMonarch" property 2020-10-29 08:48:27 +00:00
Michael Kamensky
691f6f27dc Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3304
 2020-10-29 06:44:44 +00:00
Michael Kamensky
a7790cf94b Merge branch 'master' into 'master' 
translate new setting

See merge request core-developers/forge!3299
 2020-10-29 06:44:41 +00:00
Hans Mackowiak
188c623365 CharmEffect: hotfix for getCardForUi 2020-10-29 03:07:32 +01:00
Northmoc
e55238e0af radiant_serra_archangel.txt 2020-10-28 20:11:53 -04:00
Northmoc
7dfd0adb7e magus_of_the_order.txt 2020-10-28 20:11:41 -04:00
Northmoc
fd683e73c6 eyeblight_cullers.txt 2020-10-28 20:11:28 -04:00
Andreas Bendel
670d5345d6 Update de-DE.properties 
Translation of new AltLifeDisplay entries
 2020-10-28 21:08:11 +00:00
Sol
2c7068457b Merge branch 'update-mana-conversion' into 'master' 
Update cards for Conversion strings

See merge request core-developers/forge!3301
 2020-10-28 17:57:08 +00:00
Northmoc
b33c73c7cf Szat AI improvements 2020-10-28 12:10:12 -04:00
Northmoc
7ca74a25cc merchant_raiders.txt 2020-10-28 12:10:12 -04:00
Northmoc
4dc85e5f2b editions update 2020-10-28 12:10:11 -04:00
Northmoc
6b2b1436de tevesh_szat_doom_of_fools.txt 2020-10-28 12:10:11 -04:00
Northmoc
9a0dd25590 blim_comedic_genius.txt (guytrash) 2020-10-28 12:10:10 -04:00
Northmoc
6bb9a7cb70 maelstrom_colossus.txt (medusa) 2020-10-28 12:10:10 -04:00
Northmoc
fc28594b7e bladegriff_prototype.txt (medusa) 2020-10-28 12:10:09 -04:00
Northmoc
5e0144d6de nymris - fix types 2020-10-28 12:10:09 -04:00
Northmoc
cadadc2780 nymris_oonas_trickster.txt (medusa) 2020-10-28 12:10:09 -04:00
Northmoc
d5a7b8c29f some AI hints 2020-10-28 12:10:08 -04:00
Northmoc
5c1df409e9 krark_the_thumbless.txt (medusa) 2020-10-28 12:10:08 -04:00
Northmoc
2d0077f1b7 keskit_the_flesh_sculptor.txt (medusa) 2020-10-28 12:10:07 -04:00
Northmoc
b6d6f288d5 siani_eye_of_the_storm.txt (medusa) 2020-10-28 12:10:07 -04:00
Northmoc
86243e9dda mnemonic_deluge.txt (medusa) 2020-10-28 12:10:07 -04:00
Northmoc
7a9b0dc92d get rid of CMR folder in upcoming 2020-10-28 12:10:06 -04:00
Northmoc
f36c42f765 brinelin_the_moon_kraken.txt (medusa) 2020-10-28 12:10:06 -04:00
Northmoc
81a1ca8dd4 profane_transfusion.txt add Cleanup 2020-10-28 11:21:21 -04:00
Northmoc
78d7976908 profane_transfusion.txt and support 2020-10-28 11:21:20 -04:00
friarsol
ec10c006dc Update cards for Conversion strings 2020-10-28 10:06:37 -04:00
CCTV-1
e13759dc7b translate new setting 2020-10-28 18:06:47 +08:00
Michael Kamensky
4ae50b56b3 Merge branch 'oath-of-nissa-fix' into 'master' 
Conversion matrices weren't setup properly.

See merge request core-developers/forge!3298
 2020-10-28 04:27:19 +00:00
Michael Kamensky
53ed2d98a4 Merge branch 'newBranch' into 'master' 
[Mobile] Add alternate preference for displaying player life, experience, energy and poison counters

See merge request core-developers/forge!3297
 2020-10-28 04:26:54 +00:00
friarsol
34a2f2502a Conversion matrices weren't setup properly. 2020-10-27 21:29:21 -04:00
Anthony Calosa
fde28d1fea Add alternate preference for displaying life, experience, energy and poison counters 2020-10-28 06:19:12 +08:00
Sol
a733a157b6 Merge branch 'wishes' into 'master' 
djinn_of_wishes.txt fix

See merge request core-developers/forge!3295
 2020-10-27 16:59:50 +00:00