external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,469 Commits 32 Branches 187 Tags
b7f15da799d1d9866c92f7f61013ee9e55e2c82b
Commit Graph

55469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Bendel
74008e849b Update de-DE.properties 
translated lblCommandersCardCannotBeExiledByCard
 2022-02-03 21:57:57 +00:00
Hans Mackowiak
13ff3e8add Merge branch 'staticfix' into 'master' 
Amorphous Axe: fix AllCreatureTypes not being removed when unattached

See merge request core-developers/forge!6146
 2022-02-03 20:11:57 +00:00
tool4EvEr
6f00ea3397 Amorphous Axe: fix AllCreatureTypes not being removed when unattached 2022-02-03 20:42:04 +01:00
tool4EvEr
ca71d93f2b Another puzzle by Xitax 2022-02-03 20:21:04 +01:00
Northmoc
da52c6957f improve sb following ConditionDescription clause 2022-02-03 13:30:34 -05:00
Michael Kamensky
c9cfd8f987 Merge branch 'puzzle' into 'master' 
Add old puzzle by Xitax

See merge request core-developers/forge!6142
 2022-02-03 17:53:56 +00:00
Sol
ba45327912 Merge branch 'paco_unifiedaihintrender' into 'master' 
Unified Deck AI Hints

See merge request core-developers/forge!6113
 2022-02-03 17:42:09 +00:00
Paco Ito
cde80c9c6e Unified Deck AI Hints 2022-02-03 17:42:08 +00:00
TRT
26b5ca1e45 Add old puzzle by Xitax 2022-02-03 17:01:33 +01:00
Michael Kamensky
b2992ca439 Merge branch 'paco_logturnsatendgame' into 'master' 
feat: add log for number of turns played at the end of the game

See merge request core-developers/forge!6121
 2022-02-03 16:00:35 +00:00
Michael Kamensky
8e2ef29483 Merge branch 'cleanstuff' into 'master' 
AffectedAmount -> Relative

See merge request core-developers/forge!6141
 2022-02-03 15:47:15 +00:00
Michael Kamensky
a1d68af2b9 Merge branch 'freshmaster' into 'master' 
New card scripts (HTR20 + NEO)

See merge request core-developers/forge!6119
 2022-02-03 15:46:55 +00:00
Michael Kamensky
e401aa3ebf Merge branch 'neo_2' into 'master' 
NEO – 2 Feb

See merge request core-developers/forge!6128
 2022-02-03 15:46:19 +00:00
Tim Mocny
8faf957ac7 NEO – 2 Feb 2022-02-03 15:46:16 +00:00
Renato Santos
e54b511981 Update forge-gui/res/cardsfolder/upcoming/banishing_slash.txt 2022-02-03 14:49:59 +00:00
TRT
616a6e5ddd AffectedAmount -> Relative 2022-02-03 13:56:59 +01:00
Renato Santos
b9965e1262 Update forge-gui/res/cardsfolder/upcoming/banishing_slash.txt 2022-02-03 12:11:25 +00:00
Michael Kamensky
bd93519fb6 Merge branch 'johnwilliams7-master-patch-31445' into 'master' 
Update Love Your LGS 2021.txt

See merge request core-developers/forge!6139
 2022-02-03 10:38:11 +00:00
John Williams
0d1239f4f8 Update Love Your LGS 2021.txt 2022-02-03 10:23:19 +00:00
Hans Mackowiak
8a3d6823d5 Merge branch 'attach' into 'master' 
Fix Attachments not being removed from protection

See merge request core-developers/forge!6138
 2022-02-03 08:13:10 +00:00
TRT
dd4e9fef45 Fix Attachments not being removed from protection 2022-02-03 09:00:09 +01:00
Anthony Calosa
d18bdbe5b1 Merge branch 'master' into 'master' 
add missing label

See merge request core-developers/forge!6137
 2022-02-03 05:49:21 +00:00
Anthony Calosa
5ca81ffab5 add missing label 2022-02-03 13:47:31 +08:00
Michael Kamensky
631718f4c4 Merge branch 'counters' into 'master' 
WithCounters$ -> WithCountersType$

See merge request core-developers/forge!6135
 2022-02-03 04:09:20 +00:00
