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
51,054 Commits 31 Branches 187 Tags
12be76899a7e68ad0ff394d024128e96e2c72f53
Commit Graph

51054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4EvEr
12be76899a Fix amount for X spells 2021-07-04 13:41:24 +02:00
tool4EvEr
b982620402 Fix RE 2021-07-04 12:21:43 +02:00
tool4EvEr
9a58359563 Better fix for Kethis 2021-07-04 11:45:39 +02:00
Michael Kamensky
233ad71b86 Merge branch 'AffectedAmount' into 'master' 
Fix AffectedAmount

See merge request core-developers/forge!4943
 2021-07-04 05:04:41 +00:00
Michael Kamensky
bb9cf72912 Merge branch 'AFR_cards' into 'master' 
AFR card scripts 03 Jul

See merge request core-developers/forge!4942
 2021-07-04 05:04:10 +00:00
paul_snoops
12902e8b27 AFR card scripts 03 Jul 2021-07-03 21:31:11 +01:00
paul_snoops
1417bf436d AFR card scripts 03 Jul 2021-07-03 21:29:26 +01:00
tool4EvEr
35121c85af Fix AffectedAmount 2021-07-03 22:07:55 +02:00
paul_snoops
9af01ed521 AFR card scripts 03 Jul 2021-07-03 16:53:58 +01:00
paul_snoops
063cbbfd8a AFR card scripts 03 Jul 2021-07-03 14:36:47 +01:00
Michael Kamensky
ef79f05db3 Merge branch 'cardfixes' into 'master' 
Entwine fix

See merge request core-developers/forge!4941
 2021-07-03 13:27:06 +00:00
tool4EvEr
8562f2f28d Entwine fix 2021-07-03 15:16:36 +02:00
Michael Kamensky
3e72125163 Merge branch 'play' into 'master' 
PlayEffect: small fixes

See merge request core-developers/forge!4939
 2021-07-03 04:49:03 +00:00
Michael Kamensky
3e007065b0 Merge branch 'AFR_cards' into 'master' 
AFR card scripts 02 Jul

See merge request core-developers/forge!4938
 2021-07-03 04:48:38 +00:00
paul_snoops
31fb70f115 AFR cards from various Discord contributors 2021-07-03 03:19:12 +01:00
paul_snoops
7e0e24ddd7 AFR cards from various Discord contributors 2021-07-03 01:19:40 +01:00
tool4EvEr
c52a94bbfc Refactor for facedown 2021-07-03 00:48:05 +02:00
paul_snoops
80aa06cd92 AFR cards from various Discord contributors 2021-07-02 17:34:49 +01:00
paul_snoops
dcd42ef387 AFR cards from various Discord contributors 2021-07-02 17:31:57 +01:00
paul_snoops
7da17c3a36 AFR cards from various Discord contributors 2021-07-02 15:26:26 +01:00
paul_snoops
88afa85e88 AFR cards from various Discord contributors 2021-07-02 11:01:14 +01:00
paul_snoops
16c7add22c AFR cards from various Discord contributers 2021-07-02 09:40:03 +01:00
Michael Kamensky
82339213a8 Merge branch 'master' into 'master' 
Added puzzle PS_STX5.

See merge request core-developers/forge!4937
 2021-07-02 05:35:55 +00:00
Michael Kamensky
36caca89b6 - Added puzzle PS_STX5. 2021-07-02 08:31:50 +03:00
Michael Kamensky
3ced2f2a24 Merge branch 'afr_dungeon_related_cards' into 'master' 
Implement some cards with dungeon mechanism that needs engine change.

See merge request core-developers/forge!4936
 2021-07-02 05:03:29 +00:00
Alumi
a12848864b Implement some cards with dungeon mechanism that needs engine change. 2021-07-02 05:03:28 +00:00
Michael Kamensky
e2785d4180 Merge branch 'AFR' into 'master' 
AFR update 01 Jul

See merge request core-developers/forge!4935
 2021-07-02 03:35:26 +00:00
