Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Commit

Permalink
Bump version to 2.8.0.1
Browse files Browse the repository at this point in the history 
+ added EULA read checker
* reduced loading time
  • Loading branch information
@SonoSooS
SonoSooS committed Sep 14, 2016
1 parent b06f51f commit 6b1de70
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 21 deletions.
7 changes: 4 additions & 3 deletions ...terial_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.csproj
View file
Expand Up @@ -61,9 +61,6 @@
</PropertyGroup>
<PropertyGroup />
<ItemGroup>
<Reference Include="AxInterop.WMPLib">
<HintPath>..\..\..\..\..\..\..\OneDrive\Documents\Visual Studio 2015\Projects\Zulas OS - Lite\Zulas OS - Lite\bin\Debug\AxInterop.WMPLib.dll</HintPath>
</Reference>
<Reference Include="Ionic.Zip">
<HintPath>..\..\..\old\upd_extract_Source\upd_extract\bin\x86\Release\Ionic.Zip.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -119,15 +116,19 @@
<Compile Include="YLS.cs" />
<EmbeddedResource Include="dev_faq.resx">
<DependentUpon>dev_faq.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="dev_settings.resx">
<DependentUpon>dev_settings.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FormMain.resx">
<DependentUpon>FormMain.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="main_load.resx">
<DependentUpon>main_load.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand Down
26 changes: 26 additions & 0 deletions ..._Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.sln
View file
@@ -0,0 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "3DNUS Material Edition", "3DNUS Material Edition.csproj", "{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|x86.ActiveCfg = Debug|x86
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|x86.Build.0 = Debug|x86
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|Any CPU.Build.0 = Release|Any CPU
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|x86.ActiveCfg = Release|x86
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
3 changes: 3 additions & 0 deletions Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/App.config
View file
Expand Up @@ -28,6 +28,9 @@
<setting name="dev_mode" serializeAs="String">
<value />
</setting>
<setting name="eula_read" serializeAs="String">
<value />
</setting>
</_3DNUS_Material_Edition.Properties.Settings>
</userSettings>
</configuration>
19 changes: 12 additions & 7 deletions Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/FormMain.cs
View file
Expand Up @@ -122,14 +122,19 @@ private void Form1_Load(object sender, EventArgs e)
// Process.Start(cd + "\\3DNUS Upd - Lite.exe");
t_log.Text += " " + DateTime.Now;

DialogResult dialogResult = MessageBox.Show("All components that are used in 3DNUS are either created by Me, or other users; these components are Open-Source, and can not be distributed for any cost. \r\nThis also includes 3DNUS, and/or it's Components. \r\n \r\nIF you paid for 3DNUS or any other of its components, please demand your Money back Immediately! \r\nAlso, report where you Purchased 3DNUS or as a Bundle. \r\nWe are NOT affiliated with Nintendo, or any other Company. \r\n \r\nThis project is Non-Profit, meaning it will always be Free, and is maintained by Volunteers. \r\nBy using this Program, you agree to these Terms. \r\n \r\nDo you agree to these Terms? \r\n \r\nIn order to access other menu's, right-click the main Window. \r\n \r\nCaution: Some parts of 3DNUS may have some Loud Bck Music!", "Legal Terms:", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
if (dialogResult == DialogResult.Yes)
if(Properties.Settings.Default.eula_read != "yiss")
{
}
else if (dialogResult == DialogResult.No)
{
MessageBox.Show("You have chosen to NOT agree to the Terms, therefor the Program will now Close.", "Legal Terms:", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
Application.Exit();
DialogResult dialogResult = MessageBox.Show("All components that are used in 3DNUS are either created by Me, or other users; these components are Open-Source, and can not be distributed for any cost. \r\nThis also includes 3DNUS, and/or it's Components. \r\n \r\nIF you paid for 3DNUS or any other of its components, please demand your Money back Immediately! \r\nAlso, report where you Purchased 3DNUS or as a Bundle. \r\nWe are NOT affiliated with Nintendo, or any other Company. \r\n \r\nThis project is Non-Profit, meaning it will always be Free, and is maintained by Volunteers. \r\nBy using this Program, you agree to these Terms. \r\n \r\nDo you agree to these Terms? \r\n \r\nIn order to access other menu's, right-click the main Window. \r\n \r\nCaution: Some parts of 3DNUS may have some Loud Bck Music!", "Legal Terms:", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
if(dialogResult == DialogResult.Yes)
{
Properties.Settings.Default.eula_read = "yiss";
Properties.Settings.Default.Save();
}
else if(dialogResult == DialogResult.No)
{
MessageBox.Show("You have chosen to NOT agree to the Terms, therefor the Program will now Close.", "Legal Terms:", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
Application.Exit();
}
}
//}
//catch
Expand Down
4 changes: 2 additions & 2 deletions ..._Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/AssemblyInfo.cs
View file
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.8.0.0")]
[assembly: AssemblyFileVersion("2.8.0.0")]
[assembly: AssemblyVersion("2.8.0.1")]
[assembly: AssemblyFileVersion("2.8.0.1")]
16 changes: 14 additions & 2 deletions ...rial_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions ...aterial_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.settings
View file
Expand Up @@ -20,5 +20,8 @@
<Setting Name="dev_mode" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="eula_read" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>
22 changes: 15 additions & 7 deletions Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/main_load.cs
View file
Expand Up @@ -20,6 +20,8 @@ public partial class main_load : Form
private bool is64 = System.Environment.Is64BitOperatingSystem;
private bool checksum;

FormMain frm;

public main_load()
{
InitializeComponent();
Expand Down Expand Up @@ -77,14 +79,20 @@ private void main_load_Load(object sender, EventArgs e)
{
Properties.Settings.Default.dev_music = "0";
Properties.Settings.Default.Save();
Application.Restart();
//Application.Restart();
}
if (Properties.Settings.Default.dev_auto_upd == "")
{
Properties.Settings.Default.dev_auto_upd = "1";
Properties.Settings.Default.Save();
Application.Restart();
//Application.Restart();
}
if(Properties.Settings.Default.eula_read == "")
{
Properties.Settings.Default.eula_read = "nope";
Properties.Settings.Default.Save();
}
/*
if (Properties.Settings.Default.dev_auto_upd == "1")
{
try
Expand Down Expand Up @@ -143,16 +151,16 @@ private void main_load_Load(object sender, EventArgs e)
}
}
else
{
splash_timer.Start();
}
{*/
frm = new FormMain();
splash_timer.Start();
//}
}

private void timer1_Tick(object sender, EventArgs e)
{
splash_timer.Stop();
FormMain f = new FormMain();
f.Show();
frm.Show();
Hide();
}

Expand Down

0 comments on commit 6b1de70

Please sign in to comment.