external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,736 Commits 33 Branches 187 Tags
bfd743cd88c04f5409d3cca2acb42f654b21cda3
Commit Graph

47736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
bfd743cd88 Merge branch 'master' into 'master' 
AI shouldn't miss mandatory triggers for FogAi

Closes #1723

See merge request core-developers/forge!3878
 2021-02-17 04:24:21 +00:00
Michael Kamensky
f78a375402 - AI shouldn't miss mandatory triggers for FogAi 2021-02-17 07:23:27 +03:00
Michael Kamensky
e28df0a723 Merge branch 'fixflash' into 'master' 
[Desktop] Fix flash icon being shown from opponents hidden hand

See merge request core-developers/forge!3875
 2021-02-17 04:10:47 +00:00
Michael Kamensky
7445374841 Merge branch 'daxos' into 'master' 
Cleanup Daxos of Meletis

See merge request core-developers/forge!3872
 2021-02-17 04:10:29 +00:00
Michael Kamensky
6bd7d027e5 Merge branch 'reveal_foretold_endgame' into 'master' 
Reveal foretold cards and other face-down cards when a player leaves the game or the game ends

See merge request core-developers/forge!3865
 2021-02-17 04:07:59 +00:00
Alumi
3ff19f7957 Reveal foretold cards and other face-down cards when a player leaves the game or the game ends 2021-02-17 04:07:59 +00:00
Michael Kamensky
2e5a950afd Merge branch 'unset-cards' into 'master' 
Some un-set/cmb1 card scripts

See merge request core-developers/forge!3857
 2021-02-17 04:07:38 +00:00
Michael Kamensky
ef48d0bbc3 Merge branch 'cmb1' into 'master' 
Edition file prep

See merge request core-developers/forge!3852
 2021-02-17 04:07:24 +00:00
Anthony Calosa
75e2fe60bf Merge branch 'master' into 'master' 
updateMergeCollections

See merge request core-developers/forge!3877
 2021-02-17 02:51:58 +00:00
Anthony Calosa
cddd0f6fb3 updateMergeCollections 2021-02-17 10:50:25 +08:00
Hans Mackowiak
201f53fb09 Merge branch 'card-fixes' into 'master' 
Prevent crash with Back for More

Closes #1717

See merge request core-developers/forge!3874
 2021-02-17 00:49:01 +00:00
tool4EvEr
4b25332a9d Refactor 2021-02-16 22:42:46 +01:00
tool4EvEr
54d7e89953 Fix flash icon being shown from opponents hidden hand 2021-02-16 22:13:20 +01:00
Adam Pantel
9ecad3f775 Prevent crash with Back for More 2021-02-16 15:14:20 -05:00
tool4EvEr
499e7d12af Cleanup Daxos of Meletis 2021-02-16 20:27:07 +01:00
Michael Kamensky
d0e8052c9f Merge branch 'soulecho' into 'master' 
AI support for soul echo

See merge request core-developers/forge!3871
 2021-02-16 19:27:03 +00:00
tool4EvEr
44df63adee AI support for soul echo 2021-02-16 20:17:24 +01:00
Anthony Calosa
8180243283 Merge branch 'twosat-master-patch-41935' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3870
 2021-02-16 18:13:02 +00:00
Anthony Calosa
182b97e369 Merge branch 'fixFlash' into 'master' 
[Desktop] Fix flash icon showing in library

See merge request core-developers/forge!3869
 2021-02-16 18:12:38 +00:00
Andreas Bendel
feaca17b4e Update de-DE.properties 
translated new DeckChooser strings
 2021-02-16 18:02:19 +00:00
tool4EvEr
b9ebb06146 [Desktop] Fix flash icon showing in library 2021-02-16 17:45:10 +01:00
Michael Kamensky
5fa237af42 Merge branch 'Williams-master-patch-01404' into 'master' 
Update Secret Lair Drop Series Black is Magic

See merge request core-developers/forge!3868
 2021-02-16 16:30:10 +00:00
Michael Kamensky
1ef44c2f70 Merge branch 'fixCastCancel' into 'master' 
Fix ExcludedDestinations logic

See merge request core-developers/forge!3861
 2021-02-16 16:29:55 +00:00
