external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,951 Commits 34 Branches 187 Tags
b049c8c09becb7188894a86bb76f7abcded916f3
Commit Graph

51951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
ddf8eeb5c9 Merge branch 'art_crop' into 'master' 
Support art crop in Card Image Renderer

See merge request core-developers/forge!5150
 2021-08-02 08:21:25 +00:00
Alumi
2c9b3f648d Support art crop in Card Image Renderer 2021-08-02 08:21:23 +00:00
Michael Kamensky
d5388b8831 Merge branch 'fix_token_crash' into 'master' 
Fix token related crash

See merge request core-developers/forge!5162
 2021-08-02 07:00:05 +00:00
Bug Hunter
a3a6bd20a5 Merge branch 'TRT-master-patch-94208' into 'master' 
Update forge-gui/res/cardsfolder/h/hazorets_monument.txt

See merge request core-developers/forge!5163
 2021-08-02 06:37:04 +00:00
Bug Hunter
90ffdcba11 Update forge-gui/res/cardsfolder/h/hazorets_monument.txt 2021-08-02 06:36:38 +00:00
Lyu Zong-Hong
1cd8255ab6 Fix token related crash 2021-08-02 14:29:53 +09:00
Michael Kamensky
ab869853ac Merge branch 'j21_31' into 'master' 
Fixing/adding some goofy Skeletons

See merge request core-developers/forge!5154
 2021-08-02 04:00:09 +00:00
Northmoc
8bdf7fe388 fix typo in AI hint 2021-08-01 20:58:27 -04:00
Bug Hunter
e71c05a985 Merge branch 'TRT-master-patch-35684' into 'master' 
Update forge-gui/res/cardsfolder/e/exploding_borders.txt

See merge request core-developers/forge!5161
 2021-08-01 17:20:37 +00:00
Bug Hunter
416f877100 Update forge-gui/res/cardsfolder/e/exploding_borders.txt 2021-08-01 17:20:01 +00:00
Michael Kamensky
e74e89b737 Merge branch 'manalki' into 'master' 
ManaSpent: check source at time it produced

See merge request core-developers/forge!5158
 2021-08-01 16:58:22 +00:00
Bug Hunter
2ded193dda Merge branch 'TRT-master-patch-11670' into 'master' 
Update forge-gui/res/cardsfolder/p/peregrination.txt

See merge request core-developers/forge!5160
 2021-08-01 15:48:16 +00:00
Bug Hunter
6a4c35272b Update forge-gui/res/cardsfolder/p/peregrination.txt 2021-08-01 15:47:58 +00:00
tool4EvEr
45ca346703 ManaSpent: check source at time it produced 2021-08-01 16:42:30 +02:00
Bug Hunter
0f431a21a6 Merge branch 'aifix' into 'master' 
AI: Fix MDFC check

See merge request core-developers/forge!5159
 2021-08-01 14:40:55 +00:00
tool4EvEr
1639a07e07 AI: Fix MDFC check 2021-08-01 16:41:04 +02:00
Anthony Calosa
8bd1222b90 Merge branch 'restart' into 'master' 
RestartGameEffect: Fully clean Blessing & Monarch

See merge request core-developers/forge!5157
 2021-08-01 07:36:01 +00:00
tool4EvEr
75f674cfca Fix target 2021-08-01 09:13:55 +02:00
tool4EvEr
c2e4b8fab0 Fully clean Blessing & Monarch 2021-08-01 09:09:35 +02:00
Bug Hunter
7a615c3a7c Merge branch 'fixnpe' into 'master' 
Fix NPE

See merge request core-developers/forge!5156
 2021-08-01 06:53:21 +00:00
tool4EvEr
0114d8c9db Fix NPE 2021-08-01 08:53:07 +02:00
Michael Kamensky
9f39857dad Merge branch 'master' into 'master' 
Added puzzle PS_AFR01

See merge request core-developers/forge!5155
 2021-08-01 05:06:51 +00:00
Michael Kamensky
32a6c7e001 - Added puzzle PS_AFR01. 2021-08-01 08:05:54 +03:00
Michael Kamensky
07d71143b6 Merge branch 'tramplePW' into 'master' 
Trample over PW as Variant of Trample

