external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,065 Commits 31 Branches 187 Tags
c7c6c574e65c7ab85fac8c3a6063a0c7458c820c
Commit Graph

47065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
130a7e0d33 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3294
 2020-10-27 04:09:33 +00:00
Northmoc
183bb7759c djinn_of_wishes.txt fix 2020-10-26 19:44:55 -04:00
Andreas Bendel
8a292df8c3 Update de-DE.properties 
lblGauntletProgress
 2020-10-26 20:29:48 +00:00
Michael Kamensky
54032c4bdb Merge branch 'master' into 'master' 
update translation

See merge request core-developers/forge!3293
 2020-10-26 14:07:05 +00:00
CCTV-1
4fa9856244 Merge remote-tracking branch 'upstream/master' 2020-10-26 14:56:46 +08:00
CCTV-1
f61329c4fe translate "Gauntlet Progress" 2020-10-25 20:20:49 +08:00
Michael Kamensky
156ccc8535 Merge branch 'revealFixes' into 'master' 
Reveal fixes and NPE

See merge request core-developers/forge!3291
 2020-10-24 15:32:37 +00:00
Hans Mackowiak
4cd297b6c8 Rushing River: fix missing Reference 2020-10-24 10:45:23 +02:00
Hans Mackowiak
617ca47c19 AbilityUtils: fix possible NPE when sa is null 2020-10-24 10:42:49 +02:00
Hans Mackowiak
c0bb61b0b0 Reveal: also reveal cards for the AI too 2020-10-24 10:42:03 +02:00
Anthony Calosa
cee0ec6d5b Merge branch 'newBranch' into 'master' 
Fix leftsplit manacost display

See merge request core-developers/forge!3290
 2020-10-23 22:38:30 +00:00
Anthony Calosa
152c7dd564 Fix leftsplit manacost display 2020-10-24 06:32:25 +08:00
Anthony Calosa
f33382a4fc Merge branch 'newBranch' into 'master' 
revert accidental change here, this is device specific

See merge request core-developers/forge!3289
 2020-10-23 10:47:20 +00:00
Anthony Calosa
02181593cc revert accidental change here, this is device specific 2020-10-23 18:46:11 +08:00
Anthony Calosa
df6d8488a9 Merge branch 'newBranch' into 'master' 
[Mobile] Minor Improvements

See merge request core-developers/forge!3288
 2020-10-23 10:10:41 +00:00