external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 01:38:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,234 Commits 31 Branches 187 Tags
c8d9e00904f2bcace8a76476ed12a5c5939b27cc
Commit Graph

55234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paco Ito
027939a1a7 Add AI column to deck editor 2022-01-16 17:46:19 +00:00
tool4EvEr
9e8d366026 Add Skip button to allow arbitrary order when assigning attackers dmg 2022-01-16 11:43:20 +01:00
Michael Kamensky
6bb5813942 Merge branch 'paco_wincmd' into 'master' 
Add cmd file

See merge request core-developers/forge!6045
 2022-01-16 05:00:01 +00:00
Michael Kamensky
3fb9049f78 Merge branch 'johnwilliams7-master-patch-54599' into 'master' 
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!6049
 2022-01-16 04:59:14 +00:00
John Williams
ed6179566f Update Secret Lair Drop Series.txt 2022-01-15 21:30:01 +00:00
Michael Kamensky
68fb53ff10 Merge branch 'thrivingMana' into 'master' 
AbilityManaPart: support 'Combo X Chosen' Mana Part for Thriving Lands

See merge request core-developers/forge!6048
 2022-01-15 13:13:24 +00:00
Michael Kamensky
a8861e589a Merge branch 'fearsome' into 'master' 
Fix some card scripts

Closes #2064

See merge request core-developers/forge!6047
 2022-01-15 13:12:01 +00:00
Hans Mackowiak
f529bc1c7a AbilityManaPart: support 'Combo X Chosen' Mana Part for Thriving Lands 2022-01-15 13:11:03 +01:00
tool4EvEr
81d2f41495 Fix bad params 2022-01-15 11:21:52 +01:00
tool4EvEr
b5046e3fcf Clean up 2022-01-15 11:10:16 +01:00
pakoito
c15109da30 Add cmd file 2022-01-14 17:40:29 +01:00
Anthony Calosa
097b556463 Merge branch 'master' into 'master' 
[Mobile] Crash Fix on Loading New Game

Closes #2046

See merge request core-developers/forge!6043
 2022-01-14 05:59:23 +00:00
Anthony Calosa
e212502646 [Mobile] Crash Fix on Loading New Game 
- fix #2046
 2022-01-14 13:57:01 +08:00
Michael Kamensky
5fd4030917 Merge branch 'statics' into 'master' 
CR 603.6b: cardsAddedThisTurn should not use LKI with unmodified characteristics for battlefield

See merge request core-developers/forge!6037
 2022-01-14 04:43:49 +00:00
Bug Hunter
e1f784211f CR 603.6b: cardsAddedThisTurn should not use LKI with unmodified characteristics for battlefield 2022-01-14 04:43:47 +00:00
Michael Kamensky
3e55983ee3 Merge branch 'blocking' into 'master' 
Improve detection of blocking requirements

See merge request core-developers/forge!6039
 2022-01-14 04:43:13 +00:00
Bug Hunter
84a9972034 Improve detection of blocking requirements 2022-01-14 04:43:13 +00:00
Hans Mackowiak
37e8c41b7e Merge branch 'volrath' into 'master' 
Fix Mirage Mirror copying Shifting Sky turning all colorless

See merge request core-developers/forge!6042
 2022-01-13 08:56:58 +00:00
TRT
387e14ff0b Fix Mirage Mirror copying Shifting Sky turning all colorless 2022-01-13 09:35:20 +01:00
Michael Kamensky
3e4faa7760 Merge branch 'mana' into 'master' 
Fix generating Chosen mana when no choice was made

See merge request core-developers/forge!6040
 2022-01-13 04:27:48 +00:00
tool4EvEr
7e5061eae9 Fix generating Chosen mana when no choice was made 2022-01-12 22:49:07 +01:00
Michael Kamensky
0fc621eb4d Merge branch 'guifix' into 'master' 
Fix crash when assigning damage to defender

See merge request core-developers/forge!6038
 2022-01-12 19:24:09 +00:00
Michael Kamensky
bd76214bf6 Merge branch 'van_maa' into 'master' 
Vanguard: Maelstrom Archangel Avatar

See merge request core-developers/forge!6033
 2022-01-12 19:23:59 +00:00
