external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,400 Commits 32 Branches 187 Tags
32a71f7d3a2d80df15c9bf3328b10db743eb268c
Commit Graph

56400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renato Santos
95a96c0561 Card script tidying 2022-01-19 09:54:57 +00:00
Hans Mackowiak
551be74558 Merge branch 'lightning' into 'master' 
Fix Lightning Storm retargeting

See merge request core-developers/forge!6054
 2022-01-19 08:05:59 +00:00
Michael Kamensky
6b41b66eff Merge branch 'zenith' into 'master' 
Fix Zeniths + Flashback

Closes #2055

See merge request core-developers/forge!6055
 2022-01-19 04:21:55 +00:00
Michael Kamensky
ff74e5c48c Merge branch 'TRT-master-patch-44700' into 'master' 
Update forge-gui/res/cardsfolder/s/sigarda_host_of_herons.txt

See merge request core-developers/forge!6056
 2022-01-19 04:21:52 +00:00
Bug Hunter
3742c6ddfa Update forge-gui/res/cardsfolder/s/sigarda_host_of_herons.txt 2022-01-18 22:25:31 +00:00
tool4EvEr
df87ad8cf7 Fix Zeniths + Flashback 2022-01-18 23:16:26 +01:00
tool4EvEr
1374f75ab7 Fix Lightning Storm retargeting 2022-01-18 21:05:35 +01:00
Michael Kamensky
00e32ef06b Merge branch 'master' into 'master' 
fix caves of koilos displayed mana

See merge request core-developers/forge!6053
 2022-01-18 04:23:46 +00:00
Dirk Leichsenring
5660816e96 fix caves of koilos displayed mana 2022-01-18 01:43:50 +01:00
Anthony Calosa
49c6e57c83 Merge branch 'master' into 'master' 
[Mobile] fix NPE

See merge request core-developers/forge!6052
 2022-01-17 23:19:15 +00:00
Anthony Calosa
0097b66cd6 [Mobile] fix NPE 2022-01-18 07:17:23 +08:00
Michael Kamensky
03815d38ea Merge branch 'master' into 'master' 
Net Decks Archive Updates

See merge request core-developers/forge!6051
 2022-01-17 09:46:20 +00:00
Churrufli
c80923b936 Net Decks Archive Updates 2022-01-17 07:40:21 +01:00
Michael Kamensky
70c1e39e2a Merge branch 'assignattackers' into 'master' 
Add Skip button to allow arbitrary order when assigning attackers dmg

Closes #2059

See merge request core-developers/forge!6050
 2022-01-16 17:46:49 +00:00
Michael Kamensky
fe6f93c174 Merge branch 'paco_adddeckaicolumn' into 'master' 
Add AI column to deck editor

See merge request core-developers/forge!6044
 2022-01-16 17:46:20 +00:00
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