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
55,094 Commits 31 Branches 187 Tags
bc85d9fcbe01c3be80426c76b36b78692901f21c
Commit Graph

55094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
75231395c5 Merge branch 'TRT-master-patch-61920' into 'master' 
Update forge-gui/res/cardsfolder/b/bloodthirsty_adversary.txt

See merge request core-developers/forge!5631
 2021-10-23 04:05:36 +00:00
Michael Kamensky
13f3ec8e9f Merge branch 'control' into 'master' 
Control changing effects should not overwrite default controller

Closes #1990

See merge request core-developers/forge!5624
 2021-10-23 04:03:55 +00:00
Michael Kamensky
7ad0fea6f4 Merge branch 'awaken' into 'master' 
Fix Awaken targeting

Closes #1991

See merge request core-developers/forge!5629
 2021-10-23 04:03:37 +00:00
Bug Hunter
847e703509 Update forge-gui/res/cardsfolder/b/bloodthirsty_adversary.txt 2021-10-22 21:36:50 +00:00
tool4EvEr
66c03856b1 Fix Awaken targeting 2021-10-22 20:49:09 +02:00
Michael Kamensky
502b6be1a5 Merge branch 'awol' into 'master' 
AWOL

See merge request core-developers/forge!5621
 2021-10-22 15:22:11 +00:00
Bug Hunter
7716496b89 Merge branch 'typo' into 'master' 
vexing_arcanix.txt fix typos in desc

See merge request core-developers/forge!5628
 2021-10-22 14:42:14 +00:00
Northmoc
a92db22518 vexing_arcanix.txt fix typos in desc 2021-10-22 10:29:00 -04:00
Northmoc
0f0d7d5f9e SpellApiToAi add RemoveFromGame 2021-10-22 10:00:35 -04:00
Michael Kamensky
3d96dc9d93 Merge branch 'astral' into 'master' 
MicroProse Astral cards!?!

See merge request core-developers/forge!5465
 2021-10-22 12:45:15 +00:00
Tim Mocny
f535c8bc8e MicroProse Astral cards!?! 2021-10-22 12:45:14 +00:00
Michael Kamensky
14ed47a722 Merge branch 'audit' into 'master' 
Exclude "funny" cards from audit

See merge request core-developers/forge!5627
 2021-10-22 12:44:20 +00:00
tool4EvEr
6f8a5071ee Control changing effects should not overwrite default controller 2021-10-22 14:33:38 +02:00
paul_snoops
c409e907c2 Exclude "funny" cards from audit 2021-10-22 12:59:41 +01:00
Anthony Calosa
c8aa496b41 Merge branch 'master' into 'master' 
Gauntlets Updates

See merge request core-developers/forge!5626
 2021-10-22 11:09:13 +00:00
Michael Kamensky
6b84130757 Merge branch 'master' into 'master' 
Attempt deleting gitlab-ci.yml after the Adventures merge.

See merge request core-developers/forge!5625
 2021-10-22 09:50:18 +00:00
Michael Kamensky
14563b8f65 - Attempt deleting gitlab-ci.yml after the Adventures merge. 2021-10-22 12:49:01 +03:00
Churrufli
0693f6ee3c Gauntlets Updates 2021-10-22 11:39:25 +02:00
Michael Kamensky
eaaf61ba10 Merge branch 'master' into 'master' 
Add AI logic for Delina, Wild Mage

See merge request core-developers/forge!5623
 2021-10-22 06:53:24 +00:00
Michael Kamensky
b6354907bc - Add AI logic for Delina, Wild Mage. 2021-10-22 09:52:12 +03:00
Michael Kamensky
5a4828d886 Merge branch 'aicombat' into 'master' 
Fix miscalculation of damage shields

See merge request core-developers/forge!5622
 2021-10-22 03:42:14 +00:00
tool4EvEr
f1467d5a3e Fix miscalculation of damage shields 2021-10-21 22:55:50 +02:00
Michael Kamensky
4233ee160e Merge branch 'shoe_tree' into 'master' 
Shoe Tree!

See merge request core-developers/forge!5619
 2021-10-21 19:21:29 +00:00
