Cinq sprint (#942)

Autodesk · Sep 23, 2023 · 42c572e · 42c572e
2 parents 56d696c + 12c31c3
commit 42c572e
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 213 deletions.
diff --git a/VersionManager.json b/VersionManager.json
@@ -1,4 +1,4 @@
 {
-  "Version": "5.1.0",
+  "Version": "6.0.0",
   "URL": "https://synthesis.autodesk.com/download.html"
 }
diff --git a/engine/Assets/Scripts/AutoUpdater.cs b/engine/Assets/Scripts/AutoUpdater.cs
@@ -15,7 +15,7 @@ public class AutoUpdater : MonoBehaviour {
     public static bool UpdateAvailable { get; private set; } = false;
     public static string UpdaterLink { get; private set; }
 
-    public const string LocalVersion = "5.1.0.0"; // must be a version value
+    public const string LocalVersion = "6.0.0.0"; // must be a version value
 
     private void Start() {
         if (CheckConnection()) {

diff --git a/engine/Assets/Scripts/Drivers/LinearDriver.cs b/engine/Assets/Scripts/Drivers/LinearDriver.cs
@@ -95,7 +95,7 @@ public override void Update() {
             if (Mathf.Abs(_lastVel * Time.deltaTime) > _motor.targetVelocity)
                 _lastVel = _motor.targetVelocity * Mathf.Sign(_lastVel);
 
-            Position += _lastVel;
+            Position += _lastVel * Time.deltaTime;
         }
     }
 }
diff --git a/engine/ProjectSettings/ProjectSettings.asset b/engine/ProjectSettings/ProjectSettings.asset
@@ -135,7 +135,7 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
-  bundleVersion: 5.1.0
+  bundleVersion: 6.0.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

diff --git a/installer/Windows/.gitignore b/installer/Windows/.gitignore
@@ -1,4 +1,11 @@
 Robots/
 Fields/
+Exporter/
+Themes/
+MixAndMatch/
 Synthesis/
 
+Robots.zip
+Fields.zip
+Themes.zip
+MixAndMatch.zip
diff --git a/installer/Windows/EngInstaller(x86).nsi b/installer/Windows/EngInstaller(x86).nsi
diff --git a/installer/Windows/MainInstaller.nsi b/installer/Windows/MainInstaller.nsi
@@ -1,6 +1,6 @@
 !include MUI2.nsh
 !include x64.nsh
-!define PRODUCT_VERSION "6.0.0b"
+!define PRODUCT_VERSION "6.0.0"
 
 Name "Synthesis"
 
@@ -160,10 +160,6 @@ Section "Synthesis (required)" Synthesis
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Synthesis" "NoModify" 1
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Synthesis" "NoRepair" 1
   WriteUninstaller "uninstall.exe"
-
-	; Set extraction path for field files
-	SetOutPath $APPDATA\Autodesk\Synthesis\Fields
-	File /r "Fields\*"
 
 SectionEnd
 
@@ -184,7 +180,8 @@ Section "Fusion Exporter Plugin" fExporter
 
   ; Set extraction path to Fusion plugin directories
   SetOutPath "$APPDATA\Autodesk\Autodesk Fusion 360\API\AddIns\Synthesis"
-  File /r "..\..\exporter\SynthesisFusionAddin\*"
+  File /r "Exporter\*"
+  ; File /r "..\..\exporter\SynthesisFusionAddin\*"
 
   ; SetOutPath "$APPDATA\Autodesk\ApplicationPlugins\FusionRobotExporter.bundle\Contents\"
   ; File /r "FusionExporter\FusionRobotExporter.dll"
@@ -202,6 +199,22 @@ Section "Robots and Fields" RobotFiles
 
 SectionEnd
 
+Section "PartBuilder Samples" PartBuilder
+
+  ; Set extraction path for preloaded robot files
+  SetOutPath $APPDATA\Autodesk\Synthesis\MixAndMatch
+  File /r "MixAndMatch\*"
+
+SectionEnd
+
+Section "Themes" Themes
+
+  ; Set extraction path for preloaded robot files
+  SetOutPath $APPDATA\Autodesk\Synthesis\Themes
+  File /r "Themes\*"
+
+SectionEnd
+
 /*
 Section "Code Emulator" Emulator
 
@@ -229,13 +242,17 @@ SectionEnd
   ; LangString DESC_iExporter ${LANG_ENGLISH} "The Inventor Exporter Plugin is an Inventor addin used to export Autodesk Inventor Assemblies directly into the simulator"
   LangString DESC_fExporter ${LANG_ENGLISH} "The Fusion360 Exporter Plugin is a Fusion addin used to export Autodesk Fusion Assemblies directly into the simulator"
   LangString DESC_RobotFiles ${LANG_ENGLISH} "A library of sample robots and fields pre-loaded into the simulator"
+  LangString DESC_PartBuilder ${LANG_ENGLISH} "A library of sample parts to use in Robot Builder"
+  LangString DESC_Themes ${LANG_ENGLISH} "Preinstalled themes"
   ; LangString DESC_Emulator ${LANG_ENGLISH} "The Robot Code Emulator allows you to emulate your C++ & JAVA robot code in the simulator"
 
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${Synthesis} $(DESC_Synthesis)
   ; !insertmacro MUI_DESCRIPTION_TEXT ${iExporter} $(DESC_iExporter)
   !insertmacro MUI_DESCRIPTION_TEXT ${fExporter} $(DESC_fExporter)
   !insertmacro MUI_DESCRIPTION_TEXT ${RobotFiles} $(DESC_RobotFiles)
+  !insertmacro MUI_DESCRIPTION_TEXT ${PartBuilder} $(DESC_PartBuilder)
+  !insertmacro MUI_DESCRIPTION_TEXT ${Themes} $(DESC_Themes)
   ; !insertmacro MUI_DESCRIPTION_TEXT ${Emulator} $(DESC_Emulator)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END