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

65761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
fc0885d673 Merge pull request #3237 from Simisays/castles 
Castle Rework + new enemies
 2023-06-11 19:33:54 +08:00
Agetian
655ef731eb - Fix rankings for Tura Kennerud, Skyknight (#3240) 2023-06-11 13:34:02 +03:00
Anthony Calosa
15fad78eb1 update Regular Cube (#3238) 2023-06-11 12:26:24 +03:00
Simisays
2129fee6ab LTR 9 cards (#3219) 
* update

* update

* Update sharkey_tyrant_of_the_shire.txt

* Update sharkey_tyrant_of_the_shire.txt

* Update radagast_the_brown.txt

---------

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2023-06-11 12:16:29 +03:00
Agetian
a27f3a9550 AI: Account for transformable cards (e.g. Incubator tokens) when considering defenders (#3232) 
* - AI: Account for transformable cards (e.g. Incubator tokens) when looking for possible defenders.

* - Check if the transformed card is actually a creature

* - Some recommended improvements to the logic
- Comment out a block of code which might not be as useful under the current rules and with contemporary cards anymore

* - Style fix

* - Attempt to count the total mana spent on transforming stuff when determining how many extra defenders are available.

* - Check pay costs for Animate as well as for Transform.
- NPE guard for pay costs check.
 2023-06-11 12:14:12 +03:00
Anthony Calosa
31495e7d63 update Regular Cube 2023-06-11 17:12:53 +08:00
Simisays
5e667b3cd5 Update Akroma's Presence.fullborder.jpg 2023-06-11 10:33:41 +02:00
Simisays
b909303979 Squashed commit of the following: 
commit 27b88eb8c4401542211aecf395cbdd95ded98320
Merge: b09156f692 cda99e3f38
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jun 11 08:14:32 2023 +0200

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

commit b09156f692f34ae1f6603add82f640489607a414
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jun 11 08:14:22 2023 +0200

    update

commit c98b9a5e1846019bae86988bf4532556bd4e6a33
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jun 10 15:36:40 2023 +0200

    update

commit f536a55d469df542c173d3ff8a4e9e5f59cd467c
Merge: af84861ff6 ba1d3fbe43
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 9 14:59:51 2023 +0200

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

commit af84861ff6ab2eeb876f152b0e0d3b94c4179704
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 9 14:59:46 2023 +0200

    update

commit 55b0c30763a55733a6034c0eeb8c1d91c392aac5
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 9 10:09:34 2023 +0200

    update

commit 747c37ca17aca39ac5026008edcb9bd198353151
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jun 8 19:52:51 2023 +0200

    update

commit 72d86c43e55c62bb6efba42230fffb9f4a641e1c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jun 8 09:08:45 2023 +0200

    update

commit 9383a873d9a8a30616d45129b607182d8f85c31c
Merge: e422e37c1b 2b9de4509e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 7 12:35:24 2023 +0200

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

commit e422e37c1b1e0b7814ef83373a1bfaf04572e4e5
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 7 12:35:13 2023 +0200

    update

commit 594621233b57e8241ca80013316933216de0b85f
Merge: 213fdb1e08 441b6ea7c0
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jun 6 22:12:14 2023 +0200

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

commit 213fdb1e080b2f02237b474f3bd7c2595e3203a7
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jun 6 22:12:09 2023 +0200

    update

commit 42c94ecb4e77d649ead99ba8b524e94a6005d841
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jun 6 17:41:53 2023 +0200

    update

commit 9a80e29c5f1b3bebcb0f6db9aa78933d6afaab5d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jun 4 21:19:08 2023 +0200

    updqte

commit 154cac5fcda8e884737d70b0128de7fb450592a2
Merge: d925b4d0a1 53ba1d79a4
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jun 4 16:07:19 2023 +0200

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

commit d925b4d0a10491e9c0c0de3e480f76e98db9f7ae
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jun 3 23:13:22 2023 +0200

    update

commit 0744f9790e91339d383b335be3dddf42ddc11f8a
Merge: c2a0b4f33e 65d385d531
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jun 3 15:03:57 2023 +0200

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

commit c2a0b4f33ec27424ba5642a9c8254c62c6059910
Merge: 885c6c84c4 968be94d55
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 2 21:20:18 2023 +0200

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

commit 885c6c84c452b03d72d94dcf7298a3c0017d11b4
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 2 14:07:14 2023 +0200

    update
 2023-06-11 08:15:23 +02:00
Anthony Calosa
cda99e3f38 Merge pull request #3229 from schnautzr/master 
add Naga Initiate enemy, nagawarrior sprite/atlas/deck
 2023-06-11 08:00:33 +08:00
Anthony Calosa
6e1d6c9dfb Merge pull request #3226 from kevlahnota/newmaster2 
filter out invalid option for BoosterDraft
 2023-06-11 06:19:56 +08:00
Alwayssnarky
d2d955143f Phyrexian Server Request Implementation 
.Makes it possible for phyrexian enemies to drop mythic rares. (Still very rarely.)
.Adds missing keyword ("compleated") to the string search for Phyrexian shops.
 2023-06-10 14:10:50 -04:00
schnautzr
380c664897 Fix missing nagawarrior avatar 2023-06-10 10:34:34 -05:00
schnautzr
c888c293ba Merge branch 'Card-Forge:master' into master 2023-06-10 10:33:03 -05:00
Anthony Calosa
370f0aa808 Merge branch 'master' into newmaster2 2023-06-10 20:05:20 +08:00
Paul Hammerton
16fd08ee02 Merge pull request #3231 from paulsnoops/update_ltr 
Edition updates: LTR, LTC
 2023-06-10 11:05:23 +01:00
paulsnoops
7c5fca2c50 Edition updates: LTR, LTC 2023-06-10 11:00:46 +01:00
Agetian
f5bd8bd62b Add several popular cubes from Cube Cobra (#3228) 
* - Added several popular cubes from Cube Cobra.

* - Comment out unsupported cards, fix set IDs on some cards.
 2023-06-10 10:25:13 +03:00
schnautzr
98490e73b9 add Naga Initiate 2023-06-09 22:05:50 -05:00
schnautzr
c3bead5081 Update white.json 
add Naga Initiate
 2023-06-09 22:00:09 -05:00
schnautzr
8e0f227240 add naga warrior sprites/atlas 2023-06-09 21:57:06 -05:00
schnautzr
e9b2cf2fc1 Add naga warrior deck by MasterXploder7 2023-06-09 21:55:16 -05:00
Anthony Calosa
13605d5350 update 2023-06-10 09:00:55 +08:00
Anthony Calosa
5f41d2ffda Merge branch 'master' into newmaster2 2023-06-10 08:28:59 +08:00
Hans Mackowiak
4d7e41a9d7 Update StaticAbilityContinuous.java (#3227) 2023-06-09 18:33:15 +03:00
Anthony Calosa
03ab5cba6b Merge branch 'master' into newmaster2 2023-06-09 21:43:11 +08:00
Anthony Calosa
37562ad009 Merge pull request #3203 from Simisays/LTR5 
LTR 13 cards
 2023-06-09 21:17:12 +08:00
Anthony Calosa
a118a3df93 filter out invalid option for BoosterDraft 2023-06-09 21:16:25 +08:00
Simisays
7519d32366 update 2023-06-09 13:57:45 +02:00
tool4ever
ba1d3fbe43 Clean up (#3225) 2023-06-09 11:47:59 +00:00
Klisz
85eb8fd5b4 Update eomer_marshal_of_rohan.txt (#3221) 2023-06-09 14:35:23 +03:00
Simisays
f5b6863b24 update 2023-06-09 13:04:43 +02:00
Hans Mackowiak
8f1100dff3 Amass type (#3222) 
* AmassEffect: add Type parameter

* fix AmassAi

* update editions tokenscripts

* Update AmassEffect.java

early return if no Army could be created
 2023-06-09 12:56:46 +03:00
Paul Hammerton
5d54e0f1f2 Merge pull request #3220 from paulsnoops/ltr_update 
Edition updates: LTR, LTC
 2023-06-08 19:46:37 +01:00
paulsnoops
50c71f6a0a Edition updates: LTR, LTC 2023-06-08 19:39:14 +01:00
Simisays
20e6f48fba Update borne_upon_a_wind.txt 2023-06-08 16:03:14 +02:00
Anthony Calosa
3320b83bb8 Merge pull request #3217 from jjayers99/master 
Booster draft fix, small adventure updates
 2023-06-07 21:14:42 +08:00
jjayers99
b7c2b2de42 Merge remote-tracking branch 'upstream/master' 2023-06-07 09:09:21 -04:00
jjayers99
d321afccfe Update BoosterDraft.java 2023-06-07 09:06:32 -04:00
Simisays
8ab67fd34e Update long_list_of_the_ents.txt 2023-06-07 09:36:51 +02:00
Simisays
2091c0b89e Update morgul_knife_wound.txt 2023-06-07 09:28:39 +02:00
Simisays
97b2f88fd2 Update long_list_of_the_ents.txt 2023-06-07 09:26:09 +02:00
Simisays
32fd6243f5 Delete landroval_horizon_witness.txt 2023-06-07 09:14:03 +02:00
Simisays
d90df1cebb update 2023-06-07 09:13:27 +02:00
Anthony Calosa
2b9de4509e Merge pull request #3215 from schnautzr/master 
Add Greater Sandwurm enemy for white biome, sprite, atlas
 2023-06-07 14:07:48 +08:00
Anthony Calosa
b73c6a511b Merge pull request #3216 from Agetian/event-music 
Add music back to town events/draft scene
 2023-06-07 13:39:10 +08:00
Agetian
7c2133d0a7 - Fix double music in player statistics screen. 2023-06-07 08:33:39 +03:00
Agetian
68ea350bf4 - Add music back to town events/draft scene. 2023-06-07 08:28:41 +03:00
schnautzr
580fa9aa07 Add greater sandwurm enemy 2023-06-06 22:54:00 -05:00
schnautzr
e1f4fbd91b Update white.json 
add greater sandwurm to desert biome
 2023-06-06 22:51:25 -05:00
schnautzr
f3c57e0d40 Amonkhet Sandwurm sprite and atlas 2023-06-06 22:49:38 -05:00