Browse Source

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

pull/39/head
Adam Johnson 3 years ago
parent
commit
3288a2e39b
Signed by: Hoikas
GPG Key ID: 0B6515D6FF6F271E
  1. 12
      .gitattributes
  2. 6
      .gitignore
  3. 5
      compiled/.gitignore
  4. BIN
      compiled/dat/GlobalClothing_District_FemaleFan02.prp
  5. BIN
      compiled/dat/GlobalClothing_District_MaleFan02.prp
  6. BIN
      compiled/dat/KIEnglish.loc
  7. BIN
      compiled/dat/Kadish_District_kdshGlowInTheDark.prp
  8. BIN
      compiled/dat/Serene_District_Snowfall.prp
  9. BIN
      compiled/dat/Teledahn_District_tldnHarvest.prp
  10. BIN
      compiled/dat/city_District_ferry.prp
  11. BIN
      compiled/sfx/Serene_flocksndloop.ogg
  12. BIN
      sources/Aquarium Museum/aquaMuseum.max
  13. BIN
      sources/Aquarium Museum/aquaMuseum01.max
  14. BIN
      sources/Aquarium Museum/aquaMuseum01.tga
  15. BIN
      sources/Aquarium Museum/aquaMuseum02.max
  16. BIN
      sources/Aquarium Museum/aquaMuseum02.tga
  17. BIN
      sources/Aquarium Museum/aquaMuseum03Scaled.max
  18. BIN
      sources/Aquarium Museum/aquaMuseum04.max
  19. BIN
      sources/Aquarium Museum/aquaMuseum05.max
  20. BIN
      sources/Aquarium Museum/aquaMuseumHL01.tga
  21. BIN
      sources/Aquarium Museum/aquaMuseumHL02.tga
  22. BIN
      sources/Aquarium Museum/aquaMuseumHL03.tga
  23. BIN
      sources/Aquarium Museum/aquaMuseumHL04.tga
  24. BIN
      sources/Aquarium Museum/aquaMuseumHL05.psd
  25. BIN
      sources/Aquarium Museum/aquaMuseumHL05.tga
  26. BIN
      sources/Aquarium Museum/aquaMuseumHL06.psd
  27. BIN
      sources/Aquarium Museum/aquaMuseumHL06.tga
  28. BIN
      sources/Aquarium Museum/aquaWhark01.tga
  29. BIN
      sources/Aquarium Museum/aquaWhark02.tga
  30. 6
      sources/Aquarium Museum/aquarium/Aquarium.age
  31. BIN
      sources/Aquarium Museum/aquarium/aquaShaleBones.max
  32. BIN
      sources/Aquarium Museum/aquarium/clftAdobeWallsINT.tga
  33. BIN
      sources/Aquarium Museum/aquarium/khloBone04B.tga
  34. BIN
      sources/Aquarium Museum/aquarium/xJCloth.tga
  35. BIN
      sources/Bahro (Spiral) Age/BahroSpiral/sprlMassingModel.max
  36. BIN
      sources/Bahro (Spiral) Age/bahro-tree-print.jpg
  37. BIN
      sources/Bahro (Spiral) Age/birth-room.jpg
  38. BIN
      sources/Bahro (Spiral) Age/maze-room.jpg
  39. BIN
      sources/Bahro (Spiral) Age/ring-room.jpg
  40. BIN
      sources/Bahro (Spiral) Age/spiral-color-comp-copy.jpg
  41. BIN
      sources/Bahro (Spiral) Age/spiral-color-comp.jpg
  42. BIN
      sources/Bahro (Spiral) Age/spiral-top-view-copy.jpg
  43. BIN
      sources/Bahro (Spiral) Age/spiral067.max
  44. BIN
      sources/Bahro (Spiral) Age/sprlMassingModel.max
  45. BIN
      sources/Bahro (Spiral) Age/whirlpool-room-print.jpg
  46. BIN
      sources/Bead Age/AlphaHoleCA.tga
  47. BIN
      sources/Bead Age/Bead01CA.tga
  48. BIN
      sources/Bead Age/BeadAge/beadBeadAge.max
  49. BIN
      sources/Bead Age/Belt01.tga
  50. BIN
      sources/Bead Age/Belt02.tga
  51. BIN
      sources/Bead Age/BeltBack01.tga
  52. BIN
      sources/Bead Age/BlackNoiseDetail.tga
  53. BIN
      sources/Bead Age/BoardPatternCM.tga
  54. BIN
      sources/Bead Age/BoardPatternSpecCA.tga
  55. BIN
      sources/Bead Age/Bronze01.tga
  56. BIN
      sources/Bead Age/Cantaloupe05.tga
  57. BIN
      sources/Bead Age/Cantile04.tga
  58. BIN
      sources/Bead Age/Cantile06.tga
  59. BIN
      sources/Bead Age/Carrot09.tga
  60. BIN
      sources/Bead Age/Clouds01Green.tga
  61. BIN
      sources/Bead Age/Clouds07.tga
  62. BIN
      sources/Bead Age/CloudsGrey.tga
  63. BIN
      sources/Bead Age/CutStoneFloorGrooveCM.tga
  64. BIN
      sources/Bead Age/DarkEdges01AO.tga
  65. BIN
      sources/Bead Age/DarkEdgesCircleAO.tga
  66. BIN
      sources/Bead Age/ElevFloor01.tga
  67. BIN
      sources/Bead Age/ElevFloor01TEMP.tga
  68. BIN
      sources/Bead Age/GearTile.tga
  69. BIN
      sources/Bead Age/GlareCircleSmooth2.tga
  70. BIN
      sources/Bead Age/GlassNoiseCA.tga
  71. BIN
      sources/Bead Age/GlassParticleCA.tga
  72. BIN
      sources/Bead Age/Groove01.tga
  73. BIN
      sources/Bead Age/GrooveShadCA.tga
  74. BIN
      sources/Bead Age/LightShaft2CA.tga
  75. BIN
      sources/Bead Age/LightShaft3CA.tga
  76. BIN
      sources/Bead Age/LightShaftCA.tga
  77. BIN
      sources/Bead Age/Metal01.tga
  78. BIN
      sources/Bead Age/Metal01Hole&MarksCA.tga
  79. BIN
      sources/Bead Age/Metal01StripCA.tga
  80. BIN
      sources/Bead Age/Metal01StripSpecular.tga
  81. BIN
      sources/Bead Age/Metal01_128.tga
  82. BIN
      sources/Bead Age/Metal01_128Spec.tga
  83. BIN
      sources/Bead Age/Metal03.tga
  84. BIN
      sources/Bead Age/MetalMesh01CA.tga
  85. BIN
      sources/Bead Age/MetalPlank01.tga
  86. BIN
      sources/Bead Age/MetalPlankEnd01.tga
  87. BIN
      sources/Bead Age/MetalScratched01.tga
  88. BIN
      sources/Bead Age/MetalStrip02CM.tga
  89. BIN
      sources/Bead Age/Pathway5.tga
  90. BIN
      sources/Bead Age/PatternDetail02.tga
  91. BIN
      sources/Bead Age/Pip_OutSide.tga
  92. BIN
      sources/Bead Age/Pipe_Inside.tga
  93. BIN
      sources/Bead Age/Pod02.tga
  94. BIN
      sources/Bead Age/PulleyShadCA.tga
  95. BIN
      sources/Bead Age/RustyPipe01.tga
  96. BIN
      sources/Bead Age/RustyWall2CM.tga
  97. BIN
      sources/Bead Age/RustyWall2SpecCM.tga
  98. BIN
      sources/Bead Age/Shadow01.tga
  99. BIN
      sources/Bead Age/Stain01SM.tga
  100. BIN
      sources/Bead Age/StickClothCM.tga
  101. Some files were not shown because too many files have changed in this diff Show More

