Skip to content

Commit 3e3149b

Browse files
committed
Merge branch 'master' into 2022.2
# Conflicts: # ProjectSettings/ProjectVersion.txt
2 parents e705245 + b528c68 commit 3e3149b

20 files changed

+69
-56
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323
id: set_unity_version
2424
run: |
2525
UNITY_VERSION=$(sed -n 's/^\m_EditorVersion: //p'< ./ProjectSettings/ProjectVersion.txt)
26-
echo "::set-output name=VERSION::$UNITY_VERSION"
26+
echo "VERSION={$UNITY_VERSION}" >> $GITHUB_OUTPUT
2727
2828
- name: Set tag
2929
id: set_tag
30-
run: echo "::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}"
30+
run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
3131

3232
- name: Set target name
3333
id: set_build_name
34-
run: echo "::set-output name=VERSION::WebGL-${{ steps.set_tag.outputs.VERSION }}"
34+
run: echo "VERSION=WebGL-${{ steps.set_tag.outputs.VERSION }}" >> $GITHUB_OUTPUT
3535

3636
- name: Log variables
3737
run: |
@@ -101,16 +101,10 @@ jobs:
101101
needs: [ variables ]
102102
runs-on: ubuntu-latest
103103
steps:
104-
- uses: actions/download-artifact@v3
105-
with:
106-
name: ${{ needs.variables.outputs.BUILD_NAME }}
107-
108104
- name: Create Release
109105
uses: softprops/action-gh-release@v1
110106
with:
111-
files: ${{ needs.variables.outputs.BUILD_NAME }}.zip
112107
body: |
113-
# ${{ needs.variables.outputs.UNITY_VERSION }}
114108
## Changes
115109
*
116110

Assets/Plugins/WebGL/WebGLTools/Attributes.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Plugins/WebGL/WebGLTools/Attributes/WebGlCommandAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// --------------------------------------------------------------------------------------------------------------------
1+
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="WebGlCommandAttribute.cs">
33
// Copyright (c) 2022 Johannes Deml. All rights reserved.
44
// </copyright>

Assets/Plugins/WebGL/WebGLTools/Attributes/WebGlCommandAttribute.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Plugins/WebGL/WebGLTools/WebGlBridge.Commands.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// --------------------------------------------------------------------------------------------------------------------
1+
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="WebGlBridge.Commands.cs">
33
// Copyright (c) 2022 Johannes Deml. All rights reserved.
44
// </copyright>
@@ -111,7 +111,7 @@ public void ToggleInfoPanel()
111111
/// Log an example message to see if it is rendered correctly, and to see the stacktrace
112112
/// </summary>
113113
[WebGlCommand(Description = "Log an example debug message")]
114-
public void LogDebugMessage()
114+
public void LogExampleMessage()
115115
{
116116
Debug.Log("This is an <color=#ff0000>example</color> message, showing off <color=#ff00ff>rich text</color> support!");
117117
}
@@ -120,8 +120,8 @@ public void LogDebugMessage()
120120
/// Log a custom message to test Debug.Log in general
121121
/// </summary>
122122
/// <param name="message">Message that will be logged</param>
123-
[WebGlCommand(Description = "Log a custom debug message")]
124-
public void LogDebugMessage(string message)
123+
[WebGlCommand(Description = "Log a custom message")]
124+
public void LogMessage(string message)
125125
{
126126
Debug.Log(message);
127127
}

Assets/Plugins/WebGL/WebGLTools/WebGlBridge.Commands.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Plugins/WebGL/WebGLTools/WebGlBridge.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// --------------------------------------------------------------------------------------------------------------------
1+
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="WebGlBridge.cs">
33
// Copyright (c) 2021 Johannes Deml. All rights reserved.
44
// </copyright>
@@ -90,11 +90,11 @@ public void Help()
9090
}
9191
}
9292

93-
sb.AppendLine($") -> {commandAttribute.Description}");
93+
sb.AppendLine($"); <color=#555555FF>-> {commandAttribute.Description}</color>");
9494
}
9595
}
9696

97-
sb.AppendLine("\nRun a command with 'unityGame.SendMessage(\"WebGL\", \"COMMAND_NAME\",PARAMETER)'");
97+
sb.AppendLine("\nRun a command with 'unityGame.SendMessage(\"WebGL\", \"COMMAND_NAME\",PARAMETER);'");
9898
Debug.Log(sb.ToString());
9999
}
100100
}

Assets/Plugins/WebGL/WebGLTools/WebGlBridge.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Plugins/WebGL/WebGLTools/WebGlPlugins.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// --------------------------------------------------------------------------------------------------------------------
1+
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="WebGlPlugins.cs">
33
// Copyright (c) 2021 Johannes Deml. All rights reserved.
44
// </copyright>

Assets/Plugins/WebGL/WebGLTools/WebGlPlugins.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)