Northmoc
a319d7882d add AI hint 2021-10-21 14:24:16 -04:00
Michael Kamensky
1deb890f93 Merge branch 'cleanup/added-DB$-space' into 'master' 
Cleanup/added db$ space

See merge request core-developers/forge!5341
 2021-10-21 17:59:27 +00:00
Stu Bob
efcb45546c Cleanup/added db$ space 2021-10-21 17:59:24 +00:00
Michael Kamensky
dede976ce5 Merge branch 'fix' into 'master' 
haktos_the_unscarred.txt NICKNAME flag

See merge request core-developers/forge!5620
 2021-10-21 17:56:44 +00:00
Northmoc
9dd5f0b590 add RemoveFromGameEffect 2021-10-21 12:56:16 -04:00
Northmoc
947deb4b8d awol.txt 2021-10-21 12:55:08 -04:00
Northmoc
d913d0519a haktos_the_unscarred.txt NICKNAME flag 2021-10-21 12:48:08 -04:00
Northmoc
37036332f7 shoe_tree.txt 2021-10-21 12:46:25 -04:00
Michael Kamensky
4f8247c443 Merge branch 'orderCardsByTheirOwners' into 'master' 
orderCardsByTheirOwners adjustment

See merge request core-developers/forge!5617
 2021-10-21 15:26:41 +00:00
Michael Kamensky
e4394d135d Merge branch 'gray2' into 'master' 
improve Gray Text preference implementation

See merge request core-developers/forge!5618
 2021-10-21 15:26:25 +00:00
TRT
de3edd52cc orderCardsByTheirOwners adjustment 2021-10-21 15:42:50 +02:00
Northmoc
843a2a643c improve Gray Text preference implementation 2021-10-21 09:31:20 -04:00
Michael Kamensky
158de07d60 Merge branch 'sld_hawkins' into 'master' 
SLD Edition for missing Stranger Things Card

See merge request core-developers/forge!5612
 2021-10-21 12:37:24 +00:00
Michael Kamensky
c3b860998b Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!5615
 2021-10-21 12:37:05 +00:00
Michael Kamensky
94141e6e7f Merge branch 'TRT-master-patch-24531' into 'master' 
Update forge-gui/res/cardsfolder/t/tevesh_szat_doom_of_fools.txt

See merge request core-developers/forge!5616
 2021-10-21 12:36:32 +00:00
Michael Kamensky
656a8a9fac Merge branch 'blockfix' into 'master' 
AiBlockController: fix for menace + trample

See merge request core-developers/forge!5614
 2021-10-21 12:36:13 +00:00
Bug Hunter
21b037e2e7 Update forge-gui/res/cardsfolder/t/tevesh_szat_doom_of_fools.txt 2021-10-21 12:35:26 +00:00
CCTV-1
9f0680b20a update new Importer strings. 2021-10-21 19:54:25 +08:00
TRT
88312465cd AiBlockController: fix for menace + trample 2021-10-21 13:28:31 +02:00
Anthony Calosa
50a7437fbd Merge branch 'master' into 'master' 
unused imports

See merge request core-developers/forge!5613
 2021-10-21 07:46:21 +00:00
Anthony Calosa
165a564caf unused imports 2021-10-21 15:45:30 +08:00
paul_snoops
83441c6e75 SLD Edition for missing Stranger Things Card 2021-10-21 08:37:30 +01:00
Michael Kamensky
6cfc5041c7 Merge branch 'master' into 'master' 
[Mobile] Prevent Card Animations when FScrollPane is moving

See merge request core-developers/forge!5611
 2021-10-21 05:25:21 +00:00
Anthony Calosa
a6570491ea Merge remote-tracking branch 'core/master' 2021-10-21 12:40:54 +08:00
Michael Kamensky
7306f69c4a Merge branch 'twosat-master-patch-36825' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5606
 2021-10-21 04:34:54 +00:00
Michael Kamensky
da838bdb4c Merge branch 'layout' into 'master' 
Add some more modern resolution choices

See merge request core-developers/forge!5608
 2021-10-21 04:34:44 +00:00
Michael Kamensky
b19f01ef8b Merge branch 'gildedrake' into 'master' 
Fix AI refusing Gilded Drake trigger when no targets

See merge request core-developers/forge!5607
 2021-10-21 04:30:40 +00:00