Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v6.1 (Prod) #944

Merged
merged 35 commits into from
Jan 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a6e2566
New DMG installer creator
HunterBarclay Jul 31, 2023
2e163a5
Added EULA
HunterBarclay Jul 31, 2023
8e16b6a
Added background
HunterBarclay Aug 1, 2023
fb24176
Adding DMG files to gitignore
HunterBarclay Sep 15, 2023
70b0676
Added a field that converts the MirabufPartFile to an absolute path a…
HunterBarclay Sep 26, 2023
6b625fd
Formatted
HunterBarclay Sep 26, 2023
7057ecb
Added support for older pathing method
HunterBarclay Oct 3, 2023
65034d5
Pathing Issue (#943)
HunterBarclay Oct 5, 2023
1a5693f
Deleted go grpc server
HunterBarclay Oct 12, 2023
28728ca
Deleted go grpc server (#946)
HunterBarclay Oct 12, 2023
c028ef9
Fixed Macos dependencies, remove use of
HunterBarclay Nov 7, 2023
3dccbb8
Started an exporter installer
HunterBarclay Nov 7, 2023
e36c568
Random 32x32 icon isn't tracked yet
HunterBarclay Nov 7, 2023
991e601
Added missing forward-slash
HunterBarclay Nov 7, 2023
1ef0329
Added path separator adapting for windows
HunterBarclay Nov 8, 2023
a0365ba
Cleanup and some changes to the progress bar
HunterBarclay Nov 8, 2023
0a245d3
Fixed MacOS Dependencies for Exporter (#950)
HunterBarclay Nov 8, 2023
8e1d247
Merging the two installers into one. For some reason a bigger backgro…
HunterBarclay Nov 10, 2023
efcf163
Conceptually works
HunterBarclay Nov 18, 2023
42aa97a
Mecanum drive plus omni wheels
HunterBarclay Nov 19, 2023
b8d129b
Updated tutorial codedocs
HunterBarclay Nov 19, 2023
227d17a
Minor cleanups
HunterBarclay Nov 19, 2023
606c716
Added omni drive and cleanup
HunterBarclay Nov 20, 2023
92d7c8e
Added visuals and toggle field centric
HunterBarclay Nov 20, 2023
56d3926
Fixed toggle
HunterBarclay Nov 20, 2023
349d58d
Updated codedoc
HunterBarclay Nov 21, 2023
1e2b798
Omni and Mecanum Drive (#951)
HunterBarclay Nov 22, 2023
b07edea
Updated version number
HunterBarclay Dec 9, 2023
3b771b6
Finalizing macos installer
HunterBarclay Dec 10, 2023
651d8fc
Changed symlink to a pdf with instructions. Also altered the backgrou…
HunterBarclay Dec 20, 2023
bd19ab1
MacOS Installer (#952)
HunterBarclay Dec 21, 2023
d47cde7
Merge branch 'dev' into release/6.1
HunterBarclay Dec 21, 2023
60de94c
Fixed omni drive turning bug
HunterBarclay Dec 21, 2023
160e6db
Fixing color issue with exporter
HunterBarclay Dec 26, 2023
29d81dc
Release v6.1 (Dev) (#953)
HunterBarclay Jan 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VersionManager.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"Version": "6.0.0",
"Version": "6.1.0",
"URL": "https://synthesis.autodesk.com/download.html"
}
24 changes: 24 additions & 0 deletions api/Api/Mirabuf/JointInstance.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
namespace Mirabuf.Joint {
public partial class JointInstance {

public enum WheelTypeEnum {
Standard = 0, Omni = 1
}

private bool? _isWheel = null;
public bool IsWheel(Assembly assembly) {
if (!_isWheel.HasValue) {
Expand All @@ -11,5 +16,24 @@ public bool IsWheel(Assembly assembly) {
}
return _isWheel.Value;
}

private WheelTypeEnum? _wheelType = null;
public WheelTypeEnum GetWheelType(Assembly assembly) {
if (!_wheelType.HasValue) {
if (IsWheel(assembly)) {
var hasValue = assembly.Data.Joints.JointDefinitions[JointReference].UserData.Data
.TryGetValue("wheelType", out var wheelType);
if (hasValue && wheelType.Equals("1")) {
_wheelType = WheelTypeEnum.Omni;
} else {
_wheelType = WheelTypeEnum.Standard;
}
} else {
throw new System.Exception("Non-wheels don't have wheel types");
}
}

return _wheelType.Value;
}
}
}
4 changes: 2 additions & 2 deletions api/Api/Simulation/SimBehaviour.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public bool Enabled {
/// </summary>
/// <param name="simObjectId">ID of the SimObject within the SimulationManager</param>
/// <param name="inputs">A list of reserved inputs by the behaviour, along with a input to assign to each</param>
public SimBehaviour(string simObjectId) {
Enabled = true;
public SimBehaviour(string simObjectId, bool autoEnable = true) {
Enabled = autoEnable;
SimObjectId = simObjectId;
string id = simObjectId;
int _i = id.IndexOf("_", 0);
Expand Down
1 change: 1 addition & 0 deletions api/Api/Simulation/SimulationManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public static bool RemoveBehaviour(string simObjectName, SimBehaviour b) {
var cursor = list.First;
while (!removed && cursor != null) {
if (cursor.Value.Equals(b)) {
cursor.Value.Enabled = false;
cursor.Value.OnRemove();
list.Remove(cursor);
removed = true;
Expand Down
2 changes: 1 addition & 1 deletion api/Api/UIManager/UIParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static VisualElementAsset CreateVisualElements(string name, XmlNodeList n

// Logger.Log("Finished Creating Element");

_UnityVisualElement resultElement = (_UnityVisualElement)element;
_UnityVisualElement resultElement = (_UnityVisualElement)element!;

foreach (XmlNode child in node.ChildNodes)
{
Expand Down
2 changes: 0 additions & 2 deletions emulation/bridge/.gitignore

This file was deleted.

29 changes: 0 additions & 29 deletions emulation/bridge/Makefile

This file was deleted.

14 changes: 0 additions & 14 deletions emulation/bridge/cmd/main.go

This file was deleted.

8 changes: 0 additions & 8 deletions emulation/bridge/go.mod

This file was deleted.

1,116 changes: 0 additions & 1,116 deletions emulation/bridge/go.sum

This file was deleted.

33 changes: 0 additions & 33 deletions emulation/bridge/pkg/protocol/grpc/server.go

This file was deleted.

159 changes: 0 additions & 159 deletions emulation/bridge/pkg/service/v1/emulator_service.go

This file was deleted.

4 changes: 0 additions & 4 deletions emulation/bridge/scripts/gen_grpc.sh

This file was deleted.

2 changes: 1 addition & 1 deletion engine/Assets/Scripts/AutoUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "6.0.0.0"; // must be a version value
public const string LocalVersion = "6.1.0.0"; // must be a version value

private void Start() {
if (CheckConnection()) {
Expand Down
11 changes: 3 additions & 8 deletions engine/Assets/Scripts/Behaviors/ArcadeDriveBehaviour.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
using System;
using System.Collections.Generic;
using Google.Protobuf.WellKnownTypes;
using System.Collections.Generic;
using Synthesis.PreferenceManager;
using Synthesis.UI.Dynamic;
using SynthesisAPI.EventBus;
using SynthesisAPI.InputManager;
using SynthesisAPI.InputManager.Inputs;
using SynthesisAPI.Simulation;
using UnityEditor;
using UnityEngine;
using Input = UnityEngine.Input;
using Logger = SynthesisAPI.Utilities.Logger;
using Math = SynthesisAPI.Utilities.Math;
using Math = SynthesisAPI.Utilities.Math;

#nullable enable

Expand Down Expand Up @@ -94,7 +89,7 @@ public Analog TryLoadInput(string key, Analog defaultInput) {
}

private void OnValueInputAssigned(IEvent tmp) {
ValueInputAssignedEvent args = tmp as ValueInputAssignedEvent;
ValueInputAssignedEvent args = (tmp as ValueInputAssignedEvent)!;

if (args.InputKey.Length > MiraId.Length) {
string s = args.InputKey.Remove(0, MiraId.Length);
Expand Down
8 changes: 1 addition & 7 deletions engine/Assets/Scripts/Behaviors/GeneralArmBehaviour.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Google.Protobuf.WellKnownTypes;
using Synthesis.PreferenceManager;
using Synthesis.UI.Dynamic;
using SynthesisAPI.EventBus;
using SynthesisAPI.InputManager;
using SynthesisAPI.InputManager.Inputs;
using SynthesisAPI.Simulation;
using SynthesisAPI.Utilities;
using UnityEngine;

using Logger = SynthesisAPI.Utilities.Logger;

#nullable enable

namespace Synthesis {
Expand Down Expand Up @@ -74,7 +68,7 @@ public Analog TryLoadInput(string key, Analog defaultInput) {
}

private void OnValueInputAssigned(IEvent tmp) {
ValueInputAssignedEvent args = tmp as ValueInputAssignedEvent;
ValueInputAssignedEvent args = (tmp as ValueInputAssignedEvent)!;
if (args.InputKey.Equals(_forwardInputKey) || args.InputKey.Equals(_reverseInputKey)) {
if (_robot.RobotGUID != (MainHUD.SelectedRobot?.RobotGUID ?? string.Empty) ||
!((DynamicUIManager.ActiveModal as ChangeInputsModal)?.isSave ?? false))
Expand Down
Loading
Loading