Skip to content
This repository was archived by the owner on Mar 24, 2022. It is now read-only.

Commit 16249cb

Browse files
LewisJohnsonLewisJohnson
committed
Fixed namespace
1 parent cc2678c commit 16249cb

File tree

66 files changed

+357
-321
lines changed

Some content is hidden

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

66 files changed

+357
-321
lines changed

‎Assets/Common/StandardAssets/Cameras/Scripts/AbstractTargetFollower.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
21
using UnityEngine;
32

4-
namespace UnityStandardAssets.Cameras
3+
namespace Assets.Common.StandardAssets.Cameras.Scripts
54
{
65
public abstract class AbstractTargetFollower : MonoBehaviour
76
{

‎Assets/Common/StandardAssets/Cameras/Scripts/AutoCam.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using System;
21
using UnityEngine;
2+
33
#if UNITY_EDITOR
44

55
#endif
66

7-
namespace UnityStandardAssets.Cameras
7+
namespace Assets.Common.StandardAssets.Cameras.Scripts
88
{
99
[ExecuteInEditMode]
1010
public class AutoCam : PivotBasedCameraRig

‎Assets/Common/StandardAssets/Cameras/Scripts/FreeLookCam.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System;
1+
using Assets.Common.StandardAssets.CrossPlatformInput.Scripts;
22
using UnityEngine;
3-
using UnityStandardAssets.CrossPlatformInput;
43

5-
namespace UnityStandardAssets.Cameras
4+
namespace Assets.Common.StandardAssets.Cameras.Scripts
65
{
76
public class FreeLookCam : PivotBasedCameraRig
87
{

‎Assets/Common/StandardAssets/Cameras/Scripts/HandHeldCam.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
21
using UnityEngine;
32

4-
namespace UnityStandardAssets.Cameras
3+
namespace Assets.Common.StandardAssets.Cameras.Scripts
54
{
65
public class HandHeldCam : LookatTarget
76
{

‎Assets/Common/StandardAssets/Cameras/Scripts/LookatTarget.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
21
using UnityEngine;
32

4-
namespace UnityStandardAssets.Cameras
3+
namespace Assets.Common.StandardAssets.Cameras.Scripts
54
{
65
public class LookatTarget : AbstractTargetFollower
76
{

‎Assets/Common/StandardAssets/Cameras/Scripts/PivotBasedCameraRig.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using System;
21
using UnityEngine;
32

4-
5-
namespace UnityStandardAssets.Cameras
3+
namespace Assets.Common.StandardAssets.Cameras.Scripts
64
{
75
public abstract class PivotBasedCameraRig : AbstractTargetFollower
86
{

‎Assets/Common/StandardAssets/Cameras/Scripts/ProtectCameraFromWallClip.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections;
33
using UnityEngine;
44

5-
namespace UnityStandardAssets.Cameras
5+
namespace Assets.Common.StandardAssets.Cameras.Scripts
66
{
77
public class ProtectCameraFromWallClip : MonoBehaviour
88
{

‎Assets/Common/StandardAssets/Cameras/Scripts/TargetFieldOfView.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using System;
21
using UnityEngine;
32

4-
5-
namespace UnityStandardAssets.Cameras
3+
namespace Assets.Common.StandardAssets.Cameras.Scripts
64
{
75
public class TargetFieldOfView : AbstractTargetFollower
86
{

‎Assets/Common/StandardAssets/Characters/FirstPersonCharacter/Scripts/FirstPersonController.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
using System;
1+
using Assets.Common.StandardAssets.CrossPlatformInput.Scripts;
2+
using Assets.Common.StandardAssets.Utility;
23
using UnityEngine;
3-
using UnityStandardAssets.CrossPlatformInput;
4-
using UnityStandardAssets.Utility;
54
using Random = UnityEngine.Random;
65

7-
namespace UnityStandardAssets.Characters.FirstPerson
6+
namespace Assets.Common.StandardAssets.Characters.FirstPersonCharacter.Scripts
87
{
98
[RequireComponent(typeof (CharacterController))]
109
[RequireComponent(typeof (AudioSource))]

‎Assets/Common/StandardAssets/Characters/FirstPersonCharacter/Scripts/HeadBob.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System;
1+
using Assets.Common.StandardAssets.Utility;
22
using UnityEngine;
3-
using UnityStandardAssets.Utility;
43

5-
namespace UnityStandardAssets.Characters.FirstPerson
4+
namespace Assets.Common.StandardAssets.Characters.FirstPersonCharacter.Scripts
65
{
76
public class HeadBob : MonoBehaviour
87
{

‎Assets/Common/StandardAssets/Characters/FirstPersonCharacter/Scripts/MouseLook.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
2+
using Assets.Common.StandardAssets.CrossPlatformInput.Scripts;
23
using UnityEngine;
3-
using UnityStandardAssets.CrossPlatformInput;
44

5-
namespace UnityStandardAssets.Characters.FirstPerson
5+
namespace Assets.Common.StandardAssets.Characters.FirstPersonCharacter.Scripts
66
{
77
[Serializable]
88
public class MouseLook

‎Assets/Common/StandardAssets/Characters/FirstPersonCharacter/Scripts/RigidbodyFirstPersonController.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
2+
using Assets.Common.StandardAssets.CrossPlatformInput.Scripts;
23
using UnityEngine;
3-
using UnityStandardAssets.CrossPlatformInput;
44

5-
namespace UnityStandardAssets.Characters.FirstPerson
5+
namespace Assets.Common.StandardAssets.Characters.FirstPersonCharacter.Scripts
66
{
77
[RequireComponent(typeof (Rigidbody))]
88
[RequireComponent(typeof (CapsuleCollider))]

‎Assets/Common/StandardAssets/Characters/RollerBall/Scripts/Ball.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
21
using UnityEngine;
32

4-
namespace UnityStandardAssets.Vehicles.Ball
3+
namespace Assets.Common.StandardAssets.Characters.RollerBall.Scripts
54
{
65
public class Ball : MonoBehaviour
76
{

‎Assets/Common/StandardAssets/Characters/RollerBall/Scripts/BallUserControl.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System;
1+
using Assets.Common.StandardAssets.CrossPlatformInput.Scripts;
22
using UnityEngine;
3-
using UnityStandardAssets.CrossPlatformInput;
43

5-
namespace UnityStandardAssets.Vehicles.Ball
4+
namespace Assets.Common.StandardAssets.Characters.RollerBall.Scripts
65
{
76
public class BallUserControl : MonoBehaviour
87
{

‎Assets/Common/StandardAssets/Characters/ThirdPersonCharacter/Scripts/AICharacterControl.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
21
using UnityEngine;
32

4-
namespace UnityStandardAssets.Characters.ThirdPerson
3+
namespace Assets.Common.StandardAssets.Characters.ThirdPersonCharacter.Scripts
54
{
65
[RequireComponent(typeof (UnityEngine.AI.NavMeshAgent))]
76
[RequireComponent(typeof (ThirdPersonCharacter))]

‎Assets/Common/StandardAssets/Characters/ThirdPersonCharacter/Scripts/ThirdPersonCharacter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace UnityStandardAssets.Characters.ThirdPerson
3+
namespace Assets.Common.StandardAssets.Characters.ThirdPersonCharacter.Scripts
44
{
55
[RequireComponent(typeof(Rigidbody))]
66
[RequireComponent(typeof(CapsuleCollider))]

‎Assets/Common/StandardAssets/Characters/ThirdPersonCharacter/Scripts/ThirdPersonUserControl.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System;
1+
using Assets.Common.StandardAssets.CrossPlatformInput.Scripts;
22
using UnityEngine;
3-
using UnityStandardAssets.CrossPlatformInput;
43

5-
namespace UnityStandardAssets.Characters.ThirdPerson
4+
namespace Assets.Common.StandardAssets.Characters.ThirdPersonCharacter.Scripts
65
{
76
[RequireComponent(typeof (ThirdPersonCharacter))]
87
public class ThirdPersonUserControl : MonoBehaviour

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/AxisTouchButton.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System;
21
using UnityEngine;
32
using UnityEngine.EventSystems;
43

5-
namespace UnityStandardAssets.CrossPlatformInput
4+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts
65
{
76
public class AxisTouchButton : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
87
{

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/ButtonHandler.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
21
using UnityEngine;
32

4-
namespace UnityStandardAssets.CrossPlatformInput
3+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts
54
{
65
public class ButtonHandler : MonoBehaviour
76
{

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/CrossPlatformInputManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
2+
using Assets.Common.StandardAssets.CrossPlatformInput.Scripts.PlatformSpecific;
23
using UnityEngine;
3-
using UnityStandardAssets.CrossPlatformInput.PlatformSpecific;
44

5-
namespace UnityStandardAssets.CrossPlatformInput
5+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts
66
{
77
public static class CrossPlatformInputManager
88
{

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/InputAxisScrollbar.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
21
using UnityEngine;
32

4-
namespace UnityStandardAssets.CrossPlatformInput
3+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts
54
{
65
public class InputAxisScrollbar : MonoBehaviour
76
{

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/Joystick.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System;
21
using UnityEngine;
32
using UnityEngine.EventSystems;
43

5-
namespace UnityStandardAssets.CrossPlatformInput
4+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts
65
{
76
public class Joystick : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IDragHandler
87
{

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/MobileControlRig.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
using System;
2-
#if UNITY_EDITOR
31
using UnityEditor;
4-
#endif
52
using UnityEngine;
3+
#if UNITY_EDITOR
4+
#endif
65

76

8-
namespace UnityStandardAssets.CrossPlatformInput
7+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts
98
{
109
[ExecuteInEditMode]
1110
public class MobileControlRig : MonoBehaviour

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/PlatformSpecific/MobileInput.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
21
using UnityEngine;
32

4-
namespace UnityStandardAssets.CrossPlatformInput.PlatformSpecific
3+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts.PlatformSpecific
54
{
65
public class MobileInput : VirtualInput
76
{

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/PlatformSpecific/StandaloneInput.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using UnityEngine;
33

4-
namespace UnityStandardAssets.CrossPlatformInput.PlatformSpecific
4+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts.PlatformSpecific
55
{
66
public class StandaloneInput : VirtualInput
77
{

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/TiltInput.cs

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System;
2-
using UnityEngine;
3-
#if UNITY_EDITOR
42
using UnityEditor;
5-
#endif
3+
using UnityEngine;
64

7-
namespace UnityStandardAssets.CrossPlatformInput
5+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts
86
{
9-
// helps with managing tilt input on mobile devices
7+
8+
// helps with managing tilt input on mobile devices
109
public class TiltInput : MonoBehaviour
1110
{
1211
// options for the various orientations
@@ -95,11 +94,7 @@ private void OnDisable()
9594
m_SteerAxis.Remove();
9695
}
9796
}
98-
}
99-
10097

101-
namespace UnityStandardAssets.CrossPlatformInput.Inspector
102-
{
10398
#if UNITY_EDITOR
10499
[CustomPropertyDrawer(typeof (TiltInput.AxisMapping))]
105100
public class TiltInputAxisStylePropertyDrawer : PropertyDrawer
@@ -142,4 +137,4 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
142137
}
143138
}
144139
#endif
145-
}
140+
}

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/TouchPad.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
using System;
21
using UnityEngine;
32
using UnityEngine.EventSystems;
43
using UnityEngine.UI;
54

6-
namespace UnityStandardAssets.CrossPlatformInput
5+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts
76
{
87
[RequireComponent(typeof(Image))]
98
public class TouchPad : MonoBehaviour, IPointerDownHandler, IPointerUpHandler

‎Assets/Common/StandardAssets/CrossPlatformInput/Scripts/VirtualInput.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
using System;
21
using System.Collections.Generic;
32
using UnityEngine;
43

5-
6-
namespace UnityStandardAssets.CrossPlatformInput
4+
namespace Assets.Common.StandardAssets.CrossPlatformInput.Scripts
75
{
86
public abstract class VirtualInput
97
{

‎Assets/Common/StandardAssets/Editor/CrossPlatformInput/CrossPlatformInputInitialize.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System;
21
using System.Collections.Generic;
32
using UnityEditor;
43

5-
namespace UnityStandardAssets.CrossPlatformInput.Inspector
4+
namespace Assets.Common.StandardAssets.Editor.CrossPlatformInput
65
{
76
[InitializeOnLoad]
87
public class CrossPlatformInitialize

‎Assets/Common/StandardAssets/Utility/ActivateTrigger.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System;
21
using UnityEngine;
32
using Object = UnityEngine.Object;
43

5-
namespace UnityStandardAssets.Utility
4+
namespace Assets.Common.StandardAssets.Utility
65
{
76
public class ActivateTrigger : MonoBehaviour
87
{

0 commit comments

Comments
 (0)