external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,973 Commits 31 Branches 187 Tags
15ece3cc8dbf8c149c3e668c8c92f0e819c49d1b
Commit Graph

64973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
34c4506ddd Allow puzzles with full human control (for puzzles where the AI can't manage to work optimally) (#3280) 
* - Added several puzzles from MtgPuzzles.com

* - Minor text fix in MTGP_02.

* - Human-controlled puzzle support (for puzzles with poor AI support)

* - Indicate human control for PS_GRNS

* - Simpler mark for human controlled puzzles.

* - Slightly tweaked description text.
 2023-06-17 10:08:02 +03:00
Rob Schnautz
cfaa3cab50 Add warrior, started work on Amonkhet gym. 8x8 desert building tiles need remade as 16x16. 2023-06-16 23:14:25 -05:00
Rob Schnautz
d8f6f8697e tilesets in Amonkhet directory. Removed chips.tsx... that was from a different project, I stupidly put the file there! 2023-06-16 22:02:22 -05:00
Rob Schnautz
690255b097 Forge looks for custom_card_pics and custom_cards directories, adding these to Amonkhet even though they're not used. 2023-06-16 21:47:56 -05:00
Rob Schnautz
e66a4ade13 Move unmapped sprites to WIP folder 2023-06-16 21:23:05 -05:00
Rob Schnautz
a8f3f7f811 Merge branch 'master' of https://github.com/schnautzr/forge into working 2023-06-16 15:27:55 -05:00
Rob Schnautz
dafc28ef92 add human warrior 2023-06-16 15:26:50 -05:00
Rob Schnautz
cae57cf783 update Amonkhet decks to match Shandalar decks. 2023-06-16 15:06:58 -05:00
Rob Schnautz
c57dc1286a Merge branch 'working' of https://github.com/schnautzr/forge into working 2023-06-16 15:02:30 -05:00
Rob Schnautz
9c58fbe31e finish cleaning up sprite sorting; new Amonkhet sprites; general fixes 2023-06-16 15:02:00 -05:00
schnautzr
191956dc07 Merge branch 'Card-Forge:master' into working 2023-06-16 14:58:29 -05:00
schnautzr
1913c54437 Merge branch 'Card-Forge:master' into master 2023-06-16 14:54:49 -05:00
Simisays
5e47fc5769 update 2023-06-16 19:23:17 +02:00
Paul Hammerton
5b219bbc64 Merge pull request #3278 from JohnWilliams77/patch-86 
Update Store Championships.txt
 2023-06-16 16:48:00 +01:00
Agetian
e7fb3f1f48 Add several puzzles from MtgPuzzles.com (#3277) 
* - Added several puzzles from MtgPuzzles.com

* - Minor text fix in MTGP_02.
 2023-06-16 17:56:01 +03:00
Simisays
dc7cf20255 update 2023-06-16 13:57:50 +02:00
Simisays
2dff2cb1ef Squashed commit of the following: 
commit 3d5271243e70464d71517206a6d5bcfef5658126
Merge: 781807e85d 8b0fa88546
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 16 11:46:24 2023 +0200

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

commit 781807e85d39da205dfda41b6f49e0785034e6c7
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 16 11:46:16 2023 +0200

    update

commit a7fa843f9e107807b2a40a624da6a68c587bdd3b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 16 11:44:37 2023 +0200

    update

commit a606af2fee40cae1f63c6b19eaa50458fc89db85
Merge: 5e21008373 f9a32bd1d3
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jun 15 19:52:56 2023 +0200

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

commit 5e210083739f4cdb1c6a131c32455fd103378e8b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jun 15 19:52:53 2023 +0200

    update

commit f9a32bd1d3893e7913390852ff03740f98dbd435
Merge: 044d51f244 203a7a4f73
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jun 15 19:32:41 2023 +0200

    Merge branch 'Card-Forge:master' into LOTR12

commit 044d51f2446367287773860d974c164161ba5d5a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 14 21:00:35 2023 +0200

    update

commit 29da2dc62e2e5f0c09df67c5a8d9009f50cd664c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 14 20:39:51 2023 +0200

    update

commit 9d37a007fdfee37b1dd803b105a8e3023c33ab7b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 14 18:14:34 2023 +0200

    update

commit 1e1b572f4225a5b57f37ef7c1c83036cdd704b5c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jun 13 23:38:16 2023 +0200

    update
 2023-06-16 11:47:19 +02:00
JohnWilliams77
9100bd99a8 Update Store Championships.txt 2023-06-16 09:41:33 +01:00
Agetian
8b0fa88546 Adventure: several minor fixes / QoL changes (#3258) 
* - Fix double music playback in deck selection/deck editor screens.
- Make shops use Esc to quit (consistent with other screens).
- Very minor style correction.

* - Experimental: sort editions by name in the SpellSmith card filter.

* - Experimental: sort editions by name in the SpellSmith card filter.

* - Revert the button assignment for the shop button until a better solution can be devised.

* - Added puzzles PS_MOM4, PS_MOM5.
- Fixed the name of PS_MOM3.

* - Avoid resetting the music for some of the scene events.

* - One more music tweak.

* - Fix imports.

* - Take care of seamless music in the inn.

* - Fix imports.

* - Fix more imports.
 2023-06-16 07:54:52 +03:00
schnautzr
1bb4dee060 Merge branch 'Card-Forge:master' into working 2023-06-15 20:45:56 -05:00
schnautzr
0ec55eb747 Merge branch 'Card-Forge:master' into master 2023-06-15 20:45:37 -05:00
Anthony Calosa
ceb8e00e62 Merge pull request #3276 from tool4ever/loseEnchant 
Aura without Enchant shouldnt't stay attached
 2023-06-16 05:11:19 +08:00
Simisays
11ebc4d23d LOTR 10 cards (#3275) 2023-06-15 19:26:53 +00:00
Simisays
88ecaf89d5 LOTR 10 cards (#3261) 2023-06-15 19:26:34 +00:00
tool4EvEr
39ae4b5c83 Aura without Enchant can't stay attached 2023-06-15 20:32:26 +02:00
schnautzr
deae09cd99 Merge branch 'Card-Forge:master' into master 2023-06-15 12:03:09 -05:00
Rob Schnautz
2ec52b4d52 Merge branch 'working' of https://github.com/schnautzr/forge into working 2023-06-15 11:08:32 -05:00
Rob Schnautz
e1707bd24d unused decks, also added a rat deck 2023-06-15 11:08:11 -05:00
schnautzr
e0b09fef18 Merge branch 'Card-Forge:master' into working 2023-06-15 09:23:55 -05:00
Rob Schnautz
e368a91cab sort out miniboss decks not in use 2023-06-15 08:40:43 -05:00
Rob Schnautz
fdd4f2aebb move greenwizard_hard_rampbis.dck to standard decks 2023-06-15 08:37:21 -05:00
Rob Schnautz
e247fd3698 sort starter decks not in use to subdirectory 2023-06-15 08:34:58 -05:00
Anthony Calosa
203a7a4f73 Merge pull request #3274 from kevlahnota/newmaster2 
fix panglacial wurm hidden cardview
 2023-06-15 21:31:54 +08:00
schnautzr
99d0063e75 Merge branch 'Card-Forge:master' into working 2023-06-15 08:28:36 -05:00
Anthony Calosa
4e108bbdaa fix panglacial wurm hidden cardview 2023-06-15 21:26:27 +08:00
Rob Schnautz
9c9a00fe43 Update Amonkhet decks to match Shandalar decks. 2023-06-15 08:12:55 -05:00
schnautzr
e0e6ad096b Merge branch 'Card-Forge:master' into master 2023-06-14 19:32:07 -05:00
Rob Schnautz
8938f0a7d6 Rearrange the sprites and decks directories. 2023-06-14 18:11:55 -05:00
Anthony Calosa
da0dca319b Merge pull request #3273 from kevlahnota/newmaster2 
update hasLegalCardsPredicate when deckconformance is turned off
 2023-06-15 06:48:53 +08:00
Anthony Calosa
cabd79b6b4 update hasLegalCardsPredicate when deckconformance is turned off 
- fixes #3271
 2023-06-15 06:25:35 +08:00
tool4ever
f59cf3791e Update sword_of_once_and_future.txt (#3270) 2023-06-14 22:33:17 +03:00
schnautzr
3689a2e09b Merge branch 'Card-Forge:master' into master 2023-06-14 11:32:13 -05:00
Rob Schnautz
c911150ee3 Adding Amonkhet to the project. To access, you'll need to change \adventure\settings.json to say "Amonkhet" instead of "Shandalar". When finished, remember to change it back again. 2023-06-14 11:29:42 -05:00
Anthony Calosa
92cfd313e2 Merge pull request #3266 from Simisays/ADVENTUREFIX 
Master green wizard crash fix
 2023-06-15 00:26:49 +08:00
Simisays
913fede917 Update greenwizard_hard_rampbis.dck 2023-06-14 18:20:11 +02:00
tool4ever
5e6c433a42 Fix AI not being able to use mana from tapped sources (#3264) 
* Fix AI not being able to use mana from tapped sources

* Clean up

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-06-14 16:28:39 +03:00
Paul Hammerton
9d772e0906 Merge pull request #3265 from paulsnoops/lotr_legal 
Formats update: Add LTR & LTC (also add tokens to editions)
 2023-06-14 14:24:27 +01:00
paulsnoops
8481926ab2 Formats update: Add LTR & LTC (also add tokens to editions) 2023-06-14 14:19:20 +01:00
tool4ever
1dbe024db4 Update kaya_the_inexorable.txt 2023-06-14 11:15:51 +02:00
schnautzr
71a94d0842 Merge branch 'Card-Forge:master' into master 2023-06-14 01:19:52 -05:00