I_Jemin / Unity-OpenVR-Shooter-Template

Go to a project
Toggle navigation Toggle navigation pinning
I_Jemin
67f8ce80 1 parent 68152ce5

Update to Unity2017.3P2

Inline Side-by-side
Showing 2 changed files with 61 additions and 5 deletions
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 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -376,7 +376,7 @@ namespace UnityEditor.PostProcessing ...@@ -376,7 +376,7 @@ namespace UnityEditor.PostProcessing
376 // Draw 376 // Draw
377 if (state.showNonEditableHandles) 377 if (state.showNonEditableHandles)
378 { 378 {
379 - if (e.type == EventType.repaint) 379 + if (e.type == EventType.Repaint)
380 { 380 {
381 var selectedColor = (isCurrentlySelectedCurve && isCurrentlySelectedKeyframe) 381 var selectedColor = (isCurrentlySelectedCurve && isCurrentlySelectedKeyframe)
382 ? settings.selectionColor 382 ? settings.selectionColor
...@@ -422,7 +422,7 @@ namespace UnityEditor.PostProcessing ...@@ -422,7 +422,7 @@ namespace UnityEditor.PostProcessing
422 } 422 }
423 423
424 // Keyframe selection & context menu 424 // Keyframe selection & context menu
425 - if (e.type == EventType.mouseDown && rect.Contains(e.mousePosition)) 425 + if (e.type == EventType.MouseDown && rect.Contains(e.mousePosition))
426 { 426 {
427 if (hitRect.Contains(e.mousePosition)) 427 if (hitRect.Contains(e.mousePosition))
428 { 428 {
...@@ -453,7 +453,7 @@ namespace UnityEditor.PostProcessing ...@@ -453,7 +453,7 @@ namespace UnityEditor.PostProcessing
453 } 453 }
454 454
455 // Tangent selection & edit mode 455 // Tangent selection & edit mode
456 - if (e.type == EventType.mouseDown && rect.Contains(e.mousePosition)) 456 + if (e.type == EventType.MouseDown && rect.Contains(e.mousePosition))
457 { 457 {
458 if (inTangentHitRect.Contains(e.mousePosition) && (k > 0 || state.loopInBounds)) 458 if (inTangentHitRect.Contains(e.mousePosition) && (k > 0 || state.loopInBounds))
459 { 459 {
...@@ -499,7 +499,7 @@ namespace UnityEditor.PostProcessing ...@@ -499,7 +499,7 @@ namespace UnityEditor.PostProcessing
499 var e = Event.current; 499 var e = Event.current;
500 500
501 // Selection 501 // Selection
502 - if (e.type == EventType.mouseDown) 502 + if (e.type == EventType.MouseDown)
503 { 503 {
504 GUI.FocusControl(null); 504 GUI.FocusControl(null);
505 m_SelectedCurve = null; 505 m_SelectedCurve = null;
...@@ -582,7 +582,7 @@ namespace UnityEditor.PostProcessing ...@@ -582,7 +582,7 @@ namespace UnityEditor.PostProcessing
582 } 582 }
583 583
584 // Delete selected key(s) 584 // Delete selected key(s)
585 - if (e.type == EventType.keyDown && (e.keyCode == KeyCode.Delete || e.keyCode == KeyCode.Backspace)) 585 + if (e.type == EventType.KeyDown && (e.keyCode == KeyCode.Delete || e.keyCode == KeyCode.Backspace))
586 { 586 {
587 if (m_SelectedKeyframeIndex != -1 && m_SelectedCurve != null) 587 if (m_SelectedKeyframeIndex != -1 && m_SelectedCurve != null)
588 { 588 {
......