external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 31 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

18628 Commits

Author SHA1 Message Date
Michael Kamensky
286fabdeb9 - Improve scripted sound effect support. 2021-09-28 08:06:12 +03:00
Michael Kamensky
962a99f38d Merge branch 'mic_26' into 'master' 
MIC - 27 Sep

See merge request core-developers/forge!5450
 2021-09-28 03:42:23 +00:00
Michael Kamensky
4d315c2c07 Merge branch 'announce' into 'master' 
allow for multi-word AnnounceTitle when the VarName won't do

See merge request core-developers/forge!5460
 2021-09-28 03:42:01 +00:00
Northmoc
3a52c711bf primitive_justice.txt - add AnnounceTitle 2021-09-27 18:13:00 -04:00
Northmoc
3cec314b9a allow for multi-word AnnounceTitle when the VarName won't do 2021-09-27 18:11:23 -04:00
Northmoc
93ca04b2aa improved cardscripts 2021-09-27 13:05:49 -04:00
Northmoc
f253f50787 goldspan_dragon.txt fix Desc 2021-09-27 11:47:51 -04:00
Northmoc
d179d7512e prowling_geistcatcher.txt improve 2021-09-27 11:38:45 -04:00
Northmoc
8ca4ecab90 bunch of MIC cards from Marvel 2021-09-27 11:17:35 -04:00
Northmoc
fb09401ca3 remove unneeded 2021-09-27 10:47:50 -04:00
Michael Kamensky
53162d45da Merge branch 'foreach' into 'master' 
Fix Clarion Ultimatum and co.

Closes #1980

See merge request core-developers/forge!5446
 2021-09-27 03:50:57 +00:00
Northmoc
964da6ac0a stonewise_fortifier.txt remove unneeded IsCombat 2021-09-26 20:15:45 -04:00
Northmoc
7d1c9c8ac3 kurbis_harvest_celebrant.txt prevention as replacement effect instead of keyword 2021-09-26 20:15:10 -04:00
Northmoc
7114329586 add ActiveZones to LifeReduced replacement effects 2021-09-26 20:04:02 -04:00
Northmoc
020d40bc5c fix Will -3 2021-09-26 20:03:27 -04:00
Northmoc
bca8f9457f dichotomancy.txt improve 2021-09-26 17:21:52 -04:00
Northmoc
8306361607 doubling_chant.txt improve 2021-09-26 17:21:51 -04:00
Northmoc
21536abda7 clarion_ultimatum.txt improve 2021-09-26 17:21:51 -04:00
Hans Mackowiak
fd9ffbb84b Merge branch '1964-red-mana-battery-should-be-2-steps' into 'master' 
Resolve "Red Mana Battery should be 2 steps"

Closes #1964

See merge request core-developers/forge!5436
 2021-09-26 20:23:52 +00:00
Hans Mackowiak
c5dc50fc38 Mana Battery: better coding for ManaRitualBattery 2021-09-26 22:23:25 +02:00
Andreas Bendel
e937da8f82 Update de-DE.properties 
translated new lblChooseCreatureWith strings
 2021-09-26 18:14:44 +00:00
Michael Kamensky
66636a47b8 - Improve AI logic for Cleaver Skaab. 2021-09-26 21:01:58 +03:00
Michael Kamensky
00dba3b946 Merge branch 'mic_25' into 'master' 
MIC - 25 Sep

See merge request core-developers/forge!5438
 2021-09-26 17:55:08 +00:00
Michael Kamensky
8755cebaa3 Merge branch 'sacz' into 'master' 
MIC: Some "sacrifice Zombie" cards

See merge request core-developers/forge!5440
 2021-09-26 17:53:36 +00:00
Michael Kamensky
6c64483c2a - Fix Lotus Cobra. 2021-09-26 18:58:13 +03:00
Northmoc
9864b0c880 empty_the_laboratory.txt 2021-09-26 11:38:12 -04:00
Northmoc
593ccf2264 ravenous_rotbelly.txt 2021-09-26 11:37:54 -04:00
Michael Kamensky
6d64381539 - Add 2 XMage cubes, update some other cubes. 2021-09-26 17:44:05 +03:00
Michael Kamensky
6cd701bb04 Merge branch 'dif_pow' into 'master' 
MIC: Celestial Judgment, Sigarda's Vanguard, Sigardian Zealot – and support

See merge request core-developers/forge!5418
 2021-09-26 13:43:59 +00:00
Northmoc
82c06711e5 drown_in_dreams.txt 2021-09-26 08:57:37 -04:00
Northmoc
3799505e35 cleaver_skaab.txt 2021-09-26 08:48:42 -04:00
Michael Kamensky
4909a1983c Merge branch 'klaxnek-master-patch-87216' into 'master' 
Update es-ES.properties (AnimatedCardTapUntap text)

See merge request core-developers/forge!5433
 2021-09-26 10:35:54 +00:00
Anthony Calosa
da61ae7fac [Mobile] Update Avatar Life Loss/Gain Animation 2021-09-26 17:13:53 +08:00
klaxnek
c2e33519f7 Update es-ES.properties (AnimatedCardTapUntap text) 2021-09-26 08:05:39 +00:00
Michael Kamensky
2d4d8940c5 Merge branch 'attachRework' into 'master' 
Attach rework

Closes #1447

See merge request core-developers/forge!5059
 2021-09-26 03:37:05 +00:00
Hans Mackowiak
6f5a2ccd67 Attach rework 2021-09-26 03:37:04 +00:00
leriomaggio
a576085e79 Merge remote-tracking branch 'upstream/master' into fix-ui-desktop-adds-lands-dialog 2021-09-26 00:36:29 +01:00
leriomaggio
56358ecbde When current deck is Empty, CardEdition returned is not ZEN anymore but one depending on current Art Preference 2021-09-26 00:30:17 +01:00
Michael Kamensky
a320ef24c2 - Mistype fix. 2021-09-25 20:36:03 +03:00
Northmoc
e62044ef04 shadow_kin.txt 2021-09-25 09:36:55 -04:00
Michael Kamensky
0abbedbc95 Merge branch 'kurbis' into 'master' 
MIC: Kurbis, Harvest Celebrant and cost tweak

See merge request core-developers/forge!5426
 2021-09-25 05:06:21 +00:00
Michael Kamensky
cbc60e3071 Merge branch 'gorex' into 'master' 
MIC: Gorex, the Tombshell and some stringbuilder updates

See merge request core-developers/forge!5425
 2021-09-25 05:06:02 +00:00
Michael Kamensky
e5269a1f7f Merge branch 'fixes' into 'master' 
Fixes

Closes #1977 and #1976

See merge request core-developers/forge!5422
 2021-09-25 05:05:30 +00:00
Michael Kamensky
5c209ae380 Merge branch 'troupe' into 'master' 
Fix AI for Ludevic

See merge request core-developers/forge!5424
 2021-09-25 05:05:22 +00:00
Northmoc
e04af38625 triumphant_adventurer.txt fix 2021-09-24 21:48:57 -04:00
Northmoc
734545c2b3 kurbis_harvest_celebrant.txt 2021-09-24 19:43:03 -04:00
Northmoc
d0ddbf07a0 gorex_the_tombshell.txt 2021-09-24 18:34:51 -04:00
Northmoc
1fb3cc0ca0 falcon_abomination.txt add Flying 2021-09-24 17:16:10 -04:00
Northmoc
1dfc6608dc liesa_forgotten_archangel.txt 2021-09-24 16:06:15 -04:00
Northmoc
731e610ced gavony_silversmith.txt fix PT 2021-09-24 16:02:37 -04:00