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
64,688 Commits 32 Branches 187 Tags
918a38ece2ac37c30398e536ad8ddc4421bb08a8
Commit Graph

64688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
918a38ece2 move CustomCards and Pics to common 2023-06-22 19:14:35 +08:00
Anthony Calosa
0f88548360 Merge pull request #3282 from schnautzr/working 
Support common adventure resources, relocate resources to common directory, sorting, and groundwork for Amonkhet
 2023-06-22 19:00:52 +08:00
Simisays
1a3917859a LOTR 10 cards (#3310) 
* update

* update

* Update ugluk_of_the_white_hand.txt
 2023-06-22 06:06:21 +03:00
Simisays
0e897d7d6e LOTR 11 cards (#3302) 
* update

* Add files via upload

* update

* update

* Update rosie_cotton_of_south_lane.txt

* update

* Update press_the_enemy.txt

* Update press_the_enemy.txt

---------

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2023-06-22 06:06:03 +03:00
tool4ever
9d7cfc62cc Update doomskar_warrior.txt (#3312) 2023-06-21 22:50:37 +03:00
TabletopGeneral
3098cc122f Adventure updates (#3309) 
* Adventure - draft fixes

* Update AdventureEventData.java

cleanup

* Adventure map updates

Adding collision barriers around several maps, expanding entry objects to prevent moving outside the map

minor Temple of Gideon progress

* Adventure draft set filtering

Preventing sealed-only sets from being selected only for drafts

* Adventure mob spawn rate adjustment

Making enemy spawn allocation more reasonable while still allowing for higher and lower rates.

---------

Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
 2023-06-21 22:46:49 +03:00
schnautzr
8b62951f29 Merge branch 'Card-Forge:master' into working 2023-06-21 13:51:41 -05:00
Agetian
9da75737c3 AI: AttachAi should avoid enchanting or equipping crewed vehicles (#3303) 
* - AI: AttachAi should avoid enchanting or equipping crewed vehicles

* - Attempt to detect attachments that can attach to things other than creatures.
 2023-06-21 18:53:12 +03:00
tool4ever
c3dc242460 Remove outdated fizzle code (#3306) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-06-21 18:52:48 +03:00
schnautzr
8480de6623 Merge branch 'Card-Forge:master' into working 2023-06-21 10:33:30 -05:00
Rob Schnautz
a5b28e578e optimize getFile 2023-06-21 10:23:50 -05:00
Rob Schnautz
1149f58192 consolidate getFile, eliminate need for enumeration, compacted log output, eliminated need for isCommon. 2023-06-21 09:41:10 -05:00
Rob Schnautz
3534eff26e enumerate cache statuses 2023-06-21 08:39:53 -05:00
tool4ever
33b35905af Update signal_the_clans.txt 2023-06-21 11:39:42 +00:00
Paul Hammerton
3c50f491c6 Merge pull request #3305 from JohnWilliams77/patch-87 
Update Secret Lair Showdown.txt
 2023-06-21 10:43:43 +01:00
JohnWilliams77
43983a21c5 Update Secret Lair Showdown.txt 2023-06-21 09:37:05 +01:00
tool4ever
feec9f8829 Update ramses_assassin_lord.txt 2023-06-21 07:34:28 +00:00
tool4ever
0320354401 Update orca_siege_demon.txt 2023-06-21 07:11:34 +00:00
tool4ever
4daa6ee79b Update the_tabernacle_at_pendrell_vale.txt 2023-06-21 06:42:05 +00:00
Rob Schnautz
ed55194e4d fix new atlases (x/y transposed) 2023-06-20 22:13:10 -05:00
Rob Schnautz
1c9d883fad add androsphinx and criosphinx 2023-06-20 22:04:50 -05:00
schnautzr
c7f9ba7991 Merge branch 'Card-Forge:master' into working 2023-06-20 17:21:33 -05:00
tool4ever
653d393cba Update scythe_of_the_wretched.txt 2023-06-20 21:03:33 +02:00
Anthony Calosa
1c3386562d Merge pull request #3300 from kevlahnota/newmaster2 
Fix starting ColorID
 2023-06-20 20:46:12 +08:00
Anthony Calosa
d14e706cb0 Fix starting ColorID 2023-06-20 20:36:15 +08:00
Paul Hammerton
0b0f034f17 Merge pull request #3297 from Simisays/LOTR16 
LOTR 10 cards
 2023-06-20 10:42:34 +01:00
tool4ever
6ac338a304 Fix logic (#3299) 2023-06-19 21:22:07 +00:00
Rob Schnautz
1d3e398912 turn cockatoo griffin into something more griffinlike 2023-06-19 14:25:43 -05:00
schnautzr
a20efeb723 Merge branch 'Card-Forge:master' into working 2023-06-19 11:51:41 -05:00
tool4ever
9de61f8be3 Fix UnlessCost breaking if spell changed controllers (#3298) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-06-19 18:48:12 +03:00
Anthony Calosa
9a8bbac6a8 Merge pull request #3279 from Simisays/LOTR12-2 
LOTR 20 cards
 2023-06-19 19:00:58 +08:00
Simisays
e59bb776b2 LOTR 10 cards (#3291) 2023-06-19 10:40:19 +00:00
tool4ever
c9425270d3 Fix AnimateAll / AI check creating unwanted ending commands (#3296) 
* Fix AnimateAll / AI check creating unwanted ending commands

* Fix crash with PW

* Clean up

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-06-19 13:39:18 +03:00
Simisays
02b61e8305 update 2023-06-19 11:59:57 +02:00
Simisays
49e0da7358 update 2023-06-19 11:00:24 +02:00
Simisays
6e0c6570b5 update 2023-06-19 10:54:34 +02:00
Simisays
7a933f451e Merge branch 'LOTR16' of https://github.com/Simisays/forge into LOTR16 2023-06-19 09:58:12 +02:00
Simisays
1976e4f302 update 2023-06-19 09:58:01 +02:00
Rob Schnautz
762c32e44c Removed files that weren't actually supposed to have been included (tiled-project, batch file) 2023-06-18 21:19:33 -05:00
Rob Schnautz
21d1714090 change the way the common path is declared so it doesn't use the getPlanePath method 2023-06-18 20:57:34 -05:00
Rob Schnautz
be316ccd4e Add FilenameFilter for getting plane names 2023-06-18 19:27:46 -05:00
Rob Schnautz
d8b206cdc5 Resolve conflicts 2023-06-18 18:38:41 -05:00
Rob Schnautz
38bd4476f8 modified desert building tiles 2023-06-18 18:32:43 -05:00
Rob Schnautz
6e9dcaf267 Merge branch 'master' of https://github.com/Card-Forge/forge into working 2023-06-18 18:31:09 -05:00
Simisays
4084f5217d Merge remote-tracking branch 'upstream/master' into LOTR16 2023-06-18 22:50:44 +02:00
Simisays
e64bacd3be update 2023-06-18 22:50:33 +02:00
Agetian
aa4c5e7cde ChangeZone AI: bail if ChangeNum is a variable and will be 0 (#3295) 
* - Clean up the old (and disabled) version of the puzzle file.

* - AI NeedsToPlay hint for Traverse the Outlands.

* - AI: ChangeZone should bail if X=0 in ChangeNum
 2023-06-18 18:40:09 +03:00
Agetian
996a982ab7 AI hint for Traverse the Outlands (#3293) 
* - Clean up the old (and disabled) version of the puzzle file.

* - AI NeedsToPlay hint for Traverse the Outlands.
 2023-06-18 16:32:43 +03:00
Agetian
5636889275 - Clean up the old (and disabled) version of the puzzle file. (#3292) 2023-06-18 14:42:09 +03:00
tool4ever
eae566a83c Fix full replacement not reaching caller if chain contains update result (#3281) 2023-06-18 08:06:00 +00:00