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
64,287 Commits 31 Branches 187 Tags
0ff7ab91e721e5e87c150f1a0372d1a8f73a1b0c
Commit Graph

64287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jjayers99
280361c651 Adding spawn points that can't be used to as exits 2023-05-17 22:26:22 -04:00
jjayers99
78c4f93fbd Miscellaneous adventure map fixes 2023-05-17 22:09:50 -04:00
jjayers99
d1aaf28888 Adventure collision updates 2023-05-17 20:46:32 -04:00
Chris H
b84f5f1a28 Update shoot_down.txt 2023-05-17 12:42:37 -04:00
Agetian
d5bdf2c2ae Update the deck conversion toolchain to the latest version. (#3128) 
* - Fix the name of the swamp tribal town.

* - Update deck conversion toolchain to the one that was used for the May 2023 MTGDecks.net archive update.
 2023-05-17 17:07:33 +03:00
tool4ever
b397be8cea PlayAi tweak (#3127) 
Co-authored-by: TRT <>
 2023-05-17 13:37:18 +03:00
Agetian
345db4e2c7 Fix AI not choosing to fight when putting counters from a trigger (#3126) 
* - Fix the name of the swamp tribal town.

* - Fix AILogic$ Fight when checked from a trigger.

* - Move the code to a better location.

* - Only return in the FightAi branch if canFightAi succeeded.

* - Remove a comment for now, since the AI logic check is different compared to the one in checkApiLogic.
 2023-05-17 13:31:58 +03:00
Agetian
39df71e3a1 - Fix the name of the swamp tribal town. (#3124) 2023-05-16 21:49:17 +03:00
Agetian
6753ad23ad AI: Fix counters calculation for Wildborn Preserver activation (#3119) 
* - Remove legacy hacky code that's apparently not needed anymore.

* - Fix imports.

* - Restore the original code but tweak it to hopefully accomodate for Wildborn Preserver.

* - Clean up / clarify.

* Remove fake SVar

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-05-16 21:42:48 +03:00
Simisays
5067d207a5 Plane types to TypeList.txt (#3118) 2023-05-16 17:23:35 +02:00
Hans Mackowiak
9cd02e3c39 Merge pull request #3123 from Ampersandnz/tygon-prime-vigilance-fix 
Remove incorrect vigilance ability
 2023-05-16 17:11:43 +02:00
Michael Lo
ebae3c6476 Remove incorrect vigilance ability 2023-05-16 15:25:29 +01:00
Anthony Calosa
c76cb29074 Merge pull request #3122 from jjayers99/master 
Adventure - Grolnok dungeon collision fixes
 2023-05-16 22:14:16 +08:00
jjayers99
eb019fb7c2 cave_11 collision fixes 2023-05-16 09:48:15 -04:00
jjayers99
2173de0434 Adventure - Grolnok dungeon collision fixes 2023-05-16 09:36:12 -04:00
Anthony Calosa
5472c50a52 Merge pull request #3120 from Agetian/adv-spawn 
Tweak the initial spawn text in Adventure Mode
 2023-05-16 01:49:28 +08:00
Michael Kamensky
a16d3f759e - Tweak the initial spawn text in Adventure Mode (decapitalization, punctuation). 2023-05-15 20:32:51 +03:00
Agetian
38990aff32 Battle AI support + improve Battle mechanics support (#3107) 
* - First draft of (very sketchy) Battle AI code.

* - Imports fix.

* - Slightly cleaner refreshCombatants.

* - Update Combat to allow the protecting player to participate in declaring blocks to defend a battle.

* - Update AiBlockController in order to allow the AI to participate in defending battles it's protecting.

* Clean up

* - Minor cleanup.

* Fix checking backside

* Add TODO

* Fix missing combat removal

* - Suggested minor cleanup.

* - Fix imports.

* - Improve support for battles in getAllPossibleDefenders.

* - AI: prefer own Battles before choosing allied Battles.

* Fix ClassCastException

---------

Co-authored-by: TRT <>
 2023-05-15 19:56:31 +03:00
Simisays
15a2ccb9f3 WHO The Lux Foundation Library (#3113) 
* update

* Update CardType.java

* update
 2023-05-15 09:15:41 +03:00
Anthony Calosa
292da877d6 Update laserbeak.txt 2023-05-15 06:21:56 +08:00
Anthony Calosa
5552ae2160 Update niv_mizzet_supreme.txt 2023-05-15 06:19:42 +08:00
Anthony Calosa
1fc02045af Merge pull request #3114 from kevlahnota/newmaster2 
update art mode for battle cards
 2023-05-15 06:14:55 +08:00
Anthony Calosa
4b6ca767dc update art mode for battle cards 2023-05-15 06:06:10 +08:00
Anthony Calosa
c719260f0b Merge pull request #3106 from leriomaggio/formats/premodern 
Officially Introducing PREMODERN as Core Format in Forge
 2023-05-15 05:16:21 +08:00
Anthony Calosa
8f22cbf168 Merge pull request #3108 from Simisays/ZEDRUUFINAL 
Adventure: Zedruu dungeon and much more
 2023-05-15 05:07:52 +08:00
Valerio Maggio
74e1d5e051 Added new method in GameFormat API for future support of new core format. 2023-05-14 17:49:08 +01:00
Valerio Maggio
c90608ad1d Merge branch 'formats/premodern' of github.com:leriomaggio/forge into formats/premodern 2023-05-14 16:38:55 +01:00
Valerio Maggio
e94069cfd5 Merge remote-tracking branch 'upstream/master' into formats/premodern 2023-05-14 16:38:25 +01:00
Valerio Maggio
7ffd495335 Adding missing banned Tendrils of Agony & formatting 2023-05-14 16:36:23 +01:00
Simisays
5d869a0896 scale correction 2023-05-14 14:09:01 +02:00
Simisays
f5278a815e two new arena enemies 2023-05-14 13:31:28 +02:00
Anthony Calosa
acd4cd253d Update de-DE.properties 2023-05-14 19:20:38 +08:00
Anthony Calosa
82489ce28a Update es-ES.properties 2023-05-14 19:19:02 +08:00
Anthony Calosa
21aa518b7b Update ja-JP.properties 2023-05-14 19:17:30 +08:00
Anthony Calosa
961f5beac9 Update zh-CN.properties 2023-05-14 19:16:02 +08:00
Anthony Calosa
a90b379ef4 Merge pull request #3111 from kevlahnota/newmaster2 
fix quest completed crash
 2023-05-14 19:15:07 +08:00
Anthony Calosa
e5708cc3ec Update pt-BR.properties 2023-05-14 18:54:01 +08:00
Anthony Calosa
209461ccf4 Update pt-BR.properties 2023-05-14 18:47:49 +08:00
Anthony Calosa
5c68162b9b Update fr-FR.properties 2023-05-14 18:46:25 +08:00
Anthony Calosa
b2d045e4f2 fix quest completed crash 
-remove duplicate reward
 2023-05-14 18:40:13 +08:00
Valerio Maggio
cee90017da Restore correct encoding 2023-05-14 10:09:43 +01:00
Valerio Maggio
b182eb11d2 Merge branch 'Card-Forge:master' into formats/premodern 2023-05-14 09:09:05 +01:00
Simisays
b5edb1dc28 update 2023-05-14 09:44:00 +02:00
Anthony Calosa
d67412e795 Merge pull request #3110 from jjayers99/master 
Adventure - fix ActionData deserialization
 2023-05-14 10:11:48 +08:00
jjayers99
d9252cdef3 Adventure - fix ActionData deserialization 2023-05-13 21:50:21 -04:00
Anthony Calosa
709f0f6f5d Merge pull request #3109 from kevlahnota/newmaster2 
update Shared Fate
 2023-05-14 07:24:43 +08:00
Anthony Calosa
874db2eea4 update Shared Fate 2023-05-14 07:15:35 +08:00
Simisays
762262a702 Squashed commit of the following: 
commit 1e02153c41b7649a601e6f18131d1a6c07004cc4
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 13 20:41:25 2023 +0200

    update

commit 3888a72b8e4a3df88d3450014ce61de716381952
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 13 19:14:24 2023 +0200

    update

commit 130a30353517b02e05be4e8025ea0d882dd1a5f3
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 13 10:12:37 2023 +0200

    Squashed commit of the following:

    commit d8ed8583fe8c25126d7258d09b1b11ab4af9b803
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat May 13 10:11:42 2023 +0200

        update

    commit 6e6679fe093dafd645f7c89f145f55e0d8aaa706
    Merge: da383240ff c6c9bc75be
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat May 13 09:31:15 2023 +0200

        Merge remote-tracking branch 'upstream/master' into zedruu

    commit c6c9bc75be
    Merge: 612d325580 c93de35a3f
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Sat May 13 11:35:08 2023 +0800

        Merge pull request #3103 from jjayers99/master

        Adventure gate texture fix

    commit c93de35a3f
    Merge: c86a38a22f 612d325580
    Author: TabletopGeneral <56438137+jjayers99@users.noreply.github.com>
    Date:   Fri May 12 23:26:54 2023 -0400

        Merge branch 'Card-Forge:master' into master

    commit c86a38a22f
    Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
    Date:   Fri May 12 23:24:39 2023 -0400

        Adventure gate texture fix

    commit 612d325580
    Merge: f3f6dbce94 d64cd05704
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Sat May 13 10:53:22 2023 +0800

        Merge pull request #3102 from kevlahnota/newmaster2

        allow loading old save

    commit d64cd05704
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Sat May 13 10:50:57 2023 +0800

        allow loading old save

    commit f3f6dbce94
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Sat May 13 09:03:09 2023 +0800

        update images

    commit 6a8432f7a6
    Merge: c399799910 52d52b7bf8
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Sat May 13 08:45:42 2023 +0800

        Merge pull request #3093 from jjayers99/master

        Adventure mode content

    commit c399799910
    Author: paulsnoops <paulhammerton1@hotmail.co.uk>
    Date:   Fri May 12 19:17:01 2023 +0100

        Migrate card scripts: MOM, MOC, MAT

    commit a3bde0ed95
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Fri May 12 23:51:29 2023 +0800

        Fix cost

    commit b7339cbd02
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Fri May 12 23:48:25 2023 +0800

        Update jaheira_harper_emissary.txt

    commit 107e2e5a7e
    Author: Hans Mackowiak <hanmac@gmx.de>
    Date:   Fri May 12 17:31:11 2023 +0200

        Update invasion_of_new_capenna_holy_frazzle_cannon.txt

        fixed "YouCtrl"

    commit da383240ff9f1a74750e5b6956779184759bf4e8
    Merge: a857d087ec a98ae15af9
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Fri May 12 16:26:34 2023 +0200

        Merge remote-tracking branch 'upstream/master' into zedruu

    commit a857d087ecbdd942fad48a517994325453ac2b85
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Fri May 12 16:26:22 2023 +0200

        update

    commit 436f66342448eb74e6557b710d5b7c97f96aabe6
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Thu May 11 23:14:04 2023 +0200

        update

    commit 52d52b7bf8
    Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
    Date:   Thu May 11 15:22:58 2023 -0400

        Adventure image updates, dialog logic corrections

    commit d3635a7068f0c419739208805fa0cc826c9af3aa
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Thu May 11 20:07:06 2023 +0200

        update

    commit 8b1af31b8b174aa93bb022408203b1e6d6d9ff4d
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Thu May 11 09:36:40 2023 +0200

        update

    commit d88acb262f
    Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
    Date:   Thu May 11 00:51:18 2023 -0400

        Moved swamp town Shard Trader

    commit 9f716afdda
    Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
    Date:   Thu May 11 00:40:33 2023 -0400

        Update pixie_dimir.atlas

    commit f5e062d06d
    Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
    Date:   Wed May 10 23:55:55 2023 -0400

        Adventure mode content

        Preview release of Liliana dungeon
        Autosave when entering POI
        Improved POI enemy pathing (slightly)
        Addition of Portal mechanics
        Rework of Death Ring
        Increased land quantity in basic land shops
        Removed problematic objective from quest "(Almost) Open for Business"

    commit b3b84248dc59f308fe86c356eacfff6809be2a15
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 10:25:00 2023 +0200

        Update items.json

    commit 38986a4c0cf91aa3055994c1b0fb6f56487cbefa
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 10:24:47 2023 +0200

        Update enemies.json

    commit 96775b13aa00ea04ab2f5d92362ef221f6b18e71
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 10:20:04 2023 +0200

        Update items.atlas

    commit b8bf428231edf3e8d95b5c64129c8a664e5ea896
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 10:15:34 2023 +0200

        Update zedruu_boss_effect.txt

    commit 793db9f71a0fd9874b37fb7e390bcf76380337fd
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:54:34 2023 +0200

        Add files via upload

    commit de303b67b56b3cadb143decb7840400c4393464d
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:49:57 2023 +0200

        Add files via upload

    commit 2e06047604da89c1575c9b957b2fe5cd4e00cd3c
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:26:53 2023 +0200

        Delete mineleader_boss_effect.txt

    commit 70c462f6d7899b447930bcc9d227c97dcca199d3
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:24:14 2023 +0200

        Update jaces_signature_hoodie.txt

    commit ab10796f3c49ee19892e4d60d05c65411e668deb
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:22:54 2023 +0200

        Update insect.dck

    commit 1906b21000fb2ea08fafa8b9f4dab7f2a6ae4e95
    Merge: 609aae7ec6 6437fde0c3
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:20:36 2023 +0200

        Merge branch 'Card-Forge:master' into zedruu

    commit 609aae7ec68793e7bee9818c9e7d6c4562775902
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue May 9 20:24:55 2023 +0200

        update

    commit a43d9447650e068b539f451eaf6909cc42ddbb0e
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun May 7 19:54:53 2023 +0200

        Adventurezedru (#11)

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

commit 86fe525c2b98f22d54caf4a40a20204fd2f50b9f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 12 22:07:03 2023 +0200

    update
 2023-05-13 20:42:20 +02:00
Valerio Maggio
fa907f13cb DeckImportController now includes also Casual formats in format selection 2023-05-13 17:39:13 +01:00
Valerio Maggio
876be0d9d5 Premodern is now a CORE FORMAT + new methods in Collection 
New methods have been added to GameFormat.Collection to get selected lists of available game formats. Moreover, a new method to get a map of all formats per FormatType has been added
(will be used in the revised "Formats" filter that is currently in progress).
 2023-05-13 17:38:27 +01:00