external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,809 Commits 31 Branches 187 Tags
01f213edc0d52f2f46decd34f6350dc6de0fe14c
Commit Graph

47809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
58a71af528 3 more 2020-11-23 13:15:12 -05:00
Northmoc
2370d24368 through S 2020-11-23 13:15:12 -05:00
Northmoc
5b9aa5295c Cleaning up some more stack desc 2020-11-23 13:15:11 -05:00
Northmoc
b03b58438e tidying is half done 2020-11-23 13:15:11 -05:00
Northmoc
d2c345dd75 last drafts 2020-11-23 13:15:11 -05:00
Northmoc
2238149e73 2 good ones 2020-11-23 13:15:10 -05:00
Northmoc
678a0b1c1f better polish (sac prompts for sac X are weird) 2020-11-23 13:15:10 -05:00
Northmoc
40bf94c2dd drafts 2020-11-23 13:15:09 -05:00
Northmoc
6b6e87015e drafts 2020-11-23 13:15:09 -05:00
Northmoc
61043dcfcf 4 more polished 2020-11-23 13:15:08 -05:00
Northmoc
91633a48ce not checked 2020-11-23 13:15:08 -05:00
Northmoc
d38fa6ef8f 6 clean ones 2020-11-23 13:15:08 -05:00
Northmoc
a5a06c5111 some polished ones 2020-11-23 13:15:07 -05:00
Northmoc
ae54e7ad7d more X:Targeted$Amount cards 2020-11-23 13:15:07 -05:00
Northmoc
7bc4986221 some X fixes 2020-11-23 13:15:06 -05:00
Northmoc
335cda00b7 fix incorrect TargetMin 2020-11-23 13:15:06 -05:00
Anthony Calosa
e4b44988a3 Merge branch 'fix-checkstyle-warning' into 'master' 
Remove unused import causing a checkstyle error

See merge request core-developers/forge!3429
 2020-11-23 12:27:25 +00:00
pfirpfel
98a727acbe Remove unused import causing a checkstyle error 2020-11-23 10:11:49 +01:00
Michael Kamensky
4e8ab9a087 Merge branch 'delayedTriggerX' into 'master' 
DelayedTriggerEffect: make the trigger remember the spawning Ability

See merge request core-developers/forge!3427
 2020-11-23 04:39:00 +00:00
Michael Kamensky
d20ad9f92b Merge branch 'fixes' into 'master' 
Fixes - 22 Nov

See merge request core-developers/forge!3426
 2020-11-23 04:38:22 +00:00
Hans Mackowiak
aee2bb3ffe DelayedTriggerEffect: make the trigger remember the spawning Ability 2020-11-22 23:01:29 +01:00
Hans Mackowiak
736f527179 CardFactoryUtil: fix Rebound replacement 2020-11-22 22:50:28 +01:00
Northmoc
f4a5001f55 ephemerate.txt cleanup 2020-11-22 16:34:56 -05:00
Hans Mackowiak
b63730141c fix Yidaro Cycling 2020-11-22 22:22:20 +01:00
Northmoc
5e231f4e54 oracle fix 2020-11-22 15:15:45 -05:00
Hans Mackowiak
b6dce3dd01 Merge branch 'counterfix' into 'master' 
CountersPutEffect - lock targeted out of this "if"

See merge request core-developers/forge!3425
 2020-11-22 18:40:46 +00:00
Northmoc
b0a1014ce4 lock targeted out of this "if" 2020-11-22 08:46:44 -05:00
Michael Kamensky
b90a377fef Merge branch 'pako-haldan' into 'master' 
C20: Pako & Haldan play fetch!!

Closes #1365

See merge request core-developers/forge!2729
 2020-11-22 12:29:57 +00:00
Tim Mocny
757c9208d9 C20: Pako & Haldan play fetch!! 2020-11-22 12:29:56 +00:00
Hans Mackowiak
ba37bf2312 PlayerController: fix copy activated abilities 2020-11-22 12:18:13 +01:00
Michael Kamensky
db7291b781 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3424
 2020-11-22 05:10:04 +00:00
Michael Kamensky
535f6a806e Merge branch 'cmrdraft' into 'master' 
CMR limited housekeeping

See merge request core-developers/forge!3416
 2020-11-22 05:10:02 +00:00
Hans Mackowiak
f0ed87eb18 CardFactoryUtil: fix Epic trigger MayChooseTarget 2020-11-21 22:31:11 +01:00
Northmoc
e40a37b6f2 add CMR to blocks.txt 2020-11-21 15:20:05 -05:00
Northmoc
d702eaa015 add CMR Foils and CMR Legendaries 2020-11-21 15:20:05 -05:00
Northmoc
528d664ea1 Adding booster contents 2020-11-21 15:20:04 -05:00
Andreas Bendel
2477eced1e Update de-DE.properties 
new "lblHowManyCountersThis" translation
 2020-11-21 19:43:36 +00:00
Michael Kamensky
0077b39c53 Merge branch 'taprefactor' into 'master' 
ETBTapped refactor (+Archelos)

See merge request core-developers/forge!3403
 2020-11-21 06:06:40 +00:00
Michael Kamensky
838787d781 Merge branch 'untypo' into 'master' 
typos in Un editions

See merge request core-developers/forge!3423
 2020-11-21 06:05:04 +00:00
Northmoc
ae91e7e178 remove static ETBTapped code 2020-11-21 00:23:55 -05:00
Northmoc
a4bd8c29c3 refactor existing static ETBTapped cards to replacement effect 2020-11-21 00:23:55 -05:00
Northmoc
7e5b9d2dd7 archelos_lagoon_mystic.txt 2020-11-21 00:23:54 -05:00
Northmoc
37391f42a0 Add "Untapped" param to ChangeZoneEffect 2020-11-21 00:23:53 -05:00
Northmoc
77f4cb7cc4 typos in Un editions 2020-11-21 00:21:42 -05:00
Hans Mackowiak
91ded04bb2 TokenEffectBase: don't use GameState for Remember there 2020-11-20 22:45:34 +01:00
Hans Mackowiak
bba404ea78 EffectEffect: set ActiveZone for CardTraits when created in CommandZone 2020-11-20 22:38:16 +01:00
Michael Kamensky
1121462d33 Merge branch 'vastwood' into 'master' 
CMR/C20: Non-targeting hydras (Vastwood & Stumpsquall)

See merge request core-developers/forge!3414
 2020-11-20 04:54:19 +00:00
Michael Kamensky
13b7414790 Merge branch 'klrdraft' into 'master' 
enable KLR limited

See merge request core-developers/forge!3417
 2020-11-20 04:53:31 +00:00
Michael Kamensky
9a290609b8 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3422
 2020-11-20 04:52:56 +00:00
Northmoc
137db4d2ee enable KLR draft 2020-11-19 18:45:16 -05:00