Merge branch 'master' into leonard

leonard Wu

2018-08-03 7cc84329c52b6e39cd979eb33a126e059b9bf36c

 UI/HUD/FacingCamera.cs

@@ -8,11 +8,14 @@

        [SerializeField]
        Camera m_Camera;
        public new Camera camera {
            get {
        public new Camera camera
        {
            get
            {
                return m_Camera;
            }
            set {
            set
            {
                m_Camera = value;
            }
        }