external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,186 Commits 33 Branches 187 Tags
cb5e05f8ad3669b47748db37b2df40fc7d0c829c
Commit Graph

65186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
e739e922ca Merge pull request #3517 from Simisays/ADVENTUREREWORK 
[Adventure] Evil Grove/ Djinn Palace / CryptGraveyard map rework
 2023-07-25 05:06:06 +08:00
Anthony Calosa
969c6a5d2b Merge pull request #3527 from tool4ever/landroval 
Landroval support
 2023-07-25 04:54:31 +08:00
Simisays
b4b342eb4c LTR Faramir Prince of Ithilien (#3521) 2023-07-24 20:09:20 +00:00
tool4EvEr
94211bc2c4 Clean up 2023-07-24 21:56:16 +02:00
tool4EvEr
604d565815 Landroval support 2023-07-24 21:55:27 +02:00
Simisays
b9b759bad2 Create sail_into_the_west.txt 2023-07-24 15:03:01 +02:00
Anthony Calosa
c267503bb6 Merge pull request #3524 from kevlahnota/newmaster2 
remove translation
 2023-07-24 21:02:12 +08:00
Anthony Calosa
8018483529 remove translation 
-should fix ai effect logic
-translation should be done somewhere
 2023-07-24 20:57:04 +08:00
Simisays
5fbd264c0b update 2023-07-24 12:41:19 +02:00
Simisays
31b6713091 Merge remote-tracking branch 'upstream/master' into ADVENTUREREWORK 2023-07-24 12:35:27 +02:00
tool4ever
8f1d8ce265 Remove special case of StackInstances sharing the same SpellAbility object (#3490) 
* Each activated ability needs its own instance

* Don't need LKI since each SA is unique

* Clean default param

* Fix Dawnglow Infusion

* Fix ability counting

* Avoid color words

* Fix AI

* Be a bit smarter with copying

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-07-24 10:19:15 +03:00
tool4ever
d01d9d486f Support Faramir, Prince of Ithilien (#3520) 
* Fix Curse of Vitality

* Support Faramir, Prince of Ithilien

* Fix cards

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-07-24 10:17:25 +03:00
Simisays
e04f50814f update 2023-07-23 21:50:26 +02:00
Simisays
5ccf6a50dd update 2023-07-23 13:09:34 +02:00
Anthony Calosa
245a5c5885 Merge pull request #3515 from Card-Forge/copyTraitsByText 
Card: store created CardTraits by Text Change: Volrath’s Shapeshifter
 2023-07-23 15:22:04 +08:00
Anthony Calosa
7a3ec0b8e8 Update AdventureDeckEditor.java 2023-07-23 14:35:59 +08:00
Anthony Calosa
62cfedd9db Update AdventureDeckEditor.java 2023-07-23 13:56:05 +08:00
Hans Mackowiak
74d5ad8edc fix intrinsic for Text changes 2023-07-22 22:39:52 +02:00
Simisays
db2ecbed3c update 2023-07-22 21:43:15 +02:00
Anthony Calosa
7f8925aa8e Update faramir_steward_of_gondor.txt 2023-07-23 00:56:37 +08:00
Hans Mackowiak
5c4d1ce92b Card: store created CardTraits by Text Change: Volrath’s Shapeshifter 2023-07-22 17:45:47 +02:00
Paul Hammerton
0316c689fc Merge pull request #3514 from paulsnoops/quickfix 
Edition update: CMM
 2023-07-22 13:17:46 +01:00
paulsnoops
647c991b3a Edition update: CMM 2023-07-22 13:14:31 +01:00
Paul Hammerton
8a0be83b33 Merge pull request #3513 from paulsnoops/update_editions 
Edition update: WHO
 2023-07-22 10:48:36 +01:00
paulsnoops
c9bc1d9dc7 Edition update: WHO 2023-07-22 10:42:53 +01:00
Simisays
eed448daea Create gollum_scheming_guide.txt 2023-07-22 11:02:55 +02:00
Anthony Calosa
574ee9733d update tests 2023-07-22 14:04:04 +08:00
Anthony Calosa
8cd3d09c77 Update Commander Masters.txt 2023-07-22 13:22:47 +08:00
tool4ever
69d5e1e9da Manifest: Fix missing ChangesZoneAll (#3510) 
* Crash fix

* Fix logic

* Fix missing ChangesZoneAll

* Fix scripts

* Clean up

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-07-22 07:02:21 +03:00
Anthony Calosa
37a3cc29c4 Update ob_nixilis_captive_kingpin.txt 2023-07-22 06:20:30 +08:00
Anthony Calosa
aa9cf7e955 Merge pull request #3509 from Simisays/CMM5 
CMM 6 cards 21-7
 2023-07-22 06:19:30 +08:00
Anthony Calosa
63b0c5b6f8 Merge pull request #3505 from Simisays/CMM4 
CMM 6 cards
 2023-07-22 06:19:14 +08:00
Simisays
64b94bd22a update 2023-07-21 21:58:58 +02:00
Simisays
3df4e47f4b Update abstruse_archaic.txt 2023-07-21 21:57:11 +02:00
Anthony Calosa
e8908960ca Merge pull request #3497 from Simisays/CMM3 
CMM 5 cards
 2023-07-22 02:33:53 +08:00
Anthony Calosa
a4362ee33b Merge pull request #3501 from nshcat/nyxborn_behemoth 
Implemented Ondu Spiritdancer, Nyxborn Behemoth and Onakke Oathkeeper
 2023-07-22 02:33:18 +08: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
Simisays
39e11abe57 update 2023-07-21 18:26:08 +02:00
Simisays
61eddc68a5 Update omarthis_ghostfire_initiate.txt 2023-07-21 18:19:13 +02:00
Simisays
c54dc76b48 updqte 2023-07-21 18:17:12 +02:00
Anthony Calosa
ff4ccbd6b5 Merge pull request #3496 from Simisays/CMM2 
CMM 5 cards
 2023-07-22 00:14:13 +08:00
nshcat
61ade6b187 Fixed apostrophes 2023-07-21 17:56:31 +02:00
nshcat
834146ad6e Added AI deckbuilding hints, and removed trailing empty lines 2023-07-21 17:07:50 +02:00
Simisays
dee010417c update 2023-07-21 16:21:52 +02:00
Paul Hammerton
10a40705fa Merge pull request #3507 from paulsnoops/P30T_fix 
Fix tests
 2023-07-21 14:48:51 +01:00
paulsnoops
048b4451da Fix tests 2023-07-21 14:44:41 +01:00
Paul Hammerton
c1daece446 Merge pull request #3506 from JohnWilliams77/patch-88 
Create 30th Anniversary Celebration Tokyo.txt
 2023-07-21 14:17:17 +01:00
JohnWilliams77
badbbd5d41 Create 30th Anniversary Celebration Tokyo.txt 2023-07-21 14:10:16 +01:00
Simisays
02cc62c61f Update jayas_phoenix.txt 2023-07-21 13:49:39 +02:00
Simisays
c85941b28e update 2023-07-21 13:47:08 +02:00