12
.gitattributes vendored

@ -6,23 +6,35 @@
*.dat filter=lfs diff=lfs merge=lfs -text *.dat filter=lfs diff=lfs merge=lfs -text
*.dds filter=lfs diff=lfs merge=lfs -text *.dds filter=lfs diff=lfs merge=lfs -text
*.dll 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 *.exe filter=lfs diff=lfs merge=lfs -text
*.gif filter=lfs diff=lfs merge=lfs -text *.gif filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text
*.jpeg 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 *.max filter=lfs diff=lfs merge=lfs -text
*.mov filter=lfs diff=lfs merge=lfs -text
*.node filter=lfs diff=lfs merge=lfs -text *.node filter=lfs diff=lfs merge=lfs -text
*.opus filter=lfs diff=lfs merge=lfs -text *.opus filter=lfs diff=lfs merge=lfs -text
*.ogg filter=lfs diff=lfs merge=lfs -text *.ogg filter=lfs diff=lfs merge=lfs -text
*.p2f filter=lfs diff=lfs merge=lfs -text *.p2f filter=lfs diff=lfs merge=lfs -text
*.pdn filter=lfs diff=lfs merge=lfs -text *.pdn filter=lfs diff=lfs merge=lfs -text
*.pfp 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 *.png filter=lfs diff=lfs merge=lfs -text
*.prp filter=lfs diff=lfs merge=lfs -text *.prp filter=lfs diff=lfs merge=lfs -text
*.psd filter=lfs diff=lfs merge=lfs -text *.psd filter=lfs diff=lfs merge=lfs -text
*.pxf filter=lfs diff=lfs merge=lfs -text *.pxf filter=lfs diff=lfs merge=lfs -text
*.tga 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 *.tron filter=lfs diff=lfs merge=lfs -text
*.vsd filter=lfs diff=lfs merge=lfs -text
*.wav filter=lfs diff=lfs merge=lfs -text *.wav filter=lfs diff=lfs merge=lfs -text
*.webm 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 *.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

