external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,835 Commits 33 Branches 187 Tags
bada43b901b55a573d245800f1ec53e474917ef1
Commit Graph

66835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4EvEr
7afff40c76 Clean up 2023-08-02 09:35:56 +02:00
tool4EvEr
03db49c74b Remove some fake kicker costs 2023-08-02 09:35:25 +02:00
tool4EvEr
630dcf6c17 Check attack legality of player requirements 2023-08-02 07:49:09 +02:00
Northmoc
c8d7e3d4f0 gollum_obsessed_stalker.txt and support (#3552) 
* gollum_obsessed_stalker.txt and support

* fix
 2023-08-02 06:01:45 +03:00
tool4EvEr
0db2cd3fb1 Add Seeker of Slaanesh 2023-08-01 22:56:18 +02:00
tool4EvEr
30456ea2c0 Rip out old code 2023-08-01 22:54:02 +02:00
tool4ever
546c4bcf1e Fix TriggersWhenSpent affected by Veyran (#3586) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-08-01 21:18:40 +03:00
kevlahnota
17cea24dd5 Merge pull request #3585 from tool4ever/fixDump 
Fix Cellar Door
 2023-08-02 01:28:16 +08:00
tool4EvEr
50900dbab2 Fix Cellar Door 2023-08-01 19:08:25 +02:00
kevlahnota
8d6ef15a05 Merge pull request #3577 from kevlahnota/newmaster2 
fix backface not generating if art is missing
 2023-08-01 19:43:59 +08:00
Anthony Calosa
7f6673a0b6 update 2023-08-01 19:41:31 +08:00
Anthony Calosa
afb5307502 fix backface not generating if art is missing 2023-08-01 19:24:24 +08:00
Paul Hammerton
2e3406bd28 Merge pull request #3575 from JohnWilliams77/patch-89 
Update Store Championships.txt
 2023-08-01 12:05:25 +01:00
JohnWilliams77
ac5426cb86 Update Store Championships.txt 2023-08-01 11:01:30 +01:00
Paul Hammerton
5384d26fce Merge pull request #3573 from paulsnoops/cmm_formats 
Add CMM to formats
 2023-08-01 09:26:32 +01:00
paulsnoops
1ca3d07c1c Add CMM to formats 2023-08-01 09:22:24 +01:00
tool4ever
14081b1e44 Update ControlSpellEffect.java 2023-08-01 08:28:59 +02:00
tool4ever
6c92e8d21c Update ChangeZoneEffect.java 2023-08-01 08:11:25 +02:00
tool4ever
684d8aa32c Update starscream_power_hungry_starscream_seeker_leader.txt 
Closes #3571
 2023-08-01 07:51:13 +02:00
kevlahnota
639f3dd428 Merge pull request #3572 from kevlahnota/newmaster2 
cache animated sprites
 2023-08-01 12:55:54 +08:00
Anthony Calosa
cfd9dfa8db cache animated sprites 2023-08-01 12:42:02 +08:00
tool4ever
f0261ac507 Update grishnakh_brash_instigator.txt 2023-07-31 20:05:19 +00:00
kevlahnota
dff8492bf8 Merge pull request #3570 from tool4ever/fix31 
Fix NPE
 2023-08-01 01:47:55 +08:00
tool4EvEr
503047116f Fix scripts 2023-07-31 19:32:38 +02:00
tool4EvEr
71e7728506 Fix NPE 2023-07-31 19:32:17 +02:00
kevlahnota
dd285d0d23 Merge pull request #3568 from Simisays/AdventureUpdateSnow 
[[Adventure]] HostileTown/Maze and Snowabbey revamp + other changes
 2023-08-01 00:54:17 +08:00
kevlahnota
fad9f77475 Merge pull request #3569 from kevlahnota/newmaster2 
update remaining sprites to cache
 2023-07-31 23:19:35 +08:00
Anthony Calosa
efbbf67033 update remaining sprites to cache 2023-07-31 23:11:12 +08:00
Simisays
c09bba05d5 Update emrakul.tmx 2023-07-31 14:45:15 +02:00
Simisays
ef71bb11e3 Update points_of_interest.json 2023-07-31 14:42:45 +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
kevlahnota
874ccc82ad Merge pull request #3567 from kevlahnota/newmaster2 
cache created sprites
 2023-07-31 19:18:41 +08:00
Anthony Calosa
8653bfcf22 update icons 2023-07-31 19:04:34 +08:00
Anthony Calosa
beb66d5c7d update arena atlas 2023-07-31 18:45:26 +08:00
Anthony Calosa
c4e932c2e2 cache created sprites 2023-07-31 18:21:58 +08:00
kevlahnota
f372b18061 Merge pull request #3562 from Simisays/LOTR25 
LTC 2 cards
 2023-07-31 12:32:31 +08:00
kevlahnota
16d8a69e4c Merge pull request #3566 from kevlahnota/newmaster2 
add Bookmark to GameHUD
 2023-07-31 11:27:50 +08:00
Anthony Calosa
a668b8abf8 update itemSprite, update items 2023-07-31 11:19:36 +08:00
Anthony Calosa
6e3362a330 Merge branch 'master' into newmaster2 2023-07-31 03:30:18 +08:00
Anthony Calosa
d806745cec add Bookmark to GameHUD 2023-07-31 03:21:59 +08:00
Simisays
4fe815872f Update travel_through_caradhras.txt 2023-07-30 20:43:10 +02:00
kevlahnota
54d502549e Merge pull request #3565 from tool4ever/fix30 
Fix xPaid reset
 2023-07-31 02:10:12 +08:00
tool4EvEr
b0ec1d68df Clean up 2023-07-30 18:39:27 +02:00
tool4EvEr
3cf257723d Fix xPaid reset 2023-07-30 18:37:36 +02:00
Simisays
614c2280bd update 2023-07-30 18:07:21 +02:00
kevlahnota
bc918bf3f3 Merge pull request #3534 from Simisays/gollu; 
LTR Gollum, Scheming Guide & Sauron, the Necromancer [Squash merge]
 2023-07-30 20:54:24 +08:00
Paul Hammerton
de7cd0d4f6 Merge pull request #3564 from paulsnoops/edition_updates 
Edition updates: LTR, WHO, new: WOE, WOT
 2023-07-30 13:32:12 +01:00
paulsnoops
ef109cb783 Edition updates: LTR, WHO, new: WOE, WOT 2023-07-30 13:27:06 +01:00
kevlahnota
224377e99a Merge pull request #3563 from Simisays/castlefix 
Fix for white castles not loading
 2023-07-30 20:15:24 +08:00
Simisays
28166054b2 fix 2023-07-30 13:49:40 +02:00