external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,752 Commits 34 Branches 187 Tags
a70a352aa3e058cb1fe526d7a94bada8d96b065c
Commit Graph

64752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jjayers99
c513d84517 Adventure - Tileset mapping 2023-06-06 21:51:08 -04:00
Anthony Calosa
2d59092214 Merge pull request #3149 from schnautzr/master 
Add "Base" and "Relief" terrain sets
 2023-06-07 06:30:11 +08:00
jjayers99
1d2445301f Liliana town dialog fixes 2023-06-06 17:00:34 -04:00
Anthony Calosa
441b6ea7c0 Merge pull request #3213 from Agetian/double-music-fix 
Fix double music playback in the inn.
 2023-06-07 01:57:39 +08:00
Agetian
86bd82aa37 - Fix Entreat the Angels AI while attempting to maintain the fix for the forced cast. (#3214) 2023-06-06 19:52:30 +02:00
Agetian
f3c8c60487 - Fix imports. 2023-06-06 20:51:59 +03:00
Agetian
dbae7c8a2c - Fix double music playback in the inn. 2023-06-06 20:46:47 +03:00
Simisays
3871b70ed7 Update morgul_knife_wound.txt 2023-06-06 19:09:41 +02:00
Simisays
871c66bae5 Update merry_esquire_of_rohan.txt 2023-06-06 19:07:37 +02:00