paul_snoops
1421e1617d AFR update 01 Jul 2021-07-01 18:16:01 +01:00
Michael Kamensky
a45cbff98b Merge branch 'worstland' into 'master' 
Update getWorstLand

See merge request core-developers/forge!4933
 2021-07-01 03:30:14 +00:00
Michael Kamensky
270c7e3571 Merge branch 'AFR' into 'master' 
AFR update 30 Jun

See merge request core-developers/forge!4932
 2021-07-01 03:29:03 +00:00
tool4EvEr
1b3cf98372 Update getWorstLand 2021-07-01 00:02:57 +02:00
paul_snoops
b647a74469 AFR update 30 Jun 2021-06-30 16:31:10 +01:00
Michael Kamensky
31d0d4535e Merge branch 'notnamed_comma_workaround' into 'master' 
Add the same workaround to `notnamed` property for card name with comma

See merge request core-developers/forge!4931
 2021-06-30 03:00:51 +00:00
Lyu Zong-Hong
e15c4be102 Add the same workaround to 
otnamed property for card name with comma
 2021-06-30 09:52:38 +09:00
Michael Kamensky
846b6de9ab Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4930
 2021-06-29 15:52:25 +00:00
CCTV-1
673f26cab2 translate venture effect strings. 2021-06-29 20:02:44 +08:00
Michael Kamensky
ffb05ed1b6 Merge branch 'twosat-master-patch-37299' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4929
 2021-06-29 10:11:45 +00:00
Andreas Bendel
c4eb1ceb10 Update de-DE.properties 
translated the two new dungeon strings
 2021-06-29 09:56:20 +00:00
Sol
21e27534f8 Update LEG Challenge Arboria.dck 2021-06-29 01:16:19 +00:00
Bug Hunter
b874c202cb Merge branch 'TRT-master-patch-19714' into 'master' 
Update forge-gui/res/cardsfolder/f/frostwielder.txt

See merge request core-developers/forge!4928
 2021-06-28 12:30:08 +00:00
Bug Hunter
de163b31d8 Update forge-gui/res/cardsfolder/f/frostwielder.txt 2021-06-28 12:28:08 +00:00
Michael Kamensky
b5d93cabd3 Merge branch 'master' into 'master' 
Added puzzles PS_KHM6 through PS_STX4.

See merge request core-developers/forge!4927
 2021-06-28 09:46:45 +00:00
Michael Kamensky
0d30d8659a - Added puzzles PS_STX3, PS_STX4. Tweaked PS_STX1. 
- PS_STX4 needs extra AI logic for Leyline Tyrant (DamageDealAi#chkAIDrawback).
 2021-06-28 12:38:18 +03:00
Michael Kamensky
b5bc614c65 - Added puzzle PS_STX2 with GameState support. 2021-06-28 07:22:11 +03:00
Michael Kamensky
ac23ad25fc - Added puzzles PS_KHM6, PS_TSR1, PS_STX1. 2021-06-28 06:44:37 +03:00
Michael Kamensky
510063bd98 Merge branch 'update_to_the_slaughter' into 'master' 
Revert To the Slaughter to use StoreSVar to save Delirium mode before resolving

See merge request core-developers/forge!4926
 2021-06-28 03:23:53 +00:00
Lyu Zong-Hong
83e65d3b4d Revert To the Slaughter to use StoreSVar to save Delirium mode before resolving 2021-06-28 10:17:42 +09:00
swordshine
2c5548bc88 Merge branch 'smallfix' into 'master' 
Small fixes

See merge request core-developers/forge!4925
 2021-06-28 00:48:22 +00:00
tool4EvEr
71ab3310da Small fixes 2021-06-27 23:21:11 +02:00
Michael Kamensky
73929b3e1a Merge branch 'fix_sac_each_valid' into 'master' 
Update some sacrifice spells that also should use SacEachValid

See merge request core-developers/forge!4923
 2021-06-27 13:27:10 +00:00