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

5679 Commits

Author SHA1 Message Date
Anthony Calosa
aed59750f9 [Mobile] update bg animation and overlays 2021-09-21 15:35:03 +08:00
Michael Kamensky
9faab0c4b9 - Fix imports 2021-09-21 09:34:34 +03:00
Michael Kamensky
e85ced740d Merge branch 'adversary' into 'master' 
MID – Adversary cycle

See merge request core-developers/forge!5339
 2021-09-21 04:35:13 +00:00
Michael Kamensky
dbbde9f221 Merge branch 'teferi' into 'master' 
MID: Teferi and support

See merge request core-developers/forge!5389
 2021-09-21 04:06:46 +00:00
Tim Mocny
ea58eb7f17 MID: Teferi and support 2021-09-21 04:06:45 +00:00
Michael Kamensky
cb83473ce0 Merge branch 'smolder' into 'master' 
MID: Smoldering Egg // Ashmouth Dragon and support

See merge request core-developers/forge!5390
 2021-09-21 04:06:32 +00:00
Tim Mocny
8773b28a92 MID: Ludevic and (lots of) support 2021-09-21 04:06:22 +00:00
Northmoc
cb06ea86f0 parse Count$TriggeredManaSpent 2021-09-20 15:42:39 -04:00
Northmoc
0541510e84 smoldering_egg_ashmouth_dragon.txt and ember counter 2021-09-20 15:42:38 -04:00
Michael Kamensky
6b8f2b44a1 Merge branch 'sprout' into 'master' 
MID: Deathbonnet Sprout and Support

See merge request core-developers/forge!5397
 2021-09-20 18:59:15 +00:00
Northmoc
772dbe9ec5 PlayerProperty give startsWith "controls" a fallback 2021-09-20 13:25:33 -04:00
Northmoc
f8fc679cc8 Make "ConditionZone" functional 2021-09-20 08:44:44 -04:00
Northmoc
54d8e19516 CostPartMana build cost after choosing how many times 2021-09-19 17:27:32 -04:00
Northmoc
944f4fa25e add Valor counter 2021-09-19 17:27:26 -04:00
Michael Kamensky
beca5a5d2e Merge branch 'clue' into 'master' 
allow Clue Sac cost to use more generic formatting (match Oracle)

See merge request core-developers/forge!5392
 2021-09-19 12:24:34 +00:00
Anthony Calosa
610e258602 update Avatar Animation on lifeloss 2021-09-19 19:23:31 +08:00
Anthony Calosa
73b540328c update Card Animation 2021-09-19 18:59:28 +08:00
Northmoc
0935391569 allow Clue Sac cost to use more generic formatting (match Oracle) 2021-09-19 05:42:46 -04:00
Anthony Calosa
0007b299a3 Merge remote-tracking branch 'remotes/core/master' 2021-09-19 14:14:45 +08:00
Anthony Calosa
82d6a7bbd6 [Mobile] Add Player Avatar Animation 2021-09-19 11:28:54 +08:00
tool4EvEr
69464e165c Fix Portcullis Vine 2021-09-18 20:20:40 +02:00
Michael Kamensky
987950f739 Merge branch 'cost_sb_tweak' into 'master' 
CostRemoveCounter cleanup

See merge request core-developers/forge!5381
 2021-09-17 15:27:26 +00:00
Northmoc
6d69d65b23 CostRemoveCounter cleanup 2021-09-17 11:04:24 -04:00
Tim Mocny
2f390aaa42 MID: Sungold Sentinel and support 2021-09-16 19:09:48 +00:00
Michael Kamensky
8e8ba29d4c Merge branch 'keyword' into 'master' 
keyword stringbuilder tweaks

See merge request core-developers/forge!5373
 2021-09-16 14:34:44 +00:00
Tim Mocny
7c3368a32e MID: Hostile Hostel // Creeping Inn and support 2021-09-16 12:20:27 +00:00
Northmoc
4684dca5f5 keyword stringbuilder tweaks 2021-09-16 07:40:56 -04:00
TRT
baee7c605e SacrificedThisTurn: switch to List 2021-09-16 10:11:41 +02:00
Michael Kamensky
6492ff4e62 Merge branch 'counters_sb' into 'master' 
CountersPutEffect – improve Stack Description string builder

See merge request core-developers/forge!5364
 2021-09-16 04:25:45 +00:00
Northmoc
45ac11a34a curse_of_surveillance.txt + new PlayerProperty 2021-09-15 19:52:18 -04:00
Northmoc
0b4df8c859 remove unneeded and tidy up a few more lines 2021-09-15 17:10:38 -04:00
Northmoc
fdd3a8fdf3 improve StackDesc sb 2021-09-15 07:11:33 -04:00
Northmoc
1c6a460d93 corrections for 1 or 2 keywords 2021-09-14 13:41:58 -04:00
Northmoc
32a14fa82a Pump auto stackdescription sb improvements 2021-09-14 13:25:17 -04:00
Hans Mackowiak
f3799d3982 CardProperty: add isTriggerRemembered 2021-09-14 07:51:33 +00:00
Michael Kamensky
41725e7e9f Merge branch 'flash_format' into 'master' 
some keyword formatting updates

See merge request core-developers/forge!5350
 2021-09-14 03:54:44 +00:00
tool4EvEr
664a3471c9 Add confirm when discarding hand as payment 2021-09-13 20:40:59 +02:00
Northmoc
e51b4d9abf some keyword formatting updates 2021-09-13 11:42:52 -04:00
tool4EvEr
90e5bef028 Clean up 2021-09-13 11:33:56 +02:00
Hans Mackowiak
bfc938be57 Card: refactor hidden keywords into Table Structure 2021-09-12 15:48:34 +00:00
tool4EvEr
df4c64070d Fix Fireball 2021-09-12 10:29:49 +02:00
Michael Kamensky
bbbfe8ddb1 Merge branch 'cost_formats' into 'master' 
Update some cost and prompt formats

See merge request core-developers/forge!5314
 2021-09-12 03:42:37 +00:00
Northmoc
cfc143f398 improve CostRemoveCounter prompt formatting 2021-09-11 23:13:45 -04:00
Northmoc
23967b3d85 improve CostRemoveAnyCounter prompt formatting 2021-09-11 23:13:44 -04:00
Northmoc
db988abb4f Change SimpleString to comma for multiple parts 2021-09-11 23:13:44 -04:00
Northmoc
eb25257a18 Player.java - add replacement to loseLife 2021-09-11 23:12:23 -04:00
Northmoc
be9c1d7c91 fix desc 2021-09-11 23:12:22 -04:00
Northmoc
0df5526452 add ReplaceLifeReduced 2021-09-11 23:12:22 -04:00
tool4EvEr
052b73bda2 Minor Cleanup 2021-09-11 10:26:01 +02:00
Hans Mackowiak
7d7964aae3 GameActionUtil: fix Flashback cost so it only replaces ManaCost 2021-09-10 05:19:44 +00:00