Skip to content

Commit

Permalink
Merge branch 'develop' into missing-images-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
mrbusysky authored Oct 27, 2023
2 parents b84004d + a11c05b commit 133604e
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

*.meta
node_modules/
node_modules/
./idea*
Scenario/.idea/*
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.2.2"
".": "0.2.3"
}
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.2.3](https://github.com/scenario-labs/Scenario-Unity/compare/v0.2.2...v0.2.3) (2023-10-11)


### Bug Fixes

* namespace and version ([#80](https://github.com/scenario-labs/Scenario-Unity/issues/80)) ([4ae138a](https://github.com/scenario-labs/Scenario-Unity/commit/4ae138a8c28452d1fc79dde64ee357e3882227d2))

## [0.2.2](https://github.com/scenario-labs/Scenario-Unity/compare/v0.2.1...v0.2.2) (2023-10-05)


Expand Down
1 change: 1 addition & 0 deletions Scenario/Editor/PromptWindow/Views/ImageSettingsView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ private void RenderImageSettingsSection(bool shouldAutoGenerateSeed)
int sliderWidth = Mathf.RoundToInt(EditorGUIUtility.currentViewWidth * sliderWidthPercentage);

imagesliderIntValue = Mathf.RoundToInt(imagesliderValue);

EditorGUILayout.BeginHorizontal();
{
GUILayout.Label("Images: " + imagesliderIntValue, GUILayout.Width(labelWidth));
Expand Down
1 change: 0 additions & 1 deletion Scenario/Plugins/PluginSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public class PluginSettings : EditorWindow

private readonly string[] imageFormats = { "JPEG", "PNG" };
private readonly string[] imageFormatExtensions = { "jpeg", "png" };

private static string version = "Scenario Beta Version 0.2.3";

public static string EncodedAuth
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

0 comments on commit 133604e

Please sign in to comment.