Skip to content

Commit 4fbaa70

Browse files
committed
Merge branch 'release/0.7.1'
2 parents 726ee12 + 89b84d2 commit 4fbaa70

File tree

121 files changed

+1230
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+1230
-118
lines changed

.github/workflows/npmpublish.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Node.js Package
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
publish-npm:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v1
13+
- uses: actions/setup-node@v1
14+
with:
15+
node-version: 12
16+
registry-url: https://registry.npmjs.org/
17+
- run: npm publish Packages/UnityFx.Outline
18+
env:
19+
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
20+
21+
publish-gpr:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v1
25+
- uses: actions/setup-node@v1
26+
with:
27+
node-version: 12
28+
registry-url: https://npm.pkg.github.com/
29+
- run: npm publish Packages/UnityFx.Outline
30+
env:
31+
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
[Bb]uild/
55
[Bb]uilds/
66
[Pp]roject[Ss]ettings/
7-
[Pp]ackages/
8-
[Uu]nity[Pp]ackage[Mm]anager/
97

10-
Assets/Plugins/UnityFx.Outline/CHANGELOG.md
11-
Assets/Plugins/UnityFx.Outline/CHANGELOG.md.meta
128
Assets/AssetStoreTools*
139

1410
# Visual Studio cache directory

Assets/Examples.meta

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

Assets/Plugins/UnityFx.Outline/Runtime/Scripts/Helpers.meta renamed to Assets/Examples/PostProcessing.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.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3}
13+
m_Name: PostProcessingProfile
14+
m_EditorClassIdentifier:
15+
settings:
16+
- {fileID: 114600372921182068}
17+
--- !u!114 &114600372921182068
18+
MonoBehaviour:
19+
m_ObjectHideFlags: 3
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_GameObject: {fileID: 0}
24+
m_Enabled: 1
25+
m_EditorHideFlags: 0
26+
m_Script: {fileID: 11500000, guid: 362f6fe821115814693a671c047d5f31, type: 3}
27+
m_Name: Outline
28+
m_EditorClassIdentifier:
29+
active: 1
30+
enabled:
31+
overrideState: 1
32+
value: 1
33+
_defaultResources: {fileID: 11400000, guid: d28e70f030b1a634db9a6a6d5478ef19, type: 2}
34+
Resources:
35+
overrideState: 0
36+
value: {fileID: 11400000, guid: d28e70f030b1a634db9a6a6d5478ef19, type: 2}
37+
Layers:
38+
overrideState: 0
39+
value: {fileID: 0}

Assets/Examples/PostProcessing/PostProcessingProfile.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)