6
.gitignore vendored

@ -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 # These files are ephemeral and should not be tracked
*.blend1 *.blend1
*.ktc *.ktc

5
compiled/.gitignore vendored

@ -0,0 +1,5 @@
# These files should be tracked in the Plasma repository
*.age
*.fni
*.py
*.sdl

BIN
compiled/dat/GlobalClothing_District_FemaleFan02.prp (Stored with Git LFS)

Binary file not shown.

BIN
compiled/dat/GlobalClothing_District_MaleFan02.prp (Stored with Git LFS)

Binary file not shown.

BIN
compiled/dat/KIEnglish.loc

Binary file not shown.

BIN
compiled/dat/Kadish_District_kdshGlowInTheDark.prp (Stored with Git LFS)

Binary file not shown.

BIN
compiled/dat/Serene_District_Snowfall.prp (Stored with Git LFS)

Binary file not shown.

BIN
compiled/dat/Teledahn_District_tldnHarvest.prp (Stored with Git LFS)

Binary file not shown.

BIN
compiled/dat/city_District_ferry.prp (Stored with Git LFS)

Binary file not shown.

BIN
compiled/sfx/Serene_flocksndloop.ogg (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseum.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseum01.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseum01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseum02.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseum02.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseum03Scaled.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseum04.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseum05.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseumHL01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseumHL02.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseumHL03.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseumHL04.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseumHL05.psd (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseumHL05.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseumHL06.psd (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaMuseumHL06.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaWhark01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquaWhark02.tga (Stored with Git LFS)

Binary file not shown.

6
sources/Aquarium Museum/aquarium/Aquarium.age

@ -0,0 +1,6 @@
StartDateTime=0946713600
DayLength=24.000000
MaxCapacity=10
LingerTime=180
SequencePrefix=23
ReleaseVersion=0

BIN
sources/Aquarium Museum/aquarium/aquaShaleBones.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquarium/clftAdobeWallsINT.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquarium/khloBone04B.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Aquarium Museum/aquarium/xJCloth.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/BahroSpiral/sprlMassingModel.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/bahro-tree-print.jpg (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/birth-room.jpg (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/maze-room.jpg (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/ring-room.jpg (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/spiral-color-comp-copy.jpg (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/spiral-color-comp.jpg (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/spiral-top-view-copy.jpg (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/spiral067.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/sprlMassingModel.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bahro (Spiral) Age/whirlpool-room-print.jpg (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/AlphaHoleCA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Bead01CA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/BeadAge/beadBeadAge.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Belt01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Belt02.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/BeltBack01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/BlackNoiseDetail.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/BoardPatternCM.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/BoardPatternSpecCA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Bronze01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Cantaloupe05.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Cantile04.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Cantile06.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Carrot09.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Clouds01Green.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Clouds07.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/CloudsGrey.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/CutStoneFloorGrooveCM.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/DarkEdges01AO.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/DarkEdgesCircleAO.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/ElevFloor01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/ElevFloor01TEMP.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/GearTile.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/GlareCircleSmooth2.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/GlassNoiseCA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/GlassParticleCA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Groove01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/GrooveShadCA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/LightShaft2CA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/LightShaft3CA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/LightShaftCA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Metal01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Metal01Hole&MarksCA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Metal01StripCA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Metal01StripSpecular.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Metal01_128.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Metal01_128Spec.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Metal03.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/MetalMesh01CA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/MetalPlank01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/MetalPlankEnd01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/MetalScratched01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/MetalStrip02CM.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Pathway5.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/PatternDetail02.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Pip_OutSide.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Pipe_Inside.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Pod02.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/PulleyShadCA.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/RustyPipe01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/RustyWall2CM.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/RustyWall2SpecCM.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Shadow01.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/Stain01SM.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/Bead Age/StickClothCM.tga (Stored with Git LFS)

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save