external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,299 Commits 31 Branches 187 Tags
3ef0479d76b51f43b984f4949e5281e03e8290af
Commit Graph

96 Commits

Author SHA1 Message Date
Simisays
4074a301f7 map fixes (#5460) 2024-06-23 18:47:52 +03:00
Simisays
ae4fcc8b5a cleanup (#5427) 2024-06-14 22:24:41 +03:00
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
Chris H
c7a138fc13 Adding turbofog Adventure opponent (#5225) 2024-05-11 10:57:30 +03:00
Simisays
b616bec93c Adventure minor patches (#4839) 
* adventure updates

* Update barbariancamp_goblin_3.tmx

* remove invisible gold

* Update barbariancamp_goblin_3.tmx
 2024-03-20 06:01:46 +03:00
Simisays
604c5178c8 Update evilgrove_7_dragon.tmx 2024-03-04 12:24:37 -05:00
Simisays
ab33d47838 cleanup (#4660) 2024-02-11 07:56:37 +03:00
Simisays
662bc34a31 Update grove_8_hydra.tmx (#4655) 2024-02-10 07:34:29 +03:00
Simisays
7c0f13b918 4 small adventure fixes (#4650) 
* update

* Update fort_green_3_forestcastle.tmx

* Update grove_8_hydra.tmx
 2024-02-09 06:49:10 +03:00
Simisays
2bf358412b Adventure Tibalt Dungeon Cleanup (#4558) 
* cleanup

* Update tibalt_f0.tmx
 2024-01-20 09:05:17 +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
f9fd8a7475 Adventure - Quest fixes 
Correction for empty dialog textboxes displaying on what should be silent quest triggers

Bugfixes within Library Of Varsil dungeon
 2024-01-07 22:56:29 -05: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
b5be9c3a2d quickfix (#4237) 2023-11-29 08:14:47 +03:00
Simisays
1fa64836ec Update djinpalace_entrance.tmx (#4200) 2023-11-24 06:51:58 +03:00
Simisays
5f8fa60221 Update fort_white_2_humans.tmx (#4174) 2023-11-15 07:01:40 +03: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
jjayers99
560af3c764 Adventure - Garruk river cleanup 
Fixed collision under bridge, moved all river tiles to layer "Lowest Background"
 2023-11-01 11:03:16 -04:00
Agetian
133d47150a A temporary endgame tweak for a little bit more "flow" until the real endgame is committed after the revamp. (#4028) 
* - Implement a fallback mechanism in case getting a card by name and edition fails for whatever reason.

* - Patch up pulling a card without filters in All Card Variants mode.

* - Temporary (until the revamp) endgame tweak for Adventure Mode for a little bit more flow
 2023-10-29 20:13:51 +03:00
kevlahnota
4695163e63 Merge pull request #3976 from Simisays/quickfix 
Fort 6 collision fix
 2023-10-25 21:04:43 +08:00
Simisays
3567103df3 Update fort_colorless_6_study.tmx 2023-10-25 11:20:47 +02:00
shenshinoman
b9117873bc Simple graphics fixes to maps (#3924) 
A generalized sweep of all maps in Adventure. Where any visual bugs have been edited in Tiled to no longer exist. No changes to collision, scripting, or objects  was done. This merely resolves simple graphical errors. such as a tile missing a tree that is partially created by the adjacent tile.
 2023-10-22 07:42:20 +00:00
kevlahnota
4e609ba0e1 Merge pull request #3856 from jjayers99/master 
Adventure - Graveyard map tweaks
 2023-10-07 05:19:55 +08:00
Simisays
49871bc2b6 update 2023-10-06 19:41:56 +02:00
jjayers99
617e078197 Adventure - Zombie town map tweaks 
Shards moved in to town, blocking tombstones removed to allow access to gold, removed ability to restock shops
 2023-10-06 11:33:21 -04:00
jjayers99
6503347d0c Merge branch 'master' of https://github.com/jjayers99/forge-updates into master-local 2023-10-06 08:53:23 -04:00
jjayers99
97c8f0d62f Adventure - Graveyard map tweaks 2023-10-06 08:49:36 -04:00
Simisays
0fc8daa06c update 2023-09-27 22:28:35 +02:00
Simisays
52ba920917 Update catlair_white_1_lionden.tmx 2023-09-26 20:00:27 +02:00
kevlahnota
7c4a535833 Merge pull request #3795 from jjayers99/master 
Adventure - Portal destination fix in Lilliana dungeon
 2023-09-20 15:00:52 +08:00
jjayers99
dd3e515099 Adventure - Portal destination fix in Lilliana dungeon 2023-09-19 22:35:37 -04: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
TabletopGeneral
bc9619aa0f Adventure - minor map updates (#3714) 
* Adventure: Minor map correction

Removing hidden wall in fort_colorless_2_wizards that prevented access to shards in blue mage's area

* Adventure - Log error if mob has bad waypoint set

* Update MovementBehavior.java

* Adventure - More error logging
 2023-08-30 07:03:55 +03:00
TabletopGeneral
028a1cc377 Merge branch 'Card-Forge:master' into master 2023-08-27 18:33:22 -07:00
Simisays
bcb88736b9 update (#3698) 2023-08-27 10:25:43 +00:00
jjayers99
4c1c783f51 Adventure: Minor map correction 
Removing hidden wall in fort_colorless_2_wizards that prevented access to shards in blue mage's area
 2023-08-27 01:52:27 -04:00
TabletopGeneral
f6a032f263 Update magetower_8.tmx 
Text update
 2023-08-25 19:53:06 -04:00
jjayers99
9a7b0d5c7b Adventure - Blue Mage Tower updates 
Removed extra collisions including those causing player to get stuck on 2nd level, cleaned up walls, added additional dialog to gate interaction.
 2023-08-25 19:53:06 -04:00
Simisays
bc7abbc019 Update catlair_3.tmx 2023-08-23 21:20:12 +02:00
kevlahnota
04e2e6d59e fix broken skep_outer.tmx 2023-08-23 21:09:52 +08:00
kevlahnota
812f0c3157 update broken teferi map 2023-08-23 19:32:05 +08: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