Merge remote-tracking branch 'origin/master' into KadishButterflies

4 years ago · 3288a2e39b
2927 changed files with 55698 additions and 12 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -6,23 +6,35 @@
 *.dat filter=lfs diff=lfs merge=lfs -text
 *.dds filter=lfs diff=lfs merge=lfs -text
 *.dll filter=lfs diff=lfs merge=lfs -text
+*.doc filter=lfs diff=lfs merge=lfs -text
+*.docx filter=lfs diff=lfs merge=lfs -text
 *.exe filter=lfs diff=lfs merge=lfs -text
 *.gif filter=lfs diff=lfs merge=lfs -text
 *.jpg filter=lfs diff=lfs merge=lfs -text
 *.jpeg filter=lfs diff=lfs merge=lfs -text
+*.loc text diff eol=lf
 *.max filter=lfs diff=lfs merge=lfs -text
+*.mov filter=lfs diff=lfs merge=lfs -text
 *.node filter=lfs diff=lfs merge=lfs -text
 *.opus filter=lfs diff=lfs merge=lfs -text
 *.ogg filter=lfs diff=lfs merge=lfs -text
 *.p2f filter=lfs diff=lfs merge=lfs -text
 *.pdn filter=lfs diff=lfs merge=lfs -text
 *.pfp filter=lfs diff=lfs merge=lfs -text
+*.pict filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
 *.prp filter=lfs diff=lfs merge=lfs -text
 *.psd filter=lfs diff=lfs merge=lfs -text
 *.pxf filter=lfs diff=lfs merge=lfs -text
 *.tga filter=lfs diff=lfs merge=lfs -text
+*.tif filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
 *.tron filter=lfs diff=lfs merge=lfs -text
+*.vsd filter=lfs diff=lfs merge=lfs -text
 *.wav filter=lfs diff=lfs merge=lfs -text
 *.webm filter=lfs diff=lfs merge=lfs -text
+*.wps filter=lfs diff=lfs merge=lfs -text
 *.xcf filter=lfs diff=lfs merge=lfs -text
+*.xls filter=lfs diff=lfs merge=lfs -text
+*.xlsx filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,3 @@
-# These files should be tracked in the moul-scripts repository
-*.age
-*.fni
-*.py
-*.sdl
-
 # These files are ephemeral and should not be tracked
 *.blend1
 *.ktc
