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
65,761 Commits 32 Branches 187 Tags
6d70d76efd9c76f4b9fc3d1353db00ac0c48fb0c
Commit Graph

65761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rob Schnautz
80f5ee9253 resolve deck paths, move config.json to common 2023-06-17 22:20:09 -05:00
tool4ever
9ace1978f9 Script updates (#3289) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-06-18 05:49:33 +03:00
Anthony Calosa
35cd784c25 Update token-images.txt 2023-06-18 08:44:15 +08:00
Agetian
cb1bf6c435 - Fix Green Castle crash on non-case insensitive file systems. (#3287) 
- Fix Ghalta's Presence increasing the cost of everything.
 2023-06-17 21:38:24 +03:00
Simisays
42fe78cc6d LOTR 13 cards with amass (#3285) 
* update

* cleanup

* Update orcish_medicine.txt

* update

* Update treason_of_isengard.txt
 2023-06-17 20:49:09 +03:00
Rob Schnautz
62a096a5d2 Resolve all deck paths 
Signed-off-by: Rob Schnautz <schnautzr@yahoo.com>
 2023-06-17 11:36:00 -05:00
Agetian
26de52f2b3 Several AI improvements (#3284) 
* - Improved Blitz AI support (will cast in Main 1 if viable).
- Hold for Ransom AI hint to actually use the ability when able.
- Basic AI support for Grisly Sigil so that at least it doesn't fizzle.
- Basic BranchAi framework, currently will mostly just return true, but may be used for special logic when needed.

* - Only choose from opponent's cards for Grisly Sigil.

* - Simplify implementation.

* - Minor style fix.
 2023-06-17 18:30:08 +03:00
Simisays
f8b0f46c48 Update fear_fire_foes.txt 2023-06-17 17:21:45 +02:00
Simisays
9a64ad7050 update 2023-06-17 16:57:38 +02:00
Simisays
9b1609529f Merge remote-tracking branch 'upstream/master' into LOTR12-2 2023-06-17 16:52:22 +02:00
Simisays
3c4a51d27b update 2023-06-17 15:49:42 +02:00
Anthony Calosa
db89c2bc4c Merge pull request #3283 from kevlahnota/newmaster2 
[Android] support receiving text intent
 2023-06-17 16:22:03 +08:00
Anthony Calosa
68d98eeb55 Update Main.java 2023-06-17 16:14:31 +08:00
Anthony Calosa
9b540831db [Android] support receiving text intent 
- allow deck manager to import shared text intent
 2023-06-17 16:11:15 +08:00
Hans Mackowiak
3901758327 CardChangedType: use Enum Flags for removeAllSubTypes (#3230) 
* CardChangedType: use Enum Flags for removeAllSubTypes

* extract RemoveType

* ~ fix missing type
 2023-06-17 10:47:41 +03:00
Agetian
34c4506ddd Allow puzzles with full human control (for puzzles where the AI can't manage to work optimally) (#3280) 
* - Added several puzzles from MtgPuzzles.com

* - Minor text fix in MTGP_02.

* - Human-controlled puzzle support (for puzzles with poor AI support)

* - Indicate human control for PS_GRNS

* - Simpler mark for human controlled puzzles.

* - Slightly tweaked description text.
 2023-06-17 10:08:02 +03:00
Rob Schnautz
cfaa3cab50 Add warrior, started work on Amonkhet gym. 8x8 desert building tiles need remade as 16x16. 2023-06-16 23:14:25 -05:00
Rob Schnautz
d8f6f8697e tilesets in Amonkhet directory. Removed chips.tsx... that was from a different project, I stupidly put the file there! 2023-06-16 22:02:22 -05:00
Rob Schnautz
690255b097 Forge looks for custom_card_pics and custom_cards directories, adding these to Amonkhet even though they're not used. 2023-06-16 21:47:56 -05:00
Rob Schnautz
e66a4ade13 Move unmapped sprites to WIP folder 2023-06-16 21:23:05 -05:00
Rob Schnautz
a8f3f7f811 Merge branch 'master' of https://github.com/schnautzr/forge into working 2023-06-16 15:27:55 -05:00
Rob Schnautz
dafc28ef92 add human warrior 2023-06-16 15:26:50 -05:00
Rob Schnautz
cae57cf783 update Amonkhet decks to match Shandalar decks. 2023-06-16 15:06:58 -05:00
Rob Schnautz
c57dc1286a Merge branch 'working' of https://github.com/schnautzr/forge into working 2023-06-16 15:02:30 -05:00
Rob Schnautz
9c58fbe31e finish cleaning up sprite sorting; new Amonkhet sprites; general fixes 2023-06-16 15:02:00 -05:00
schnautzr
191956dc07 Merge branch 'Card-Forge:master' into working 2023-06-16 14:58:29 -05:00
schnautzr
1913c54437 Merge branch 'Card-Forge:master' into master 2023-06-16 14:54:49 -05:00