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

53916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
cb90d4b328 Merge branch 'equinox' into 'master' 
Equinox

See merge request core-developers/forge!5641
 2021-10-24 08:27:33 +00:00
Michael Kamensky
c75552f54b - Account for random destruction (Wild Swing) 
- Some minor reorganization/refactoring.
 2021-10-24 08:27:32 +00:00
Michael Kamensky
a509fb643e Merge branch 'twosat-master-patch-09458' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5642
 2021-10-24 03:50:38 +00:00
leriomaggio
2d40d0135c Added support for new Dungeon DeckSection in Constructed Editor (w/ i18n) 2021-10-23 22:14:15 +02:00
leriomaggio
3c65d993e8 Added new static method to retrieve DungeonPool of cards (so far just 3) 2021-10-23 21:49:20 +02:00
leriomaggio
0343da977c Removed FIXME and added note 2021-10-23 21:48:35 +02:00
leriomaggio
9f97b34a3a Recognise new Dungeon DeckSection Placeholder, and improved support to .dec files 
.Dec files have collector nr//art-index as separated by a Pipe.
RegExps with collector numbers have been extended to further support decks in this format (with simply copy & paste the listing).
Tests updated/added to verify the new regexp & behaviour.
 2021-10-23 21:45:04 +02:00
leriomaggio
ed19bf0a22 New Dungeon DeckSection and corresponding validator 2021-10-23 21:43:24 +02:00
Andreas Bendel
c94f48660c Update de-DE.properties 
translated lblLogRandomMode, lblChosenCard etc., lblRandomColorChosen and lblRandomTypeChosen
 2021-10-23 19:35:56 +00:00
Michael Kamensky
2bd17ffb16 Merge branch 'master' into 'master' 
No need to limit the phase in SetPT logic itself (AnimateAi).

See merge request core-developers/forge!5640
 2021-10-23 15:08:57 +00:00
Michael Kamensky
ffc3140fdf - No need to limit the phase in SetPT logic itself (AnimateAi). 2021-10-23 18:08:14 +03:00
Anthony Calosa
a295a38101 Merge branch 'J17_rules_lawyer' into 'master' 
Exclude Rules Lawyer (J17) from audit

See merge request core-developers/forge!5639
 2021-10-23 14:56:06 +00:00
paul_snoops
eb01191720 Exclude Rules Lawyer (J17) from audit 2021-10-23 15:55:11 +01:00
Bug Hunter
35b7cf2236 Merge branch 'TRT-master-patch-78786' into 'master' 
Update forge-gui/res/cardsfolder/r/rush_of_ice.txt

See merge request core-developers/forge!5638
 2021-10-23 09:57:36 +00:00
Bug Hunter
4e3669e7be Update forge-gui/res/cardsfolder/r/rush_of_ice.txt 2021-10-23 09:57:07 +00:00
Anthony Calosa
84bd65e2bd Merge branch 'master' into 'master' 
Update funny cards

See merge request core-developers/forge!5637
 2021-10-23 09:14:38 +00:00
Anthony Calosa
0f59c30b15 Merge remote-tracking branch 'core/master' 2021-10-23 17:13:43 +08:00
Anthony Calosa
c1a56f95d2 Update funny cards 
collector number that starts with "F" denotes funny, to filter funny cards from legal sets and exclude them in the card audit
 2021-10-23 17:12:02 +08:00
Michael Kamensky
b91c7a87c8 Merge branch 'master' into 'master' 
Rudimentary AI logic for Minsc's activated ability

See merge request core-developers/forge!5636
 2021-10-23 07:05:08 +00:00
Michael Kamensky
5ecd63686e - Rudimentary AI logic for Minsc's activated ability. 2021-10-23 10:04:22 +03:00
Anthony Calosa
45fbe8d8ef Merge branch 'master' into 'master' 
update set lookup

See merge request core-developers/forge!5635
 2021-10-23 06:43:56 +00:00
Anthony Calosa
d989d22420 update set lookup 
- add missing set alias
 2021-10-23 14:43:14 +08:00
Anthony Calosa
fa0b31c9df Merge branch 'master' into 'master' 
[Desktop] Update card audit

See merge request core-developers/forge!5634
 2021-10-23 05:37:03 +00:00
Anthony Calosa
0d194ba645 [Desktop] Update card audit 
- only display the missing cards and not implemented cards.
 2021-10-23 13:36:00 +08:00
Michael Kamensky
fb497b8b1d Merge branch 'master' into 'master' 
Some logic improvement for Inferno of the Star Mounts.

See merge request core-developers/forge!5633
 2021-10-23 05:30:44 +00:00
Michael Kamensky
b28ce0f1bb Some logic improvement for Inferno of the Star Mounts. 2021-10-23 05:30:43 +00:00
Michael Kamensky
63d4cb5daa - Minor tweak. 2021-10-23 08:30:00 +03:00
Michael Kamensky
161eddae7f - Some logic improvement for Inferno of the Star Mounts. 2021-10-23 08:28:35 +03:00
Michael Kamensky
abdfe58bb2 Merge branch 'master' into 'master' 
Added puzzle PS_MID2 - Possibility Storm - Innistrad Midnight Hunt 02

See merge request core-developers/forge!5632
 2021-10-23 04:58:18 +00:00
Michael Kamensky
4aabd478f7 - Added puzzle PS_MID2. 2021-10-23 07:57:43 +03:00
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