diff --git a/Directory.Build.props b/Directory.Build.props index c2d19f86fe..5d5abf3e9f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,10 +9,10 @@ FuseeProjectTeam Furtwangen University FUSEE - 0.10.0.0 - 0.10.0.0 - 0.10.0.0-b - 0.10.0.0 + 0.10.1.0 + 0.10.1.0 + 0.10.1.0 + 0.10.1.0 Copyright © 2013-today MIT https://fusee3d.org/ diff --git a/dis/DnTemplate/template/Fusee_App.csproj b/dis/DnTemplate/template/Fusee_App.csproj index cf880b80e1..96e747a4bc 100644 --- a/dis/DnTemplate/template/Fusee_App.csproj +++ b/dis/DnTemplate/template/Fusee_App.csproj @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/dis/VSTemplate/VSIX/Properties/AssemblyInfo.cs b/dis/VSTemplate/VSIX/Properties/AssemblyInfo.cs index 42fe00c742..e710f5004c 100644 --- a/dis/VSTemplate/VSIX/Properties/AssemblyInfo.cs +++ b/dis/VSTemplate/VSIX/Properties/AssemblyInfo.cs @@ -29,5 +29,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("0.10.0.0")] -[assembly: AssemblyFileVersion("0.10.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("0.10.1.0")] +[assembly: AssemblyFileVersion("0.10.1.0")] \ No newline at end of file diff --git a/dis/VSTemplate/VSTemplate/Android/Android.csproj b/dis/VSTemplate/VSTemplate/Android/Android.csproj index 276a22be69..598b7ea470 100644 --- a/dis/VSTemplate/VSTemplate/Android/Android.csproj +++ b/dis/VSTemplate/VSTemplate/Android/Android.csproj @@ -58,7 +58,7 @@ - + diff --git a/dis/VSTemplate/VSTemplate/Core/Core.csproj b/dis/VSTemplate/VSTemplate/Core/Core.csproj index 83dfc8e14b..a1e808b600 100644 --- a/dis/VSTemplate/VSTemplate/Core/Core.csproj +++ b/dis/VSTemplate/VSTemplate/Core/Core.csproj @@ -13,7 +13,7 @@ - + diff --git a/dis/VSTemplate/VSTemplate/Desktop/Desktop.csproj b/dis/VSTemplate/VSTemplate/Desktop/Desktop.csproj index 3b07278648..aa58feae0b 100644 --- a/dis/VSTemplate/VSTemplate/Desktop/Desktop.csproj +++ b/dis/VSTemplate/VSTemplate/Desktop/Desktop.csproj @@ -15,7 +15,7 @@ - + diff --git a/dis/VSTemplate/VSTemplate/Properties/AssemblyInfo.cs b/dis/VSTemplate/VSTemplate/Properties/AssemblyInfo.cs index 4ac4789b02..3ff7590302 100644 --- a/dis/VSTemplate/VSTemplate/Properties/AssemblyInfo.cs +++ b/dis/VSTemplate/VSTemplate/Properties/AssemblyInfo.cs @@ -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("0.10.0.0")] -[assembly: AssemblyFileVersion("0.10.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("0.10.1.0")] +[assembly: AssemblyFileVersion("0.10.1.0")] \ No newline at end of file diff --git a/src/Engine/Imp/Graphics/Desktop/InputImp.cs b/src/Engine/Imp/Graphics/Desktop/InputImp.cs index 6a6ac6fd0d..a076e1682f 100644 --- a/src/Engine/Imp/Graphics/Desktop/InputImp.cs +++ b/src/Engine/Imp/Graphics/Desktop/InputImp.cs @@ -906,7 +906,7 @@ public float GetAxis(int iAxisId) switch (iAxisId) { case (int)MouseAxes.Wheel: - return 0; + return _gameWindow.MouseState.Scroll.Y; case (int)MouseAxes.MinX: return 0; case (int)MouseAxes.MaxX: diff --git a/src/Tools/BlenderScripts/addons/io_export_fus/__init__.py b/src/Tools/BlenderScripts/addons/io_export_fus/__init__.py index 2932bbd8c9..ea46960aba 100644 --- a/src/Tools/BlenderScripts/addons/io_export_fus/__init__.py +++ b/src/Tools/BlenderScripts/addons/io_export_fus/__init__.py @@ -5,7 +5,7 @@ bl_info = { "name": ".fus format", "author": "The FUSEE Project Team", - "version": (0, 10, 0), + "version": (0, 10, 1), "blender": (2, 80, 0), "location": "File > Import-Export", "description": "Export to the FUSEE .fus format/as a FUSEE Web application",