Skip to content

Commit

Permalink
Prepare for 0.3.0.0
Browse files Browse the repository at this point in the history
Conflicts:
	CM3D2.SceneCapture.plugin.cs
  • Loading branch information
ShinHogera committed Aug 14, 2017
2 parents 28e3595 + c1cdfde commit 6bb0ecb
Show file tree
Hide file tree
Showing 267 changed files with 7,187 additions and 49 deletions.
3 changes: 0 additions & 3 deletions AssetLoader.cs
Expand Up @@ -149,7 +149,6 @@ public static MenuInfo LoadMenu(string menuFileName)
file = GameUty.FileOpen(name);
if( file.GetSize() == 0 || !file.IsValid() )
{
Debug.Log(menuFileName + " " + name);
throw new FileNotFoundException(name);
}
}
Expand Down Expand Up @@ -255,8 +254,6 @@ public static MenuInfo LoadMenu(string menuFileName)
label_61:

binaryReader.Close();
if(mi.isMan)
Debug.Log(mi.isMan + " " + mi.partCategory);
return mi;
}

Expand Down
5 changes: 4 additions & 1 deletion CM3D2.SceneCapture.plugin.cs
Expand Up @@ -51,7 +51,7 @@ namespace CM3D2.SceneCapture.Plugin
/// モーション一時停止後、選択対象メイドを切り替えるとモーションの一時停止が解除される不具合
/// </remarks>
///=========================================================================
[PluginFilter( "CM3D2x64" ), PluginFilter( "CM3D2x86" ), PluginFilter( "CM3D2VRx64" ), PluginName( "CM3D2.SceneCapture.Plugin" ), PluginVersion( "0.2.3.0" )]
[PluginFilter( "CM3D2x64" ), PluginFilter( "CM3D2x86" ), PluginFilter( "CM3D2VRx64" ), PluginName( "CM3D2.SceneCapture.Plugin" ), PluginVersion( "0.3.0.0" )]
public class SceneCapture : PluginBase
{
#region Methods
Expand Down Expand Up @@ -317,6 +317,7 @@ public void OnGUI()
GlobalColorPicker.Update();
GlobalCurveWindow.Update();
GlobalItemPicker.Update();
GlobalTexturePicker.Update();

// Update
SunShaftsDef.Update();
Expand Down Expand Up @@ -356,6 +357,8 @@ private void Initialize()

float windowWidth = Screen.width / 4 - ControlBase.FixedMargin * 2;

new Instances();

// モード選択画面
this.modeSelectView = new ModeSelectWindow( fontSize );
this.modeSelectView.Text = String.Format( "{0} ver.{1}", SceneCapture.GetPluginName(), SceneCapture.GetPluginVersion() );
Expand Down
Binary file added Config/SceneCapture/Images/blue.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/19603D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Action3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Arctic3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/BadFilm3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Beach3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Bit1Channel3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Bit3Channels3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Cyberpunk3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Dark3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Dreadful3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Dream3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Endgame3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Fincher3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Fire3D16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Config/SceneCapture/LUTs/Cinema/Hackers3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/HarshSun3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Hayloft3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Hipster3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Hitchcock3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Hollywood3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Horror3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/HotSun3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Icefall3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Intensity3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Matrix3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Minimalist3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/ModernRetro3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Nature3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Negative3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/NeonWorld3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Noire3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Pike3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Posterize3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Punchy3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/PurpleHaze3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Rads3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Rainbow3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/RedRoom3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/RobotVision3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Romantic3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Saw3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/SciFi3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Sepia3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/SinCity3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Slumber3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/TexMex3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Toxic3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Vault1013D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Vintage3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/War3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Warm3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Weathered3D16.png
Binary file added Config/SceneCapture/LUTs/Cinema/Winterfell3D16.png
Binary file added Config/SceneCapture/LUTs/Instagram/Aden.png
Binary file added Config/SceneCapture/LUTs/Instagram/Amaro.png
Binary file added Config/SceneCapture/LUTs/Instagram/Brannan.png
Binary file added Config/SceneCapture/LUTs/Instagram/Crema.png
Binary file added Config/SceneCapture/LUTs/Instagram/Earlybird.png
Binary file added Config/SceneCapture/LUTs/Instagram/F1977.png
Binary file added Config/SceneCapture/LUTs/Instagram/Hefe.png
Binary file added Config/SceneCapture/LUTs/Instagram/Hudson.png
Binary file added Config/SceneCapture/LUTs/Instagram/Inkwell.png
Binary file added Config/SceneCapture/LUTs/Instagram/Juno.png
Binary file added Config/SceneCapture/LUTs/Instagram/Kelvin.png
Binary file added Config/SceneCapture/LUTs/Instagram/Lark.png
Binary file added Config/SceneCapture/LUTs/Instagram/LoFi.png
Binary file added Config/SceneCapture/LUTs/Instagram/Ludwig.png
Binary file added Config/SceneCapture/LUTs/Instagram/Mayfair.png
Binary file added Config/SceneCapture/LUTs/Instagram/Nashville.png
Binary file added Config/SceneCapture/LUTs/Instagram/Perpetua.png
Binary file added Config/SceneCapture/LUTs/Instagram/Reyes.png
Binary file added Config/SceneCapture/LUTs/Instagram/Rise.png
Binary file added Config/SceneCapture/LUTs/Instagram/Sierra.png
Binary file added Config/SceneCapture/LUTs/Instagram/Slumber.png
Binary file added Config/SceneCapture/LUTs/Instagram/Sutro.png
Binary file added Config/SceneCapture/LUTs/Instagram/Toaster.png
Binary file added Config/SceneCapture/LUTs/Instagram/Valencia.png
Binary file added Config/SceneCapture/LUTs/Instagram/Walden.png
Binary file added Config/SceneCapture/LUTs/Instagram/Willow.png
Binary file added Config/SceneCapture/LUTs/Instagram/XProII.png
Binary file added Config/SceneCapture/LUTs/LoFi/AmstradCPC.png
Binary file added Config/SceneCapture/LUTs/LoFi/Andrae.png
Binary file added Config/SceneCapture/LUTs/LoFi/Anodomani.png
Binary file added Config/SceneCapture/LUTs/LoFi/CGA.png
Binary file added Config/SceneCapture/LUTs/LoFi/Commodore64.png
Binary file added Config/SceneCapture/LUTs/LoFi/CommodorePlus.png
Binary file added Config/SceneCapture/LUTs/LoFi/Crayolo.png
Binary file added Config/SceneCapture/LUTs/LoFi/DB16.png
Binary file added Config/SceneCapture/LUTs/LoFi/DB32.png
Binary file added Config/SceneCapture/LUTs/LoFi/DJinn.png
Binary file added Config/SceneCapture/LUTs/LoFi/DrazileA.png
Binary file added Config/SceneCapture/LUTs/LoFi/DrazileB.png
Binary file added Config/SceneCapture/LUTs/LoFi/DrazileC.png
Binary file added Config/SceneCapture/LUTs/LoFi/EGA.png
Binary file added Config/SceneCapture/LUTs/LoFi/Eggy.png
Binary file added Config/SceneCapture/LUTs/LoFi/FinlalA.png
Binary file added Config/SceneCapture/LUTs/LoFi/FinlalB.png
Binary file added Config/SceneCapture/LUTs/LoFi/GameBoy.png
Binary file added Config/SceneCapture/LUTs/LoFi/Hapiel.png
Binary file added Config/SceneCapture/LUTs/LoFi/MacOS16.png
Binary file added Config/SceneCapture/LUTs/LoFi/MacOS256.png
Binary file added Config/SceneCapture/LUTs/LoFi/MasterSystem.png
Binary file added Config/SceneCapture/LUTs/LoFi/PavanzA.png
Binary file added Config/SceneCapture/LUTs/LoFi/PavanzB.png
Binary file added Config/SceneCapture/LUTs/LoFi/Peyton.png
Binary file added Config/SceneCapture/LUTs/LoFi/RiscOS16.png
Binary file added Config/SceneCapture/LUTs/LoFi/SpeedyCube.png
Binary file added Config/SceneCapture/LUTs/LoFi/Teletex.png
Binary file added Config/SceneCapture/LUTs/LoFi/Windows16.png
Binary file added Config/SceneCapture/LUTs/LoFi/Windows256.png
Binary file added Config/SceneCapture/LUTs/LoFi/ZXSpectrum.png
Binary file modified Config/SceneCapture/Shaders/extra_shaders.unity3d
Binary file not shown.

0 comments on commit 6bb0ecb

Please sign in to comment.