Skip to content

Commit

Permalink
Merge pull request #13 from brentbatch/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
brentbatch authored Sep 4, 2021
2 parents 8ba2800 + 221ef50 commit 64ddd38
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 5 deletions.
13 changes: 12 additions & 1 deletion Assets/Plugins/DevIL/DevIL.dll.meta

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

13 changes: 12 additions & 1 deletion Assets/Plugins/DevIL/ILU.dll.meta

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

13 changes: 12 additions & 1 deletion Assets/Plugins/DevIL/ILUT.dll.meta

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

3 changes: 3 additions & 0 deletions Assets/Scripts/Model/Data/BlueprintData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ public class Controller

[JsonProperty("speed")]
public int? Speed { get; set; } // joint (piston)

[JsonProperty("level")]
public int? Level { get; set; } // thruster level
}

[JsonObject(ItemNullValueHandling = NullValueHandling.Ignore)]
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
companyName: BrentBatch
productName: Advanced Blueprint Tool
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
Expand Down Expand Up @@ -147,7 +147,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Standalone: com.DefaultCompany.AdvancedBlueprintTool
Standalone: com.BrentBatch.AdvancedBlueprintTool
buildNumber:
Standalone: 0
iPhone: 0
Expand Down

0 comments on commit 64ddd38

Please sign in to comment.