Merge branch 'development' into merging + added remaining gavrant's fixes

3 years ago · cee86aadc0
parent ffca434851
commit cee86aadc0
181 changed files with 2474 additions and 1258 deletions
--- a/GavrantFixes_210510.esp
+++ b/GavrantFixes_210510.esp
--- a/Gavrant_playerhousing_seperate_nif4_placebales.esp
+++ b/Gavrant_playerhousing_seperate_nif4_placebales.esp
--- a/fix.esp
+++ b/fix.esp
--- a/overhaul.esp
+++ b/overhaul.esp
--- a/assets/skeleton_triceratops.nif
+++ b/assets/skeleton_triceratops.nif
--- a/meshes/clutter/bones/deerskullhornsstatic.nif
+++ b/meshes/clutter/bones/deerskullhornsstatic.nif
--- a/meshes/clutter/candles/candlehornchandelier02.nif
+++ b/meshes/clutter/candles/candlehornchandelier02.nif
--- a/meshes/clutter/candles/candlehornfloor01.nif
+++ b/meshes/clutter/candles/candlehornfloor01.nif
--- a/meshes/clutter/candles/candlehorntable01.nif
+++ b/meshes/clutter/candles/candlehorntable01.nif
--- a/meshes/clutter/common/commoncrate01.nif
+++ b/meshes/clutter/common/commoncrate01.nif
--- a/meshes/clutter/common/commoncrate02.nif
+++ b/meshes/clutter/common/commoncrate02.nif
--- a/meshes/clutter/glazedcandlesstatic02.nif
+++ b/meshes/clutter/glazedcandlesstatic02.nif
--- a/meshes/clutter/ruins/ruinsfloorcandlelampmidon.nif
+++ b/meshes/clutter/ruins/ruinsfloorcandlelampmidon.nif
--- a/meshes/clutter/ruins/ruinsfloorcandlelampsmon.nif
+++ b/meshes/clutter/ruins/ruinsfloorcandlelampsmon.nif
--- a/meshes/clutter/shrines/shrinebase.nif
+++ b/meshes/clutter/shrines/shrinebase.nif
--- a/meshes/enderal/architecture/undercity/gramophone.nif
+++ b/meshes/enderal/architecture/undercity/gramophone.nif
--- a/meshes/enderal/armor/common/mercenary/vanguardhelmetclosed_1.nif
+++ b/meshes/enderal/armor/common/mercenary/vanguardhelmetclosed_1.nif
--- a/meshes/enderal/armor/steelplatearmor/hounskull_bascinet.nif
+++ b/meshes/enderal/armor/steelplatearmor/hounskull_bascinet.nif
--- a/meshes/enderal/forgottenstories/phasmalist/phasmalistworkstation_placeable.nif
+++ b/meshes/enderal/forgottenstories/phasmalist/phasmalistworkstation_placeable.nif
--- a/meshes/enderal/playerhousing/animaltrophies/mountedantlers.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/mountedantlers.nif
--- a/meshes/enderal/playerhousing/animaltrophies/wallmountedbear01.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/wallmountedbear01.nif
--- a/meshes/enderal/playerhousing/animaltrophies/wallmountedelkfemale02.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/wallmountedelkfemale02.nif
--- a/meshes/enderal/playerhousing/animaltrophies/wallmountedelkmale02.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/wallmountedelkmale02.nif
--- a/meshes/enderal/playerhousing/animaltrophies/wallmountedgoat01.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/wallmountedgoat01.nif
--- a/meshes/enderal/playerhousing/animaltrophies/wallmountedhorker01.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/wallmountedhorker01.nif
--- a/meshes/enderal/playerhousing/animaltrophies/wallmountedmudcrab01.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/wallmountedmudcrab01.nif
--- a/meshes/enderal/playerhousing/animaltrophies/wallmountedsabrecat01.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/wallmountedsabrecat01.nif
--- a/meshes/enderal/playerhousing/animaltrophies/wallmountedskeever01.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/wallmountedskeever01.nif
--- a/meshes/enderal/playerhousing/animaltrophies/wallmountedslaughterfish01.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/wallmountedslaughterfish01.nif
--- a/meshes/enderal/playerhousing/animaltrophies/wallmountedwolf01.nif
+++ b/meshes/enderal/playerhousing/animaltrophies/wallmountedwolf01.nif
--- a/meshes/enderal/playerhousing/ceramic/ruinspot01.nif
+++ b/meshes/enderal/playerhousing/ceramic/ruinspot01.nif
--- a/meshes/enderal/playerhousing/ceramic/ruinspot02.nif
+++ b/meshes/enderal/playerhousing/ceramic/ruinspot02.nif
--- a/meshes/enderal/playerhousing/ceramic/ruinspot03.nif
+++ b/meshes/enderal/playerhousing/ceramic/ruinspot03.nif
--- a/meshes/enderal/playerhousing/ceramic/ruinspot04.nif
+++ b/meshes/enderal/playerhousing/ceramic/ruinspot04.nif
--- a/meshes/enderal/playerhousing/ceramic/ruinspot05.nif
+++ b/meshes/enderal/playerhousing/ceramic/ruinspot05.nif
--- a/meshes/enderal/playerhousing/ceramic/ruinspot06.nif
+++ b/meshes/enderal/playerhousing/ceramic/ruinspot06.nif
--- a/meshes/enderal/playerhousing/furniture/gramophone_placeable.nif
+++ b/meshes/enderal/playerhousing/furniture/gramophone_placeable.nif
--- a/meshes/enderal/playerhousing/lights/glazedcandles01static.nif
+++ b/meshes/enderal/playerhousing/lights/glazedcandles01static.nif
--- a/meshes/enderal/playerhousing/lights/impwallsconcecandle01c.nif
+++ b/meshes/enderal/playerhousing/lights/impwallsconcecandle01c.nif
--- a/meshes/enderal/playerhousing/lights/ruinscandlesconceon01.nif
+++ b/meshes/enderal/playerhousing/lights/ruinscandlesconceon01.nif
--- a/meshes/enderal/playerhousing/lights/silvercandlestick01.nif
+++ b/meshes/enderal/playerhousing/lights/silvercandlestick01.nif
--- a/meshes/enderal/playerhousing/lights/silvercandlestick02.nif
+++ b/meshes/enderal/playerhousing/lights/silvercandlestick02.nif
--- a/meshes/enderal/playerhousing/miscellaneous/haybale01.nif
+++ b/meshes/enderal/playerhousing/miscellaneous/haybale01.nif
--- a/meshes/enderal/playerhousing/miscellaneous/meadbarrel01.nif
+++ b/meshes/enderal/playerhousing/miscellaneous/meadbarrel01.nif
--- a/meshes/enderal/playerhousing/miscellaneous/nobledivider01.nif
+++ b/meshes/enderal/playerhousing/miscellaneous/nobledivider01.nif
--- a/meshes/enderal/playerhousing/miscellaneous/noblewallshelf01.nif
+++ b/meshes/enderal/playerhousing/miscellaneous/noblewallshelf01.nif
--- a/meshes/enderal/playerhousing/miscellaneous/noblewallshelf02.nif
+++ b/meshes/enderal/playerhousing/miscellaneous/noblewallshelf02.nif
--- a/meshes/enderal/playerhousing/plants/basketflowers.nif
+++ b/meshes/enderal/playerhousing/plants/basketflowers.nif
--- a/meshes/enderal/playerhousing/plants/basketthistles.nif
+++ b/meshes/enderal/playerhousing/plants/basketthistles.nif
--- a/meshes/enderal/playerhousing/plants/planter01deathbell.nif
+++ b/meshes/enderal/playerhousing/plants/planter01deathbell.nif
--- a/meshes/enderal/playerhousing/plants/planter01dragontongue.nif
+++ b/meshes/enderal/playerhousing/plants/planter01dragontongue.nif
--- a/meshes/enderal/playerhousing/plants/planter01juniper.nif
+++ b/meshes/enderal/playerhousing/plants/planter01juniper.nif
--- a/meshes/enderal/playerhousing/plants/planter01snowberries.nif
+++ b/meshes/enderal/playerhousing/plants/planter01snowberries.nif
--- a/meshes/enderal/playerhousing/plants/planter01vinemaple.nif
+++ b/meshes/enderal/playerhousing/plants/planter01vinemaple.nif
--- a/meshes/enderal/playerhousing/plants/planter02nightshade.nif
+++ b/meshes/enderal/playerhousing/plants/planter02nightshade.nif
--- a/meshes/enderal/playerhousing/plants/planter03lavender.nif
+++ b/meshes/enderal/playerhousing/plants/planter03lavender.nif
--- a/meshes/enderal/playerhousing/plants/planter04vinemaple.nif
+++ b/meshes/enderal/playerhousing/plants/planter04vinemaple.nif
--- a/meshes/enderal/playerhousing/plants/planterkettleferns.nif
+++ b/meshes/enderal/playerhousing/plants/planterkettleferns.nif
--- a/meshes/enderal/playerhousing/plants/ruinsflowervase01.nif
+++ b/meshes/enderal/playerhousing/plants/ruinsflowervase01.nif
--- a/meshes/enderal/playerhousing/rugs/rug01.nif
+++ b/meshes/enderal/playerhousing/rugs/rug01.nif
--- a/meshes/enderal/playerhousing/rugs/rug02.nif
+++ b/meshes/enderal/playerhousing/rugs/rug02.nif
--- a/meshes/enderal/playerhousing/rugs/rug03.nif
+++ b/meshes/enderal/playerhousing/rugs/rug03.nif
--- a/meshes/enderal/playerhousing/rugs/rug04.nif
+++ b/meshes/enderal/playerhousing/rugs/rug04.nif
--- a/meshes/enderal/playerhousing/rugs/rug05.nif
+++ b/meshes/enderal/playerhousing/rugs/rug05.nif
--- a/meshes/enderal/playerhousing/rugs/rug06.nif
+++ b/meshes/enderal/playerhousing/rugs/rug06.nif
--- a/meshes/enderal/playerhousing/rugs/rug07.nif
+++ b/meshes/enderal/playerhousing/rugs/rug07.nif
--- a/meshes/enderal/playerhousing/rugs/rug08.nif
+++ b/meshes/enderal/playerhousing/rugs/rug08.nif
--- a/meshes/enderal/playerhousing/rugs/rug09.nif
+++ b/meshes/enderal/playerhousing/rugs/rug09.nif
--- a/meshes/enderal/playerhousing/rugs/rug10.nif
+++ b/meshes/enderal/playerhousing/rugs/rug10.nif
--- a/meshes/enderal/playerhousing/rugs/rug11.nif
+++ b/meshes/enderal/playerhousing/rugs/rug11.nif
--- a/meshes/enderal/playerhousing/rugs/rug12.nif
+++ b/meshes/enderal/playerhousing/rugs/rug12.nif
--- a/meshes/enderal/playerhousing/rugs/rug13.nif
+++ b/meshes/enderal/playerhousing/rugs/rug13.nif
--- a/meshes/enderal/playerhousing/rugs/rug14.nif
+++ b/meshes/enderal/playerhousing/rugs/rug14.nif
--- a/meshes/enderal/playerhousing/rugs/rug15.nif
+++ b/meshes/enderal/playerhousing/rugs/rug15.nif
--- a/meshes/enderal/playerhousing/rugs/ruground01.nif
+++ b/meshes/enderal/playerhousing/rugs/ruground01.nif
--- a/meshes/enderal/playerhousing/rugs/ruground02.nif
+++ b/meshes/enderal/playerhousing/rugs/ruground02.nif
--- a/meshes/enderal/playerhousing/rugs/ruground03.nif
+++ b/meshes/enderal/playerhousing/rugs/ruground03.nif
--- a/meshes/enderal/playerhousing/rugs/ruground04.nif
+++ b/meshes/enderal/playerhousing/rugs/ruground04.nif
--- a/meshes/enderal/playerhousing/wallbasket/wallbasket01.nif
+++ b/meshes/enderal/playerhousing/wallbasket/wallbasket01.nif
--- a/meshes/enderal/playerhousing/wallbasket/wallbasket03.nif
+++ b/meshes/enderal/playerhousing/wallbasket/wallbasket03.nif
--- a/meshes/enderal/playerhousing/wallbasket/wallbasket04.nif
+++ b/meshes/enderal/playerhousing/wallbasket/wallbasket04.nif
--- a/meshes/enderal/playerhousing/wallbasket/wallbaskethex01.nif
+++ b/meshes/enderal/playerhousing/wallbasket/wallbaskethex01.nif
--- a/meshes/enderal/playerhousing/wallbasket/wallbaskethex04.nif
+++ b/meshes/enderal/playerhousing/wallbasket/wallbaskethex04.nif
--- a/meshes/furniture/orcfurniture/orcshelf01.nif
+++ b/meshes/furniture/orcfurniture/orcshelf01.nif
--- a/scripts/_00e_apparitionfxscript.pex
+++ b/scripts/_00e_apparitionfxscript.pex
--- a/scripts/_00e_bedscript.pex
+++ b/scripts/_00e_bedscript.pex
--- a/scripts/_00e_blockactivationforplayer.pex
+++ b/scripts/_00e_blockactivationforplayer.pex
--- a/scripts/_00e_bonespiritcontrolscript.pex
+++ b/scripts/_00e_bonespiritcontrolscript.pex
--- a/scripts/_00e_class_openclassmenuscript.pex
+++ b/scripts/_00e_class_openclassmenuscript.pex
--- a/scripts/_00e_class_perkscript.pex
+++ b/scripts/_00e_class_perkscript.pex
--- a/scripts/_00e_cqc05_functions.pex
+++ b/scripts/_00e_cqc05_functions.pex
--- a/scripts/_00e_cqj05_functions.pex
+++ b/scripts/_00e_cqj05_functions.pex
--- a/scripts/_00e_frozenmescript.pex
+++ b/scripts/_00e_frozenmescript.pex
--- a/scripts/_00e_fs_affinity_absoulcallersc.pex
+++ b/scripts/_00e_fs_affinity_absoulcallersc.pex
--- a/scripts/_00e_fs_affinity_ghostblade_onattack.pex
+++ b/scripts/_00e_fs_affinity_ghostblade_onattack.pex
--- a/scripts/_00e_fs_dreameatersc.pex
+++ b/scripts/_00e_fs_dreameatersc.pex
--- a/scripts/_00e_fs_nq07_dinnercontrolsc.pex
+++ b/scripts/_00e_fs_nq07_dinnercontrolsc.pex
--- a/scripts/_00e_fs_nqr05_perversionsc.pex
+++ b/scripts/_00e_fs_nqr05_perversionsc.pex
--- a/scripts/_00e_fs_psychosissc.pex
+++ b/scripts/_00e_fs_psychosissc.pex
--- a/scripts/_00e_fs_theriantrophist_allowtemptsc.pex
+++ b/scripts/_00e_fs_theriantrophist_allowtemptsc.pex
--- a/Show More
+++ b/Show More