Michael Kamensky
55088a5316 Merge branch 'crew' into 'master' 
Add count when Crewing

See merge request core-developers/forge!6132
 2022-02-03 04:08:56 +00:00
Michael Kamensky
19c93d4e9c Merge branch 'costs' into 'master' 
use IsPresent instead of CheckSVar for some cost reductions

See merge request core-developers/forge!6130
 2022-02-03 04:08:15 +00:00
Renato Santos
9058cb8d64 Update forge-gui/res/cardsfolder/upcoming/euroakus.txt 2022-02-03 03:18:44 +00:00
Renato Santos
7451ce2877 Update forge-gui/res/cardsfolder/upcoming/euroakus.txt 2022-02-03 03:17:15 +00:00
Renato Santos
f5a40aafef Deleted forge-gui/res/cardsfolder/upcoming/mountain_mover.txt 2022-02-02 22:15:08 +00:00
Bug Hunter
d5b11e75fa Merge branch 'digstack' into 'master' 
improve DigEffect getStackDescription

See merge request core-developers/forge!6134
 2022-02-02 21:36:16 +00:00
tool4EvEr
63ca64c4cc WithCounters$ -> WithCountersType$ 2022-02-02 21:10:37 +01:00
Northmoc
f09484b1ce improve DigEffect getStackDescription 2022-02-02 13:43:24 -05:00
TRT
efe48e5d00 Add count when Crewing 2022-02-02 19:05:32 +01:00
Michael Kamensky
3d2a94c783 Merge branch 'neo_mm' into 'master' 
NEO: Malicious Malfunction and fix similar cards

See merge request core-developers/forge!6129
 2022-02-02 17:17:30 +00:00
Tim Mocny
d2f78a1b9e NEO: Malicious Malfunction and fix similar cards 2022-02-02 17:17:29 +00:00
Renato Santos
199a8cf08b Update forge-gui/res/cardsfolder/upcoming/invoke_justice.txt 2022-02-02 16:28:29 +00:00
Northmoc
e3031d536b use IsPresent instead of CheckSVar for some cost reductions 2022-02-02 11:17:02 -05:00
Michael Kamensky
bc882f7821 Merge branch 'ranking' into 'master' 
Improve CardRanker

See merge request core-developers/forge!6127
 2022-02-02 15:41:57 +00:00
TRT
af1f59909e Improve CardRanker 2022-02-02 15:02:52 +01:00
Hans Mackowiak
aaae555513 Merge branch 'crew' into 'master' 
Crew fix

See merge request core-developers/forge!6126
 2022-02-02 12:28:05 +00:00
Renato Santos
6038e3b5c6 Update forge-gui/res/cardsfolder/upcoming/invoke_justice.txt 2022-02-02 11:44:17 +00:00
TRT
50da6a361c Crew fix 2022-02-02 11:00:54 +01:00
Paul Hammerton
d48b12ef55 Merge branch 'neo_update' into 'master' 
NEO edition update

See merge request core-developers/forge!6125
 2022-02-02 08:24:21 +00:00
paul_snoops
54fe4a576d NEO edition update 2022-02-02 08:23:12 +00:00
Michael Kamensky
03d040616f Merge branch 'fussy' into 'master' 
fussy prompt fix

See merge request core-developers/forge!6123
 2022-02-02 05:54:30 +00:00
Michael Kamensky
1609c78741 Merge branch 'neo_1' into 'master' 
NEO – 1 Feb

See merge request core-developers/forge!6117
 2022-02-02 05:54:28 +00:00
Tim Mocny
7eb277d5a6 NEO – 1 Feb 2022-02-02 05:54:26 +00:00
Michael Kamensky
1b5360c182 Merge branch 'neo_ktw' into 'master' 
NEO: Kappa Tech-Wrecker and some etbCounter parsing upgrades

See merge request core-developers/forge!6122
 2022-02-02 05:54:12 +00:00
Tim Mocny
73e4e838bc NEO: Kappa Tech-Wrecker and some etbCounter parsing upgrades 2022-02-02 05:54:11 +00:00
Michael Kamensky
39ff60f714 Merge branch 'neo_morj' into 'master' 
NEO: March of Reckless Joy and support

See merge request core-developers/forge!6124
 2022-02-02 05:52:56 +00:00