external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,352 Commits 32 Branches 187 Tags
ff75bee0c20ca643bcace2aee5d0e1dfd85eb84c
Commit Graph

64352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
c921928012 Merge branch 'master' into newmaster2 2023-05-11 06:26:00 +08:00
tool4ever
fbf401cb55 Clean up (#3092) 2023-05-10 20:02:05 +00:00
Anthony Calosa
5e58331921 Merge branch 'master' into newmaster2 2023-05-10 18:44:07 +08:00
tool4ever
02b39d3a16 Update zhulodok_void_gorger.txt 2023-05-10 12:22:03 +02:00
Hans Mackowiak
5ed76b8171 Stored kw idx (#3089) 
* Card: Static Ability Keywords now use idx
 2023-05-10 11:31:01 +02:00
Anthony Calosa
ec14a4a784 Merge branch 'master' into newmaster2 2023-05-10 15:30:22 +08:00
EldritchBimbo
dbf8be8372 Phyrexian Shops Update (#3087) 
* Phyrexian Shops Update

Changes:
.Adds 6 shops for Phyrexian theme (1 per region.)
.Adds sign + infrastructure to indicate Phyrexian shops.
.Adds Phyrexian shops to towns - mythic rarity in capital and generic, rare rarity in tribal.

* Update shops.json

---------

Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
 2023-05-10 10:27:24 +03:00
Chris H
6437fde0c3 Make it clearer where the simulater is loading decks from (#3088) 2023-05-10 07:38:40 +02:00
Klisz
d3b955139a Update arni_metalbrow.txt (#3086) 
Fix bug where creatures attacking or ETBing attacking triggers Arni from any zone, even if he's in your library or something
 2023-05-09 20:32:16 +00:00
Simisays
3ad83ebc1d Update calix_guided_by_fate.txt (#3085) 2023-05-09 18:56:11 +00:00
Paul Hammerton
142198bb5e Merge pull request #3083 from Agetian/master 
Fix case on One with the Multiverse
 2023-05-09 17:10:05 +01:00
Michael Kamensky
fd317ef4ad - Fix case on One with the Multiverse. 2023-05-09 18:52:44 +03:00
Agetian
1920830f21 Merge branch 'Card-Forge:master' into master 2023-05-09 17:55:17 +03:00
Agetian
ae18f7726c QHD/UHD resolution support in Adventure Mode (#3079) 
* - Simplify MeldedWith support in GameState (as a parameter for Meld).

* - Maintain support for old-style "|Meld" game states just in case.

* - Add 1440p and 2160p to the list of supported video modes in Adventure mode.

* - Refactor the video mode constants and related code duplication.
 2023-05-09 17:54:29 +03:00
Anthony Calosa
d37a36851a Merge branch 'master' into newmaster2 2023-05-09 15:26:36 +08:00
EldritchBimbo
f55f17fcd6 Sprite Request Fulfilled (Dimir Faerie, Witch) (#3080) 
* Sprite Request Fulfilled

Adds:
.Adds sprite, atlas for Witch and Dimir Faerie as requested, in "Requested" folder of "Unused" sprite folder.

Changes:
.Splits "Unused" folder into "Requested" (for sprites that were requested in the spreadsheet but haven't been implemented as enemies anywhere) and "Removed" - for sprites that were either replaced, or were attached to a de-implemented creature.
.Moved previous contents of "unused" folder to "removed" folder.

* Update witch.png

* Update witch.png
 2023-05-09 06:48:29 +03:00
Anthony Calosa
01790479e8 update StandardLDA 2023-05-08 23:39:59 -04:00
Anthony Calosa
27118ceb2d update StandardLDA 2023-05-09 07:35:19 +08:00
Agetian
a368466b13 Merge branch 'Card-Forge:master' into master 2023-05-08 17:11:41 +03:00
tool4ever
87d934acef Update vraska_betrayals_sting.txt 2023-05-08 15:58:32 +02:00
Agetian
71362ce82b Update support for Meld in GameState/Puzzle Mode. (#3078) 
* - Simplify MeldedWith support in GameState (as a parameter for Meld).

* - Maintain support for old-style "|Meld" game states just in case.
 2023-05-08 14:12:33 +02:00
Michael Kamensky
2f2204b81f - Maintain support for old-style "|Meld" game states just in case. 2023-05-08 14:45:53 +03:00
Michael Kamensky
4a6ce340ba - Simplify MeldedWith support in GameState (as a parameter for Meld). 2023-05-08 14:45:53 +03:00
Anthony Calosa
80cf74d26c Merge pull request #3075 from Agetian/master 
Add several puzzles (ONE, MOM)
 2023-05-08 19:23:00 +08:00
Michael Kamensky
c846b30014 - Minor cleanup for PS_ONE3. 2023-05-08 14:11:07 +03:00
Michael Kamensky
f4984495f4 - Add support for MeldedWith in Game State. 
- Add proper support for PS_ONE3 (goal and all).
 2023-05-08 14:08:46 +03:00
Anthony Calosa
bac9a0c4bd Merge pull request #3076 from tool4ever/fixroll 
Fix rollback sometimes reverting to LKI version of card
 2023-05-08 17:36:03 +08:00
TRT
6c3ba98667 Fix casting disturbed from other zones 2023-05-08 11:16:12 +02:00
TRT
936833321b Clean up 2023-05-08 11:03:32 +02:00
TRT
0303a0e6fd Better fix for Mutagen Connoisseur 2023-05-08 10:00:19 +02:00
Agetian
dfb69fa0d4 Merge branch 'Card-Forge:master' into master 2023-05-08 08:37:41 +03:00
tool4EvEr
fa7e9024fe Fix rollback sometimes reverting to LKI version of card 2023-05-07 23:49:55 +02:00
Hans Mackowiak
bb3709ebad CardFactory: Token Copy of transforming permanent 2023-05-07 22:53:24 +02:00
Michael Kamensky
215a41ed84 - Added puzzles PS_ONE3 (disabled for now), PS_ONE4, PS_ONE5, PS_MOM1, PS_MOM2. 2023-05-07 21:10:25 +03:00
Anthony Calosa
3bc8fb6f9a Merge pull request #3074 from Simisays/LOTRBIS 
LTR 3 cards
 2023-05-07 22:09:39 +08:00
Simisays
7eb6518aee update 2023-05-07 13:46:46 +02:00
Paul Hammerton
a8af1ffbfe Merge pull request #3073 from paulsnoops/update_sld 
Edition updates: SLD
 2023-05-07 11:28:01 +01:00
paulsnoops
02e8efd496 Edition updates: SLD 2023-05-07 11:23:12 +01:00
Simisays
16e5f58c35 CMM 3 face commanders (#3069) 2023-05-07 08:42:24 +00:00
Agetian
1c7828314e Merge branch 'Card-Forge:master' into master 2023-05-07 08:53:17 +03:00
tool4ever
384b2aa0cc Fix exiling sometimes handled incomplete for combined permanents (#3071) 
* Fix exiling sometimes handled incomplete for combined permanents

* Fix Mutagen Connoisseur ignoring transformed battles

* LKI fix

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-05-07 07:17:17 +03:00
Paul Hammerton
6dcfab0712 Merge pull request #3068 from paulsnoops/edition_updates 
Edition updates: CMM, LTR, SLD, WHO
 2023-05-06 10:40:48 +01:00
paulsnoops
033ce44bb5 Edition updates: CMM, LTR, SLD, WHO 2023-05-06 10:35:05 +01:00
Anthony Calosa
45a86bd04e Merge pull request #3067 from tool4ever/mayplayreset 
MayPlayLimit is not copiable
 2023-05-06 17:15:07 +08:00
tool4EvEr
bb2244abba MayPlayLimit is not copiable 2023-05-06 10:17:39 +02:00
Anthony Calosa
e3d9db279f Merge pull request #3066 from kevlahnota/newmaster2 
fix typo
 2023-05-06 07:59:01 +08:00
Anthony Calosa
5abdb6b2ef fix typo 2023-05-06 07:58:17 +08:00
Anthony Calosa
b3450129d3 Merge pull request #3065 from kevlahnota/newmaster2 
update SettingsScene
 2023-05-06 07:33:35 +08:00
Anthony Calosa
fd9c7c57e9 Merge pull request #3055 from EldritchBimbo/Gwyn-Dev 
Kor Replacement Update
 2023-05-06 07:21:50 +08:00
Anthony Calosa
c6040086d3 update SettingsScene 
-update Music Slider, BorderMask Options
-fix not applying changes
 2023-05-06 07:20:19 +08:00