--- a/compiled/.gitignore
+++ b/compiled/.gitignore
@ -0,0 +1,5 @@
+# These files should be tracked in the Plasma repository
+*.age
+*.fni
+*.py
+*.sdl
--- a/compiled/dat/GlobalClothing_District_FemaleFan02.prp
+++ b/compiled/dat/GlobalClothing_District_FemaleFan02.prp
--- a/compiled/dat/GlobalClothing_District_MaleFan02.prp
+++ b/compiled/dat/GlobalClothing_District_MaleFan02.prp
--- a/compiled/dat/KIEnglish.loc
+++ b/compiled/dat/KIEnglish.loc
--- a/compiled/dat/Kadish_District_kdshGlowInTheDark.prp
+++ b/compiled/dat/Kadish_District_kdshGlowInTheDark.prp
--- a/compiled/dat/Serene_District_Snowfall.prp
+++ b/compiled/dat/Serene_District_Snowfall.prp
--- a/compiled/dat/Teledahn_District_tldnHarvest.prp
+++ b/compiled/dat/Teledahn_District_tldnHarvest.prp
--- a/compiled/dat/city_District_ferry.prp
+++ b/compiled/dat/city_District_ferry.prp
--- a/compiled/sfx/Serene_flocksndloop.ogg
+++ b/compiled/sfx/Serene_flocksndloop.ogg
--- a/Museum/aquaMuseum.max
+++ b/Museum/aquaMuseum.max
--- a/Museum/aquaMuseum01.max
+++ b/Museum/aquaMuseum01.max
--- a/Museum/aquaMuseum01.tga
+++ b/Museum/aquaMuseum01.tga
--- a/Museum/aquaMuseum02.max
+++ b/Museum/aquaMuseum02.max
--- a/Museum/aquaMuseum02.tga
+++ b/Museum/aquaMuseum02.tga
--- a/Museum/aquaMuseum03Scaled.max
+++ b/Museum/aquaMuseum03Scaled.max
--- a/Museum/aquaMuseum04.max
+++ b/Museum/aquaMuseum04.max
--- a/Museum/aquaMuseum05.max
+++ b/Museum/aquaMuseum05.max
--- a/Museum/aquaMuseumHL01.tga
+++ b/Museum/aquaMuseumHL01.tga
--- a/Museum/aquaMuseumHL02.tga
+++ b/Museum/aquaMuseumHL02.tga
--- a/Museum/aquaMuseumHL03.tga
+++ b/Museum/aquaMuseumHL03.tga
--- a/Museum/aquaMuseumHL04.tga
+++ b/Museum/aquaMuseumHL04.tga
--- a/Museum/aquaMuseumHL05.psd
+++ b/Museum/aquaMuseumHL05.psd
--- a/Museum/aquaMuseumHL05.tga
+++ b/Museum/aquaMuseumHL05.tga
--- a/Museum/aquaMuseumHL06.psd
+++ b/Museum/aquaMuseumHL06.psd
--- a/Museum/aquaMuseumHL06.tga
+++ b/Museum/aquaMuseumHL06.tga
--- a/Museum/aquaWhark01.tga
+++ b/Museum/aquaWhark01.tga
--- a/Museum/aquaWhark02.tga
+++ b/Museum/aquaWhark02.tga
--- a/Museum/aquarium/Aquarium.age
+++ b/Museum/aquarium/Aquarium.age
@ -0,0 +1,6 @@
+StartDateTime=0946713600
+DayLength=24.000000
+MaxCapacity=10
+LingerTime=180
+SequencePrefix=23
+ReleaseVersion=0
--- a/Museum/aquarium/aquaShaleBones.max
+++ b/Museum/aquarium/aquaShaleBones.max
--- a/Museum/aquarium/clftAdobeWallsINT.tga
+++ b/Museum/aquarium/clftAdobeWallsINT.tga
--- a/Museum/aquarium/khloBone04B.tga
+++ b/Museum/aquarium/khloBone04B.tga
--- a/Museum/aquarium/xJCloth.tga
+++ b/Museum/aquarium/xJCloth.tga
--- a/Age/BahroSpiral/sprlMassingModel.max
+++ b/Age/BahroSpiral/sprlMassingModel.max
--- a/Age/bahro-tree-print.jpg
+++ b/Age/bahro-tree-print.jpg
--- a/Age/birth-room.jpg
+++ b/Age/birth-room.jpg
--- a/Age/maze-room.jpg
+++ b/Age/maze-room.jpg
--- a/Age/ring-room.jpg
+++ b/Age/ring-room.jpg
--- a/Age/spiral-color-comp-copy.jpg
+++ b/Age/spiral-color-comp-copy.jpg
--- a/Age/spiral-color-comp.jpg
+++ b/Age/spiral-color-comp.jpg
--- a/Age/spiral-top-view-copy.jpg
+++ b/Age/spiral-top-view-copy.jpg
--- a/Age/spiral067.max
+++ b/Age/spiral067.max
--- a/Age/sprlMassingModel.max
+++ b/Age/sprlMassingModel.max
--- a/Age/whirlpool-room-print.jpg
+++ b/Age/whirlpool-room-print.jpg
--- a/Age/AlphaHoleCA.tga
+++ b/Age/AlphaHoleCA.tga
--- a/Age/Bead01CA.tga
+++ b/Age/Bead01CA.tga
--- a/Age/BeadAge/beadBeadAge.max
+++ b/Age/BeadAge/beadBeadAge.max
--- a/Age/Belt01.tga
+++ b/Age/Belt01.tga
--- a/Age/Belt02.tga
+++ b/Age/Belt02.tga
--- a/Age/BeltBack01.tga
+++ b/Age/BeltBack01.tga
--- a/Age/BlackNoiseDetail.tga
+++ b/Age/BlackNoiseDetail.tga
--- a/Age/BoardPatternCM.tga
+++ b/Age/BoardPatternCM.tga
--- a/Age/BoardPatternSpecCA.tga
+++ b/Age/BoardPatternSpecCA.tga
--- a/Age/Bronze01.tga
+++ b/Age/Bronze01.tga
--- a/Age/Cantaloupe05.tga
+++ b/Age/Cantaloupe05.tga
--- a/Age/Cantile04.tga
+++ b/Age/Cantile04.tga
--- a/Age/Cantile06.tga
+++ b/Age/Cantile06.tga
--- a/Age/Carrot09.tga
+++ b/Age/Carrot09.tga
--- a/Age/Clouds01Green.tga
+++ b/Age/Clouds01Green.tga
--- a/Age/Clouds07.tga
+++ b/Age/Clouds07.tga
--- a/Age/CloudsGrey.tga
+++ b/Age/CloudsGrey.tga
--- a/Age/CutStoneFloorGrooveCM.tga
+++ b/Age/CutStoneFloorGrooveCM.tga
--- a/Age/DarkEdges01AO.tga
+++ b/Age/DarkEdges01AO.tga
--- a/Age/DarkEdgesCircleAO.tga
+++ b/Age/DarkEdgesCircleAO.tga
--- a/Age/ElevFloor01.tga
+++ b/Age/ElevFloor01.tga
--- a/Age/ElevFloor01TEMP.tga
+++ b/Age/ElevFloor01TEMP.tga
--- a/Age/GearTile.tga
+++ b/Age/GearTile.tga
--- a/Age/GlareCircleSmooth2.tga
+++ b/Age/GlareCircleSmooth2.tga
--- a/Age/GlassNoiseCA.tga
+++ b/Age/GlassNoiseCA.tga
--- a/Age/GlassParticleCA.tga
+++ b/Age/GlassParticleCA.tga
--- a/Age/Groove01.tga
+++ b/Age/Groove01.tga
--- a/Age/GrooveShadCA.tga
+++ b/Age/GrooveShadCA.tga
--- a/Age/LightShaft2CA.tga
+++ b/Age/LightShaft2CA.tga
--- a/Age/LightShaft3CA.tga
+++ b/Age/LightShaft3CA.tga
--- a/Age/LightShaftCA.tga
+++ b/Age/LightShaftCA.tga
--- a/Age/Metal01.tga
+++ b/Age/Metal01.tga
--- a/Age/Metal01Hole&MarksCA.tga
+++ b/Age/Metal01Hole&MarksCA.tga
--- a/Age/Metal01StripCA.tga
+++ b/Age/Metal01StripCA.tga
--- a/Age/Metal01StripSpecular.tga
+++ b/Age/Metal01StripSpecular.tga
--- a/Age/Metal01_128.tga
+++ b/Age/Metal01_128.tga
--- a/Age/Metal01_128Spec.tga
+++ b/Age/Metal01_128Spec.tga
--- a/Age/Metal03.tga
+++ b/Age/Metal03.tga
--- a/Age/MetalMesh01CA.tga
+++ b/Age/MetalMesh01CA.tga
--- a/Age/MetalPlank01.tga
+++ b/Age/MetalPlank01.tga
--- a/Age/MetalPlankEnd01.tga
+++ b/Age/MetalPlankEnd01.tga
--- a/Age/MetalScratched01.tga
+++ b/Age/MetalScratched01.tga
--- a/Age/MetalStrip02CM.tga
+++ b/Age/MetalStrip02CM.tga
--- a/Age/Pathway5.tga
+++ b/Age/Pathway5.tga
--- a/Age/PatternDetail02.tga
+++ b/Age/PatternDetail02.tga
--- a/Age/Pip_OutSide.tga
+++ b/Age/Pip_OutSide.tga
--- a/Age/Pipe_Inside.tga
+++ b/Age/Pipe_Inside.tga
--- a/Age/Pod02.tga
+++ b/Age/Pod02.tga
--- a/Age/PulleyShadCA.tga
+++ b/Age/PulleyShadCA.tga
--- a/Age/RustyPipe01.tga
+++ b/Age/RustyPipe01.tga
--- a/Age/RustyWall2CM.tga
+++ b/Age/RustyWall2CM.tga
--- a/Age/RustyWall2SpecCM.tga
+++ b/Age/RustyWall2SpecCM.tga
--- a/Age/Shadow01.tga
+++ b/Age/Shadow01.tga
--- a/Age/Stain01SM.tga
+++ b/Age/Stain01SM.tga
--- a/Age/StickClothCM.tga
+++ b/Age/StickClothCM.tga
--- a/Show More
+++ b/Show More