Bug Hunter
64c1f2dec9 Fix ExcludedDestinations logic 2021-02-16 16:29:55 +00:00
John
880729712f Update Secret Lair Drop Series.txt 2021-02-16 15:51:39 +00:00
Adam Pantel
87b821d628 Ach Hans Run 2021-02-16 09:37:03 -05:00
Adam Pantel
30980fdac2 Some un-set/cmb1 card scripts 2021-02-16 09:37:03 -05:00
Michael Kamensky
7a85918b04 Merge branch 'fixmissingmusicfolder' into 'master' 
Fix NullPointerException when music folder is not present

See merge request core-developers/forge!3867
 2021-02-16 11:26:03 +00:00
Michael Kamensky
f45e5f1fdf Merge branch 'translateFDeckChooser' into 'master' 
Translate missings strings in FDeckChooser

See merge request core-developers/forge!3866
 2021-02-16 11:25:55 +00:00
klaxnek
31a73d0887 Fix NullPointerException when music folder is not present 2021-02-16 11:33:44 +01:00
klaxnek
c2d8440583 Translate missings strings in FDeckChooser 2021-02-16 11:29:57 +01:00
Hans Mackowiak
54f1767d01 Merge branch 'fixCantBeCast' into 'master' 
Fix CantBeCast Origin check

See merge request core-developers/forge!3864
 2021-02-16 08:47:11 +00:00
Michael Kamensky
9fe18d95bb Merge branch 'master' into 'master' 
Resolve several issues in the Game State support for Mutate/merged cards.

See merge request core-developers/forge!3863
 2021-02-16 06:47:49 +00:00
Michael Kamensky
7ef07fa681 - Resolve several issues in the Game State support for Mutate/merged cards. 2021-02-16 09:46:17 +03:00
Michael Kamensky
de11dcd280 Merge branch 'tyvaremblem' into 'master' 
tyvar_kell.txt standardize emblem name

See merge request core-developers/forge!3862
 2021-02-16 04:12:06 +00:00
Sol
49be4bf74b Merge branch 'kathrilfix' into 'master' 
kathril_aspect_warper.txt fix

See merge request core-developers/forge!3860
 2021-02-16 01:29:29 +00:00
Sol
6c59c058e9 Merge branch '15FebBnR' into 'master' 
15 February Banned and Restricted

See merge request core-developers/forge!3859
 2021-02-16 01:27:45 +00:00
Tim Mocny
34b13579f5 15 February Banned and Restricted 2021-02-16 01:27:45 +00:00
Northmoc
825c0f431b tyvar_kell.txt standardize emblem name 2021-02-15 19:03:29 -05:00
Northmoc
d80455b900 kathril_aspect_warper.txt add SharedRestrictions 2021-02-15 17:08:01 -05:00
tool4EvEr
79d69ce4e7 Fix CantBeCast Origin 2021-02-15 22:17:12 +01:00
Michael Kamensky
ed6200b999 Merge branch 'fixCascade' into 'master' 
Add new cascade ruling

See merge request core-developers/forge!3850
 2021-02-15 20:15:24 +00:00
Anthony Calosa
b1fd265643 Merge branch 'master' into 'master' 
fix commander ability icon

See merge request core-developers/forge!3856
 2021-02-15 18:45:26 +00:00
Anthony Calosa
a87dd33712 commander ability icon 2021-02-16 02:44:26 +08:00
Michael Kamensky
0ae1b701ec Merge branch 'fixMarath' into 'master' 
Marath, Will of the Wild: Fix ability payment

See merge request core-developers/forge!3853
 2021-02-15 18:40:09 +00:00
Bug Hunter
3252c8f195 Marath, Will of the Wild: Fix ability payment 2021-02-15 18:40:08 +00:00
Michael Kamensky
c232bf9191 Merge branch 'fixLKI' into 'master' 
Fix cardscripts missing LKI usage

See merge request core-developers/forge!3839
 2021-02-15 18:17:20 +00:00
Bug Hunter
d6f77b1d96 Fix cardscripts missing LKI usage 2021-02-15 18:17:20 +00:00
Michael Kamensky
7936b5774c Merge branch 'master' into 'master' 
Fix auto mana payment for Chromatic Orrery and friends + fix desktop Forge crash on Haste icon

See merge request core-developers/forge!3855
 2021-02-15 18:09:35 +00:00
Michael Kamensky
71f191e71b - Fix auto mana payment for Chromatic Orrery and friends 
- Fix the Haste icon crashing in desktop Forge
 2021-02-15 21:08:51 +03:00