external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,761 Commits 32 Branches 187 Tags
6d70d76efd9c76f4b9fc3d1353db00ac0c48fb0c
Commit Graph

65761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simisays
75ab03bd2c update 2023-07-02 09:08:48 +02:00
Agetian
7c2e3d2a47 Basic AI for Gale's Redirection, Consecrate // Consume, Serra's Emissary (#3376) 
* - Basic AI for Gale's Redirection.

* - Clean up.

* - Add resetTargets.

* - Minor style tweak.

* - Improve Consecrate // Consume implementation, enable AI support.

* - Improve Serra's Emissary AI support.
 2023-07-02 06:50:26 +03:00
Anthony Calosa
96c88382dc Update MapViewScene.java 
fix showing quest button on empty quest POI
 2023-07-02 11:41:42 +08:00
Anthony Calosa
343621fe30 Merge pull request #3388 from schnautzr/tiger 
Recolor tiger
 2023-07-02 10:09:48 +08:00
Anthony Calosa
37c5bceea7 Merge pull request #3382 from Simisays/LOTR26BIS 
Updated LTC 5 cards
 2023-07-02 10:08:06 +08:00
Anthony Calosa
6c6b3ba29f Merge pull request #3389 from kevlahnota/newmaster2 
update SettingsScene
 2023-07-02 10:07:16 +08:00
Anthony Calosa
8fb92a9df1 Update Forge.java 2023-07-02 09:13:37 +08:00
Anthony Calosa
e5ebcb51e2 update 2023-07-02 09:08:43 +08:00
Anthony Calosa
75435aa699 add description 2023-07-02 08:56:32 +08:00
Anthony Calosa
a4505279aa update 2023-07-02 08:55:32 +08:00
Anthony Calosa
1f03836b20 update SettingsScene 
- fix preferences
 2023-07-02 08:50:41 +08:00
tool4EvEr
6106e5247f Don't store LastState than can become outdated before resolving 2023-07-02 00:11:29 +02:00
tool4EvEr
91c34d3b99 AI fix 2023-07-01 23:07:51 +02:00
schnautzr
689dea356f Merge branch 'Card-Forge:master' into tiger 2023-07-01 15:31:19 -05:00
Rob Schnautz
ef710b8782 recolor tiger so it doesn't look like a squirrel 2023-07-01 15:30:05 -05:00
tool4EvEr
8b892a3c82 Clean up 2023-07-01 22:25:37 +02:00
tool4EvEr
408746037a Remove old calls? 2023-07-01 22:17:11 +02:00
tool4EvEr
9208e1eb02 Exiled card becomes new object when it's exiled 2023-07-01 19:20:56 +02:00
Peter Helbing
754882f546 Fix LTR Stew The Coneys mana cost (#3384) 2023-07-01 16:59:06 +00: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
Anthony Calosa
921a1c8f9c Merge pull request #3381 from kevlahnota/newmaster2 
update player collision
 2023-07-01 21:27:14 +08:00
Anthony Calosa
059a407d2f remove duplicated code 2023-07-01 21:08:28 +08:00
Simisays
afa57f5f8d Squashed commit of the following: 
commit 7507522f2e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jul 1 14:52:10 2023 +0200

    Update taunt_from_the_rampart.txt

commit 46f4927a30
Merge: e5c11122df 6650ab0cc5
Author: tool4ever <therealtoolkit@hotmail.com>
Date:   Sat Jul 1 14:50:12 2023 +0200

    Merge branch 'master' into LOTR26

commit e5c11122df
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jul 1 14:42:49 2023 +0200

    Update taunt_from_the_rampart.txt

commit 01e1f1a3af
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jul 1 11:18:28 2023 +0200

    Update the_balrog_of_moria.txt

commit b2e59a81b0
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jul 1 11:18:18 2023 +0200

    update

commit e49b1576d3
Merge: d8cd4297e9 1e9ee21176
Author: Anthony Calosa <anthonycalosa@gmail.com>
Date:   Sat Jul 1 15:22:32 2023 +0800

    Merge pull request #3375 from jjayers99/master

    Adventure - prevent getting stuck between close POI

commit 1e9ee21176
Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
Date:   Fri Jun 30 23:05:29 2023 -0400

    Adventure - prevention from getting stuck between POI

commit 799cd09ab6
Merge: d9c0a08662 409a3a65ce
Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
Date:   Fri Jun 30 23:02:11 2023 -0400

    Merge branch 'master' of https://github.com/jjayers99/forge-updates

commit d9c0a08662
Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
Date:   Fri Jun 30 22:30:54 2023 -0400

    Initial commit
 2023-07-01 15:06:38 +02:00
Anthony Calosa
6b20505a2e update 2023-07-01 20:38:23 +08:00
Anthony Calosa
48709aed5d update player collision 
- add flicker effect when restoring player collision after map/world duel
 2023-07-01 20:31:51 +08:00
Anthony Calosa
6650ab0cc5 Update soulless_jailer.txt 
- closes #3377
 2023-07-01 13:26:37 +02:00
jjayers99
42b9581c9e Adventure - prevention from getting stuck between POI 2023-07-01 13:26:33 +02:00
Alwayssnarky
1e95b9f4ee Update Sigil of Torment art 2023-07-01 06:56:10 -04:00
tool4EvEr
d8cd4297e9 Solemnity doesn't prevent planeswalkers +0 2023-07-01 06:52:10 +02:00
Anthony Calosa
409a3a65ce Merge pull request #3372 from Simisays/LOTR25 
LTC 5 cards
 2023-07-01 06:49:13 +08:00
Anthony Calosa
0e9f091bb4 Merge pull request #3371 from Simisays/LOTR24 
LTC 6 cards
 2023-07-01 06:48:48 +08:00
Rob Schnautz
35fb17d366 Merge branch 'master' of https://github.com/Card-Forge/forge into biomes-update 2023-06-30 14:45:25 -05:00
Rob Schnautz
37c650e21a Fix collision issues in Shandalar overworld by converting several sprites to structures, rework biome structures. 2023-06-30 14:36:30 -05: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
85dd10c74f Update shelobs_ambush.txt 2023-06-30 18:47:26 +08:00
Simisays
83f94b642c update 2023-06-30 12:39:49 +02:00
Simisays
6950f58bfc update 2023-06-30 12:27:24 +02:00
Simisays
037970b52f Update lossarnach_captain.txt 2023-06-30 08:46:24 +02:00
Anthony Calosa
b7e0d31b66 Merge pull request #3369 from kevlahnota/newmaster2 
update GameHUD
 2023-06-30 14:46:17 +08:00
Simisays
c9a2205515 Update grey_host_reinforcements.txt 2023-06-30 08:45:48 +02:00
Simisays
c448373032 update 2023-06-30 08:44:27 +02:00
Anthony Calosa
a5c6090b2f update GameHUD 
- add GPS Icon on Zoom button to notify player for quest location
 2023-06-30 14:24:27 +08:00
Anthony Calosa
32c62f8ba6 Merge pull request #3368 from kevlahnota/newmaster2 
update some cards
 2023-06-30 13:49:22 +08:00
Anthony Calosa
1125dafe75 update some cards 2023-06-30 13:47:57 +08:00
Anthony Calosa
93ce6e4425 Update HudScene.java 2023-06-30 13:33:49 +08:00
Anthony Calosa
2c07f688c7 Merge pull request #3367 from kevlahnota/newmaster2 
stop player movement when dialog is shown
 2023-06-30 13:28:40 +08:00
Anthony Calosa
c8e9fd2089 update 2023-06-30 13:09:09 +08:00
Anthony Calosa
e67539ebdd stop player movement when dialog is shown 2023-06-30 06:39:58 +08:00
Anthony Calosa
3ce02a7143 Merge pull request #3355 from Simisays/LOTR23 
LTC 5 cards
 2023-06-30 05:52:22 +08:00
Simisays
63b3a4f37f update 2023-06-29 22:32:38 +02:00