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

64352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Valerio Maggio
723ed8ba59 OFFICIALLY ADD PREMODERN as supported format 2023-05-13 17:37:01 +01:00
Valerio Maggio
8517384352 Deck Import now includes the extra note option if no current game type and All formats loaded. 
If there is no current game type (i.e. GameFormat is displayed) the extra note option on the interaction between the two filter options is added.
 2023-05-13 17:36:43 +01:00
Valerio Maggio
8ce77d1c3d Extra option label for Deck Import + FIX Load Archive (requires restart) 
A new label has been added to translation for DeckImport to specify the interaction between Latest/Original Art and Format Selection.

Moreover, FIXED a few italian translations + Added (REQUIRES RESTART) on Load Archive Format option.
 2023-05-13 17:33:46 +01:00
Anthony Calosa
2d301890bf Merge pull request #3104 from tool4ever/quicksilverfix 
Quicksilver Elemental shouldn't look at the recent state to gain abilities
 2023-05-13 19:31:34 +08:00
Anthony Calosa
3be7115616 Merge pull request #3105 from kevlahnota/newmaster2 
fix bordermask options for Adventure Mode
 2023-05-13 19:25:38 +08:00
Anthony Calosa
8ca66d40e0 update synq and texture check 2023-05-13 18:58:44 +08:00
Anthony Calosa
b2f773d860 support art bordermask for adventure 
-fix bordermask options
 2023-05-13 18:51:36 +08:00
TRT
96e5e06b86 Fix Quicksilver Elemental 2023-05-13 10:36:53 +02:00
TRT
f309000e99 Fix Martyrdom 2023-05-13 10:31:10 +02:00
Anthony Calosa
4683803cdb Merge pull request #3101 from tool4ever/changedtext 
Tweak TextChange transformation
 2023-05-13 16:10:33 +08:00
Anthony Calosa
c6c9bc75be Merge pull request #3103 from jjayers99/master 
Adventure gate texture fix
 2023-05-13 11:35:08 +08:00
TabletopGeneral
c93de35a3f Merge branch 'Card-Forge:master' into master 2023-05-12 23:26:54 -04:00
jjayers99
c86a38a22f Adventure gate texture fix 2023-05-12 23:24:39 -04:00
Anthony Calosa
612d325580 Merge pull request #3102 from kevlahnota/newmaster2 
allow loading old save
 2023-05-13 10:53:22 +08:00
Anthony Calosa
d64cd05704 allow loading old save 2023-05-13 10:50:57 +08:00
Anthony Calosa
f3f6dbce94 update images 2023-05-13 09:03:09 +08:00
Anthony Calosa
6a8432f7a6 Merge pull request #3093 from jjayers99/master 
Adventure mode content
 2023-05-13 08:45:42 +08:00
TRT
eed1220c31 Tweak TextChange transformation 2023-05-12 22:14:26 +02:00
paulsnoops
c399799910 Migrate card scripts: MOM, MOC, MAT 2023-05-12 14:26:26 -04:00
Anthony Calosa
a3bde0ed95 Fix cost 2023-05-12 23:51:29 +08:00
Anthony Calosa
b7339cbd02 Update jaheira_harper_emissary.txt 2023-05-12 23:48:25 +08:00
Hans Mackowiak
107e2e5a7e Update invasion_of_new_capenna_holy_frazzle_cannon.txt 
fixed "YouCtrl"
 2023-05-12 17:31:11 +02:00
Anthony Calosa
a98ae15af9 Merge pull request #3097 from kevlahnota/newmaster2 
update Specialize ImageKey
 2023-05-12 20:48:51 +08:00
Anthony Calosa
f2297a7890 add missing imports 2023-05-12 20:16:44 +08:00
Anthony Calosa
e4366fb888 add specialized button on CardZoom 2023-05-12 19:59:52 +08:00
Hans Mackowiak
2df79520e2 Update CardFactory CloneStates: fix SetPower and setToughness (#3095) 
fix around SetPower and setToughness

* The Copy needs Original States
 2023-05-12 10:28:31 +02:00
Klisz
c71abd00ab Update nahiri_forged_in_fury.txt (#3096) 2023-05-12 10:28:10 +02:00
Anthony Calosa
5c41be49bd update Specialize ImageKey 
- fix image not updating when specialized..
 2023-05-12 12:17:27 +08:00
jjayers99
52d52b7bf8 Adventure image updates, dialog logic corrections 2023-05-11 15:22:58 -04:00
Simisays
f5a914db8a Update oglor_devoted_assistant.txt (#3091) 2023-05-11 16:27:11 +02:00
Paul Hammerton
15cb229f86 Merge pull request #3094 from paulsnoops/update_editions 
Edition updates: SLD, SLP
 2023-05-11 08:27:40 +01:00
paulsnoops
cc0bc5f9fc Edition updates: SLD, SLP 2023-05-11 08:09:38 +01:00
jjayers99
d88acb262f Moved swamp town Shard Trader 2023-05-11 00:51:18 -04:00
jjayers99
9f716afdda Update pixie_dimir.atlas 2023-05-11 00:40:33 -04:00
jjayers99
f5e062d06d 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"
 2023-05-10 23:55:55 -04:00