See merge request core-developers/forge!5153
 2021-08-01 04:53:54 +00:00
Michael Kamensky
2873fe6dd3 Merge branch 'legendary' into 'master' 
LegendaryRuleAi: Support SacMe

See merge request core-developers/forge!5146
 2021-08-01 03:42:51 +00:00
Bug Hunter
b7b647746e LegendaryRuleAi: Support SacMe 2021-08-01 03:42:51 +00:00
Northmoc
426acedb76 flameskull.txt add Condition 2021-07-31 22:31:24 -04:00
Northmoc
72eb2b4409 boneyard_aberration.txt 2021-07-31 22:31:07 -04:00
Northmoc
1500729128 bone_rattler.txt add ImmediateTrigger 2021-07-31 22:30:50 -04:00
Sol
d53270514f Merge branch 'npeguard' into 'master' 
Add NPE Guard

See merge request core-developers/forge!5152
 2021-08-01 02:13:14 +00:00
Hans Mackowiak
c7e6076f8b Trample over PW as Variant of Trample 2021-08-01 01:40:26 +02:00
tool4EvEr
d6aa6ac4c1 Add NPE Guard 2021-07-31 20:26:59 +02:00
Michael Kamensky
fd03367ac4 Merge branch 'crashfix' into 'master' 
Fix crash with The Monarch

See merge request core-developers/forge!5151
 2021-07-31 17:49:27 +00:00
tool4EvEr
168cc31955 Fix crash with The Monarch 2021-07-31 19:21:45 +02:00
Michael Kamensky
cb7d8e572c Merge branch 'fix' into 'master' 
fix vengeful_ancestor.txt second trigger

See merge request core-developers/forge!5149
 2021-07-31 15:04:13 +00:00
Michael Kamensky
e0165ef99d Merge branch 'effect' into 'master' 
move updateStateForView after moveTo Command Zone

See merge request core-developers/forge!5148
 2021-07-31 15:04:00 +00:00
Northmoc
5c2b16f35e move updateStateForView after moveTo Command Zone 2021-07-31 08:12:39 -04:00
Michael Kamensky
ddb4bce2cc Merge branch 'classcast' into 'master' 
Fix ClassCastException

See merge request core-developers/forge!5145
 2021-07-31 09:34:54 +00:00
tool4EvEr
d46a529c74 Fix ClassCastException 2021-07-31 09:59:19 +02:00
Bug Hunter
d8b376e8b1 Merge branch 'TRT-master-patch-25340' into 'master' 
Update forge-gui/res/cardsfolder/b/battlefield_scavenger.txt

See merge request core-developers/forge!5144
 2021-07-31 07:30:36 +00:00
Bug Hunter
34c98119b3 Update forge-gui/res/cardsfolder/b/battlefield_scavenger.txt 2021-07-31 07:29:51 +00:00
Michael Kamensky
1601afdfc0 Merge branch 'costs' into 'master' 
Fix CostSacrifice paying from Effect

See merge request core-developers/forge!5138
 2021-07-31 04:47:24 +00:00
Bug Hunter
a9f5ab8772 Fix CostSacrifice paying from Effect 2021-07-31 04:47:23 +00:00
Michael Kamensky
74038eefb5 Merge branch 'fixnpe' into 'master' 
Fix NPE

See merge request core-developers/forge!5141
 2021-07-31 04:47:09 +00:00
Michael Kamensky
04174c2cea Merge branch 'twosat-master-patch-00612' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5142
 2021-07-31 04:46:47 +00:00
Michael Kamensky
fda99c3006 Merge branch 'fix_unknown_token' into 'master' 
Fix crash when create token with unknown edition

See merge request core-developers/forge!5143
 2021-07-31 04:46:39 +00:00
Lyu Zong-Hong
ac516168e4 Fix crash when create token with unknown edition 2021-07-31 13:44:38 +09:00
Sol
71070e66cd Update birgi_god_of_storytelling_harnfel_horn_of_bounty.txt 2021-07-31 02:31:31 +00:00
Andreas Bendel
d0d220330b Update de-DE.properties 
translated new rendering options
 2021-07-30 22:02:18 +00:00
tool4EvEr
a2f1b258a3 Small AI fix 2021-07-30 22:24:51 +02:00