Skip to content

Commit 10bd684

Browse files
committed
upgrade version to 2018.1.0f2
1 parent b08e754 commit 10bd684

File tree

172 files changed

+6364
-7144
lines changed

Some content is hidden

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

172 files changed

+6364
-7144
lines changed

.vscode/settings.json

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"files.exclude":
3+
{
4+
"**/.DS_Store":true,
5+
"**/.git":true,
6+
"**/.gitignore":true,
7+
"**/.gitmodules":true,
8+
"**/*.booproj":true,
9+
"**/*.pidb":true,
10+
"**/*.suo":true,
11+
"**/*.user":true,
12+
"**/*.userprefs":true,
13+
"**/*.unityproj":true,
14+
"**/*.dll":true,
15+
"**/*.exe":true,
16+
"**/*.pdf":true,
17+
"**/*.mid":true,
18+
"**/*.midi":true,
19+
"**/*.wav":true,
20+
"**/*.gif":true,
21+
"**/*.ico":true,
22+
"**/*.jpg":true,
23+
"**/*.jpeg":true,
24+
"**/*.png":true,
25+
"**/*.psd":true,
26+
"**/*.tga":true,
27+
"**/*.tif":true,
28+
"**/*.tiff":true,
29+
"**/*.3ds":true,
30+
"**/*.3DS":true,
31+
"**/*.fbx":true,
32+
"**/*.FBX":true,
33+
"**/*.lxo":true,
34+
"**/*.LXO":true,
35+
"**/*.ma":true,
36+
"**/*.MA":true,
37+
"**/*.obj":true,
38+
"**/*.OBJ":true,
39+
"**/*.asset":true,
40+
"**/*.cubemap":true,
41+
"**/*.flare":true,
42+
"**/*.mat":true,
43+
"**/*.meta":true,
44+
"**/*.prefab":true,
45+
"**/*.unity":true,
46+
"build/":true,
47+
"Build/":true,
48+
"Library/":true,
49+
"library/":true,
50+
"obj/":true,
51+
"Obj/":true,
52+
"ProjectSettings/":true,
53+
"temp/":true,
54+
"Temp/":true
55+
}
56+
}

Assets/Editor/ImageEffects/BloomAndFlaresEditor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public override void OnInspectorGUI () {
7777
// display info text when screen blend mode cannot be used
7878
Camera cam = (target as BloomAndFlares).GetComponent<Camera>();
7979
if (cam != null) {
80-
if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
80+
if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
8181
EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", MessageType.Info);
8282
}
8383
}

Assets/Editor/ImageEffects/BloomEditor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public override void OnInspectorGUI () {
8585
// display info text when screen blend mode cannot be used
8686
Camera cam = (target as Bloom).GetComponent<Camera>();
8787
if (cam != null) {
88-
if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
88+
if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
8989
EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", MessageType.Info);
9090
}
9191
}

Assets/Editor/ImageEffects/TonemappingEditor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public override void OnInspectorGUI () {
4242

4343
Camera cam = (target as Tonemapping).GetComponent<Camera>();
4444
if (cam != null) {
45-
if (!cam.hdr) {
45+
if (!cam.allowHDR) {
4646
EditorGUILayout.HelpBox("The camera is not HDR enabled. This will likely break the Tonemapper.", MessageType.Warning);
4747
}
4848
else if (!(target as Tonemapping).validRenderTextureFormat) {

Assets/Level/Assets/Warehouse/warehouse.fbx.meta

100755100644
+125-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Models/Ak-47/Ak-47.fbx.meta

+35-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)