external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,469 Commits 31 Branches 187 Tags
b7f15da799d1d9866c92f7f61013ee9e55e2c82b
Commit Graph

55469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
6a50603465 NEO edition hotfix for shops 2022-01-20 12:11:12 -05:00
Northmoc
ceba4b27b9 more Curse of GoodThing draft refactors 2022-01-20 12:06:42 -05:00
Michael Kamensky
e7e0084adb Merge branch 'johnwilliams7-master-patch-35419' into 'master' 
Update Love Your LGS 2021.txt

See merge request core-developers/forge!6061
 2022-01-20 12:18:04 +00:00
John Williams
393dcbecb0 Update Love Your LGS 2021.txt 2022-01-20 11:03:00 +00:00
Michael Kamensky
70e55a8a89 Merge branch 'trigclean' into 'master' 
Trigger cleanup

See merge request core-developers/forge!6060
 2022-01-20 09:18:19 +00:00
Northmoc
01aab963d6 Curses - you get the token first!! 2022-01-19 22:19:36 -05:00
Northmoc
620d22e1ae support "Triggered...=Opponent" filter for getDefinedPlayer 2022-01-19 22:13:06 -05:00
Northmoc
864a05e388 add filter to Curses 2022-01-19 22:13:06 -05:00
Northmoc
7f83282d04 elephant_resurgence.txt 2022-01-19 22:13:05 -05:00
Northmoc
a69b2a5d80 curse_of_disturbance.txt 2022-01-19 22:13:05 -05:00
Northmoc
80b3b5ff53 curse_of_opulence.txt without RepeatEach 2022-01-19 22:13:04 -05:00
Northmoc
387a48322a captive_audience.txt without RepeatEach 2022-01-19 22:13:03 -05:00
Michael Kamensky
0297728478 Merge branch 'mayplay' into 'master' 
Fix MayPlay + CharacteristicDefining

See merge request core-developers/forge!6057
 2022-01-19 18:49:34 +00:00
Bug Hunter
f9ab5ce812 Fix MayPlay + CharacteristicDefining 2022-01-19 18:49:32 +00:00
tool4EvEr
1ea0c48867 Trigger cleanup 2022-01-19 19:40:21 +01:00
Michael Kamensky
87633bfac2 Merge branch 'lge' into 'master' 
LifeGainEffect stack description grammar improvement

See merge request core-developers/forge!6058
 2022-01-19 18:13:29 +00:00
Hans Mackowiak
d2700f0235 Merge branch 'contrib' into 'master' 
**NEW Contributors!!!

See merge request core-developers/forge!6059
 2022-01-19 16:53:33 +00:00
Tim Mocny
e61c095503 **NEW Contributors!!! 2022-01-19 16:53:33 +00:00
Northmoc
9ed0920bb5 LifeGainEffect stack description grammar improvement 2022-01-19 11:44:22 -05:00
Bug Hunter
fa9d754527 Merge branch 'master' into 'master' 
Card script tidying

See merge request core-developers/forge!6046
 2022-01-19 09:55:13 +00:00
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