external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,143 Commits 31 Branches 187 Tags
eefc20a1ac61b51e1be0d822c804273aefa77a8a
Commit Graph

52 Commits

Author SHA1 Message Date
Simisays
9183ddf558 Large adventure update (#5398) 
* Squashed commit of the following:

commit 2e0f844a2f40a622ffc0b55ed45f69a4d812fee6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jun 8 00:40:29 2024 +0200

    update

commit 25c21bf27f10fe6a78fb986f0a8ee6e7b0737978
Merge: d256832250 86154cccbd
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 7 21:33:32 2024 +0200

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

commit d256832250168447543c3ca0980636e853ff3910
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 5 19:45:29 2024 +0200

    update

commit b4b75fedc01ff1a739774194dba77aeeee46a0e7
Merge: 951440de0e 6b5412e7dc
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jun 2 21:22:33 2024 +0200

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

commit 951440de0e9c0551238f5d1f6099b5c818c4555f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 31 23:29:14 2024 +0200

    update

commit f9a76ed16971afe94f0ee9e66332cff0e86f6e1b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed May 29 20:48:37 2024 +0200

    update

commit 6f2c153a91a1a71e8264aa49a745d44277926bb7
Merge: 6944cfb2b4 5119b72066
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 27 23:33:56 2024 +0200

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

commit 6944cfb2b432672922de3e07ae6ad739c9b3b145
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 27 23:33:15 2024 +0200

    cleanup

commit 440ea14bf064f5a42a897cb711b9963adc711f05
Merge: 84687d1002 9810264d82
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 26 23:48:53 2024 +0200

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

commit 84687d100212a004f99b5d6b7f6bf73f065b7913
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 26 23:48:45 2024 +0200

    update

commit 61abd7abf20fb71b32253923073161ef97e16f0e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 25 22:53:47 2024 +0200

    update

commit 12c9442e75146dfa2aff3b230c250d9a496896d6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 25 09:03:13 2024 +0200

    update

commit 57de9e398c08ebf4c1d879683d4b2fc49002005e
Merge: fa9c878d74 6694b5a327
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 24 23:02:14 2024 +0200

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

commit fa9c878d74bc96296d2e13577940642ece84fc9f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 24 23:02:09 2024 +0200

    Update config.json

commit fc51b02e2728ffa31941c879da712c8b7a051951
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue May 21 22:55:46 2024 +0200

    update

commit be24e7e6c97782430dd12234d006a0581556177e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 20 21:49:32 2024 +0200

    updateupdate

commit 3544b9715dfd21fa6b57ebd082691be8272ec44d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 19 23:30:44 2024 +0200

    update

commit 7fdf564c3f30466ae985cfd330c4ef64a013636d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 19 11:59:07 2024 +0200

    update

commit 3c46938f70104de142afae80dac75b1007b3f59f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 18 22:38:00 2024 +0200

    MOAR

commit 8c1126eb33073e6f4cd38b5734313de1c7454396
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 18 22:37:47 2024 +0200

    update

commit aab99445192045dcbcee93d32826f604e39eeff0
Merge: 175312aab6 3309a48710
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 16 23:34:17 2024 +0200

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

commit 175312aab690fbbc286171efece3e06944a3a32b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 16 23:34:11 2024 +0200

    update

commit 847191072fe1a8c71e81e1b4d0e5b79f1bd992e9
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 13 19:18:52 2024 +0200

    update

commit a34f4ec0a9570be4f0ff0da4bb2512462efcebe1
Merge: babbfcfaa5 c7a138fc13
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 11 13:41:42 2024 +0200

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

commit babbfcfaa54983a4f0916f5588c554a198749255
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 10 23:40:12 2024 +0200

    hugemapupdate

commit ccbd5b907ad1a20d49d162ba7a2192a01fd7fc45
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 9 23:24:45 2024 +0200

    updatre

commit 3f2d0cbc0123d20e7bb9414e49fc08f3330381a9
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 9 13:01:08 2024 +0200

    update

commit 8f43aace8ad4434c56ae4e14bb3c1a02ee7c158a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 9 00:40:41 2024 +0200

    update

commit 585134cdb9347298d7138a32c3e5906c2993d70a
Merge: c51c6b119b a2deb08337
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed May 8 18:42:43 2024 +0200

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

commit c51c6b119b72871cda3fcc0964d350d2e39830a2
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed May 8 18:42:37 2024 +0200

    update

commit 4c4f1d70005668339dd7f14f244a7170fa231748
Merge: d4ac1939da 085b9e9735
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Apr 22 19:53:09 2024 +0200

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

commit d4ac1939daa16e77032978831a42c53d2139db01
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Apr 22 19:53:02 2024 +0200

    update

commit 1e1d7b7cef12b3ac5fb28c9ce7fede915e54a809
Merge: d872995ea6 fd2522e51c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Apr 14 13:08:20 2024 +0200

    Merge branch 'Card-Forge:master' into garruknahiri

commit d872995ea63531e44bcb0ef2bf38b53b7a434ceb
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jan 19 21:27:47 2024 +0100

    update

* temoraryrevert

* name changes

* Update shops.json

* Update config.json

* Update config.json

* d
 2024-06-09 19:48:33 +03:00
Simisays
05743679d8 Adventure: Tibalt, Skep and White Castle rework (#4508) 
* Squashed commit of the following:

commit abe8d9bc8ff01eec3da2347e66f8cdc5348a7327
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jan 11 20:26:19 2024 +0100

    update

commit 16f45e1b1c64b95f7a38d8bb2ca8c2809e260b79
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jan 9 22:00:20 2024 +0100

    update

commit dd2cf3c0a840920fa9477cd1f85c6047de633a15
Merge: ebe940f020 acb5151a82
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jan 9 21:04:33 2024 +0100

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

commit ebe940f0203de29c4466a3a0f676c409c254387f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jan 9 21:04:24 2024 +0100

    update

commit 338947f02b7f133b97d2c9eb993423094645e421
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jan 6 16:41:00 2024 +0100

    update

commit 6328694aaf4311de3160fbd70edd49c1a8a6c289
Merge: 1f0a498b0d 94e154fcb8
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jan 3 20:21:42 2024 +0100

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

commit 1f0a498b0d5bb11655def1a3b8142c9898cb993d
Merge: 45b65fa602 9a5fe05838
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jan 3 20:20:47 2024 +0100

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

commit 45b65fa602ed1c5c6a6d65dbc9be89ea8ac636df
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jan 3 20:20:37 2024 +0100

    update

commit f984e00dbc70ab428133337d10f5a1157ef6a333
Merge: acf99e95aa be2f9aa187
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Dec 29 20:47:36 2023 +0100

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

commit acf99e95aae979e9c718809277b455ec12766b33
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Dec 29 20:47:31 2023 +0100

    update

commit a72da3d39a0b837370ef82b07253db1016a24772
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Dec 26 21:19:55 2023 +0100

    update

commit 96d037511f35c6f9c0393b5091b49a030b0ce2f9
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Dec 23 18:07:21 2023 +0100

    cleanup

commit e1271ec1f80918ace004c01b1e1183364c162a21
Merge: 3710aaad6a de851fc749
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Dec 23 11:38:23 2023 +0100

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

commit 3710aaad6a627138ff202b84335ffa4f06a48e4a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Dec 23 11:37:59 2023 +0100

    Update tibalt.tmx

* update

* Update skep_outer.tmx

* Update enemies.json

* More fitting homarid sprite
 2024-01-13 12:57:55 +03:00
jjayers99
3cc39b6a11 Adventure - Exploration branch of Chapter 1 storyline quests 2023-12-30 00:15:04 -05:00
Simisays
055d188301 update 2023-12-12 20:40:41 +01:00
Simisays
ec48757158 update 2023-12-10 11:15:02 +01:00
Simisays
01be86d88e batch1 2023-12-02 23:24:17 +01:00
Simisays
b62b588060 Large Adventure update (Hydra ect) (#4136) 
* Squashed commit of the following:

commit ccba1cbded5ca546f333ad33c227a1617296e9b4
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Nov 2 23:30:45 2023 +0100

    update

commit d8727b9d053b38a5faa806c0c2494826958e9e26
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Nov 1 21:31:30 2023 +0100

    update

commit 84d2bd0a29770c189ee24f9d413fda9c450569d6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Oct 31 22:51:03 2023 +0100

    update

commit 22c4ff1bd3b25bf0340f79b7a2ad096e3ff02bb5
Merge: 278ebc005b b6de8a6d63
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Oct 31 11:40:20 2023 +0100

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

commit 278ebc005bd32f332a6bf0637b3d2e2886d50dee
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 29 19:35:42 2023 +0100

    update

commit a7d7a768fc47b8063c22462551a94a79fc9e4bee
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 29 10:44:01 2023 +0100

    update

commit e4fe3fb08f084daccf155d809f1838ddbb32cb54
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Oct 28 00:13:40 2023 +0200

    update

commit b9d2065d1545aa1c1b2145753144575f6b0b6888
Merge: 770082f750 920e811812
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Oct 27 15:28:09 2023 +0200

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

commit 770082f7502c7725610d10cb386bb6c9354730ba
Merge: 590945bcc5 3fed75e089
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 22:06:22 2023 +0200

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

commit 590945bcc5c0afca8012a11f31662f53be18652c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 21:23:27 2023 +0200

    update

commit ea9e1452de6d9b46dc74ef34526515581ea0d81c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 20:10:48 2023 +0200

    update

commit acfd54e8fccf19b490648e8f13530f1d5c487965
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 17:44:04 2023 +0200

    update

commit 665f86fb4d307620a142fcb1604dd43ddd97abfb
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 22 15:10:11 2023 +0200

    Squashed commit of the following:

    commit 916ffceecdf96ac505591aa070c3301f6fceaec8
    Merge: ce28f2b548 48a8aa5463
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Oct 22 08:20:48 2023 +0200

        Merge branch 'vampirefort' of https://github.com/Simisays/forge into vampirefort

    commit ce28f2b548f4bb84db9a34d9149c358bda5ed96f
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Oct 22 08:20:25 2023 +0200

        update

    commit 48a8aa54631b3cec5d65719d3a4a42d8ebed1d4d
    Merge: 0cc727a8f5 437d64dc08
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Oct 21 22:36:16 2023 +0200

        Merge branch 'Card-Forge:master' into vampirefort

    commit 0cc727a8f52888efca1bb50426296cd2922839a4
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Oct 15 12:02:57 2023 +0200

        update

    commit 38b5eddb61785210d086df99dea7497d9c06f61c
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Oct 14 17:09:37 2023 +0200

        Update enemies.json

    commit bc12ef0c14fc4a838a54d7a10d091ba7e5ab5d5b
    Merge: 2a213a14cb 1fc11929a8
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Oct 14 12:23:12 2023 +0200

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

    commit 2a213a14cb7d8f04e1b5dc1b9c040421edba8419
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue Sep 26 21:28:52 2023 +0200

        update

    commit 093db5a7bb7b81881595907f0047ac7f806aa8c5
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue Sep 26 19:59:51 2023 +0200

        updarz

    commit d5af52298b9d12a9c1dce60ffaf7513565a0c214
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue Sep 26 19:59:32 2023 +0200

        update

    commit b06de36dacfaba785aea4f260a4e21f6869b52be
    Merge: 8ffb3ad52f 0fc88cc46c
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Mon Sep 25 20:13:50 2023 +0200

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

    commit 8ffb3ad52f71282ae3f04f423249299c7e9ac608
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Sep 24 17:39:55 2023 +0200

        update

    commit 723292aa9f47b140d41ab0ede394923aeaba9d60
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Sep 23 19:32:58 2023 +0200

        update

    commit db882cc60275e07d6767597dc33fea8dc4c78bc6
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Sep 23 08:34:43 2023 +0200

        update

    commit b22ee9e876f95d54718ec62b5236eb78dd125ccb
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Fri Sep 22 15:25:06 2023 +0200

        update

commit 09b57894da4dd08723c71af1b6e0c1e9efe4ac9b
Merge: beefe201ee b9117873bc
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 22 09:58:10 2023 +0200

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

commit beefe201ee1720cfa254472fd74619408e53a98c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Oct 21 23:42:54 2023 +0200

    update

* update

* update

* update

* update

* update

* update

* grolnok cleanup

* move gold

* colission fix Fort 4 White
 2023-11-10 19:10:09 +03:00
Simisays
49871bc2b6 update 2023-10-06 19:41:56 +02:00
Simisays
b0a7648a1f update 2023-09-17 22:05:36 +02:00
Simisays
bccf599215 update 2023-09-16 19:26:49 +02:00
Simisays
e54078aeb5 update 2023-09-16 09:02:49 +02:00
TabletopGeneral
a4af5ccbf2 Merge branch 'Card-Forge:master' into master 2023-09-13 07:42:11 -04:00
jjayers99
373e334c67 Adventure updates 
Large sprite collision fix
Jumpstart reward fix
Emeny instance specific deck overrides
Selectable reward framework
Work in progress for new storyline dungeons
 2023-09-13 07:36:54 -04:00
Simisays
d3dcd5ac82 update 2023-08-31 23:02:48 +02:00
jjayers99
3f51f569ec Adventure - file name correction for wolf.png 2023-08-25 20:01:24 -04:00
TabletopGeneral
168f999a57 Adventure - Pathfinding update (#3675) 
* Adventure - reward scene controller button availability

* Adventure A* & main quest prep

* Update pom.xml

* box2d natives

---------

Co-authored-by: kevlahnota <anthonycalosa@gmail.com>
 2023-08-23 09:56:20 +03:00
kevlahnota
c1f13a5713 Merge pull request #3619 from jjayers99/master 
Adventure updates / bugfixes
 2023-08-13 08:52:32 +08:00
jjayers99
e872a15f65 Adventure - Named cards in card union rewards 2023-08-12 11:41:40 -04:00
Simisays
cb7bd6fadd Squashed commit of the following: 
commit aa1dedcceebf540eafeea60fdd45daa6440726f2
Merge: 535ffa4d68 a2f7f512ee
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Aug 12 16:38:52 2023 +0200

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

commit 535ffa4d68f66808b0b044636c4e8d61ed7e6f66
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Aug 12 16:38:44 2023 +0200

    update

commit a9154396b72ea558f6225cb46245b3c29f7e6aa3
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Aug 11 18:38:24 2023 +0200

    update

commit 4267b664d7012d2f82d9977568acc409bb4777fe
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Aug 9 20:54:05 2023 +0200

    m

commit 38d3012328b6323ea90953beb2b6936296c0b12e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Aug 9 08:08:45 2023 +0200

    update

commit 2580f75c7f3795d99db6da3a7544a6723db2c7f7
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Aug 8 13:31:45 2023 +0200

    update

commit 40d1e3307f9254efffa902ec15884be4ab84d171
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Aug 7 22:37:16 2023 +0200

    update

commit 2bcf176b48e1e0b1de7f63ce6ae584b403b7ea88
Merge: d43ad56a62 efe6195f1f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Aug 7 17:50:55 2023 +0200

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

commit d43ad56a620f5d06da76f85936e81d94faa51f07
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Aug 7 17:50:49 2023 +0200

    update

commit 827f536676a4ddaa3d53afcd5d31daf5921547e0
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Aug 7 00:00:57 2023 +0200

    update

commit e7bab337b4533c59e5a725fcb0607f3bd6983f63
Merge: e8eeed5496 670e08bd42
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Aug 6 14:07:34 2023 +0200

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

commit e8eeed5496889e2f7bbd29b96d0cb0809f70ec63
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Aug 6 11:46:21 2023 +0200

    update

commit ed34c9c21c13e88d6f6e6fa07f2ff3c128cfd63a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Aug 5 16:09:44 2023 +0200

    update

commit 4776f522c1d2b207dec0de75ca838af3a84cafff
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Aug 4 16:47:41 2023 +0200

    update

commit 8763aad502b14e505e8310bd5659f4ab07c2c6d7
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Aug 3 17:08:17 2023 +0200

    update

commit 580e81a63f953d78595fc609e2e40c5ff392268a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Aug 3 15:37:36 2023 +0200

    Update lavaforge_3.tmx

commit 0929fc1074ea6b7040ef76658797041c75d0d771
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Aug 3 08:57:14 2023 +0200

    updqte

commit 6020873093477907bdc13f1b572f1cf66afc683f
Merge: 6fc718d160 c8d7e3d4f0
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Aug 2 17:19:19 2023 +0200

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

commit 6fc718d1602c5daa8751705f694320baf36bd6c1
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Aug 2 17:19:12 2023 +0200

    update

commit fe5c4b1b8d0e39b2415ccbb244b6a54a077aa6e5
Merge: 3c06a261f9 dff8492bf8
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 31 20:14:56 2023 +0200

    update

commit 3c06a261f92ebfce57d1db412454e5d9f1f4fa37
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 31 20:14:21 2023 +0200

    update
 2023-08-12 16:39:18 +02:00
Simisays
a822c13944 Squashed commit of the following: 
commit bcfc1f2dc207e5b82b95b5f2b892219f0f9efb04
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 31 14:33:29 2023 +0200

    update

commit b4f71b19dfea016093e9f9c42749662e7ee98367
Merge: 261582b907 54d502549e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 31 10:13:50 2023 +0200

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

commit 261582b90746048d0a3e093c94a55ec643762b8c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 30 22:51:15 2023 +0200

    update

commit cdd5671159a3ee1b7c39f27bd6fb922b27669d2a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 30 18:03:13 2023 +0200

    update

commit 2407c9dab876b518e2e9051d86aff9753aeda6a6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 30 13:36:20 2023 +0200

    update

commit 8f8599bd56b50d05d56243e5264491d578fb637a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 30 08:29:40 2023 +0200

    updqte

commit bbc8dd9a5774ce73334c602b27aa4a2976b3029e
Merge: cded375e45 d0777fce21
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jul 28 21:28:53 2023 +0200

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

commit cded375e452d4df56d295e03e20c30e869db1049
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jul 28 21:25:23 2023 +0200

    updqte

commit 07432a5098f33e79ff0fb33b8db0f26c6fbf6cd3
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jul 28 19:49:04 2023 +0200

    updqte

commit 50103e95f255441f5643e1f00b54771d268616d3
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jul 27 22:18:25 2023 +0200

    update

commit aa118c6e4a2b4fb3c980f2576c39eaeac5c424fe
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jul 27 21:40:05 2023 +0200

    update

commit 98a9089fb1d8dedca537b0201fbef1298b5c8453
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jul 27 16:12:14 2023 +0200

    Delete aerie_00.tmx

commit d6c2206bec34fbab972980c71066f22c6bfdf063
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jul 27 16:12:05 2023 +0200

    update

commit 28eca26a29d7325cb77a467daf61cb028f1f8b16
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 26 22:15:03 2023 +0200

    d

commit dc6d94522b375d42f061618489e2ca854b4e9e46
Merge: 6620402422 69748ab0fb
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 26 14:03:44 2023 +0200

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

commit 66204024220350a3ea8b0414e7f3dd605301c008
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jul 25 20:17:50 2023 +0200

    update
 2023-07-31 14:33:51 +02:00
Anthony Calosa
a668b8abf8 update itemSprite, update items 2023-07-31 11:19:36 +08:00
Anthony Calosa
d806745cec add Bookmark to GameHUD 2023-07-31 03:21:59 +08:00
TabletopGeneral
121dd3a2c5 Merge branch 'Card-Forge:master' into master 2023-07-24 20:11:17 -07:00
Simisays
5ccf6a50dd update 2023-07-23 13:09:34 +02:00
Simisays
db2ecbed3c update 2023-07-22 21:43:15 +02:00
Simisays
49806176a0 Squashed commit of the following: 
commit 57bf9f805a56eef196bb8ac04a054cacd91a5413
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jul 21 18:27:05 2023 +0200

    Update wraith.png

commit 0ada960215aeb151f80abb7a5f883ecff1d1248e
Merge: 22ad4d0f94 36b7632b95
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 19 21:40:05 2023 +0200

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

commit 22ad4d0f947beb3a775c3f141c616bf2813471b6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 19 21:40:02 2023 +0200

    Update wraith.atlas

commit 364302aaa98afa2d4c402f09700cfe74b8d1c8c1
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 19 20:33:04 2023 +0200

    update

commit dc86f4c68d325c3b56632d25f8df11accf82270a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 19 09:11:10 2023 +0200

    update

commit 1237abb763d19854875918868b226ed16f1f1b62
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jul 18 14:51:30 2023 +0200

    updqte

commit 87f3eace2b11a5a75defecbb2e72bc2e515fe0f4
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jul 15 19:21:31 2023 +0200

    update

commit 2c64be230de9d818a2f021a5e5852e428d7c99bd
Merge: f20ce3c429 be7f837f9a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jul 13 12:58:29 2023 +0200

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

commit f20ce3c429d4b9ca2414fd9d74df5aa5f756d0a6
Merge: c6e74547c7 3b0ce53e66
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jul 13 12:40:18 2023 +0200

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

commit c6e74547c7af04fdf06c5e28192feb3979900eed
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jul 13 12:40:13 2023 +0200

    update

commit 3c17c8e8c1711aa2bc43d30dd103ee7424808388
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jul 13 09:33:30 2023 +0200

    updqte
 2023-07-21 18:27:39 +02:00
jjayers99
dcb8cd5c13 Adventure updates 
Reputation now affects most purchase prices (0.5% per point to a max of +/-10%)
Card catalog tweaked to include unsellable / autosell cards.
Card selling improvements (can sell cards in excess of 4 copies in your deck, can no longer sell cards in use in other decks)
Jumpstart events available which grant unsellable copies of cards used.
Main quest prep work
 2023-07-17 16:31:04 -04:00
Simisays
410501a9d2 Squashed commit of the following: 
commit b8c05c468bf6f24e4a4ea0d07ae208f993aa727a
Merge: 7863f7f7f7 e0ac62e518
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 22:24:14 2023 +0200

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

commit 7863f7f7f727e2fb1c5e837afd14aa2340ebce98
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 22:24:03 2023 +0200

    update

commit 1b081579d2647b7d81736724259e7b9d433a0abf
Merge: 5d77df87d7 b437d9764d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 13:35:30 2023 +0200

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

commit 5d77df87d7426df792e428c5f17bda2d33ed6f3d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 13:35:24 2023 +0200

    update

commit a2ad5160c661da24dc158a1b6e734216403b529f
Merge: 0326d4321d 49e5ce974d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 9 08:51:51 2023 +0200

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

commit 0326d4321dfa63a42cc5452527b25cab182f018e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 9 08:51:44 2023 +0200

    update

commit 1d713086f2032b04d0e2ed7fc25dc079bb0987f6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jul 8 16:52:33 2023 +0200

    update

commit a7840d878e321e6c512155c69b34aa71f41c46f6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jul 7 20:38:42 2023 +0200

    update

commit 76e34825185c536d0f7cbd102ada692dc6c4d20e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 5 21:02:29 2023 +0200

    update

commit 89f79fa47dbb3780c7cf9c6aa075cfe0cead404f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 5 15:20:36 2023 +0200

    update

commit 3e2bda59936cfd2fdd3a14baa0e3c87bdf65c838
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jul 4 16:56:31 2023 +0200

    update

commit 74ff2ba0bbf87fd343be3a118f63ab433597352f
Merge: 51323d9f8e 7f4705e6be
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 3 22:45:19 2023 +0200

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

commit 51323d9f8ee780d854dad586333ce45c8849bf98
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 3 22:45:14 2023 +0200

    update

commit 588b3a3e86b27ae1a5f71e69053285d8e391698d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 20:40:53 2023 +0200

    update

commit 63cae02800cb3b4ce44e3f198c366ea8bc659ca3
Merge: 7348cfb517 7c2e3d2a47
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 20:40:49 2023 +0200

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

commit 7348cfb517bb859f8850c3df2624bb8f5a128e7a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 16:00:31 2023 +0200

    update

commit dd05b537484ff3e4fda310109e58fd02f37ab985
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 09:09:07 2023 +0200

    updqte

commit 73f72462db817e9be9df6ab6f2a8ad3920e1b41b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jun 29 20:53:45 2023 +0200

    update

commit 361fa91ebbfbff17e346d4b530cb4d6e2e18f57e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 28 16:39:23 2023 +0200

    update
 2023-07-10 22:24:48 +02:00
Anthony Calosa
31c705e1bb Merge pull request #3430 from schnautzr/golem 
Remove steam animation from golem and golem_2.
 2023-07-08 07:58:28 +08:00
Anthony Calosa
e28becb576 Merge pull request #3343 from EldritchBimbo/Gwyn_DungeonDev 
Unhallowed Abbey Dungeon
 2023-07-08 07:56:58 +08:00
Anthony Calosa
527f0097c6 update items.png 2023-07-08 07:42:18 +08:00
Rob Schnautz
98494d8630 Remove steam animation from golem and golem_2. 2023-07-07 15:45:38 -05:00
Alwayssnarky
bcbe6c0068 Re-added new item sprites 2023-07-05 11:59:55 -04:00
Rob Schnautz
ef710b8782 recolor tiger so it doesn't look like a squirrel 2023-07-01 15:30:05 -05:00
Alwayssnarky
57e1630404 Reverts items.atlas and .png to match master, gives new equipment items a placeholder. 2023-07-01 11:22:21 -04:00
Alwayssnarky
3b46acf78c Swapped Sigil of Torment art, updated items.atlas and .png for compatibility. 2023-06-30 11:09:49 -04:00
Anthony Calosa
60c79a32c3 Quest location on MapViewScene 2023-06-29 16:34:57 +08:00
EldritchBimbo
f63a7fb75d Merge branch 'Card-Forge:master' into Gwyn_DungeonDev 2023-06-28 12:44:21 -04:00
Simisays
3023b57b64 Adventure update (#3348) 
* update 1

* update

* update

* update
 2023-06-27 17:11:08 +03:00
Alwayssnarky
f92a8040b7 Unhallowed Abbey Dungeon 
Adds:

.New dungeon in white biome + tiles.

.3 new enemies (2 regular and 1 boss).

.Effect, sprite for boss.

.2 new equipable items (chosen between by player upon completing dungeon).

Changes:

.2 new sprites in Items.png and .atlas.

.3 new items in items.json.

.4 new entries in enemies.json

.1 new entry in points_of_interest.json

.1 new entry for dungeon spawns in white.json
 2023-06-26 12:28:08 -04:00
Rob Schnautz
971724fb0f deck for warrior, add drake sprite 2023-06-21 22:00:31 -05:00
Rob Schnautz
ed55194e4d fix new atlases (x/y transposed) 2023-06-20 22:13:10 -05:00
Rob Schnautz
1c9d883fad add androsphinx and criosphinx 2023-06-20 22:04:50 -05:00
Rob Schnautz
1d3e398912 turn cockatoo griffin into something more griffinlike 2023-06-19 14:25:43 -05:00
Rob Schnautz
d8b206cdc5 Resolve conflicts 2023-06-18 18:38:41 -05:00
Rob Schnautz
6e9dcaf267 Merge branch 'master' of https://github.com/Card-Forge/forge into working 2023-06-18 18:31:09 -05:00
Rob Schnautz
e66a4ade13 Move unmapped sprites to WIP folder 2023-06-16 21:23:05 -05:00
Rob Schnautz
dafc28ef92 add human warrior 2023-06-16 15:26:50 -05:00
Rob Schnautz
9c58fbe31e finish cleaning up sprite sorting; new Amonkhet sprites; general fixes 2023-06-16 15:02:00 -05:00
Rob Schnautz
8938f0a7d6 Rearrange the sprites and decks directories. 2023-06-14 18:11:55 -05:00