TRT
94f54f8e71 Fix crash when assigning damage to defender 2022-01-12 13:57:50 +01:00
Michael Kamensky
e3593ad8ac Merge branch 'attack' into 'master' 
Fix War's Toll + Dueling Grounds

See merge request core-developers/forge!6036
 2022-01-12 05:05:25 +00:00
Bug Hunter
151742f4fd Fix War's Toll + Dueling Grounds 2022-01-12 05:05:24 +00:00
Northmoc
ae58554d16 make existing "doesNotShareNameWith " more flexible 2022-01-11 13:14:47 -05:00
Northmoc
75a35a3236 light_paws_emperors_voice.txt use existing param 2022-01-11 13:13:23 -05:00
Michael Kamensky
bc85d9fcbe Merge branch 'melee' into 'master' 
Fix Melee

See merge request core-developers/forge!6034
 2022-01-11 16:21:06 +00:00
Bug Hunter
de938dd3e7 Fix Melee 2022-01-11 16:21:03 +00:00
Northmoc
89fbf0bdf8 CardProperty support "DifferentName_" 2022-01-11 10:50:52 -05:00
Northmoc
d142af2f42 light_paws_emperors_voice.txt 2022-01-11 10:50:28 -05:00
Michael Kamensky
3e341b8903 Merge branch 'unf_kc' into 'master' 
UNF: Killer Cosplay

See merge request core-developers/forge!6021
 2022-01-11 04:42:39 +00:00
Northmoc
899b20cd48 RevealEffect - support RevealToAll for when targetplayer should also see stuff 2022-01-10 16:30:58 -05:00
Northmoc
d4a51dad4b RevealEffect - support RevealAll for when cards are not in hand 2022-01-10 16:28:45 -05:00
Northmoc
ea79b3346b PlayerControllerHuman: allow custom Reveal messages 2022-01-10 16:26:32 -05:00
Northmoc
f3f6ebcc75 maelstrom_archangel_avatar.txt improve Reveal and Choose 2022-01-10 16:25:15 -05:00
Northmoc
343bf1e4d9 ChooseCardNameEffect support AtRandom with ValidCards and ManaCost=Imprinted 2022-01-10 00:22:43 -05:00
Northmoc
487cd79522 PlayEffect add "ZoneRegardless" override param 2022-01-10 00:21:14 -05:00
Northmoc
3e8c30e6a7 PumpEffect - support ClearNotedCardsFor param 2022-01-10 00:20:47 -05:00
Northmoc
94d58fa131 Player - add clearNotesForName function 2022-01-10 00:20:03 -05:00
Northmoc
2afa7ce661 MakeCardEffect - allow made cards to be tokens 2022-01-10 00:18:32 -05:00
Northmoc
20ae37ad78 maelstrom_archangel_avatar.txt 2022-01-10 00:17:49 -05:00
Hans Mackowiak
9c028e65d6 Merge branch 'TRT-master-patch-34800' into 'master' 
Update forge-gui/res/cardsfolder/n/null_champion.txt

Closes #2063

See merge request core-developers/forge!6032
 2022-01-10 04:58:46 +00:00
Northmoc
eb8fa774ea killer_cosplay.txt cmcEQ -> ManaCost= 2022-01-09 19:48:42 -05:00
Northmoc
fc81f7e7d7 ChooseCardNameEffect: cmcEQ -> ManaCost 2022-01-09 19:47:53 -05:00
Northmoc
28aebca071 CardFacePredicates: cmcEQ -> ManaCost 2022-01-09 19:46:59 -05:00
Bug Hunter
2a307595f8 Update forge-gui/res/cardsfolder/n/null_champion.txt 2022-01-09 21:00:25 +00:00
Michael Kamensky
f40045b8ef Merge branch 'pramikon' into 'master' 
Fix Pramikon applying when no direction was chosen

See merge request core-developers/forge!6031
 2022-01-09 13:42:55 +00:00
Anthony Calosa
8b0feb12f2 Merge branch 'master' into 'master' 
Disable missingcards cache for desktop

See merge request core-developers/forge!6030
 2022-01-09 11:58:58 +00:00