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

55094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
0399e52bf6 Merge branch 'manual-dexterity' into 'master' 
Initial implementation for simulated manual dexterity cards (Chaos Orb and Falling Star)

See merge request core-developers/forge!5647
 2021-10-25 05:08:15 +00:00
Michael Kamensky
c9b94710b2 - Initial implementation for simulated manual dexterity cards (Chaos Orb and Falling Star) with basic AI support. 2021-10-25 05:08:14 +00:00
Michael Kamensky
d0afefb5ab Merge branch 'mpfix' into 'master' 
Fix SA not fizzling when targeting cards that left game

See merge request core-developers/forge!5649
 2021-10-25 03:44:45 +00:00
tool4EvEr
47a1a93625 Fix SA not fizzling when targeting cards that left game 2021-10-24 22:10:22 +02:00
Michael Kamensky
81ec2c1a55 Merge branch 'twosat-master-patch-04851' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5648
 2021-10-24 19:06:58 +00:00
Andreas Bendel
066ede2237 Update de-DE.properties 
translated lblfromdungeondeck and LimitedPoolType
 2021-10-24 19:04:39 +00:00
Michael Kamensky
916b73e4b9 Merge branch 'master' into 'master' 
Enable Harm's Way in MTGO Core Cube 2018.

See merge request core-developers/forge!5646
 2021-10-24 15:08:39 +00:00
Michael Kamensky
bbe0a5b76b - Enable Harm's Way in MTGO Core Cube 2018. 2021-10-24 18:07:58 +03:00
Michael Kamensky
6c1b5d2ea3 Merge branch 'master' into 'master' 
Bag of Holding AI spec.

See merge request core-developers/forge!5645
 2021-10-24 14:55:35 +00:00
Michael Kamensky
c827769da7 - Bag of Holding AI spec. 2021-10-24 17:54:55 +03:00
Michael Kamensky
9afa3908b8 Merge branch 'master' into 'master' 
Enable some of the recently implemented cards in Oldschool 93-94 Magic Full Set cube list.

See merge request core-developers/forge!5644
 2021-10-24 14:39:38 +00:00
Michael Kamensky
a91699bc07 - Enable some of the recently implemented cards in Oldschool 93-94 Magic Full Set cube list. 2021-10-24 17:39:00 +03:00
Michael Kamensky
75c6e9ef5e Merge branch 'deck-importer-decks-file-format' into 'master' 
FIX Issue with Race Condition in Decks + Extras to CustomCube Draft and Deck Editor

See merge request core-developers/forge!5643
 2021-10-24 14:36:37 +00:00
leriomaggio
669a10820e Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-24 16:20:21 +02:00
leriomaggio
d303c0e8ff Saving a Deck is now performed ONLY if there is any actual change to save onto disk. Otherwise, the whole op is skipped. 2021-10-24 16:18:18 +02:00
leriomaggio
1a7288815c Updated resetTable to reuse the code in setEditorMode and to update the DeckSection Dropdown 
This FIXES a bug causing the Deck Editor to not properly restore its state after saving a Deck and not originally in Main Decksection.
This commit also avoids repeating code and reset tables only if necessary.
 2021-10-24 16:17:05 +02:00
leriomaggio
3035f81e35 FIXED all cards in custom cube decks from wrong edition (mostly STX instead of STA) 2021-10-24 12:34:12 +02:00
leriomaggio
0a4d2005c5 Added i18n support to LimitedType 2021-10-24 11:14:16 +02:00
leriomaggio
b350a2d110 FIXED issue with race condition when updating deferredSections 2021-10-24 10:40:27 +02:00
leriomaggio
526d41bddd Added dungeon section in DeckSection matching for cards 2021-10-24 10:39:59 +02:00
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