diff --git a/Engine/.clang-tidy b/Engine/.clang-tidy
new file mode 100644
index 000000000..649992e69
--- /dev/null
+++ b/Engine/.clang-tidy
@@ -0,0 +1,6 @@
+---
+Checks:            '-*,modernize-use-override'
+WarningsAsErrors:  ''
+HeaderFilterRegex: '(source/).*'
+CheckOptions:
+  - { key: modernize-use-override.IgnoreDestructors,          value: true }
\ No newline at end of file
diff --git a/Engine/source/T3D/gameBase/extended/extendedMove.h b/Engine/source/T3D/gameBase/extended/extendedMove.h
index 5f0dae742..a3aa64d4d 100644
--- a/Engine/source/T3D/gameBase/extended/extendedMove.h
+++ b/Engine/source/T3D/gameBase/extended/extendedMove.h
@@ -29,11 +29,11 @@ struct ExtendedMove : public Move
 
    ExtendedMove();
 
-   virtual void pack(BitStream *stream, const Move * move = NULL);
-   virtual void unpack(BitStream *stream, const Move * move = NULL);
+   void pack(BitStream *stream, const Move * move = NULL) override;
+   void unpack(BitStream *stream, const Move * move = NULL) override;
 
-   virtual void clamp();
-   virtual void unclamp();
+   void clamp() override;
+   void unclamp() override;
 };
 
 extern const ExtendedMove NullExtendedMove;
diff --git a/Engine/source/afx/afxCamera.h b/Engine/source/afx/afxCamera.h
index 78e4bcb98..992a2a1b2 100644
--- a/Engine/source/afx/afxCamera.h
+++ b/Engine/source/afx/afxCamera.h
@@ -52,8 +52,8 @@ struct afxCameraData: public ShapeBaseData {
   //
   DECLARE_CONOBJECT(afxCameraData);
   static void initPersistFields();
-  virtual void packData(BitStream* stream);
-  virtual void unpackData(BitStream* stream);
+  void packData(BitStream* stream) override;
+  void unpackData(BitStream* stream) override;
 };
 
 
@@ -140,7 +140,7 @@ public:
   void            setThirdPersonSnapClient();
   const char*     getMode();
 
-  bool            isCamera() const { return true; }
+  bool            isCamera() const override { return true; }
 
   DECLARE_CONOBJECT(afxCamera);
   DECLARE_CATEGORY("UNLISTED");
@@ -151,35 +151,35 @@ private:          // 3POV SECTION
   bool            test_blocked_line(const Point3F& start, const Point3F& end);
 
 public:           // STD OVERRIDES SECTION
-  virtual bool    onAdd();
-  virtual void    onRemove();
-  virtual void    onDeleteNotify(SimObject *obj);
+  bool    onAdd() override;
+  void    onRemove() override;
+  void    onDeleteNotify(SimObject *obj) override;
 
-  virtual void    advanceTime(F32 dt);
-  virtual void    processTick(const Move* move);
-  virtual void    interpolateTick(F32 delta);
+  void    advanceTime(F32 dt) override;
+  void    processTick(const Move* move) override;
+  void    interpolateTick(F32 delta) override;
 
-  virtual void    writePacketData(GameConnection *conn, BitStream *stream);
-  virtual void    readPacketData(GameConnection *conn, BitStream *stream);
-  virtual U32     packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
-  virtual void    unpackUpdate(NetConnection *conn, BitStream *stream);
+  void    writePacketData(GameConnection *conn, BitStream *stream) override;
+  void    readPacketData(GameConnection *conn, BitStream *stream) override;
+  U32     packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
+  void    unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
-  virtual void    onCameraScopeQuery(NetConnection* cr, CameraScopeQuery*);
-  virtual void    getCameraTransform(F32* pos,MatrixF* mat);
-  virtual void    setTransform(const MatrixF& mat);
+  void    onCameraScopeQuery(NetConnection* cr, CameraScopeQuery*) override;
+  void    getCameraTransform(F32* pos,MatrixF* mat) override;
+  void    setTransform(const MatrixF& mat) override;
 
-  virtual void    onEditorEnable();
-  virtual void    onEditorDisable();
+  void    onEditorEnable() override;
+  void    onEditorDisable() override;
 
-  virtual F32     getCameraFov();
-  virtual F32     getDefaultCameraFov();
-  virtual bool    isValidCameraFov(F32 fov);
-  virtual void    setCameraFov(F32 fov);
+  F32     getCameraFov() override;
+  F32     getDefaultCameraFov() override;
+  bool    isValidCameraFov(F32 fov) override;
+  void    setCameraFov(F32 fov) override;
 
-  virtual F32     getDamageFlash() const;
-  virtual F32     getWhiteOut() const;
+  F32     getDamageFlash() const override;
+  F32     getWhiteOut() const override;
 
-  virtual void setControllingClient( GameConnection* connection );
+  void setControllingClient( GameConnection* connection ) override;
 };
 
 
diff --git a/Engine/source/afx/afxChoreographer.h b/Engine/source/afx/afxChoreographer.h
index 70a301350..2442feef7 100644
--- a/Engine/source/afx/afxChoreographer.h
+++ b/Engine/source/afx/afxChoreographer.h
@@ -49,10 +49,10 @@ public:
   /*C*/         afxChoreographerData();
   /*C*/         afxChoreographerData(const afxChoreographerData&, bool = false);
 
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  bool          preload(bool server, String &errorStr);
+  bool          preload(bool server, String &errorStr) override;
 
   static void   initPersistFields();
 
@@ -137,12 +137,12 @@ public:
 
   static void       initPersistFields();
 
-  virtual bool      onAdd();
-  virtual void      onRemove();
-  virtual void      onDeleteNotify(SimObject*);
-  virtual bool      onNewDataBlock(GameBaseData* dptr, bool reload);
-  virtual U32       packUpdate(NetConnection*, U32, BitStream*);
-  virtual void      unpackUpdate(NetConnection*, BitStream*);
+  bool      onAdd() override;
+  void      onRemove() override;
+  void      onDeleteNotify(SimObject*) override;
+  bool      onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  U32       packUpdate(NetConnection*, U32, BitStream*) override;
+  void      unpackUpdate(NetConnection*, BitStream*) override;
 
   virtual void      sync_with_clients() { }
   
@@ -196,7 +196,7 @@ public:
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
 // missile watcher callbacks
 public:
-  virtual void  impactNotify(const Point3F& p, const Point3F& n, SceneObject*) { }
+  void  impactNotify(const Point3F& p, const Point3F& n, SceneObject*) override { }
 
   DECLARE_CONOBJECT(afxChoreographer);
   DECLARE_CATEGORY("UNLISTED");
diff --git a/Engine/source/afx/afxConstraint.h b/Engine/source/afx/afxConstraint.h
index a17ed3b29..aa7b94559 100644
--- a/Engine/source/afx/afxConstraint.h
+++ b/Engine/source/afx/afxConstraint.h
@@ -278,14 +278,14 @@ public:
   virtual           ~afxPointConstraint();
 
   virtual void      set(Point3F point, Point3F vector);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
 
-  virtual SceneObject* getSceneObject() { return 0; }
-  virtual void      restoreObject(SceneObject*) { }
-  virtual U16       getScopeId() { return 0; }
-  virtual U32       getTriggers() { return 0; }
+  SceneObject* getSceneObject() override { return 0; }
+  void      restoreObject(SceneObject*) override { }
+  U16       getScopeId() override { return 0; }
+  U32       getTriggers() override { return 0; }
 
-  virtual void      unset() { set(Point3F::Zero, Point3F(0,0,1)); }
+  void      unset() override { set(Point3F::Zero, Point3F(0,0,1)); }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -305,14 +305,14 @@ public:
   virtual           ~afxTransformConstraint();
 
   virtual void      set(const MatrixF& xfm);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
 
-  virtual SceneObject* getSceneObject() { return 0; }
-  virtual void      restoreObject(SceneObject*) { }
-  virtual U16       getScopeId() { return 0; }
-  virtual U32       getTriggers() { return 0; }
+  SceneObject* getSceneObject() override { return 0; }
+  void      restoreObject(SceneObject*) override { }
+  U16       getScopeId() override { return 0; }
+  U32       getTriggers() override { return 0; }
 
-  virtual void      unset() { set(MatrixF::Identity); }
+  void      unset() override { set(MatrixF::Identity); }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -341,27 +341,27 @@ public:
   virtual           ~afxShapeConstraint();
 
   virtual void      set(ShapeBase* shape);
-  virtual void      set_scope_id(U16 scope_id);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
+  void      set_scope_id(U16 scope_id) override;
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
 
-  virtual U32       setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim);
-  virtual void      resetAnimation(U32 tag);
-  virtual U32       lockAnimation();
-  virtual void      unlockAnimation(U32 tag);
-  virtual F32       getAnimClipDuration(const char* clip);
+  U32       setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim) override;
+  void      resetAnimation(U32 tag) override;
+  U32       lockAnimation() override;
+  void      unlockAnimation(U32 tag) override;
+  F32       getAnimClipDuration(const char* clip) override;
 
   void              remapAnimation(U32 tag, ShapeBase* other_shape);
 
-  virtual S32       getDamageState();
+  S32       getDamageState() override;
 
-  virtual SceneObject* getSceneObject() { return mShape; }
-  virtual void      restoreObject(SceneObject*);
-  virtual U16       getScopeId() { return mScope_id; }
-  virtual U32       getTriggers();
+  SceneObject* getSceneObject() override { return mShape; }
+  void      restoreObject(SceneObject*) override;
+  U16       getScopeId() override { return mScope_id; }
+  U32       getTriggers() override;
 
-  virtual void      onDeleteNotify(SimObject*);
+  void      onDeleteNotify(SimObject*) override;
 
-  virtual void      unset() { set(0); }
+  void      unset() override { set(0); }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -380,14 +380,14 @@ public:
   /*C*/             afxShapeNodeConstraint(afxConstraintMgr*);
   /*C*/             afxShapeNodeConstraint(afxConstraintMgr*, StringTableEntry arb_name, StringTableEntry arb_node);
 
-  virtual void      set(ShapeBase* shape);
-  virtual void      set_scope_id(U16 scope_id);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
-  virtual void      restoreObject(SceneObject*);
+  void      set(ShapeBase* shape) override;
+  void      set_scope_id(U16 scope_id) override;
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
+  void      restoreObject(SceneObject*) override;
 
   S32               getNodeID() const { return mShape_node_ID; }
 
-  virtual void      onDeleteNotify(SimObject*);
+  void      onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -415,17 +415,17 @@ public:
   virtual           ~afxObjectConstraint();
 
   virtual void      set(SceneObject* obj);
-  virtual void      set_scope_id(U16 scope_id);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
+  void      set_scope_id(U16 scope_id) override;
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
 
-  virtual SceneObject* getSceneObject() { return mObj; }
-  virtual void      restoreObject(SceneObject*);
-  virtual U16       getScopeId() { return mScope_id; }
-  virtual U32       getTriggers();
+  SceneObject* getSceneObject() override { return mObj; }
+  void      restoreObject(SceneObject*) override;
+  U16       getScopeId() override { return mScope_id; }
+  U32       getTriggers() override;
 
-  virtual void      onDeleteNotify(SimObject*);
+  void      onDeleteNotify(SimObject*) override;
 
-  virtual void      unset() { set(0); }
+  void      unset() override { set(0); }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -452,23 +452,23 @@ public:
   /*C*/             afxEffectConstraint(afxConstraintMgr*, StringTableEntry effect_name);
   virtual           ~afxEffectConstraint();
 
-  virtual bool      getPosition(Point3F& pos, F32 hist=0.0f); 
-  virtual bool      getTransform(MatrixF& xfm, F32 hist=0.0f);
-  virtual bool      getAltitudes(F32& terrain_alt, F32& interior_alt);
+  bool      getPosition(Point3F& pos, F32 hist=0.0f) override; 
+  bool      getTransform(MatrixF& xfm, F32 hist=0.0f) override;
+  bool      getAltitudes(F32& terrain_alt, F32& interior_alt) override;
 
   virtual void      set(afxEffectWrapper* effect);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) { }
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override { }
 
-  virtual U32       setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim);
-  virtual void      resetAnimation(U32 tag);
-  virtual F32       getAnimClipDuration(const char* clip);
+  U32       setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim) override;
+  void      resetAnimation(U32 tag) override;
+  F32       getAnimClipDuration(const char* clip) override;
 
-  virtual SceneObject* getSceneObject() { return 0; }
-  virtual void      restoreObject(SceneObject*) { }
-  virtual U16       getScopeId() { return 0; }
-  virtual U32       getTriggers();
+  SceneObject* getSceneObject() override { return 0; }
+  void      restoreObject(SceneObject*) override { }
+  U16       getScopeId() override { return 0; }
+  U32       getTriggers() override;
 
-  virtual void      unset() { set(0); }
+  void      unset() override { set(0); }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -487,10 +487,10 @@ public:
   /*C*/             afxEffectNodeConstraint(afxConstraintMgr*);
   /*C*/             afxEffectNodeConstraint(afxConstraintMgr*, StringTableEntry name, StringTableEntry node);
 
-  virtual bool      getPosition(Point3F& pos, F32 hist=0.0f); 
-  virtual bool      getTransform(MatrixF& xfm, F32 hist=0.0f);
+  bool      getPosition(Point3F& pos, F32 hist=0.0f) override; 
+  bool      getTransform(MatrixF& xfm, F32 hist=0.0f) override;
 
-  virtual void      set(afxEffectWrapper* effect);
+  void      set(afxEffectWrapper* effect) override;
 
   S32               getNodeID() const { return mEffect_node_ID; }
 };
@@ -532,14 +532,14 @@ class afxSampleXfmBuffer : public afxSampleBuffer
 protected:
   MatrixF*          mXfm_buffer;
 
-  virtual void      recSample(U32 idx, void* data);
+  void      recSample(U32 idx, void* data) override;
 
 public:
   /*C*/             afxSampleXfmBuffer();
   virtual           ~afxSampleXfmBuffer();
 
-  virtual void      configHistory(F32 hist_len, U8 sample_rate);
-  virtual void      getSample(F32 lag, void* data, bool& oob);
+  void      configHistory(F32 hist_len, U8 sample_rate) override;
+  void      getSample(F32 lag, void* data, bool& oob) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -558,11 +558,11 @@ public:
   /*C*/             afxPointHistConstraint(afxConstraintMgr*);
   virtual           ~afxPointHistConstraint();
 
-  virtual void      set(Point3F point, Point3F vector);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
+  void      set(Point3F point, Point3F vector) override;
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
 
-  virtual bool      getPosition(Point3F& pos, F32 hist=0.0f);
-  virtual bool      getTransform(MatrixF& xfm, F32 hist=0.0f);
+  bool      getPosition(Point3F& pos, F32 hist=0.0f) override;
+  bool      getTransform(MatrixF& xfm, F32 hist=0.0f) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -581,11 +581,11 @@ public:
   /*C*/             afxTransformHistConstraint(afxConstraintMgr*);
   virtual           ~afxTransformHistConstraint();
 
-  virtual void      set(const MatrixF& xfm);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
+  void      set(const MatrixF& xfm) override;
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
 
-  virtual bool      getPosition(Point3F& pos, F32 hist=0.0f);
-  virtual bool      getTransform(MatrixF& xfm, F32 hist=0.0f);
+  bool      getPosition(Point3F& pos, F32 hist=0.0f) override;
+  bool      getTransform(MatrixF& xfm, F32 hist=0.0f) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -605,14 +605,14 @@ public:
   /*C*/             afxShapeHistConstraint(afxConstraintMgr*, StringTableEntry arb_name);
   virtual           ~afxShapeHistConstraint();
 
-  virtual void      set(ShapeBase* shape);
-  virtual void      set_scope_id(U16 scope_id);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
+  void      set(ShapeBase* shape) override;
+  void      set_scope_id(U16 scope_id) override;
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
 
-  virtual bool      getPosition(Point3F& pos, F32 hist=0.0f);
-  virtual bool      getTransform(MatrixF& xfm, F32 hist=0.0f);
+  bool      getPosition(Point3F& pos, F32 hist=0.0f) override;
+  bool      getTransform(MatrixF& xfm, F32 hist=0.0f) override;
 
-  virtual void      onDeleteNotify(SimObject*);
+  void      onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -632,14 +632,14 @@ public:
   /*C*/             afxShapeNodeHistConstraint(afxConstraintMgr*, StringTableEntry arb_name, StringTableEntry arb_node);
   virtual           ~afxShapeNodeHistConstraint();
 
-  virtual void      set(ShapeBase* shape);
-  virtual void      set_scope_id(U16 scope_id);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
+  void      set(ShapeBase* shape) override;
+  void      set_scope_id(U16 scope_id) override;
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
 
-  virtual bool      getPosition(Point3F& pos, F32 hist=0.0f);
-  virtual bool      getTransform(MatrixF& xfm, F32 hist=0.0f);
+  bool      getPosition(Point3F& pos, F32 hist=0.0f) override;
+  bool      getTransform(MatrixF& xfm, F32 hist=0.0f) override;
 
-  virtual void      onDeleteNotify(SimObject*);
+  void      onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -661,14 +661,14 @@ public:
                     afxObjectHistConstraint(afxConstraintMgr*, StringTableEntry arb_name);
   virtual           ~afxObjectHistConstraint();
 
-  virtual void      set(SceneObject* obj);
-  virtual void      set_scope_id(U16 scope_id);
-  virtual void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
+  void      set(SceneObject* obj) override;
+  void      set_scope_id(U16 scope_id) override;
+  void      sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
 
-  virtual bool      getPosition(Point3F& pos, F32 hist=0.0f);
-  virtual bool      getTransform(MatrixF& xfm, F32 hist=0.0f);
+  bool      getPosition(Point3F& pos, F32 hist=0.0f) override;
+  bool      getTransform(MatrixF& xfm, F32 hist=0.0f) override;
 
-  virtual void      onDeleteNotify(SimObject*);
+  void      onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/afxEffectGroup.h b/Engine/source/afx/afxEffectGroup.h
index 87a99522e..125cb7889 100644
--- a/Engine/source/afx/afxEffectGroup.h
+++ b/Engine/source/afx/afxEffectGroup.h
@@ -60,7 +60,7 @@ class afxEffectGroupData : public afxEffectBaseData
     U32 id;
   public:
     egValidator(U32 id) { this->id = id; }
-    void validateType(SimObject *object, void *typePtr);
+    void validateType(SimObject *object, void *typePtr) override;
   };
 
   bool          do_id_convert;
@@ -82,16 +82,16 @@ public:
   /*C*/         afxEffectGroupData();
   /*C*/         afxEffectGroupData(const afxEffectGroupData&, bool = false);
 
-  virtual void  reloadReset();
+  void  reloadReset() override;
 
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  bool          preload(bool server, String &errorStr);
+  bool          preload(bool server, String &errorStr) override;
 
-  virtual void  gather_cons_defs(Vector<afxConstraintDef>& defs);
+  void  gather_cons_defs(Vector<afxConstraintDef>& defs) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
diff --git a/Engine/source/afx/afxEffectWrapper.h b/Engine/source/afx/afxEffectWrapper.h
index b12678795..9d14f96ef 100644
--- a/Engine/source/afx/afxEffectWrapper.h
+++ b/Engine/source/afx/afxEffectWrapper.h
@@ -175,7 +175,7 @@ public:
 
   void                  parse_cons_specs();
   void                  parse_vis_keys();
-  void                  gather_cons_defs(Vector<afxConstraintDef>& defs);
+  void                  gather_cons_defs(Vector<afxConstraintDef>& defs) override;
   void                  pack_mods(BitStream*, afxXM_BaseData* mods[], bool packed);
   void                  unpack_mods(BitStream*, afxXM_BaseData* mods[]);
 
@@ -184,13 +184,13 @@ public:
   /*C*/             afxEffectWrapperData(const afxEffectWrapperData&, bool = false);
   /*D*/             ~afxEffectWrapperData();
 
-  virtual bool      onAdd();
-  virtual void      packData(BitStream*);
-  virtual void      unpackData(BitStream*);
+  bool      onAdd() override;
+  void      packData(BitStream*) override;
+  void      unpackData(BitStream*) override;
 
-  bool              preload(bool server, String &errorStr);
+  bool              preload(bool server, String &errorStr) override;
 
-  virtual void      onPerformSubstitutions();
+  void      onPerformSubstitutions() override;
 
   bool              requiresStop(const afxEffectTimingData& timing) { return effect_desc->requiresStop(this, timing); }
   bool              runsOnServer() { return effect_desc->runsOnServer(this); }
@@ -201,7 +201,7 @@ public:
 
   F32               afterStopTime() { return ewd_timing.fade_out_time; }
 
-  virtual bool      allowSubstitutions() const { return true; }
+  bool      allowSubstitutions() const override { return true; }
 
   static void       initPersistFields();
 
diff --git a/Engine/source/afx/afxEffectron.cpp b/Engine/source/afx/afxEffectron.cpp
index 6c9a36299..0fd053a7f 100644
--- a/Engine/source/afx/afxEffectron.cpp
+++ b/Engine/source/afx/afxEffectron.cpp
@@ -56,7 +56,7 @@ void afxEffectronData::ewValidator::validateType(SimObject* object, void* typePt
 class EffectronFinishStartupEvent : public SimEvent
 {
 public:
-  void process(SimObject* obj) 
+  void process(SimObject* obj) override 
   { 
      afxEffectron* eff = dynamic_cast<afxEffectron*>(obj);
      if (eff)
diff --git a/Engine/source/afx/afxEffectron.h b/Engine/source/afx/afxEffectron.h
index bb66c988b..ec0921652 100644
--- a/Engine/source/afx/afxEffectron.h
+++ b/Engine/source/afx/afxEffectron.h
@@ -46,7 +46,7 @@ class afxEffectronData : public afxChoreographerData
     U32 id;
   public:
     ewValidator(U32 id) { this->id = id; }
-    void validateType(SimObject *object, void *typePtr);
+    void validateType(SimObject *object, void *typePtr) override;
   };
 
   bool          do_id_convert;
@@ -67,17 +67,17 @@ public:
   /*C*/         afxEffectronData();
   /*C*/         afxEffectronData(const afxEffectronData&, bool = false);
 
-  virtual void  reloadReset();
+  void  reloadReset() override;
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  bool          preload(bool server, String &errorStr);
+  bool          preload(bool server, String &errorStr) override;
 
   void          gatherConstraintDefs(Vector<afxConstraintDef>&); 
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
@@ -127,7 +127,7 @@ public:
   class ObjectDeleteEvent : public SimEvent
   {
   public:
-    void process(SimObject *obj) { if (obj) obj->deleteObject(); }
+    void process(SimObject *obj) override { if (obj) obj->deleteObject(); }
   };
 
 private:
@@ -164,16 +164,16 @@ public:
   /*D*/         ~afxEffectron();
 
     // STANDARD OVERLOADED METHODS //
-  virtual bool  onNewDataBlock(GameBaseData* dptr, bool reload);
-  virtual void  processTick(const Move*);
-  virtual void  advanceTime(F32 dt);
-  virtual bool  onAdd();
-  virtual U32   packUpdate(NetConnection*, U32, BitStream*);
-  virtual void  unpackUpdate(NetConnection*, BitStream*);
+  bool  onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  void  processTick(const Move*) override;
+  void  advanceTime(F32 dt) override;
+  bool  onAdd() override;
+  U32   packUpdate(NetConnection*, U32, BitStream*) override;
+  void  unpackUpdate(NetConnection*, BitStream*) override;
 
-  virtual void  inflictDamage(const char * label, const char* flavor, SimObjectId target,
-                              F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp);
-  virtual void  sync_with_clients();
+  void  inflictDamage(const char * label, const char* flavor, SimObjectId target,
+                              F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp) override;
+  void  sync_with_clients() override;
   void          finish_startup();
 
   DECLARE_CONOBJECT(afxEffectron);
diff --git a/Engine/source/afx/afxMagicMissile.cpp b/Engine/source/afx/afxMagicMissile.cpp
index 73cbfefc0..e797c2dc1 100644
--- a/Engine/source/afx/afxMagicMissile.cpp
+++ b/Engine/source/afx/afxMagicMissile.cpp
@@ -67,7 +67,7 @@
 class ObjectDeleteEvent : public SimEvent
 {
 public:
-  void process(SimObject *object)
+  void process(SimObject *object) override
   {
     object->deleteObject();
   }
diff --git a/Engine/source/afx/afxMagicMissile.h b/Engine/source/afx/afxMagicMissile.h
index 957066a4b..e3f6ee755 100644
--- a/Engine/source/afx/afxMagicMissile.h
+++ b/Engine/source/afx/afxMagicMissile.h
@@ -61,7 +61,7 @@ class afxMagicMissileData : public GameBaseData
   typedef GameBaseData Parent;
   
 protected:
-  bool onAdd();
+  bool onAdd() override;
 
 public:
   enum { MaxLifetimeTicks = 4095 };
@@ -210,10 +210,10 @@ public:
   /*C*/                 afxMagicMissileData();
   /*D*/                 ~afxMagicMissileData();
   
-  void                  packData(BitStream*);
-  void                  unpackData(BitStream*);
+  void                  packData(BitStream*) override;
+  void                  unpackData(BitStream*) override;
 
-  bool                  preload(bool server, String &errorStr);
+  bool                  preload(bool server, String &errorStr) override;
   
   static void           initPersistFields();
   
@@ -223,7 +223,7 @@ public:
   /*C*/                 afxMagicMissileData(const afxMagicMissileData&, bool = false);
 
   afxMagicMissileData*  cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
-  virtual bool          allowSubstitutions() const { return true; }
+  bool          allowSubstitutions() const override { return true; }
   void                  gather_cons_defs(Vector<afxConstraintDef>& defs);
 };
 
@@ -290,8 +290,8 @@ protected:
   */
 
   // ISceneLight
-  virtual void submitLights( LightManager *lm, bool staticLighting );
-  virtual LightInfo* getLight() { return mLight; }
+  void submitLights( LightManager *lm, bool staticLighting ) override;
+  LightInfo* getLight() override { return mLight; }
 
   LightInfo *mLight;
   LightState mLightState;
@@ -319,19 +319,19 @@ protected:
   U32     mCollideHitType;
   */
   
-  bool onAdd();
-  void onRemove();
-  bool onNewDataBlock(GameBaseData *dptr, bool reload);
+  bool onAdd() override;
+  void onRemove() override;
+  bool onNewDataBlock(GameBaseData *dptr, bool reload) override;
 
   // Rendering
-  virtual void prepRenderImage(SceneRenderState*);
+  void prepRenderImage(SceneRenderState*) override;
   void prepBatchRender( SceneRenderState *state); 
 
-  void processTick(const Move *move);
+  void processTick(const Move *move) override;
   /*
   void advanceTime(F32 dt);
   */
-  void interpolateTick(F32 delta);
+  void interpolateTick(F32 delta) override;
 
   /*
   /// What to do once this projectile collides with something
@@ -355,8 +355,8 @@ protected:
    // These are stolen from the player class ..
   bool              pointInWater(const Point3F &point);
 
-  U32  packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
-  void unpackUpdate(NetConnection *conn, BitStream *stream);
+  U32  packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
+  void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
   afxChoreographer* choreographer;
 
@@ -396,7 +396,7 @@ public:
   /*C*/             afxMagicMissile();
   /*C*/             afxMagicMissile(bool on_server, bool on_client);
   /*D*/             ~afxMagicMissile();
-  virtual void      onDeleteNotify(SimObject*);
+  void      onDeleteNotify(SimObject*) override;
 
   DECLARE_CONOBJECT(afxMagicMissile);
   DECLARE_CATEGORY("UNLISTED");
diff --git a/Engine/source/afx/afxMagicSpell.cpp b/Engine/source/afx/afxMagicSpell.cpp
index 8d0822b51..5cb5be2eb 100644
--- a/Engine/source/afx/afxMagicSpell.cpp
+++ b/Engine/source/afx/afxMagicSpell.cpp
@@ -77,7 +77,7 @@ void afxMagicSpellData::ewValidator::validateType(SimObject* object, void* typeP
 class SpellFinishStartupEvent : public SimEvent
 {
 public:
-  void process(SimObject* obj)
+  void process(SimObject* obj) override
   {
      afxMagicSpell* spell = dynamic_cast<afxMagicSpell*>(obj);
      if (spell)
@@ -574,10 +574,10 @@ class CastingPhrase_C : public afxPhrase
   F32           mCastbar_progress;
 public:
   /*C*/         CastingPhrase_C(ShapeBase* caster, bool notify_castbar);
-  virtual void  start(F32 startstamp, F32 timestamp);
-  virtual void  update(F32 dt, F32 timestamp);
-  virtual void  stop(F32 timestamp);
-  virtual void  interrupt(F32 timestamp);
+  void  start(F32 startstamp, F32 timestamp) override;
+  void  update(F32 dt, F32 timestamp) override;
+  void  stop(F32 timestamp) override;
+  void  interrupt(F32 timestamp) override;
 };
 
 CastingPhrase_C::CastingPhrase_C(ShapeBase* c, bool notify)
diff --git a/Engine/source/afx/afxMagicSpell.h b/Engine/source/afx/afxMagicSpell.h
index c97886802..a978303e0 100644
--- a/Engine/source/afx/afxMagicSpell.h
+++ b/Engine/source/afx/afxMagicSpell.h
@@ -65,7 +65,7 @@ class afxMagicSpellData : public afxChoreographerData, public afxMagicSpellDefs
     U32 id;
   public:
     ewValidator(U32 id) { this->id = id; }
-    void validateType(SimObject *object, void *typePtr);
+    void validateType(SimObject *object, void *typePtr) override;
   };
 
   bool                  mDo_id_convert;
@@ -106,18 +106,18 @@ public:
   /*C*/                 afxMagicSpellData();
   /*C*/                 afxMagicSpellData(const afxMagicSpellData&, bool = false);
 
-  virtual void          reloadReset();
+  void          reloadReset() override;
 
-  virtual bool          onAdd();
-  virtual void          packData(BitStream*);
-  virtual void          unpackData(BitStream*);
-  virtual bool          writeField(StringTableEntry fieldname, const char* value);
+  bool          onAdd() override;
+  void          packData(BitStream*) override;
+  void          unpackData(BitStream*) override;
+  bool          writeField(StringTableEntry fieldname, const char* value) override;
 
-  bool                  preload(bool server, String &errorStr);
+  bool                  preload(bool server, String &errorStr) override;
 
   void                  gatherConstraintDefs(Vector<afxConstraintDef>&); 
 
-  virtual bool          allowSubstitutions() const { return true; }
+  bool          allowSubstitutions() const override { return true; }
 
   static void           initPersistFields();
 
@@ -208,7 +208,7 @@ public:
   class ObjectDeleteEvent : public SimEvent
   {
   public:
-    void process(SimObject *obj) { if (obj) obj->deleteObject(); }
+    void process(SimObject *obj) override { if (obj) obj->deleteObject(); }
   };
 
 private:
@@ -272,9 +272,9 @@ private:
   bool          is_impact_in_water(SceneObject* obj, const Point3F& p);
 
 protected:
-  virtual bool  remap_builtin_constraint(SceneObject*, const char* cons_name); // CONSTRAINT REMAPPING
-  virtual void  pack_constraint_info(NetConnection* conn, BitStream* stream);
-  virtual void  unpack_constraint_info(NetConnection* conn, BitStream* stream);
+  bool  remap_builtin_constraint(SceneObject*, const char* cons_name) override; // CONSTRAINT REMAPPING
+  void  pack_constraint_info(NetConnection* conn, BitStream* stream) override;
+  void  unpack_constraint_info(NetConnection* conn, BitStream* stream) override;
 
 private:
   afxMagicMissile*  mMissile;
@@ -292,11 +292,11 @@ private:
   void          launch_missile_c();
 
 public:
-  virtual void  impactNotify(const Point3F& p, const Point3F& n, SceneObject*);
-  virtual void  executeScriptEvent(const char* method, afxConstraint*, 
-                                   const MatrixF& pos, const char* data);
-  virtual void  inflictDamage(const char * label, const char* flavor, SimObjectId target,
-                              F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp);
+  void  impactNotify(const Point3F& p, const Point3F& n, SceneObject*) override;
+  void  executeScriptEvent(const char* method, afxConstraint*, 
+                                   const MatrixF& pos, const char* data) override;
+  void  inflictDamage(const char * label, const char* flavor, SimObjectId target,
+                              F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp) override;
 
 public:
   /*C*/         afxMagicSpell();
@@ -304,16 +304,16 @@ public:
   /*D*/         ~afxMagicSpell();
 
     // STANDARD OVERLOADED METHODS //
-  virtual bool  onNewDataBlock(GameBaseData* dptr, bool reload);
-  virtual void  processTick(const Move*);
-  virtual void  advanceTime(F32 dt);
-  virtual bool  onAdd();
-  virtual void  onRemove();
-  virtual void  onDeleteNotify(SimObject*);
-  virtual U32   packUpdate(NetConnection*, U32, BitStream*);
-  virtual void  unpackUpdate(NetConnection*, BitStream*);
+  bool  onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  void  processTick(const Move*) override;
+  void  advanceTime(F32 dt) override;
+  bool  onAdd() override;
+  void  onRemove() override;
+  void  onDeleteNotify(SimObject*) override;
+  U32   packUpdate(NetConnection*, U32, BitStream*) override;
+  void  unpackUpdate(NetConnection*, BitStream*) override;
 
-  virtual void  sync_with_clients();
+  void  sync_with_clients() override;
   void          finish_startup();
 
   static void   initPersistFields();
@@ -361,7 +361,7 @@ public:
   afxMagicMissile*  getMissile() const { return mMissile; }
   SceneObject*      getImpactedObject() const { return mImpacted_obj; }
 
-  virtual void      restoreObject(SceneObject*);
+  void      restoreObject(SceneObject*) override;
 
   bool              activationCallInit(bool postponed=false);
   void              activate();
diff --git a/Engine/source/afx/afxRenderHighlightMgr.h b/Engine/source/afx/afxRenderHighlightMgr.h
index 406997f90..2be151543 100644
--- a/Engine/source/afx/afxRenderHighlightMgr.h
+++ b/Engine/source/afx/afxRenderHighlightMgr.h
@@ -60,8 +60,8 @@ public:
    bool isSelectionEnabled();
 
    // RenderBinManager
-   virtual void addElement( RenderInst *inst );
-   virtual void render( SceneRenderState *state );
+   void addElement( RenderInst *inst ) override;
+   void render( SceneRenderState *state ) override;
 
    // ConsoleObject
    DECLARE_CONOBJECT( afxRenderHighlightMgr );
diff --git a/Engine/source/afx/afxResidueMgr.h b/Engine/source/afx/afxResidueMgr.h
index a4066828a..e591a15e6 100644
--- a/Engine/source/afx/afxResidueMgr.h
+++ b/Engine/source/afx/afxResidueMgr.h
@@ -153,7 +153,7 @@ public:
   /*D*/             ~afxResidueMgr();
 
   void              cleanup();
-  virtual void      onDeleteNotify(SimObject *obj);
+  void      onDeleteNotify(SimObject *obj) override;
     
 public:
   void              residueAdvanceTime();
diff --git a/Engine/source/afx/afxSelectron.cpp b/Engine/source/afx/afxSelectron.cpp
index 1aa182f6c..ccaf680e4 100644
--- a/Engine/source/afx/afxSelectron.cpp
+++ b/Engine/source/afx/afxSelectron.cpp
@@ -66,7 +66,7 @@ void afxSelectronData::ewValidator::validateType(SimObject* object, void* typePt
 class SelectronFinishStartupEvent : public SimEvent
 {
 public:
-  void process(SimObject* obj)
+  void process(SimObject* obj) override
   {
      afxSelectron* selectron = dynamic_cast<afxSelectron*>(obj);
      if (selectron)
diff --git a/Engine/source/afx/afxSelectron.h b/Engine/source/afx/afxSelectron.h
index deca54fdf..780322282 100644
--- a/Engine/source/afx/afxSelectron.h
+++ b/Engine/source/afx/afxSelectron.h
@@ -57,7 +57,7 @@ class afxSelectronData : public afxChoreographerData, public afxSelectronDefs
     U32 id;
   public:
     ewValidator(U32 id) { this->id = id; }
-    void validateType(SimObject *object, void *typePtr);
+    void validateType(SimObject *object, void *typePtr) override;
   };
 
   bool          do_id_convert;
@@ -90,18 +90,18 @@ public:
   /*C*/         afxSelectronData(const afxSelectronData&, bool = false);
   /*D*/         ~afxSelectronData();
 
-  virtual void  reloadReset();
+  void  reloadReset() override;
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  bool          preload(bool server, String &errorStr);
+  bool          preload(bool server, String &errorStr) override;
 
   bool          matches(U32 mask, U8 style);
   void          gatherConstraintDefs(Vector<afxConstraintDef>&); 
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
@@ -163,7 +163,7 @@ public:
   class ObjectDeleteEvent : public SimEvent
   {
   public:
-    void process(SimObject *obj) { if (obj) obj->deleteObject(); }
+    void process(SimObject *obj) override { if (obj) obj->deleteObject(); }
   };
 
 private:
@@ -206,15 +206,15 @@ public:
   /*D*/         ~afxSelectron();
 
     // STANDARD OVERLOADED METHODS //
-  virtual bool  onNewDataBlock(GameBaseData* dptr, bool reload);
-  virtual void  processTick(const Move*);
-  virtual void  advanceTime(F32 dt);
-  virtual bool  onAdd();
-  virtual void  onRemove();
-  virtual U32   packUpdate(NetConnection*, U32, BitStream*);
-  virtual void  unpackUpdate(NetConnection*, BitStream*);
+  bool  onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  void  processTick(const Move*) override;
+  void  advanceTime(F32 dt) override;
+  bool  onAdd() override;
+  void  onRemove() override;
+  U32   packUpdate(NetConnection*, U32, BitStream*) override;
+  void  unpackUpdate(NetConnection*, BitStream*) override;
 
-  virtual void  sync_with_clients();
+  void  sync_with_clients() override;
   void          finish_startup();
 
   DECLARE_CONOBJECT(afxSelectron);
diff --git a/Engine/source/afx/afxSpellBook.h b/Engine/source/afx/afxSpellBook.h
index e6bf8d580..ed487c5a0 100644
--- a/Engine/source/afx/afxSpellBook.h
+++ b/Engine/source/afx/afxSpellBook.h
@@ -57,10 +57,10 @@ public:
 public:
   /*C*/                 afxSpellBookData();
 
-  virtual void          packData(BitStream*);
-  virtual void          unpackData(BitStream*);
+  void          packData(BitStream*) override;
+  void          unpackData(BitStream*) override;
 
-  bool                  preload(bool server, String &errorStr);
+  bool                  preload(bool server, String &errorStr) override;
 
   bool                  verifyPageSlot(S32 page, S32 slot);
   S32                   getPageSlotIndex(S32 page, S32 slot);
@@ -104,15 +104,15 @@ public:
   /*C*/                   afxSpellBook();
   /*D*/                   ~afxSpellBook();
 
-  virtual bool            onNewDataBlock(GameBaseData* dptr, bool reload);
-  virtual void            processTick(const Move*);
-  virtual void            advanceTime(F32 dt);
+  bool            onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  void            processTick(const Move*) override;
+  void            advanceTime(F32 dt) override;
 
-  virtual bool            onAdd();
-  virtual void            onRemove();
+  bool            onAdd() override;
+  void            onRemove() override;
 
-  virtual U32             packUpdate(NetConnection*, U32, BitStream*);
-  virtual void            unpackUpdate(NetConnection*, BitStream*);
+  U32             packUpdate(NetConnection*, U32, BitStream*) override;
+  void            unpackUpdate(NetConnection*, BitStream*) override;
 
   static void             initPersistFields();
 
diff --git a/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h b/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h
index 5e8deafb9..6ca962a71 100644
--- a/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h
+++ b/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h
@@ -71,13 +71,13 @@ public:
    /*D*/          ~afxZodiacGroundPlaneRenderer();
 
    // RenderBinManager
-   virtual void   sort(){}  // don't sort them
-   virtual void   clear();
+   void   sort() override{}  // don't sort them
+   void   clear() override;
 
    void           initShader();
    void           addZodiac(U32 zode_idx, const Point3F& pos, F32 ang, const GroundPlane*, F32 camDist);
 
-   virtual void   render(SceneRenderState* state);
+   void   render(SceneRenderState* state) override;
 
    static afxZodiacGroundPlaneRenderer* getMaster();
 
diff --git a/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h b/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h
index 8fd5e10f7..030887cc0 100644
--- a/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h
+++ b/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h
@@ -72,13 +72,13 @@ public:
    /*D*/          ~afxZodiacMeshRoadRenderer();
 
    // RenderBinManager
-   virtual void   sort(){}  // don't sort them
-   virtual void   clear();
+   void   sort() override{}  // don't sort them
+   void   clear() override;
 
    void           initShader();
    void           addZodiac(U32 zode_idx, ConcretePolyList*, const Point3F& pos, F32 ang, const MeshRoad*, F32 camDist);
 
-   virtual void   render(SceneRenderState*);
+   void   render(SceneRenderState*) override;
 
    static afxZodiacMeshRoadRenderer* getMaster();
 
diff --git a/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h b/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h
index b28fba9c1..357dc34d8 100644
--- a/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h
+++ b/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h
@@ -72,13 +72,13 @@ public:
    /*D*/          ~afxZodiacPolysoupRenderer();
 
    // RenderBinManager
-   virtual void   sort(){}  // don't sort them
-   virtual void   clear();
+   void   sort() override{}  // don't sort them
+   void   clear() override;
 
    void           initShader();
    void           addZodiac(U32 zode_idx, ConcretePolyList*, const Point3F& pos, F32 ang, const TSStatic*, F32 camDist);
 
-   virtual void   render(SceneRenderState*);
+   void   render(SceneRenderState*) override;
 
    static afxZodiacPolysoupRenderer* getMaster();
 
diff --git a/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h b/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h
index 1f0f804a5..e32acdf55 100644
--- a/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h
+++ b/Engine/source/afx/afxZodiacTerrainRenderer_T3D.h
@@ -72,13 +72,13 @@ public:
    /*D*/          ~afxZodiacTerrainRenderer();
 
    // RenderBinManager
-   virtual void   sort(){}  // don't sort them
-   virtual void   clear();
+   void   sort() override{}  // don't sort them
+   void   clear() override;
 
    void           initShader();
    void           addZodiac(U32 zode_idx, const Point3F& pos, F32 ang, const TerrainBlock*, const TerrCell*, const MatrixF& mRenderObjToWorld, F32 camDist);
 
-   virtual void   render(SceneRenderState*);
+   void   render(SceneRenderState*) override;
 
    static afxZodiacTerrainRenderer* getMaster();
 
diff --git a/Engine/source/afx/arcaneFX.cpp b/Engine/source/afx/arcaneFX.cpp
index dccaca6c9..db3dd43a7 100644
--- a/Engine/source/afx/arcaneFX.cpp
+++ b/Engine/source/afx/arcaneFX.cpp
@@ -69,11 +69,11 @@ public:
   ClientZoneInEvent() { mGuaranteeType = Guaranteed; }
   ~ClientZoneInEvent() { }
 
-  virtual void pack(NetConnection*, BitStream*bstream) { }
-  virtual void write(NetConnection*, BitStream *bstream) { }
-  virtual void unpack(NetConnection* /*ps*/, BitStream *bstream) { }
+  void pack(NetConnection*, BitStream*bstream) override { }
+  void write(NetConnection*, BitStream *bstream) override { }
+  void unpack(NetConnection* /*ps*/, BitStream *bstream) override { }
 
-  virtual void process(NetConnection* conn)
+  void process(NetConnection* conn) override
   {
     GameConnection* game_conn = dynamic_cast<GameConnection*>(conn);
     if (game_conn && !game_conn->isZonedIn())
diff --git a/Engine/source/afx/ce/afxAnimClip.h b/Engine/source/afx/ce/afxAnimClip.h
index 19bd3ccfa..c7f39fff3 100644
--- a/Engine/source/afx/ce/afxAnimClip.h
+++ b/Engine/source/afx/ce/afxAnimClip.h
@@ -61,14 +61,14 @@ public:
   /*C*/                 afxAnimClipData();
   /*C*/                 afxAnimClipData(const afxAnimClipData&, bool = false);
 
-  virtual bool          onAdd();
-  virtual void          packData(BitStream*);
-  virtual void          unpackData(BitStream*);
-  virtual bool          writeField(StringTableEntry fieldname, const char* value);
+  bool          onAdd() override;
+  void          packData(BitStream*) override;
+  void          unpackData(BitStream*) override;
+  bool          writeField(StringTableEntry fieldname, const char* value) override;
 
-  virtual void          onStaticModified(const char* slotName, const char* newValue = NULL);
+  void          onStaticModified(const char* slotName, const char* newValue = NULL) override;
 
-  virtual bool          allowSubstitutions() const { return true; }
+  bool          allowSubstitutions() const override { return true; }
 
   static void           initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxAnimLock.h b/Engine/source/afx/ce/afxAnimLock.h
index 8aa9cf348..63d75b2d1 100644
--- a/Engine/source/afx/ce/afxAnimLock.h
+++ b/Engine/source/afx/ce/afxAnimLock.h
@@ -33,9 +33,9 @@ class afxAnimLockData : public GameBaseData
 public:
   /*C*/                 afxAnimLockData();
 
-  virtual bool          onAdd();
-  virtual void          packData(BitStream*);
-  virtual void          unpackData(BitStream*);
+  bool          onAdd() override;
+  void          packData(BitStream*) override;
+  void          unpackData(BitStream*) override;
 
   static void           initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxAreaDamage.h b/Engine/source/afx/ce/afxAreaDamage.h
index dd8a2b30a..2274b2b19 100644
--- a/Engine/source/afx/ce/afxAreaDamage.h
+++ b/Engine/source/afx/ce/afxAreaDamage.h
@@ -45,11 +45,11 @@ public:
   /*C*/         afxAreaDamageData();
   /*C*/         afxAreaDamageData(const afxAreaDamageData&, bool = false);
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxAudioBank.h b/Engine/source/afx/ce/afxAudioBank.h
index 1f1fa42e8..67d2e8bfb 100644
--- a/Engine/source/afx/ce/afxAudioBank.h
+++ b/Engine/source/afx/ce/afxAudioBank.h
@@ -48,15 +48,15 @@ public:
 
    static void        initPersistFields();
 
-   virtual bool       onAdd();
-   virtual void       packData(BitStream* stream);
-   virtual void       unpackData(BitStream* stream);
+   bool       onAdd() override;
+   void       packData(BitStream* stream) override;
+   void       unpackData(BitStream* stream) override;
 
-   bool               preload(bool server, String &errorStr);
+   bool               preload(bool server, String &errorStr) override;
 
    afxAudioBank*      cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
-   virtual void       onPerformSubstitutions();
-   virtual bool       allowSubstitutions() const { return true; }
+   void       onPerformSubstitutions() override;
+   bool       allowSubstitutions() const override { return true; }
 
    DECLARE_CONOBJECT(afxAudioBank);
 };
diff --git a/Engine/source/afx/ce/afxBillboard.h b/Engine/source/afx/ce/afxBillboard.h
index da382ac20..8918e2f26 100644
--- a/Engine/source/afx/ce/afxBillboard.h
+++ b/Engine/source/afx/ce/afxBillboard.h
@@ -62,12 +62,12 @@ public:
   /*C*/             afxBillboardData();
   /*C*/             afxBillboardData(const afxBillboardData&, bool = false);
 
-  virtual void      packData(BitStream*);
-  virtual void      unpackData(BitStream*);
+  void      packData(BitStream*) override;
+  void      unpackData(BitStream*) override;
 
-  bool              preload(bool server, String &errorStr);
+  bool              preload(bool server, String &errorStr) override;
 
-  virtual bool      allowSubstitutions() const { return true; }
+  bool      allowSubstitutions() const override { return true; }
 
   static void       initPersistFields();
 
@@ -103,15 +103,15 @@ public:
   /*C*/             afxBillboard();
   /*D*/             ~afxBillboard();
 
-  virtual bool      onNewDataBlock(GameBaseData* dptr, bool reload);
-  virtual bool      onAdd();
-  virtual void      onRemove();
+  bool      onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  bool      onAdd() override;
+  void      onRemove() override;
 
   void              setFadeAmount(F32 amt) { fade_amt = amt; }
   void              setSortPriority(S8 priority) { sort_priority = priority; }
   void              setVisibility(bool flag) { is_visible = flag; }
 
-  virtual void      prepRenderImage(SceneRenderState*);
+  void      prepRenderImage(SceneRenderState*) override;
 
   void              _renderBillboard(ObjectRenderInst*, SceneRenderState*, BaseMatInstance*);
 
diff --git a/Engine/source/afx/ce/afxCameraPuppet.h b/Engine/source/afx/ce/afxCameraPuppet.h
index da9f4eb7a..f44424079 100644
--- a/Engine/source/afx/ce/afxCameraPuppet.h
+++ b/Engine/source/afx/ce/afxCameraPuppet.h
@@ -40,17 +40,17 @@ public:
 
   U8                networking;
 
-  virtual void      gather_cons_defs(Vector<afxConstraintDef>& defs);
+  void      gather_cons_defs(Vector<afxConstraintDef>& defs) override;
 
 public:
   /*C*/             afxCameraPuppetData();
   /*C*/             afxCameraPuppetData(const afxCameraPuppetData&, bool = false);
 
-  virtual bool      onAdd();
-  virtual void      packData(BitStream*);
-  virtual void      unpackData(BitStream*);
+  bool      onAdd() override;
+  void      packData(BitStream*) override;
+  void      unpackData(BitStream*) override;
 
-  virtual bool      allowSubstitutions() const { return true; }
+  bool      allowSubstitutions() const override { return true; }
 
   static void       initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxCameraShake.h b/Engine/source/afx/ce/afxCameraShake.h
index 32d4393ca..b0aa63370 100644
--- a/Engine/source/afx/ce/afxCameraShake.h
+++ b/Engine/source/afx/ce/afxCameraShake.h
@@ -40,11 +40,11 @@ public:
   /*C*/                 afxCameraShakeData();
   /*C*/                 afxCameraShakeData(const afxCameraShakeData&, bool = false);
 
-  virtual bool          onAdd();
-  virtual void          packData(BitStream*);
-  virtual void          unpackData(BitStream*);
+  bool          onAdd() override;
+  void          packData(BitStream*) override;
+  void          unpackData(BitStream*) override;
 
-  virtual bool          allowSubstitutions() const { return true; }
+  bool          allowSubstitutions() const override { return true; }
 
   static void           initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxCollisionEvent.h b/Engine/source/afx/ce/afxCollisionEvent.h
index 29cb7b5a6..ee7b7d475 100644
--- a/Engine/source/afx/ce/afxCollisionEvent.h
+++ b/Engine/source/afx/ce/afxCollisionEvent.h
@@ -43,10 +43,10 @@ public:
   /*C*/                 afxCollisionEventData();
   /*C*/                 afxCollisionEventData(const afxCollisionEventData&, bool = false);
 
-  void                  packData(BitStream* stream);
-  void                  unpackData(BitStream* stream);
+  void                  packData(BitStream* stream) override;
+  void                  unpackData(BitStream* stream) override;
 
-  virtual bool          allowSubstitutions() const { return true; }
+  bool          allowSubstitutions() const override { return true; }
 
   static void           initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxConsoleMessage.h b/Engine/source/afx/ce/afxConsoleMessage.h
index e91705a00..ad95d5918 100644
--- a/Engine/source/afx/ce/afxConsoleMessage.h
+++ b/Engine/source/afx/ce/afxConsoleMessage.h
@@ -37,11 +37,11 @@ public:
   /*C*/                 afxConsoleMessageData();
   /*C*/                 afxConsoleMessageData(const afxConsoleMessageData&, bool = false);
 
-  virtual bool          onAdd();
-  virtual void          packData(BitStream*);
-  virtual void          unpackData(BitStream*);
+  bool          onAdd() override;
+  void          packData(BitStream*) override;
+  void          unpackData(BitStream*) override;
 
-  virtual bool          allowSubstitutions() const { return true; }
+  bool          allowSubstitutions() const override { return true; }
 
   static void           initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxDamage.h b/Engine/source/afx/ce/afxDamage.h
index 40249ef6b..d42fd772d 100644
--- a/Engine/source/afx/ce/afxDamage.h
+++ b/Engine/source/afx/ce/afxDamage.h
@@ -46,11 +46,11 @@ public:
   /*C*/         afxDamageData();
   /*C*/         afxDamageData(const afxDamageData&, bool = false);
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxFootSwitch.h b/Engine/source/afx/ce/afxFootSwitch.h
index c15f4299a..f1c8484ad 100644
--- a/Engine/source/afx/ce/afxFootSwitch.h
+++ b/Engine/source/afx/ce/afxFootSwitch.h
@@ -40,10 +40,10 @@ public:
   /*C*/           afxFootSwitchData();
   /*C*/           afxFootSwitchData(const afxFootSwitchData&, bool = false);
 
-  virtual void    packData(BitStream*);
-  virtual void    unpackData(BitStream*);
+  void    packData(BitStream*) override;
+  void    unpackData(BitStream*) override;
 
-  virtual bool    allowSubstitutions() const { return true; }
+  bool    allowSubstitutions() const override { return true; }
 
   static void     initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxGuiController.h b/Engine/source/afx/ce/afxGuiController.h
index 744ddb7f3..1c1cf8ffa 100644
--- a/Engine/source/afx/ce/afxGuiController.h
+++ b/Engine/source/afx/ce/afxGuiController.h
@@ -41,11 +41,11 @@ public:
   /*C*/         afxGuiControllerData();
   /*C*/         afxGuiControllerData(const afxGuiControllerData&, bool = false);
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxGuiText.h b/Engine/source/afx/ce/afxGuiText.h
index a8f06af9d..f4e29676f 100644
--- a/Engine/source/afx/ce/afxGuiText.h
+++ b/Engine/source/afx/ce/afxGuiText.h
@@ -40,11 +40,11 @@ public:
   /*C*/         afxGuiTextData();
   /*C*/         afxGuiTextData(const afxGuiTextData&, bool = false);
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxLightBase_T3D.h b/Engine/source/afx/ce/afxLightBase_T3D.h
index 0913c8b10..3f101b1d7 100644
--- a/Engine/source/afx/ce/afxLightBase_T3D.h
+++ b/Engine/source/afx/ce/afxLightBase_T3D.h
@@ -56,11 +56,11 @@ public:
   /*C*/         afxT3DLightBaseData();
   /*C*/         afxT3DLightBaseData(const afxT3DLightBaseData&, bool = false);
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  bool          preload(bool server, String &errorStr);
+  bool          preload(bool server, String &errorStr) override;
 
   static void   initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxMachineGun.h b/Engine/source/afx/ce/afxMachineGun.h
index 7a8612a48..925e8b8fc 100644
--- a/Engine/source/afx/ce/afxMachineGun.h
+++ b/Engine/source/afx/ce/afxMachineGun.h
@@ -42,11 +42,11 @@ public:
   /*C*/         afxMachineGunData();
   /*C*/         afxMachineGunData(const afxMachineGunData&, bool = false);
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxModel.h b/Engine/source/afx/ce/afxModel.h
index ec972a439..521409735 100644
--- a/Engine/source/afx/ce/afxModel.h
+++ b/Engine/source/afx/ce/afxModel.h
@@ -85,12 +85,12 @@ public:
   /*C*/                 afxModelData(const afxModelData&, bool = false);
   /*D*/                 ~afxModelData();
 
-  bool                  preload(bool server, String &errorStr);
-  void                  packData(BitStream* stream);
-  void                  unpackData(BitStream* stream);
+  bool                  preload(bool server, String &errorStr) override;
+  void                  packData(BitStream* stream) override;
+  void                  unpackData(BitStream* stream) override;
 
-  virtual void          onPerformSubstitutions();
-  virtual bool          allowSubstitutions() const { return true; }
+  void          onPerformSubstitutions() override;
+  bool          allowSubstitutions() const override { return true; }
 
   static void           initPersistFields();
 
@@ -130,22 +130,22 @@ private:
 protected:
   Vector<S32>           mCollisionDetails;
   Vector<S32>           mLOSDetails;
-  bool                  castRay(const Point3F &start, const Point3F &end, RayInfo* info);
+  bool                  castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
 
-  virtual void          advanceTime(F32 dt);
+  void          advanceTime(F32 dt) override;
 
-  virtual void          prepRenderImage(SceneRenderState*);
+  void          prepRenderImage(SceneRenderState*) override;
 
   void                  renderObject(SceneRenderState*);
 
-  virtual bool          onAdd();
-  virtual void          onRemove();
+  bool          onAdd() override;
+  void          onRemove() override;
 
 public:
   /*C*/                 afxModel();
   /*D*/                 ~afxModel();
 
-  virtual bool          onNewDataBlock(GameBaseData* dptr, bool reload);
+  bool          onNewDataBlock(GameBaseData* dptr, bool reload) override;
 
   void                  setFadeAmount(F32 amt) { fade_amt = amt; }
   void                  setSequenceRateFactor(F32 factor);
diff --git a/Engine/source/afx/ce/afxMooring.h b/Engine/source/afx/ce/afxMooring.h
index 266331b21..34b3b7eff 100644
--- a/Engine/source/afx/ce/afxMooring.h
+++ b/Engine/source/afx/ce/afxMooring.h
@@ -43,11 +43,11 @@ public:
   /*C*/         afxMooringData();
   /*C*/         afxMooringData(const afxMooringData&, bool = false);
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
@@ -82,15 +82,15 @@ public:
   /*C*/                 afxMooring(U32 networking, U32 chor_id, StringTableEntry cons_name);
   /*D*/                 ~afxMooring();
 
-  virtual bool          onNewDataBlock(GameBaseData* dptr, bool reload);
-  virtual void          advanceTime(F32 dt);
-  virtual bool          onAdd();
-  virtual void          onRemove();
-  virtual U32           packUpdate(NetConnection*, U32, BitStream*);
-  virtual void          unpackUpdate(NetConnection*, BitStream*);
-  virtual void          setTransform(const MatrixF&);
+  bool          onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  void          advanceTime(F32 dt) override;
+  bool          onAdd() override;
+  void          onRemove() override;
+  U32           packUpdate(NetConnection*, U32, BitStream*) override;
+  void          unpackUpdate(NetConnection*, BitStream*) override;
+  void          setTransform(const MatrixF&) override;
 
-  virtual void          prepRenderImage(SceneRenderState*);
+  void          prepRenderImage(SceneRenderState*) override;
 
   DECLARE_CONOBJECT(afxMooring);
   DECLARE_CATEGORY("UNLISTED");
diff --git a/Engine/source/afx/ce/afxParticleEmitter.h b/Engine/source/afx/ce/afxParticleEmitter.h
index 69fb79c91..25b377ad0 100644
--- a/Engine/source/afx/ce/afxParticleEmitter.h
+++ b/Engine/source/afx/ce/afxParticleEmitter.h
@@ -56,13 +56,13 @@ public:
   /*C*/       afxParticleEmitterData();
   /*C*/       afxParticleEmitterData(const afxParticleEmitterData&, bool = false);
 
-  void        packData(BitStream* stream);
-  void        unpackData(BitStream* stream);
-  bool        onAdd();
+  void        packData(BitStream* stream) override;
+  void        unpackData(BitStream* stream) override;
+  bool        onAdd() override;
 
-  bool        preload(bool server, String &errorStr);
+  bool        preload(bool server, String &errorStr) override;
 
-  virtual bool allowSubstitutions() const { return true; }
+  bool allowSubstitutions() const override { return true; }
 
   static void initPersistFields();
 
@@ -80,13 +80,13 @@ public:
   /*C*/       afxParticleEmitterVectorData();
   /*C*/       afxParticleEmitterVectorData(const afxParticleEmitterVectorData&, bool = false);
 
-  void        packData(BitStream* stream);
-  void        unpackData(BitStream* stream);
-  bool        onAdd();
+  void        packData(BitStream* stream) override;
+  void        unpackData(BitStream* stream) override;
+  bool        onAdd() override;
 
-  bool        preload(bool server, String &errorStr);
+  bool        preload(bool server, String &errorStr) override;
 
-  virtual bool allowSubstitutions() const { return true; }
+  bool allowSubstitutions() const override { return true; }
 
   static void initPersistFields();
 
@@ -108,13 +108,13 @@ public:
   /*C*/       afxParticleEmitterConeData();
   /*C*/       afxParticleEmitterConeData(const afxParticleEmitterConeData&, bool = false);
 
-  void        packData(BitStream* stream);
-  void        unpackData(BitStream* stream);
-  bool        onAdd();
+  void        packData(BitStream* stream) override;
+  void        unpackData(BitStream* stream) override;
+  bool        onAdd() override;
 
-  bool        preload(bool server, String &errorStr);
+  bool        preload(bool server, String &errorStr) override;
 
-  virtual bool allowSubstitutions() const { return true; }
+  bool allowSubstitutions() const override { return true; }
 
   static void initPersistFields();
 
@@ -150,14 +150,14 @@ public:
   /*C*/                 afxParticleEmitterPathData();
   /*C*/                 afxParticleEmitterPathData(const afxParticleEmitterPathData&, bool = false);
 
-  void                  packData(BitStream* stream);
-  void                  unpackData(BitStream* stream);
-  bool                  onAdd();
+  void                  packData(BitStream* stream) override;
+  void                  unpackData(BitStream* stream) override;
+  bool                  onAdd() override;
 
-  bool                  preload(bool server, String &errorStr);
+  bool                  preload(bool server, String &errorStr) override;
 
-  virtual void          onPerformSubstitutions();
-  virtual bool          allowSubstitutions() const { return true; }
+  void          onPerformSubstitutions() override;
+  bool          allowSubstitutions() const override { return true; }
 
   static void           initPersistFields();
 
@@ -182,13 +182,13 @@ public:
   /*C*/                 afxParticleEmitterDiscData();
   /*C*/                 afxParticleEmitterDiscData(const afxParticleEmitterDiscData&, bool = false);
 
-  void                  packData(BitStream* stream);
-  void                  unpackData(BitStream* stream);
-  bool                  onAdd();
+  void                  packData(BitStream* stream) override;
+  void                  unpackData(BitStream* stream) override;
+  bool                  onAdd() override;
 
-  bool                  preload(bool server, String &errorStr);
+  bool                  preload(bool server, String &errorStr) override;
 
-  virtual bool          allowSubstitutions() const { return true; }
+  bool          allowSubstitutions() const override { return true; }
 
   static void           initPersistFields();
 
@@ -225,7 +225,7 @@ protected:
   void          afx_emitParticles(const Point3F& start, const Point3F& end, const Point3F& velocity, const U32 numMilliseconds);
   void          preCompute(const MatrixF& mat);
 
-  virtual void  sub_particleUpdate(Particle*);
+  void  sub_particleUpdate(Particle*) override;
   virtual void  sub_preCompute(const MatrixF& mat)=0;
   virtual void  sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx)=0;
 
@@ -233,13 +233,13 @@ public:
   /*C*/         afxParticleEmitter();
   /*D*/         ~afxParticleEmitter();
 
-  virtual void  emitParticlesExt(const MatrixF& xfm, const Point3F& point, const Point3F& velocity, const U32 numMilliseconds);
+  void  emitParticlesExt(const MatrixF& xfm, const Point3F& point, const Point3F& velocity, const U32 numMilliseconds) override;
 
   afxParticleEmitterData* getDataBlock(){ return mDataBlock; }
   void          setAFXOwner(const SimObject* owner) { afx_owner = owner; }
-  bool          onNewDataBlock(GameBaseData* dptr, bool reload);
-  bool          onAdd();
-  void          onRemove();
+  bool          onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  bool          onAdd() override;
+  void          onRemove() override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -256,11 +256,11 @@ public:
   /*C*/       afxParticleEmitterVector();
   /*D*/       ~afxParticleEmitterVector();
 
-  bool        onNewDataBlock(GameBaseData* dptr, bool reload);
+  bool        onNewDataBlock(GameBaseData* dptr, bool reload) override;
 
 protected:
-  void        sub_preCompute(const MatrixF& mat);
-  void        sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offse, S32 part_idxt);
+  void        sub_preCompute(const MatrixF& mat) override;
+  void        sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offse, S32 part_idxt) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -278,11 +278,11 @@ public:
   /*C*/       afxParticleEmitterCone();
   /*D*/       ~afxParticleEmitterCone();
 
-  bool        onNewDataBlock(GameBaseData* dptr, bool reload);
+  bool        onNewDataBlock(GameBaseData* dptr, bool reload) override;
 
 protected:
-  void        sub_preCompute(const MatrixF& mat);
-  void        sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx);
+  void        sub_preCompute(const MatrixF& mat) override;
+  void        sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -309,13 +309,13 @@ public:
   /*C*/       afxParticleEmitterPath();
   /*D*/       ~afxParticleEmitterPath();
 
-  bool        onNewDataBlock(GameBaseData* dptr, bool reload);
+  bool        onNewDataBlock(GameBaseData* dptr, bool reload) override;
 
 protected:
-  bool        onAdd();
-  void        onRemove();
-  void        sub_preCompute(const MatrixF& mat);
-  void        sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx);
+  bool        onAdd() override;
+  void        onRemove() override;
+  void        sub_preCompute(const MatrixF& mat) override;
+  void        sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -333,11 +333,11 @@ public:
   /*C*/       afxParticleEmitterDisc();
   /*D*/       ~afxParticleEmitterDisc();
 
-  bool        onNewDataBlock(GameBaseData* dptr, bool reload);
+  bool        onNewDataBlock(GameBaseData* dptr, bool reload) override;
 
 protected:
-  void        sub_preCompute(const MatrixF& mat);
-  void        sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx);
+  void        sub_preCompute(const MatrixF& mat) override;
+  void        sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/ce/afxPhraseEffect.h b/Engine/source/afx/ce/afxPhraseEffect.h
index 827ac9ca9..5fd4c6ab6 100644
--- a/Engine/source/afx/ce/afxPhraseEffect.h
+++ b/Engine/source/afx/ce/afxPhraseEffect.h
@@ -42,7 +42,7 @@ class afxPhraseEffectData : public GameBaseData, public afxEffectDefs, public af
     U32 id;
   public:
     ewValidator(U32 id) { this->id = id; }
-    void validateType(SimObject *object, void *typePtr);
+    void validateType(SimObject *object, void *typePtr) override;
   };
 
   bool            do_id_convert;
@@ -88,17 +88,17 @@ public:
   /*C*/           afxPhraseEffectData();
   /*C*/           afxPhraseEffectData(const afxPhraseEffectData&, bool = false);
 
-  virtual void    reloadReset();
+  void    reloadReset() override;
 
-  virtual bool    onAdd();
-  virtual void    packData(BitStream*);
-  virtual void    unpackData(BitStream*);
+  bool    onAdd() override;
+  void    packData(BitStream*) override;
+  void    unpackData(BitStream*) override;
 
-  bool            preload(bool server, String &errorStr);
+  bool            preload(bool server, String &errorStr) override;
 
-  virtual void    gather_cons_defs(Vector<afxConstraintDef>& defs);
+  void    gather_cons_defs(Vector<afxConstraintDef>& defs) override;
 
-  virtual bool    allowSubstitutions() const { return true; }
+  bool    allowSubstitutions() const override { return true; }
 
   static void     initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxPhysicalZone.h b/Engine/source/afx/ce/afxPhysicalZone.h
index 02012c5a0..19165c9d0 100644
--- a/Engine/source/afx/ce/afxPhysicalZone.h
+++ b/Engine/source/afx/ce/afxPhysicalZone.h
@@ -49,10 +49,10 @@ public:
   /*C*/             afxPhysicalZoneData();
   /*C*/             afxPhysicalZoneData(const afxPhysicalZoneData&, bool = false);
 
-  virtual void      packData(BitStream*);
-  virtual void      unpackData(BitStream*);
+  void      packData(BitStream*) override;
+  void      unpackData(BitStream*) override;
 
-  virtual bool      allowSubstitutions() const { return true; }
+  bool      allowSubstitutions() const override { return true; }
 
   static void       initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxPlayerMovement.h b/Engine/source/afx/ce/afxPlayerMovement.h
index 13920d85f..512542b6f 100644
--- a/Engine/source/afx/ce/afxPlayerMovement.h
+++ b/Engine/source/afx/ce/afxPlayerMovement.h
@@ -51,13 +51,13 @@ public:
   /*C*/             afxPlayerMovementData();
   /*C*/             afxPlayerMovementData(const afxPlayerMovementData&, bool = false);
 
-  virtual bool      onAdd();
-  virtual void      packData(BitStream*);
-  virtual void      unpackData(BitStream*);
+  bool      onAdd() override;
+  void      packData(BitStream*) override;
+  void      unpackData(BitStream*) override;
 
   bool              hasMovementOverride();
 
-  virtual bool      allowSubstitutions() const { return true; }
+  bool      allowSubstitutions() const override { return true; }
 
   static void       initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxPlayerPuppet.h b/Engine/source/afx/ce/afxPlayerPuppet.h
index d8d96727a..f3cabe4aa 100644
--- a/Engine/source/afx/ce/afxPlayerPuppet.h
+++ b/Engine/source/afx/ce/afxPlayerPuppet.h
@@ -40,17 +40,17 @@ public:
 
   U8                networking;
 
-  virtual void      gather_cons_defs(Vector<afxConstraintDef>& defs);
+  void      gather_cons_defs(Vector<afxConstraintDef>& defs) override;
 
 public:
   /*C*/             afxPlayerPuppetData();
   /*C*/             afxPlayerPuppetData(const afxPlayerPuppetData&, bool = false);
 
-  virtual bool      onAdd();
-  virtual void      packData(BitStream*);
-  virtual void      unpackData(BitStream*);
+  bool      onAdd() override;
+  void      packData(BitStream*) override;
+  void      unpackData(BitStream*) override;
 
-  virtual bool      allowSubstitutions() const { return true; }
+  bool      allowSubstitutions() const override { return true; }
 
   static void       initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxPointLight_T3D.h b/Engine/source/afx/ce/afxPointLight_T3D.h
index de5215aa8..bccd5abbe 100644
--- a/Engine/source/afx/ce/afxPointLight_T3D.h
+++ b/Engine/source/afx/ce/afxPointLight_T3D.h
@@ -39,11 +39,11 @@ public:
   /*C*/         afxT3DPointLightData();
   /*C*/         afxT3DPointLightData(const afxT3DPointLightData&, bool = false);
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxProjectile.cpp b/Engine/source/afx/ce/afxProjectile.cpp
index e95cf88f9..de98a870a 100644
--- a/Engine/source/afx/ce/afxProjectile.cpp
+++ b/Engine/source/afx/ce/afxProjectile.cpp
@@ -351,7 +351,7 @@ void afxProjectile::unpackUpdate(NetConnection * conn, BitStream * stream)
 class afxProjectileDeleteEvent : public SimEvent
 {
 public:
-   void process(SimObject *object)
+   void process(SimObject *object) override
    {
       object->deleteObject();
    }
diff --git a/Engine/source/afx/ce/afxProjectile.h b/Engine/source/afx/ce/afxProjectile.h
index d3bbff312..19da1548f 100644
--- a/Engine/source/afx/ce/afxProjectile.h
+++ b/Engine/source/afx/ce/afxProjectile.h
@@ -63,11 +63,11 @@ public:
   /*C*/             afxProjectileData();
   /*C*/             afxProjectileData(const afxProjectileData&, bool = false);
 
-  virtual bool      onAdd();
-  void              packData(BitStream* stream);
-  void              unpackData(BitStream* stream);
+  bool      onAdd() override;
+  void              packData(BitStream* stream) override;
+  void              unpackData(BitStream* stream) override;
 
-  virtual bool      allowSubstitutions() const { return true; }
+  bool      allowSubstitutions() const override { return true; }
 
   static void       initPersistFields();
 
@@ -97,15 +97,15 @@ public:
 
   void                init(Point3F& pos, Point3F& vel, ShapeBase* src_obj);
 
-  virtual bool        onNewDataBlock(GameBaseData* dptr, bool reload);
-  virtual void        processTick(const Move *move);
-  virtual void        interpolateTick(F32 delta);
-  virtual void        advanceTime(F32 dt);
-  virtual bool        onAdd();
-  virtual void        onRemove();
-  virtual U32         packUpdate(NetConnection*, U32, BitStream*);
-  virtual void        unpackUpdate(NetConnection*, BitStream*);
-  virtual void        explode(const Point3F& p, const Point3F& n, const U32 collideType);
+  bool        onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  void        processTick(const Move *move) override;
+  void        interpolateTick(F32 delta) override;
+  void        advanceTime(F32 dt) override;
+  bool        onAdd() override;
+  void        onRemove() override;
+  U32         packUpdate(NetConnection*, U32, BitStream*) override;
+  void        unpackUpdate(NetConnection*, BitStream*) override;
+  void        explode(const Point3F& p, const Point3F& n, const U32 collideType) override;
 
   DECLARE_CONOBJECT(afxProjectile);
   DECLARE_CATEGORY("UNLISTED");
diff --git a/Engine/source/afx/ce/afxScriptEvent.h b/Engine/source/afx/ce/afxScriptEvent.h
index 39a32f79f..b917f0747 100644
--- a/Engine/source/afx/ce/afxScriptEvent.h
+++ b/Engine/source/afx/ce/afxScriptEvent.h
@@ -41,10 +41,10 @@ public:
   /*C*/                 afxScriptEventData();
   /*C*/                 afxScriptEventData(const afxScriptEventData&, bool = false);
 
-  void                  packData(BitStream* stream);
-  void                  unpackData(BitStream* stream);
+  void                  packData(BitStream* stream) override;
+  void                  unpackData(BitStream* stream) override;
 
-  virtual bool          allowSubstitutions() const { return true; }
+  bool          allowSubstitutions() const override { return true; }
 
   static void           initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxSpotLight_T3D.h b/Engine/source/afx/ce/afxSpotLight_T3D.h
index 9fc5a2f4e..a7102be94 100644
--- a/Engine/source/afx/ce/afxSpotLight_T3D.h
+++ b/Engine/source/afx/ce/afxSpotLight_T3D.h
@@ -41,11 +41,11 @@ public:
   /*C*/         afxT3DSpotLightData();
   /*C*/         afxT3DSpotLightData(const afxT3DSpotLightData&, bool = false);
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  bool  onAdd() override;
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
diff --git a/Engine/source/afx/ce/afxStaticShape.h b/Engine/source/afx/ce/afxStaticShape.h
index fce34d053..3d0e3f2d9 100644
--- a/Engine/source/afx/ce/afxStaticShape.h
+++ b/Engine/source/afx/ce/afxStaticShape.h
@@ -46,10 +46,10 @@ public:
   /*C*/       afxStaticShapeData();
   /*C*/       afxStaticShapeData(const afxStaticShapeData&, bool = false);
 
-  void        packData(BitStream* stream);
-  void        unpackData(BitStream* stream);
+  void        packData(BitStream* stream) override;
+  void        unpackData(BitStream* stream) override;
 
-  virtual bool allowSubstitutions() const { return true; }
+  bool allowSubstitutions() const override { return true; }
 
   static void initPersistFields();
 
@@ -72,7 +72,7 @@ private:
   StringTableEntry      mGhost_cons_name;
 
 protected:
-  virtual void          prepRenderImage(SceneRenderState*);
+  void          prepRenderImage(SceneRenderState*) override;
 
 public:
   /*C*/                 afxStaticShape();
@@ -80,10 +80,10 @@ public:
 
   void                  init(U32 chor_id, StringTableEntry cons_name);
 
-  virtual bool          onNewDataBlock(GameBaseData* dptr, bool reload);
-  virtual void          advanceTime(F32 dt);
-  virtual U32           packUpdate(NetConnection*, U32, BitStream*);
-  virtual void          unpackUpdate(NetConnection*, BitStream*);
+  bool          onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  void          advanceTime(F32 dt) override;
+  U32           packUpdate(NetConnection*, U32, BitStream*) override;
+  void          unpackUpdate(NetConnection*, BitStream*) override;
 
   const char*           getShapeFileName() const { return mDataBlock->mShapeAsset->getShapeFileName(); }
   void                  setVisibility(bool flag) { mIs_visible = flag; }
diff --git a/Engine/source/afx/ce/afxZodiacPlane.h b/Engine/source/afx/ce/afxZodiacPlane.h
index bb2b6ed33..13c9879b5 100644
--- a/Engine/source/afx/ce/afxZodiacPlane.h
+++ b/Engine/source/afx/ce/afxZodiacPlane.h
@@ -84,12 +84,12 @@ public:
   /*C*/         afxZodiacPlaneData();
   /*C*/         afxZodiacPlaneData(const afxZodiacPlaneData&, bool = false);
 
-  virtual void  packData(BitStream*);
-  virtual void  unpackData(BitStream*);
+  void  packData(BitStream*) override;
+  void  unpackData(BitStream*) override;
 
-  bool          preload(bool server, String &errorStr);
+  bool          preload(bool server, String &errorStr) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   F32           calcRotationAngle(F32 elapsed, F32 rate_factor=1.0f);
 
@@ -128,15 +128,15 @@ public:
   /*C*/                 afxZodiacPlane();
   /*D*/                 ~afxZodiacPlane();
 
-  virtual bool          onNewDataBlock(GameBaseData* dptr, bool reload);
-  virtual bool          onAdd();
-  virtual void          onRemove();
+  bool          onNewDataBlock(GameBaseData* dptr, bool reload) override;
+  bool          onAdd() override;
+  void          onRemove() override;
 
   void                  setRadius(F32 rad) { radius = rad; }
   void                  setColor(const LinearColorF& clr) { color = clr; }
   void                  setVisibility(bool flag) { is_visible = flag; }
 
-  virtual void          prepRenderImage(SceneRenderState*);
+  void          prepRenderImage(SceneRenderState*) override;
                                         
   void                  _renderZodiacPlane(ObjectRenderInst*, SceneRenderState*, BaseMatInstance*);
 
diff --git a/Engine/source/afx/ea/afxEA_AnimClip.cpp b/Engine/source/afx/ea/afxEA_AnimClip.cpp
index 25f811cb1..2437751e5 100644
--- a/Engine/source/afx/ea/afxEA_AnimClip.cpp
+++ b/Engine/source/afx/ea/afxEA_AnimClip.cpp
@@ -49,10 +49,10 @@ public:
   /*C*/             afxEA_AnimClip();
   /*C*/             ~afxEA_AnimClip();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -176,13 +176,13 @@ class afxEA_AnimClipDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_AnimClipDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
-  virtual bool  isPositional(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
+  bool  isPositional(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_AnimClip; }
+  afxEffectWrapper* create() const override { return new afxEA_AnimClip; }
 };
 
 afxEA_AnimClipDesc afxEA_AnimClipDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_AnimLock.cpp b/Engine/source/afx/ea/afxEA_AnimLock.cpp
index 3f6fd5597..1f97dfe3f 100644
--- a/Engine/source/afx/ea/afxEA_AnimLock.cpp
+++ b/Engine/source/afx/ea/afxEA_AnimLock.cpp
@@ -42,8 +42,8 @@ class afxEA_AnimLock : public afxEffectWrapper
 public:
   /*C*/             afxEA_AnimLock();
 
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -84,13 +84,13 @@ class afxEA_AnimLockDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_AnimLockDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
-  virtual bool  isPositional(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
+  bool  isPositional(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_AnimLock; }
+  afxEffectWrapper* create() const override { return new afxEA_AnimLock; }
 };
 
 afxEA_AnimLockDesc afxEA_AnimLockDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_AreaDamage.cpp b/Engine/source/afx/ea/afxEA_AreaDamage.cpp
index a9a6036fb..8def146d6 100644
--- a/Engine/source/afx/ea/afxEA_AreaDamage.cpp
+++ b/Engine/source/afx/ea/afxEA_AreaDamage.cpp
@@ -53,12 +53,12 @@ public:
   /*C*/               afxEA_AreaDamage();
   /*C*/               ~afxEA_AreaDamage();
 
-  virtual bool        isDone();
+  bool        isDone() override;
 
-  virtual void        ea_set_datablock(SimDataBlock*);
-  virtual bool        ea_start();
-  virtual bool        ea_update(F32 dt);
-  virtual void        ea_finish(bool was_stopped);
+  void        ea_set_datablock(SimDataBlock*) override;
+  bool        ea_start() override;
+  bool        ea_update(F32 dt) override;
+  void        ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -246,12 +246,12 @@ class afxEA_AreaDamageDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_AreaDamageDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_AreaDamage; }
+  afxEffectWrapper* create() const override { return new afxEA_AreaDamage; }
 };
 
 afxEA_AreaDamageDesc afxEA_AreaDamageDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_AudioBank.cpp b/Engine/source/afx/ea/afxEA_AudioBank.cpp
index 6a52ca345..78b40e266 100644
--- a/Engine/source/afx/ea/afxEA_AudioBank.cpp
+++ b/Engine/source/afx/ea/afxEA_AudioBank.cpp
@@ -53,10 +53,10 @@ public:
   /*C*/         afxEA_AudioBank();
   /*D*/         ~afxEA_AudioBank();
 
-  virtual void  ea_set_datablock(SimDataBlock*);
-  virtual bool  ea_start();
-  virtual bool  ea_update(F32 dt);
-  virtual void  ea_finish(bool was_stopped);
+  void  ea_set_datablock(SimDataBlock*) override;
+  bool  ea_start() override;
+  bool  ea_update(F32 dt) override;
+  void  ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -153,13 +153,13 @@ class afxEA_SoundBankDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_SoundBankDesc mDesc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
   //virtual void  prepEffect(afxEffectWrapperData*) const;
 
-  virtual afxEffectWrapper* create() const { return new afxEA_AudioBank; }
+  afxEffectWrapper* create() const override { return new afxEA_AudioBank; }
 };
 
 afxEA_SoundBankDesc afxEA_SoundBankDesc::mDesc;
diff --git a/Engine/source/afx/ea/afxEA_Billboard.cpp b/Engine/source/afx/ea/afxEA_Billboard.cpp
index 012b364f9..ab6c36c3d 100644
--- a/Engine/source/afx/ea/afxEA_Billboard.cpp
+++ b/Engine/source/afx/ea/afxEA_Billboard.cpp
@@ -47,14 +47,14 @@ public:
   /*C*/             afxEA_Billboard();
   /*D*/             ~afxEA_Billboard();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
-  virtual void      ea_set_scope_status(bool flag);
-  virtual void      onDeleteNotify(SimObject*);
-  virtual void      getUpdatedBoxCenter(Point3F& pos);
-  virtual void      getBaseColor(LinearColorF& color) { if (bb_data) color = bb_data->color; }
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
+  void      ea_set_scope_status(bool flag) override;
+  void      onDeleteNotify(SimObject*) override;
+  void      getUpdatedBoxCenter(Point3F& pos) override;
+  void      getBaseColor(LinearColorF& color) override { if (bb_data) color = bb_data->color; }
 };
 
 
@@ -174,12 +174,12 @@ class afxEA_BillboardDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_BillboardDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_Billboard; }
+  afxEffectWrapper* create() const override { return new afxEA_Billboard; }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/ea/afxEA_CameraPuppet.cpp b/Engine/source/afx/ea/afxEA_CameraPuppet.cpp
index 51a3a3dd9..5ec0e5a70 100644
--- a/Engine/source/afx/ea/afxEA_CameraPuppet.cpp
+++ b/Engine/source/afx/ea/afxEA_CameraPuppet.cpp
@@ -50,13 +50,13 @@ class afxEA_CameraPuppet : public afxEffectWrapper
 public:
   /*C*/             afxEA_CameraPuppet();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 
-  virtual void      getUnconstrainedPosition(Point3F& pos);
-  virtual void      getUnconstrainedTransform(MatrixF& xfm);
+  void      getUnconstrainedPosition(Point3F& pos) override;
+  void      getUnconstrainedTransform(MatrixF& xfm) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -164,12 +164,12 @@ class afxEA_CameraPuppetDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_CameraPuppetDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const;
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const;
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override;
+  bool  runsOnClient(const afxEffectWrapperData*) const override;
 
-  virtual afxEffectWrapper* create() const { return new afxEA_CameraPuppet; }
+  afxEffectWrapper* create() const override { return new afxEA_CameraPuppet; }
 };
 
 afxEA_CameraPuppetDesc afxEA_CameraPuppetDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_CameraShake.cpp b/Engine/source/afx/ea/afxEA_CameraShake.cpp
index bc57019df..ff85f409e 100644
--- a/Engine/source/afx/ea/afxEA_CameraShake.cpp
+++ b/Engine/source/afx/ea/afxEA_CameraShake.cpp
@@ -49,10 +49,10 @@ public:
   /*C*/             afxEA_CameraShake();
   /*D*/             ~afxEA_CameraShake();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -172,13 +172,13 @@ class afxEA_CameraShakeDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_CameraShakeDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
-  virtual bool  isPositional(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
+  bool  isPositional(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_CameraShake; }
+  afxEffectWrapper* create() const override { return new afxEA_CameraShake; }
 };
 
 afxEA_CameraShakeDesc afxEA_CameraShakeDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_CollisionEvent.cpp b/Engine/source/afx/ea/afxEA_CollisionEvent.cpp
index 73b6fa707..fd718ff2f 100644
--- a/Engine/source/afx/ea/afxEA_CollisionEvent.cpp
+++ b/Engine/source/afx/ea/afxEA_CollisionEvent.cpp
@@ -49,13 +49,13 @@ public:
   /*C*/             afxEA_CollisionEvent();
   /*D*/             ~afxEA_CollisionEvent();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 
-  virtual void      collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel);
-  virtual void      onDeleteNotify(SimObject*);
+  void      collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel) override;
+  void      onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -201,13 +201,13 @@ class afxEA_CollisionEventDesc : public afxEffectAdapterDesc, public afxEffectDe
   static afxEA_CollisionEventDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return false; }
-  virtual bool  isPositional(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return false; }
+  bool  isPositional(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_CollisionEvent; }
+  afxEffectWrapper* create() const override { return new afxEA_CollisionEvent; }
 };
 
 afxEA_CollisionEventDesc afxEA_CollisionEventDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_ConsoleMessage.cpp b/Engine/source/afx/ea/afxEA_ConsoleMessage.cpp
index 0f80a194a..f7304f592 100644
--- a/Engine/source/afx/ea/afxEA_ConsoleMessage.cpp
+++ b/Engine/source/afx/ea/afxEA_ConsoleMessage.cpp
@@ -45,11 +45,11 @@ class afxEA_ConsoleMessage : public afxEffectWrapper
 public:
   /*C*/             afxEA_ConsoleMessage();
 
-  virtual bool      isDone() { return displayed; }
+  bool      isDone() override { return displayed; }
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -109,13 +109,13 @@ class afxEA_ConsoleMessageDesc : public afxEffectAdapterDesc, public afxEffectDe
   static afxEA_ConsoleMessageDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
-  virtual bool  isPositional(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
+  bool  isPositional(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_ConsoleMessage; }
+  afxEffectWrapper* create() const override { return new afxEA_ConsoleMessage; }
 };
 
 afxEA_ConsoleMessageDesc afxEA_ConsoleMessageDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_Damage.cpp b/Engine/source/afx/ea/afxEA_Damage.cpp
index a338bfa38..049b5964c 100644
--- a/Engine/source/afx/ea/afxEA_Damage.cpp
+++ b/Engine/source/afx/ea/afxEA_Damage.cpp
@@ -51,12 +51,12 @@ public:
   /*C*/             afxEA_Damage();
   /*C*/             ~afxEA_Damage();
 
-  virtual bool      isDone();
+  bool      isDone() override;
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -183,12 +183,12 @@ class afxEA_DamageDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_DamageDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_Damage; }
+  afxEffectWrapper* create() const override { return new afxEA_Damage; }
 };
 
 afxEA_DamageDesc afxEA_DamageDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_Debris.cpp b/Engine/source/afx/ea/afxEA_Debris.cpp
index 678c02726..17a3447e9 100644
--- a/Engine/source/afx/ea/afxEA_Debris.cpp
+++ b/Engine/source/afx/ea/afxEA_Debris.cpp
@@ -50,14 +50,14 @@ public:
   /*C*/             afxEA_Debris();
   /*D*/             ~afxEA_Debris();
 
-  virtual bool      isDone();
+  bool      isDone() override;
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 
-  virtual void      onDeleteNotify(SimObject*);
+  void      onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -176,12 +176,12 @@ class afxEA_DebrisDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_DebrisDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_Debris; }
+  afxEffectWrapper* create() const override { return new afxEA_Debris; }
 };
 
 afxEA_DebrisDesc afxEA_DebrisDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_Explosion.cpp b/Engine/source/afx/ea/afxEA_Explosion.cpp
index d8fcd3377..7aeebe837 100644
--- a/Engine/source/afx/ea/afxEA_Explosion.cpp
+++ b/Engine/source/afx/ea/afxEA_Explosion.cpp
@@ -48,12 +48,12 @@ class afxEA_Explosion : public afxEffectWrapper
 public:
   /*C*/             afxEA_Explosion();
 
-  virtual bool      isDone() { return exploded; }
+  bool      isDone() override { return exploded; }
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -127,12 +127,12 @@ class afxEA_ExplosionDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_ExplosionDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_Explosion; }
+  afxEffectWrapper* create() const override { return new afxEA_Explosion; }
 };
 
 afxEA_ExplosionDesc afxEA_ExplosionDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_FootSwitch.cpp b/Engine/source/afx/ea/afxEA_FootSwitch.cpp
index e2cfb016b..9d3aa7158 100644
--- a/Engine/source/afx/ea/afxEA_FootSwitch.cpp
+++ b/Engine/source/afx/ea/afxEA_FootSwitch.cpp
@@ -51,10 +51,10 @@ public:
   void              set_overrides(Player*);
   void              clear_overrides(Player*);
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 
 };
 
@@ -156,13 +156,13 @@ class afxEA_FootfallSwitchDesc : public afxEffectAdapterDesc, public afxEffectDe
   static afxEA_FootfallSwitchDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
-  virtual bool  isPositional(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
+  bool  isPositional(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_FootSwitch; }
+  afxEffectWrapper* create() const override { return new afxEA_FootSwitch; }
 };
 
 afxEA_FootfallSwitchDesc afxEA_FootfallSwitchDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_GuiController.cpp b/Engine/source/afx/ea/afxEA_GuiController.cpp
index e4fe1251e..31f800251 100644
--- a/Engine/source/afx/ea/afxEA_GuiController.cpp
+++ b/Engine/source/afx/ea/afxEA_GuiController.cpp
@@ -55,10 +55,10 @@ class afxEA_GuiController : public afxEffectWrapper
 public:
   /*C*/           afxEA_GuiController();
 
-  virtual void    ea_set_datablock(SimDataBlock*);
-  virtual bool    ea_start();
-  virtual bool    ea_update(F32 dt);
-  virtual void    ea_finish(bool was_stopped);
+  void    ea_set_datablock(SimDataBlock*) override;
+  bool    ea_start() override;
+  bool    ea_update(F32 dt) override;
+  void    ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -193,12 +193,12 @@ class afxEA_GuiControllerDesc : public afxEffectAdapterDesc, public afxEffectDef
   static afxEA_GuiControllerDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_GuiController; }
+  afxEffectWrapper* create() const override { return new afxEA_GuiController; }
 };
 
 afxEA_GuiControllerDesc afxEA_GuiControllerDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_GuiText.cpp b/Engine/source/afx/ea/afxEA_GuiText.cpp
index 41b8e4346..35944b7e1 100644
--- a/Engine/source/afx/ea/afxEA_GuiText.cpp
+++ b/Engine/source/afx/ea/afxEA_GuiText.cpp
@@ -53,9 +53,9 @@ class afxEA_GuiText : public afxEffectWrapper
 public:
   /*C*/           afxEA_GuiText();
 
-  virtual void    ea_set_datablock(SimDataBlock*);
-  virtual bool    ea_start();
-  virtual bool    ea_update(F32 dt);
+  void    ea_set_datablock(SimDataBlock*) override;
+  bool    ea_start() override;
+  bool    ea_update(F32 dt) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -157,12 +157,12 @@ class afxEA_GuiTextDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_GuiTextDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_GuiText; }
+  afxEffectWrapper* create() const override { return new afxEA_GuiText; }
 };
 
 afxEA_GuiTextDesc afxEA_GuiTextDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_Light.cpp b/Engine/source/afx/ea/afxEA_Light.cpp
index fbb3c4c42..54988ca26 100644
--- a/Engine/source/afx/ea/afxEA_Light.cpp
+++ b/Engine/source/afx/ea/afxEA_Light.cpp
@@ -39,12 +39,12 @@ class afxEA_LightDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_LightDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return 0; }
+  afxEffectWrapper* create() const override { return 0; }
 };
 
 afxEA_LightDesc afxEA_LightDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_MachineGun.cpp b/Engine/source/afx/ea/afxEA_MachineGun.cpp
index 32b09c267..bca4c43ad 100644
--- a/Engine/source/afx/ea/afxEA_MachineGun.cpp
+++ b/Engine/source/afx/ea/afxEA_MachineGun.cpp
@@ -53,10 +53,10 @@ public:
   /*C*/         afxEA_MachineGun();
   /*D*/         ~afxEA_MachineGun();
 
-  virtual void  ea_set_datablock(SimDataBlock*);
-  virtual bool  ea_start();
-  virtual bool  ea_update(F32 dt);
-  virtual void  ea_finish(bool was_stopped);
+  void  ea_set_datablock(SimDataBlock*) override;
+  bool  ea_start() override;
+  bool  ea_update(F32 dt) override;
+  void  ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -184,12 +184,12 @@ class afxEA_MachineGunDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_MachineGunDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_MachineGun; }
+  afxEffectWrapper* create() const override { return new afxEA_MachineGun; }
 };
 
 afxEA_MachineGunDesc afxEA_MachineGunDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_Model.cpp b/Engine/source/afx/ea/afxEA_Model.cpp
index 004acd887..d3980b749 100644
--- a/Engine/source/afx/ea/afxEA_Model.cpp
+++ b/Engine/source/afx/ea/afxEA_Model.cpp
@@ -50,23 +50,23 @@ public:
   /*C*/             afxEA_Model();
   /*D*/             ~afxEA_Model();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
-  virtual void      ea_set_scope_status(bool flag);
-  virtual void      onDeleteNotify(SimObject*);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
+  void      ea_set_scope_status(bool flag) override;
+  void      onDeleteNotify(SimObject*) override;
 
-  virtual void      getUpdatedBoxCenter(Point3F& pos);
+  void      getUpdatedBoxCenter(Point3F& pos) override;
 
-  virtual TSShape*          getTSShape();
-  virtual TSShapeInstance*  getTSShapeInstance();
-  virtual SceneObject*      ea_get_scene_object() const;
+  TSShape*          getTSShape() override;
+  TSShapeInstance*  getTSShapeInstance() override;
+  SceneObject*      ea_get_scene_object() const override;
   virtual U32               ea_get_triggers() const;
 
-  virtual U32       setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans);
-  virtual void      resetAnimation(U32 tag);
-  virtual F32       getAnimClipDuration(const char* clip);
+  U32       setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans) override;
+  void      resetAnimation(U32 tag) override;
+  F32       getAnimClipDuration(const char* clip) override;
 };
 
 
@@ -230,12 +230,12 @@ class afxEA_ModelDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_ModelDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_Model; }
+  afxEffectWrapper* create() const override { return new afxEA_Model; }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/ea/afxEA_Mooring.cpp b/Engine/source/afx/ea/afxEA_Mooring.cpp
index 76982679b..ed1ac8da5 100644
--- a/Engine/source/afx/ea/afxEA_Mooring.cpp
+++ b/Engine/source/afx/ea/afxEA_Mooring.cpp
@@ -46,11 +46,11 @@ public:
   /*C*/             afxEA_Mooring();
   /*D*/             ~afxEA_Mooring();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
-  virtual void      onDeleteNotify(SimObject*);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
+  void      onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -153,12 +153,12 @@ class afxEA_MooringDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_MooringDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const;
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const;
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override;
+  bool  runsOnClient(const afxEffectWrapperData*) const override;
 
-  virtual afxEffectWrapper* create() const { return new afxEA_Mooring; }
+  afxEffectWrapper* create() const override { return new afxEA_Mooring; }
 };
 
 afxEA_MooringDesc afxEA_MooringDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_MultiLight.cpp b/Engine/source/afx/ea/afxEA_MultiLight.cpp
index b42a37cd5..ae907453a 100644
--- a/Engine/source/afx/ea/afxEA_MultiLight.cpp
+++ b/Engine/source/afx/ea/afxEA_MultiLight.cpp
@@ -39,12 +39,12 @@ class afxEA_MultiLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_MultiLightDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return 0; }
+  afxEffectWrapper* create() const override { return 0; }
 };
 
 afxEA_MultiLightDesc afxEA_MultiLightDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_ParticleEmitter.cpp b/Engine/source/afx/ea/afxEA_ParticleEmitter.cpp
index 18835e1bc..bc18d3898 100644
--- a/Engine/source/afx/ea/afxEA_ParticleEmitter.cpp
+++ b/Engine/source/afx/ea/afxEA_ParticleEmitter.cpp
@@ -299,12 +299,12 @@ class afxEA_ParticleEmitterDesc : public afxEffectAdapterDesc, public afxEffectD
   static afxEA_ParticleEmitterDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_ParticleEmitter; }
+  afxEffectWrapper* create() const override { return new afxEA_ParticleEmitter; }
 };
 
 afxEA_ParticleEmitterDesc afxEA_ParticleEmitterDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_ParticleEmitter.h b/Engine/source/afx/ea/afxEA_ParticleEmitter.h
index cf16f2c98..a0e403a21 100644
--- a/Engine/source/afx/ea/afxEA_ParticleEmitter.h
+++ b/Engine/source/afx/ea/afxEA_ParticleEmitter.h
@@ -51,14 +51,14 @@ public:
   /*C*/             afxEA_ParticleEmitter();
   /*D*/             ~afxEA_ParticleEmitter();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 
-  virtual bool      ea_is_enabled() { return true; }
+  bool      ea_is_enabled() override { return true; }
 
-  virtual void      onDeleteNotify(SimObject*);
+  void      onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/ea/afxEA_PhraseEffect.cpp b/Engine/source/afx/ea/afxEA_PhraseEffect.cpp
index c16f2d468..f3f58df36 100644
--- a/Engine/source/afx/ea/afxEA_PhraseEffect.cpp
+++ b/Engine/source/afx/ea/afxEA_PhraseEffect.cpp
@@ -61,12 +61,12 @@ public:
   /*C*/                 afxEA_PhraseEffect();
   /*D*/                 ~afxEA_PhraseEffect();
 
-  virtual void          ea_set_datablock(SimDataBlock*);
-  virtual bool          ea_start();
-  virtual bool          ea_update(F32 dt);
-  virtual void          ea_finish(bool was_stopped);
+  void          ea_set_datablock(SimDataBlock*) override;
+  bool          ea_start() override;
+  bool          ea_update(F32 dt) override;
+  void          ea_finish(bool was_stopped) override;
 
-  virtual bool          ea_is_enabled() { return true; }
+  bool          ea_is_enabled() override { return true; }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -360,12 +360,12 @@ class afxEA_PhraseEffectDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_PhraseEffectDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_PhraseEffect; }
+  afxEffectWrapper* create() const override { return new afxEA_PhraseEffect; }
 };
 
 afxEA_PhraseEffectDesc afxEA_PhraseEffectDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_PhysicalZone.cpp b/Engine/source/afx/ea/afxEA_PhysicalZone.cpp
index 7dbc8062f..b56d14e66 100644
--- a/Engine/source/afx/ea/afxEA_PhysicalZone.cpp
+++ b/Engine/source/afx/ea/afxEA_PhysicalZone.cpp
@@ -51,12 +51,12 @@ public:
   /*C*/             afxEA_PhysicalZone();
   /*D*/             ~afxEA_PhysicalZone();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
-  virtual void      ea_set_scope_status(bool flag);
-  virtual void      onDeleteNotify(SimObject*);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
+  void      ea_set_scope_status(bool flag) override;
+  void      onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -203,12 +203,12 @@ class afxEA_PhysicalZoneDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_PhysicalZoneDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_PhysicalZone; }
+  afxEffectWrapper* create() const override { return new afxEA_PhysicalZone; }
 };
 
 afxEA_PhysicalZoneDesc afxEA_PhysicalZoneDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_PlayerMovement.cpp b/Engine/source/afx/ea/afxEA_PlayerMovement.cpp
index a563201cc..e5bc3ed2a 100644
--- a/Engine/source/afx/ea/afxEA_PlayerMovement.cpp
+++ b/Engine/source/afx/ea/afxEA_PlayerMovement.cpp
@@ -49,10 +49,10 @@ public:
   /*C*/             afxEA_PlayerMovement();
   /*C*/             ~afxEA_PlayerMovement();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -147,12 +147,12 @@ class afxEA_PlayerMovementDesc : public afxEffectAdapterDesc, public afxEffectDe
   static afxEA_PlayerMovementDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_PlayerMovement; }
+  afxEffectWrapper* create() const override { return new afxEA_PlayerMovement; }
 };
 
 afxEA_PlayerMovementDesc afxEA_PlayerMovementDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_PlayerPuppet.cpp b/Engine/source/afx/ea/afxEA_PlayerPuppet.cpp
index 822a69b06..186637852 100644
--- a/Engine/source/afx/ea/afxEA_PlayerPuppet.cpp
+++ b/Engine/source/afx/ea/afxEA_PlayerPuppet.cpp
@@ -48,13 +48,13 @@ class afxEA_PlayerPuppet : public afxEffectWrapper
 public:
   /*C*/             afxEA_PlayerPuppet();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 
-  virtual void      getUnconstrainedPosition(Point3F& pos);
-  virtual void      getUnconstrainedTransform(MatrixF& xfm);
+  void      getUnconstrainedPosition(Point3F& pos) override;
+  void      getUnconstrainedTransform(MatrixF& xfm) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -149,12 +149,12 @@ class afxEA_PlayerPuppetDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_PlayerPuppetDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const;
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const;
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override;
+  bool  runsOnClient(const afxEffectWrapperData*) const override;
 
-  virtual afxEffectWrapper* create() const { return new afxEA_PlayerPuppet; }
+  afxEffectWrapper* create() const override { return new afxEA_PlayerPuppet; }
 };
 
 afxEA_PlayerPuppetDesc afxEA_PlayerPuppetDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_PointLight_T3D.cpp b/Engine/source/afx/ea/afxEA_PointLight_T3D.cpp
index ebbfecc47..ce7c89c95 100644
--- a/Engine/source/afx/ea/afxEA_PointLight_T3D.cpp
+++ b/Engine/source/afx/ea/afxEA_PointLight_T3D.cpp
@@ -51,15 +51,15 @@ public:
   /*C*/             afxEA_T3DPointLight();
   /*D*/             ~afxEA_T3DPointLight();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
-  virtual void      ea_set_scope_status(bool flag);
-  virtual void      onDeleteNotify(SimObject*);
-  virtual void      getBaseColor(LinearColorF& color);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
+  void      ea_set_scope_status(bool flag) override;
+  void      onDeleteNotify(SimObject*) override;
+  void      getBaseColor(LinearColorF& color) override;
 
-  virtual bool      ea_is_enabled() { return true; }
+  bool      ea_is_enabled() override { return true; }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -123,7 +123,7 @@ public:
     mLight->setColor(live_color);
   }
 
-  void submitLights(LightManager* lm, bool staticLighting)
+  void submitLights(LightManager* lm, bool staticLighting) override
   {
     if (mAnimState.active && mAnimationData && mFade_amt < 1.0f)
     {
@@ -265,12 +265,12 @@ class afxEA_T3DPointLightDesc : public afxEffectAdapterDesc, public afxEffectDef
   static afxEA_T3DPointLightDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_T3DPointLight; }
+  afxEffectWrapper* create() const override { return new afxEA_T3DPointLight; }
 };
 
 afxEA_T3DPointLightDesc afxEA_T3DPointLightDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_Projectile.cpp b/Engine/source/afx/ea/afxEA_Projectile.cpp
index 0f26d79b3..bf402cc50 100644
--- a/Engine/source/afx/ea/afxEA_Projectile.cpp
+++ b/Engine/source/afx/ea/afxEA_Projectile.cpp
@@ -56,14 +56,14 @@ public:
   /*C*/               afxEA_Projectile();
   /*D*/               ~afxEA_Projectile();
 
-  virtual bool        isDone();
+  bool        isDone() override;
 
-  virtual void        ea_set_datablock(SimDataBlock*);
-  virtual bool        ea_start();
-  virtual bool        ea_update(F32 dt);
-  virtual void        ea_finish(bool was_stopped);
+  void        ea_set_datablock(SimDataBlock*) override;
+  bool        ea_start() override;
+  bool        ea_update(F32 dt) override;
+  void        ea_finish(bool was_stopped) override;
 
-  virtual void        onDeleteNotify(SimObject*);
+  void        onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -268,12 +268,12 @@ class afxEA_ProjectileDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_ProjectileDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const;
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const;
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override;
+  bool  runsOnClient(const afxEffectWrapperData*) const override;
 
-  virtual afxEffectWrapper* create() const { return new afxEA_Projectile; }
+  afxEffectWrapper* create() const override { return new afxEA_Projectile; }
 };
 
 afxEA_ProjectileDesc afxEA_ProjectileDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_ScriptEvent.cpp b/Engine/source/afx/ea/afxEA_ScriptEvent.cpp
index a80c1b8d2..e8baac9fd 100644
--- a/Engine/source/afx/ea/afxEA_ScriptEvent.cpp
+++ b/Engine/source/afx/ea/afxEA_ScriptEvent.cpp
@@ -46,12 +46,12 @@ public:
   /*C*/             afxEA_ScriptEvent();
   /*D*/             ~afxEA_ScriptEvent();
 
-  virtual bool      isDone() { return ran_script; }
+  bool      isDone() override { return ran_script; }
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -126,13 +126,13 @@ class afxEA_ScriptEventDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_ScriptEventDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return false; }
-  virtual bool  isPositional(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return false; }
+  bool  isPositional(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_ScriptEvent; }
+  afxEffectWrapper* create() const override { return new afxEA_ScriptEvent; }
 };
 
 afxEA_ScriptEventDesc afxEA_ScriptEventDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_Sound.cpp b/Engine/source/afx/ea/afxEA_Sound.cpp
index 335800d84..6756f38e3 100644
--- a/Engine/source/afx/ea/afxEA_Sound.cpp
+++ b/Engine/source/afx/ea/afxEA_Sound.cpp
@@ -51,14 +51,14 @@ public:
   /*C*/         afxEA_Sound();
   /*D*/         ~afxEA_Sound();
 
-  virtual void  ea_set_datablock(SimDataBlock*);
-  virtual bool  ea_start();
-  virtual bool  ea_update(F32 dt);
-  virtual void  ea_finish(bool was_stopped);
+  void  ea_set_datablock(SimDataBlock*) override;
+  bool  ea_start() override;
+  bool  ea_update(F32 dt) override;
+  void  ea_finish(bool was_stopped) override;
 
-  virtual bool  ea_is_enabled() { return true; }
+  bool  ea_is_enabled() override { return true; }
 
-  virtual void  onDeleteNotify(SimObject*);
+  void  onDeleteNotify(SimObject*) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -153,13 +153,13 @@ class afxEA_SoundDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_SoundDesc mDesc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
-  virtual void  prepEffect(afxEffectWrapperData*) const;
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
+  void  prepEffect(afxEffectWrapperData*) const override;
 
-  virtual afxEffectWrapper* create() const { return new afxEA_Sound; }
+  afxEffectWrapper* create() const override { return new afxEA_Sound; }
 };
 
 afxEA_SoundDesc afxEA_SoundDesc::mDesc;
diff --git a/Engine/source/afx/ea/afxEA_SpotLight_T3D.cpp b/Engine/source/afx/ea/afxEA_SpotLight_T3D.cpp
index fac4d4ff0..0cec822a8 100644
--- a/Engine/source/afx/ea/afxEA_SpotLight_T3D.cpp
+++ b/Engine/source/afx/ea/afxEA_SpotLight_T3D.cpp
@@ -51,15 +51,15 @@ public:
   /*C*/             afxEA_T3DSpotLight();
   /*D*/             ~afxEA_T3DSpotLight();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
-  virtual void      ea_set_scope_status(bool flag);
-  virtual void      onDeleteNotify(SimObject*);
-  virtual void      getBaseColor(LinearColorF& color);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
+  void      ea_set_scope_status(bool flag) override;
+  void      onDeleteNotify(SimObject*) override;
+  void      getBaseColor(LinearColorF& color) override;
 
-  virtual bool      ea_is_enabled() { return true; }
+  bool      ea_is_enabled() override { return true; }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -128,7 +128,7 @@ public:
     mLight->setColor(live_color);
   }
 
-  void submitLights(LightManager* lm, bool staticLighting)
+  void submitLights(LightManager* lm, bool staticLighting) override
   {
     if (mAnimState.active && mAnimationData && mFade_amt < 1.0f)
     {
@@ -269,12 +269,12 @@ class afxEA_T3DSpotLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_T3DSpotLightDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_T3DSpotLight; }
+  afxEffectWrapper* create() const override { return new afxEA_T3DSpotLight; }
 };
 
 afxEA_T3DSpotLightDesc afxEA_T3DSpotLightDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_StaticShape.cpp b/Engine/source/afx/ea/afxEA_StaticShape.cpp
index 20e276335..ef1359f7e 100644
--- a/Engine/source/afx/ea/afxEA_StaticShape.cpp
+++ b/Engine/source/afx/ea/afxEA_StaticShape.cpp
@@ -48,16 +48,16 @@ public:
   /*C*/             afxEA_StaticShape();
   /*D*/             ~afxEA_StaticShape();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
-  virtual void      ea_set_scope_status(bool flag);
-  virtual void      onDeleteNotify(SimObject*);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
+  void      ea_set_scope_status(bool flag) override;
+  void      onDeleteNotify(SimObject*) override;
 
-  virtual void              getUpdatedBoxCenter(Point3F& pos);
-  virtual TSShape*          getTSShape();
-  virtual TSShapeInstance*  getTSShapeInstance();
+  void              getUpdatedBoxCenter(Point3F& pos) override;
+  TSShape*          getTSShape() override;
+  TSShapeInstance*  getTSShapeInstance() override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -222,12 +222,12 @@ class afxEA_StaticShapeDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_StaticShapeDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return true; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return false; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return true; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return false; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_StaticShape; }
+  afxEffectWrapper* create() const override { return new afxEA_StaticShape; }
 };
 
 afxEA_StaticShapeDesc afxEA_StaticShapeDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_TLKLight.cpp b/Engine/source/afx/ea/afxEA_TLKLight.cpp
index 6d76f8ac0..4c79a82fa 100644
--- a/Engine/source/afx/ea/afxEA_TLKLight.cpp
+++ b/Engine/source/afx/ea/afxEA_TLKLight.cpp
@@ -53,12 +53,12 @@ class afxEA_TLKLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_TLKLightDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return 0; }
+  afxEffectWrapper* create() const override { return 0; }
 };
 
 afxEA_TLKLightDesc afxEA_TLKLightDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_VolumeLight.cpp b/Engine/source/afx/ea/afxEA_VolumeLight.cpp
index 194052f95..c85365a77 100644
--- a/Engine/source/afx/ea/afxEA_VolumeLight.cpp
+++ b/Engine/source/afx/ea/afxEA_VolumeLight.cpp
@@ -38,12 +38,12 @@ class afxEA_VolumeLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_VolumeLightDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return 0; }
+  afxEffectWrapper* create() const override { return 0; }
 };
 
 afxEA_VolumeLightDesc afxEA_VolumeLightDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_Zodiac.cpp b/Engine/source/afx/ea/afxEA_Zodiac.cpp
index c42a36837..8ce06780d 100644
--- a/Engine/source/afx/ea/afxEA_Zodiac.cpp
+++ b/Engine/source/afx/ea/afxEA_Zodiac.cpp
@@ -65,14 +65,14 @@ public:
   /*C*/             afxEA_Zodiac();
   /*C*/             ~afxEA_Zodiac();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 
-  virtual bool      ea_is_enabled() { return true; }
+  bool      ea_is_enabled() override { return true; }
 
-  virtual void      getBaseColor(LinearColorF& color) { color = zode_data->color; }
+  void      getBaseColor(LinearColorF& color) override { color = zode_data->color; }
 
   static void       initPersistFields();
 
@@ -412,12 +412,12 @@ class afxEA_ZodiacDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_ZodiacDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_Zodiac; }
+  afxEffectWrapper* create() const override { return new afxEA_Zodiac; }
 };
 
 afxEA_ZodiacDesc afxEA_ZodiacDesc::desc;
diff --git a/Engine/source/afx/ea/afxEA_ZodiacPlane.cpp b/Engine/source/afx/ea/afxEA_ZodiacPlane.cpp
index 43246f8f1..39296733e 100644
--- a/Engine/source/afx/ea/afxEA_ZodiacPlane.cpp
+++ b/Engine/source/afx/ea/afxEA_ZodiacPlane.cpp
@@ -58,14 +58,14 @@ public:
   /*C*/             afxEA_ZodiacPlane();
   /*D*/             ~afxEA_ZodiacPlane();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
-  virtual void      ea_set_scope_status(bool flag);
-  virtual void      onDeleteNotify(SimObject*);
-  virtual void      getUpdatedBoxCenter(Point3F& pos);
-  virtual void      getBaseColor(LinearColorF& color) { color = zode_data->color; }
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
+  void      ea_set_scope_status(bool flag) override;
+  void      onDeleteNotify(SimObject*) override;
+  void      getUpdatedBoxCenter(Point3F& pos) override;
+  void      getBaseColor(LinearColorF& color) override { color = zode_data->color; }
 };
 
 F32 afxEA_ZodiacPlane::calc_facing_angle() 
@@ -319,12 +319,12 @@ class afxEA_ZodiacPlaneDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_ZodiacPlaneDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_ZodiacPlane; }
+  afxEffectWrapper* create() const override { return new afxEA_ZodiacPlane; }
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/forces/afxEA_Force.cpp b/Engine/source/afx/forces/afxEA_Force.cpp
index 4f2ac1273..2f9d33cc3 100644
--- a/Engine/source/afx/forces/afxEA_Force.cpp
+++ b/Engine/source/afx/forces/afxEA_Force.cpp
@@ -47,10 +47,10 @@ public:
   /*C*/             afxEA_Force();
   /*D*/             ~afxEA_Force();
 
-  virtual void      ea_set_datablock(SimDataBlock*);
-  virtual bool      ea_start();
-  virtual bool      ea_update(F32 dt);
-  virtual void      ea_finish(bool was_stopped);
+  void      ea_set_datablock(SimDataBlock*) override;
+  bool      ea_start() override;
+  bool      ea_update(F32 dt) override;
+  void      ea_finish(bool was_stopped) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//
@@ -155,12 +155,12 @@ class afxEA_ForceDesc : public afxEffectAdapterDesc, public afxEffectDefs
   static afxEA_ForceDesc desc;
 
 public:
-  virtual bool  testEffectType(const SimDataBlock*) const;
-  virtual bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
-  virtual bool  runsOnServer(const afxEffectWrapperData*) const { return false; }
-  virtual bool  runsOnClient(const afxEffectWrapperData*) const { return true; }
+  bool  testEffectType(const SimDataBlock*) const override;
+  bool  requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
+  bool  runsOnServer(const afxEffectWrapperData*) const override { return false; }
+  bool  runsOnClient(const afxEffectWrapperData*) const override { return true; }
 
-  virtual afxEffectWrapper* create() const { return new afxEA_Force; }
+  afxEffectWrapper* create() const override { return new afxEA_Force; }
 };
 
 afxEA_ForceDesc afxEA_ForceDesc::desc;
diff --git a/Engine/source/afx/forces/afxF_Drag.cpp b/Engine/source/afx/forces/afxF_Drag.cpp
index 91fc394ae..b6f6b6879 100644
--- a/Engine/source/afx/forces/afxF_Drag.cpp
+++ b/Engine/source/afx/forces/afxF_Drag.cpp
@@ -43,9 +43,9 @@ public:
   /*C*/           afxF_DragData();
   /*C*/           afxF_DragData(const afxF_DragData&, bool = false);
   
-  virtual void    packData(BitStream* stream);
-  virtual void    unpackData(BitStream* stream);
-  virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
+  void    packData(BitStream* stream) override;
+  void    unpackData(BitStream* stream) override;
+  afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0) override;
 
   static void     initPersistFields();
 
@@ -65,10 +65,10 @@ private:
 public:
   /*C*/           afxF_Drag();
 
-  virtual bool    onNewDataBlock(afxForceData* dptr, bool reload);
+  bool    onNewDataBlock(afxForceData* dptr, bool reload) override;
 
-  virtual void    start();
-  virtual Point3F evaluate(Point3F pos, Point3F v, F32 mass);
+  void    start() override;
+  Point3F evaluate(Point3F pos, Point3F v, F32 mass) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -196,8 +196,8 @@ class afxF_DragDesc : public afxForceDesc
   static afxF_DragDesc desc;
 
 public:
-  virtual bool testForceType(const SimDataBlock*) const;
-  virtual afxForce* create() const { return new afxF_Drag; }
+  bool testForceType(const SimDataBlock*) const override;
+  afxForce* create() const override { return new afxF_Drag; }
 };
 
 afxF_DragDesc afxF_DragDesc::desc;
diff --git a/Engine/source/afx/forces/afxF_Gravity.cpp b/Engine/source/afx/forces/afxF_Gravity.cpp
index 946a412de..b7dc5c6a8 100644
--- a/Engine/source/afx/forces/afxF_Gravity.cpp
+++ b/Engine/source/afx/forces/afxF_Gravity.cpp
@@ -41,9 +41,9 @@ public:
   /*C*/           afxF_GravityData();
   /*C*/           afxF_GravityData(const afxF_GravityData&, bool = false);
   
-  virtual void    packData(BitStream* stream);
-  virtual void    unpackData(BitStream* stream);
-  virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
+  void    packData(BitStream* stream) override;
+  void    unpackData(BitStream* stream) override;
+  afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0) override;
 
   static void     initPersistFields();
 
@@ -62,9 +62,9 @@ private:
 public:
   /*C*/             afxF_Gravity();
 
-  virtual bool      onNewDataBlock(afxForceData* dptr, bool reload);
+  bool      onNewDataBlock(afxForceData* dptr, bool reload) override;
 
-  virtual Point3F   evaluate(Point3F pos, Point3F v, F32 mass);
+  Point3F   evaluate(Point3F pos, Point3F v, F32 mass) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -158,8 +158,8 @@ class afxF_GravityDesc : public afxForceDesc
   static afxF_GravityDesc desc;
 
 public:
-  virtual bool testForceType(const SimDataBlock*) const;
-  virtual afxForce* create() const { return new afxF_Gravity; }
+  bool testForceType(const SimDataBlock*) const override;
+  afxForce* create() const override { return new afxF_Gravity; }
 };
 
 afxF_GravityDesc afxF_GravityDesc::desc;
diff --git a/Engine/source/afx/forces/afxForce.h b/Engine/source/afx/forces/afxForce.h
index 5050d17d8..0e8960bc7 100644
--- a/Engine/source/afx/forces/afxForce.h
+++ b/Engine/source/afx/forces/afxForce.h
@@ -42,11 +42,11 @@ public:
   /*C*/         afxForceData();
   /*C*/         afxForceData(const afxForceData&, bool = false);
 
-  virtual bool  onAdd();
-  virtual void  packData(BitStream* stream);
-  virtual void  unpackData(BitStream* stream);
+  bool  onAdd() override;
+  void  packData(BitStream* stream) override;
+  void  unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
   virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0)=0;
 
   static void   initPersistFields();
diff --git a/Engine/source/afx/forces/afxXM_Force.cpp b/Engine/source/afx/forces/afxXM_Force.cpp
index eaabd9332..97c3181aa 100644
--- a/Engine/source/afx/forces/afxXM_Force.cpp
+++ b/Engine/source/afx/forces/afxXM_Force.cpp
@@ -52,16 +52,16 @@ public:
   /*C*/         afxXM_ForceData();
   /*C*/         afxXM_ForceData(const afxXM_ForceData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-   bool         preload(bool server, String &errorStr);
+   bool         preload(bool server, String &errorStr) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_ForceData);
 };
@@ -85,8 +85,8 @@ class afxXM_Force : public afxXM_WeightedBase, public afxEffectDefs
 public:
   /*C*/         afxXM_Force(afxXM_ForceData*, afxEffectWrapper*);
 
-  virtual void  start(F32 timestamp);
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  start(F32 timestamp) override;
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/rpg/afxRPGMagicSpell.h b/Engine/source/afx/rpg/afxRPGMagicSpell.h
index 17e6ac0b4..a4c9fffd4 100644
--- a/Engine/source/afx/rpg/afxRPGMagicSpell.h
+++ b/Engine/source/afx/rpg/afxRPGMagicSpell.h
@@ -90,9 +90,9 @@ public:
   char*             formatDesc(char* buffer, int len) const;
   bool              requiresTarget() { return (spell_target == TARGET_ENEMY || spell_target == TARGET_CORPSE || spell_target == TARGET_FRIEND); }
 
-  virtual bool      onAdd();
-  virtual void      packData(BitStream*);
-  virtual void      unpackData(BitStream*);
+  bool      onAdd() override;
+  void      packData(BitStream*) override;
+  void      unpackData(BitStream*) override;
 
   static void       initPersistFields();
 
diff --git a/Engine/source/afx/ui/afxEventCatchAll.cpp b/Engine/source/afx/ui/afxEventCatchAll.cpp
index 7f3da32b3..91d98249d 100644
--- a/Engine/source/afx/ui/afxEventCatchAll.cpp
+++ b/Engine/source/afx/ui/afxEventCatchAll.cpp
@@ -34,21 +34,21 @@ class afxEventCatchAll : public GuiControl
 public:
   /* C */         afxEventCatchAll() { }
 
-  virtual void    getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
+  void    getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
   
-  virtual void    onMouseUp(const GuiEvent&);
-  virtual void    onMouseDown(const GuiEvent&);
-  virtual void    onMouseMove(const GuiEvent&);
-  virtual void    onMouseDragged(const GuiEvent&);
-  virtual void    onMouseEnter(const GuiEvent&);
-  virtual void    onMouseLeave(const GuiEvent&);
+  void    onMouseUp(const GuiEvent&) override;
+  void    onMouseDown(const GuiEvent&) override;
+  void    onMouseMove(const GuiEvent&) override;
+  void    onMouseDragged(const GuiEvent&) override;
+  void    onMouseEnter(const GuiEvent&) override;
+  void    onMouseLeave(const GuiEvent&) override;
   
-  virtual bool    onMouseWheelUp(const GuiEvent&);
-  virtual bool    onMouseWheelDown(const GuiEvent&);
+  bool    onMouseWheelUp(const GuiEvent&) override;
+  bool    onMouseWheelDown(const GuiEvent&) override;
   
-  virtual void    onRightMouseDown(const GuiEvent&);
-  virtual void    onRightMouseUp(const GuiEvent&);
-  virtual void    onRightMouseDragged(const GuiEvent&);
+  void    onRightMouseDown(const GuiEvent&) override;
+  void    onRightMouseUp(const GuiEvent&) override;
+  void    onRightMouseDragged(const GuiEvent&) override;
   
   DECLARE_CONOBJECT(afxEventCatchAll);
   DECLARE_CATEGORY("AFX");
diff --git a/Engine/source/afx/ui/afxGuiSubstitutionField.h b/Engine/source/afx/ui/afxGuiSubstitutionField.h
index d26218be9..bcb69ffd3 100644
--- a/Engine/source/afx/ui/afxGuiSubstitutionField.h
+++ b/Engine/source/afx/ui/afxGuiSubstitutionField.h
@@ -43,21 +43,21 @@ public:
    DECLARE_CONOBJECT(afxGuiSubstitutionField);
    DECLARE_CATEGORY("AFX");
 
-   virtual void             setData( const char* data, bool callbacks = true );
-   virtual const char*      getData( U32 inspectObjectIndex = 0 );
-   virtual void             updateValue();
+   void             setData( const char* data, bool callbacks = true ) override;
+   const char*      getData( U32 inspectObjectIndex = 0 ) override;
+   void             updateValue() override;
 
    virtual void setToolTip( StringTableEntry data );
 
-   virtual bool onAdd();
+   bool onAdd() override;
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
 
-   virtual void setValue( const char* newValue );
+   void setValue( const char* newValue ) override;
 
 protected:
 
-   virtual void _executeSelectedCallback();
+   void _executeSelectedCallback() override;
 
 protected:
 
diff --git a/Engine/source/afx/ui/afxGuiTextHud.h b/Engine/source/afx/ui/afxGuiTextHud.h
index 285f74193..5844b61af 100644
--- a/Engine/source/afx/ui/afxGuiTextHud.h
+++ b/Engine/source/afx/ui/afxGuiTextHud.h
@@ -72,7 +72,7 @@ public:
    afxGuiTextHud();
 
    // GuiControl
-   virtual void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
    static void initPersistFields();
    static void addTextItem(const Point3F& pos, const char* text, LinearColorF& color, SceneObject* obj=0);
diff --git a/Engine/source/afx/ui/afxSpellButton.h b/Engine/source/afx/ui/afxSpellButton.h
index d261b461f..5999395b0 100644
--- a/Engine/source/afx/ui/afxSpellButton.h
+++ b/Engine/source/afx/ui/afxSpellButton.h
@@ -82,15 +82,15 @@ public:
   afxMagicSpellData*      getSpellDataBlock() const;
   afxRPGMagicSpellData*   getSpellRPGDataBlock() const;
   
-  virtual bool      onAdd();
-  virtual bool      onWake();
-  virtual void      onSleep();
-  virtual void      inspectPostApply();
-  virtual void      onMouseEnter(const GuiEvent &event);
-  virtual void      onMouseLeave(const GuiEvent &event);
-  virtual void      onRender(Point2I offset, const RectI &updateRect);
+  bool      onAdd() override;
+  bool      onWake() override;
+  void      onSleep() override;
+  void      inspectPostApply() override;
+  void      onMouseEnter(const GuiEvent &event) override;
+  void      onMouseLeave(const GuiEvent &event) override;
+  void      onRender(Point2I offset, const RectI &updateRect) override;
 
-  virtual void      onDeleteNotify(SimObject*);
+  void      onDeleteNotify(SimObject*) override;
   
   static void       initPersistFields();
   
diff --git a/Engine/source/afx/ui/afxSpellCastBar.cpp b/Engine/source/afx/ui/afxSpellCastBar.cpp
index 2b2c29b90..296161a37 100644
--- a/Engine/source/afx/ui/afxSpellCastBar.cpp
+++ b/Engine/source/afx/ui/afxSpellCastBar.cpp
@@ -50,13 +50,13 @@ class afxSpellCastBar : public GuiControl, public afxProgressBase
 public:
   /*C*/             afxSpellCastBar();
 
-  virtual void      onRender(Point2I, const RectI&);
+  void      onRender(Point2I, const RectI&) override;
 
   void              setFraction(F32 frac);
   F32               getFraction() const { return fraction; }
 
-  virtual void      setProgress(F32 value) { setFraction(value); }
-  virtual void      onStaticModified(const char* slotName, const char* newValue = NULL);
+  void      setProgress(F32 value) override { setFraction(value); }
+  void      onStaticModified(const char* slotName, const char* newValue = NULL) override;
 
   static void       initPersistFields();
 
diff --git a/Engine/source/afx/ui/afxStatusBar.cpp b/Engine/source/afx/ui/afxStatusBar.cpp
index fabb0c0b7..624cc6a21 100644
--- a/Engine/source/afx/ui/afxStatusBar.cpp
+++ b/Engine/source/afx/ui/afxStatusBar.cpp
@@ -49,20 +49,20 @@ class afxStatusBar : public GuiControl, public afxProgressBase
 public:
   /*C*/             afxStatusBar();
 
-  virtual void      onRender(Point2I, const RectI&);
+  void      onRender(Point2I, const RectI&) override;
 
   void              setFraction(F32 frac);
   F32               getFraction() const { return fraction; }
 
-  virtual void      setProgress(F32 value) { setFraction(value); }
+  void      setProgress(F32 value) override { setFraction(value); }
 
   void              setShape(ShapeBase* s);
   void              clearShape() { setShape(NULL); }
 
-  virtual bool      onWake();
-  virtual void      onSleep();
-  virtual void      onMouseDown(const GuiEvent &event);
-  virtual void      onDeleteNotify(SimObject*);
+  bool      onWake() override;
+  void      onSleep() override;
+  void      onMouseDown(const GuiEvent &event) override;
+  void      onDeleteNotify(SimObject*) override;
 
   static void       initPersistFields();
 
diff --git a/Engine/source/afx/ui/afxStatusBox.h b/Engine/source/afx/ui/afxStatusBox.h
index f048cef2f..a10c0c550 100644
--- a/Engine/source/afx/ui/afxStatusBox.h
+++ b/Engine/source/afx/ui/afxStatusBox.h
@@ -38,8 +38,8 @@ private:
 public:   
   /*C*/         afxStatusBox();
 
-  virtual void  onMouseDown(const GuiEvent &event);
-  virtual void  onSleep();
+  void  onMouseDown(const GuiEvent &event) override;
+  void  onSleep() override;
 
   DECLARE_CONOBJECT(afxStatusBox);
   DECLARE_CATEGORY("AFX");
diff --git a/Engine/source/afx/ui/afxStatusLabel.h b/Engine/source/afx/ui/afxStatusLabel.h
index a81c92d86..b8e37df52 100644
--- a/Engine/source/afx/ui/afxStatusLabel.h
+++ b/Engine/source/afx/ui/afxStatusLabel.h
@@ -38,7 +38,7 @@ private:
 public:   
   /*C*/         afxStatusLabel();
 
-  virtual void  onMouseDown(const GuiEvent &event);
+  void  onMouseDown(const GuiEvent &event) override;
 
   DECLARE_CONOBJECT(afxStatusLabel);
   DECLARE_CATEGORY("AFX");
diff --git a/Engine/source/afx/ui/afxTSCtrl.h b/Engine/source/afx/ui/afxTSCtrl.h
index b45322b70..b51672938 100644
--- a/Engine/source/afx/ui/afxTSCtrl.h
+++ b/Engine/source/afx/ui/afxTSCtrl.h
@@ -55,22 +55,22 @@ private:
 public:
   /*C*/               afxTSCtrl();
 
-  virtual bool        processCameraQuery(CameraQuery *query);
-  virtual void        renderWorld(const RectI &updateRect);
-  virtual void        onRender(Point2I offset, const RectI &updateRect);
+  bool        processCameraQuery(CameraQuery *query) override;
+  void        renderWorld(const RectI &updateRect) override;
+  void        onRender(Point2I offset, const RectI &updateRect) override;
 
-  virtual void        getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
+  void        getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
 
-  virtual void        onMouseDown(const GuiEvent&);
-  virtual void        onMouseMove(const GuiEvent&);
-  virtual void        onMouseDragged(const GuiEvent&);
-  virtual void        onMouseEnter(const GuiEvent&);
-  virtual void        onMouseLeave(const GuiEvent&);
+  void        onMouseDown(const GuiEvent&) override;
+  void        onMouseMove(const GuiEvent&) override;
+  void        onMouseDragged(const GuiEvent&) override;
+  void        onMouseEnter(const GuiEvent&) override;
+  void        onMouseLeave(const GuiEvent&) override;
 
-  virtual bool        onMouseWheelUp(const GuiEvent&);
-  virtual bool        onMouseWheelDown(const GuiEvent&);
+  bool        onMouseWheelUp(const GuiEvent&) override;
+  bool        onMouseWheelDown(const GuiEvent&) override;
 
-  virtual void        onRightMouseDown(const GuiEvent&);
+  void        onRightMouseDown(const GuiEvent&) override;
 
   Point3F             getMouse3DVec() {return mMouse3DVec;};   
   Point3F             getMouse3DPos() {return mMouse3DPos;};
@@ -83,9 +83,9 @@ public:
   U8                  getTargetingCheckMethod();
   void                performTargeting(const Point2I& mousePoint, U8 mode);
 
-  virtual void        interpolateTick( F32 delta ) {};
-  virtual void        processTick() {};
-  virtual void        advanceTime( F32 timeDelta ); 
+  void        interpolateTick( F32 delta ) override {};
+  void        processTick() override {};
+  void        advanceTime( F32 timeDelta ) override; 
 
   DECLARE_CONOBJECT(afxTSCtrl);
   DECLARE_CATEGORY("AFX");
diff --git a/Engine/source/afx/util/afxCurveEval.h b/Engine/source/afx/util/afxCurveEval.h
index d5c6853b9..9df9cb92d 100644
--- a/Engine/source/afx/util/afxCurveEval.h
+++ b/Engine/source/afx/util/afxCurveEval.h
@@ -47,15 +47,15 @@ public:
 class afxHermiteEval : public afxCurveEval
 {
 public:
-  Point2F evaluateCurve(Point2F& v0, Point2F& v1, F32 t);
-  Point2F evaluateCurve(Point2F& v0, Point2F& v1, Point2F& t0, Point2F& t1, F32 t);
-  Point2F evaluateCurveTangent(Point2F& v0, Point2F& v1, F32 t);
-  Point2F evaluateCurveTangent(Point2F& v0, Point2F& v1, Point2F& t0, Point2F& t1, F32 t);
+  Point2F evaluateCurve(Point2F& v0, Point2F& v1, F32 t) override;
+  Point2F evaluateCurve(Point2F& v0, Point2F& v1, Point2F& t0, Point2F& t1, F32 t) override;
+  Point2F evaluateCurveTangent(Point2F& v0, Point2F& v1, F32 t) override;
+  Point2F evaluateCurveTangent(Point2F& v0, Point2F& v1, Point2F& t0, Point2F& t1, F32 t) override;
   
-  Point3F evaluateCurve(Point3F& v0, Point3F& v1, F32 t);
-  Point3F evaluateCurve(Point3F& v0, Point3F& v1, Point3F& t0, Point3F& t1, F32 t);
-  Point3F evaluateCurveTangent(Point3F& v0, Point3F& v1, F32 t);
-  Point3F evaluateCurveTangent(Point3F& v0, Point3F& v1, Point3F& t0, Point3F& t1, F32 t);
+  Point3F evaluateCurve(Point3F& v0, Point3F& v1, F32 t) override;
+  Point3F evaluateCurve(Point3F& v0, Point3F& v1, Point3F& t0, Point3F& t1, F32 t) override;
+  Point3F evaluateCurveTangent(Point3F& v0, Point3F& v1, F32 t) override;
+  Point3F evaluateCurveTangent(Point3F& v0, Point3F& v1, Point3F& t0, Point3F& t1, F32 t) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/util/afxPath.h b/Engine/source/afx/util/afxPath.h
index dc931641c..3eefdaea7 100644
--- a/Engine/source/afx/util/afxPath.h
+++ b/Engine/source/afx/util/afxPath.h
@@ -80,16 +80,16 @@ public:
   /*C*/                 afxPathData(const afxPathData&, bool = false);
   /*D*/                 ~afxPathData();
 
-  virtual bool          onAdd();
-  virtual void          onRemove();
-  virtual void          packData(BitStream*);
-  virtual void          unpackData(BitStream*);
+  bool          onAdd() override;
+  void          onRemove() override;
+  void          packData(BitStream*) override;
+  void          unpackData(BitStream*) override;
 
-  bool                  preload(bool server, String &errorStr);
+  bool                  preload(bool server, String &errorStr) override;
 
-  virtual void          onStaticModified(const char* slotName, const char* newValue = NULL);
-  virtual void          onPerformSubstitutions();
-  virtual bool          allowSubstitutions() const { return true; }
+  void          onStaticModified(const char* slotName, const char* newValue = NULL) override;
+  void          onPerformSubstitutions() override;
+  bool          allowSubstitutions() const override { return true; }
 
   static void           initPersistFields();
 
diff --git a/Engine/source/afx/xm/afxXM_Aim.cpp b/Engine/source/afx/xm/afxXM_Aim.cpp
index 8256ebf0b..f1351638a 100644
--- a/Engine/source/afx/xm/afxXM_Aim.cpp
+++ b/Engine/source/afx/xm/afxXM_Aim.cpp
@@ -44,14 +44,14 @@ public:
   /*C*/         afxXM_AimData();
   /*C*/         afxXM_AimData(const afxXM_AimData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_AimData);
 };
@@ -67,7 +67,7 @@ class afxXM_Aim_weighted : public afxXM_WeightedBase
 public:
   /*C*/           afxXM_Aim_weighted(afxXM_AimData*, afxEffectWrapper*);
 
-  virtual void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -79,7 +79,7 @@ class afxXM_Aim_weighted_z : public afxXM_WeightedBase
 public:
   /*C*/           afxXM_Aim_weighted_z(afxXM_AimData*, afxEffectWrapper*);
 
-  virtual void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -91,7 +91,7 @@ class afxXM_Aim_fixed : public afxXM_Base
 public:
   /*C*/           afxXM_Aim_fixed(afxXM_AimData*, afxEffectWrapper*);
 
-  virtual void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -103,7 +103,7 @@ class afxXM_Aim_fixed_z : public afxXM_Base
 public:
   /*C*/           afxXM_Aim_fixed_z(afxXM_AimData*, afxEffectWrapper*);
 
-  virtual void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_AltitudeConform.cpp b/Engine/source/afx/xm/afxXM_AltitudeConform.cpp
index 5c7228cad..cf5c52015 100644
--- a/Engine/source/afx/xm/afxXM_AltitudeConform.cpp
+++ b/Engine/source/afx/xm/afxXM_AltitudeConform.cpp
@@ -46,11 +46,11 @@ public:
   /*C*/         afxXM_AltitudeConformData();
   /*C*/         afxXM_AltitudeConformData(const afxXM_AltitudeConformData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_AltitudeConformData);
 };
@@ -70,7 +70,7 @@ class afxXM_AltitudeConform : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_AltitudeConform(afxXM_AltitudeConformData*, afxEffectWrapper*, bool on_server);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_BoxAdapt.cpp b/Engine/source/afx/xm/afxXM_BoxAdapt.cpp
index d033c144a..e057fab20 100644
--- a/Engine/source/afx/xm/afxXM_BoxAdapt.cpp
+++ b/Engine/source/afx/xm/afxXM_BoxAdapt.cpp
@@ -45,11 +45,11 @@ public:
   /*C*/         afxXM_BoxAdaptData();
   /*C*/         afxXM_BoxAdaptData(const afxXM_BoxAdaptData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_BoxAdaptData);
 };
@@ -68,7 +68,7 @@ class afxXM_BoxAdapt : public afxXM_WeightedBase
 public:
   /*C*/           afxXM_BoxAdapt(afxXM_BoxAdaptData*, afxEffectWrapper*);
 
-  virtual void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_BoxConform.cpp b/Engine/source/afx/xm/afxXM_BoxConform.cpp
index 130e4421c..f43a9463a 100644
--- a/Engine/source/afx/xm/afxXM_BoxConform.cpp
+++ b/Engine/source/afx/xm/afxXM_BoxConform.cpp
@@ -46,11 +46,11 @@ public:
   /*C*/         afxXM_BoxConformData();
   /*C*/         afxXM_BoxConformData(const afxXM_BoxConformData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_BoxConformData);
 };
@@ -64,7 +64,7 @@ class afxXM_BoxConform : public afxXM_Base
 public:
   /*C*/         afxXM_BoxConform(afxXM_BoxConformData*, afxEffectWrapper*, bool on_server);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_BoxHeightOffset.cpp b/Engine/source/afx/xm/afxXM_BoxHeightOffset.cpp
index d7418ba52..dd9e2f54a 100644
--- a/Engine/source/afx/xm/afxXM_BoxHeightOffset.cpp
+++ b/Engine/source/afx/xm/afxXM_BoxHeightOffset.cpp
@@ -44,12 +44,12 @@ public:
   /*C*/         afxXM_BoxHeightOffsetData();
   /*C*/         afxXM_BoxHeightOffsetData(const afxXM_BoxHeightOffsetData&, bool = false);
   
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
   static void   initPersistFields();
   
 #if defined(AFX_VERSION)
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 #else
   afxXM_Base*   create(afxEffectWrapper* fx);
 #endif
@@ -67,7 +67,7 @@ class afxXM_BoxHeightOffset : public afxXM_Base
 public:
   /*C*/         afxXM_BoxHeightOffset(afxXM_BoxHeightOffsetData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_Freeze.cpp b/Engine/source/afx/xm/afxXM_Freeze.cpp
index c7872f94a..0a5841b16 100644
--- a/Engine/source/afx/xm/afxXM_Freeze.cpp
+++ b/Engine/source/afx/xm/afxXM_Freeze.cpp
@@ -43,14 +43,14 @@ public:
   /*C*/         afxXM_FreezeData() : mask(POSITION | ORIENTATION | POSITION2), delay(0.0f) { }
   /*C*/         afxXM_FreezeData(const afxXM_FreezeData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_FreezeData);
 };
@@ -71,7 +71,7 @@ class afxXM_Freeze : public afxXM_Base
 public:
   /*C*/         afxXM_Freeze(afxXM_FreezeData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -89,7 +89,7 @@ class afxXM_Freeze_all_but_scale : public afxXM_Base
 public:
   /*C*/         afxXM_Freeze_all_but_scale(afxXM_FreezeData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -105,7 +105,7 @@ class afxXM_Freeze_pos : public afxXM_Base
 public:
   /*C*/         afxXM_Freeze_pos(afxXM_FreezeData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -121,7 +121,7 @@ class afxXM_Freeze_pos2 : public afxXM_Base
 public:
   /*C*/         afxXM_Freeze_pos2(afxXM_FreezeData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -137,7 +137,7 @@ class afxXM_Freeze_ori : public afxXM_Base
 public:
   /*C*/         afxXM_Freeze_ori(afxXM_FreezeData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_GroundConform.cpp b/Engine/source/afx/xm/afxXM_GroundConform.cpp
index 79fe44253..e661f70ca 100644
--- a/Engine/source/afx/xm/afxXM_GroundConform.cpp
+++ b/Engine/source/afx/xm/afxXM_GroundConform.cpp
@@ -45,14 +45,14 @@ public:
   /*C*/         afxXM_GroundConformData();
   /*C*/         afxXM_GroundConformData(const afxXM_GroundConformData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_GroundConformData);
 };
@@ -67,7 +67,7 @@ class afxXM_GroundConform : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_GroundConform(afxXM_GroundConformData*, afxEffectWrapper*, bool on_server);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_HeightSampler.cpp b/Engine/source/afx/xm/afxXM_HeightSampler.cpp
index eec80c9e6..76c5a7d74 100644
--- a/Engine/source/afx/xm/afxXM_HeightSampler.cpp
+++ b/Engine/source/afx/xm/afxXM_HeightSampler.cpp
@@ -42,14 +42,14 @@ public:
   /*C*/         afxXM_HeightSamplerData();
   /*C*/         afxXM_HeightSamplerData(const afxXM_HeightSamplerData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_HeightSamplerData);
 };
@@ -65,7 +65,7 @@ class afxXM_HeightSampler : public afxXM_WeightedBase
 public:
   /*C*/           afxXM_HeightSampler(afxXM_HeightSamplerData*, afxEffectWrapper*);
 
-  virtual void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_MountedImageNode.cpp b/Engine/source/afx/xm/afxXM_MountedImageNode.cpp
index 9ab4ea029..0a9df62b2 100644
--- a/Engine/source/afx/xm/afxXM_MountedImageNode.cpp
+++ b/Engine/source/afx/xm/afxXM_MountedImageNode.cpp
@@ -43,15 +43,15 @@ public:
   /*C*/         afxXM_MountedImageNodeData();
   /*C*/         afxXM_MountedImageNodeData(const afxXM_MountedImageNodeData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
-  bool          onAdd();
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
+  bool          onAdd() override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_MountedImageNodeData);
 };
@@ -73,8 +73,8 @@ class afxXM_MountedImageNode : public afxXM_Base
 public:
   /*C*/         afxXM_MountedImageNode(afxXM_MountedImageNodeData*, afxEffectWrapper*);
 
-  virtual void  start(F32 timestamp);
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  start(F32 timestamp) override;
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_Offset.cpp b/Engine/source/afx/xm/afxXM_Offset.cpp
index 2500c8d9d..b9beec334 100644
--- a/Engine/source/afx/xm/afxXM_Offset.cpp
+++ b/Engine/source/afx/xm/afxXM_Offset.cpp
@@ -49,14 +49,14 @@ public:
   /*C*/         afxXM_LocalOffsetData();
   /*C*/         afxXM_LocalOffsetData(const afxXM_LocalOffsetData&, bool = false);
   
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
   
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
   
   DECLARE_CONOBJECT(afxXM_LocalOffsetData);
 };
@@ -71,7 +71,7 @@ class afxXM_LocalOffset_weighted : public afxXM_WeightedBase
   
 public:
   /*C*/         afxXM_LocalOffset_weighted(afxXM_LocalOffsetData*, afxEffectWrapper*);
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -87,7 +87,7 @@ class afxXM_LocalOffset_fixed : public afxXM_Base
   
 public:
   /*C*/         afxXM_LocalOffset_fixed(afxXM_LocalOffsetData*, afxEffectWrapper*);
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -100,7 +100,7 @@ class afxXM_LocalOffset2_weighted : public afxXM_WeightedBase
   
 public:
   /*C*/         afxXM_LocalOffset2_weighted(afxXM_LocalOffsetData*, afxEffectWrapper*);
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -116,7 +116,7 @@ class afxXM_LocalOffset2_fixed : public afxXM_Base
   
 public:
   /*C*/         afxXM_LocalOffset2_fixed(afxXM_LocalOffsetData*, afxEffectWrapper*);
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -134,14 +134,14 @@ public:
   /*C*/         afxXM_WorldOffsetData();
   /*C*/         afxXM_WorldOffsetData(const afxXM_WorldOffsetData&, bool = false);
   
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
   
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
   
   DECLARE_CONOBJECT(afxXM_WorldOffsetData);
 };
@@ -156,7 +156,7 @@ class afxXM_WorldOffset_weighted : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_WorldOffset_weighted(afxXM_WorldOffsetData*, afxEffectWrapper*);
   
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -171,7 +171,7 @@ class afxXM_WorldOffset_fixed : public afxXM_Base
   
 public:
   /*C*/         afxXM_WorldOffset_fixed(afxXM_WorldOffsetData*, afxEffectWrapper*);
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -184,7 +184,7 @@ class afxXM_WorldOffset2_weighted : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_WorldOffset2_weighted(afxXM_WorldOffsetData*, afxEffectWrapper*);
   
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -199,7 +199,7 @@ class afxXM_WorldOffset2_fixed : public afxXM_Base
   
 public:
   /*C*/         afxXM_WorldOffset2_fixed(afxXM_WorldOffsetData*, afxEffectWrapper*);
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_Oscillate.cpp b/Engine/source/afx/xm/afxXM_Oscillate.cpp
index 7a4c89caf..62af9492f 100644
--- a/Engine/source/afx/xm/afxXM_Oscillate.cpp
+++ b/Engine/source/afx/xm/afxXM_Oscillate.cpp
@@ -51,14 +51,14 @@ public:
   /*C*/         afxXM_OscillateData();
   /*C*/         afxXM_OscillateData(const afxXM_OscillateData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_OscillateData);
 };
@@ -72,7 +72,7 @@ class afxXM_Oscillate_rot : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_Oscillate_rot(afxXM_OscillateData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 class afxXM_Oscillate_scale : public afxXM_WeightedBase
@@ -84,7 +84,7 @@ class afxXM_Oscillate_scale : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_Oscillate_scale(afxXM_OscillateData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 class afxXM_Oscillate_position : public afxXM_WeightedBase
@@ -96,7 +96,7 @@ class afxXM_Oscillate_position : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_Oscillate_position(afxXM_OscillateData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 class afxXM_Oscillate_position2 : public afxXM_WeightedBase
@@ -108,7 +108,7 @@ class afxXM_Oscillate_position2 : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_Oscillate_position2(afxXM_OscillateData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 class afxXM_Oscillate : public afxXM_WeightedBase
@@ -120,7 +120,7 @@ class afxXM_Oscillate : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_Oscillate(afxXM_OscillateData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_OscillateZodiacColor.cpp b/Engine/source/afx/xm/afxXM_OscillateZodiacColor.cpp
index 6897023e8..fd08eb953 100644
--- a/Engine/source/afx/xm/afxXM_OscillateZodiacColor.cpp
+++ b/Engine/source/afx/xm/afxXM_OscillateZodiacColor.cpp
@@ -41,11 +41,11 @@ public:
 public:
   /*C*/         afxXM_OscillateZodiacColorData();
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_OscillateZodiacColorData);
 };
@@ -64,8 +64,8 @@ class afxXM_OscillateZodiacColor : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_OscillateZodiacColor(afxXM_OscillateZodiacColorData*, afxEffectWrapper*);
 
-  virtual void  update(F32 dt, F32 elapsed, Point3F& pos, MatrixF& ori, Point3F& pos2, 
-                       Point3F& scale);
+  void  update(F32 dt, F32 elapsed, Point3F& pos, MatrixF& ori, Point3F& pos2, 
+                       Point3F& scale) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_PathConform.cpp b/Engine/source/afx/xm/afxXM_PathConform.cpp
index 365f5af92..a322bd56a 100644
--- a/Engine/source/afx/xm/afxXM_PathConform.cpp
+++ b/Engine/source/afx/xm/afxXM_PathConform.cpp
@@ -55,16 +55,16 @@ public:
   /*C*/           afxXM_PathConformData();
   /*C*/           afxXM_PathConformData(const afxXM_PathConformData&, bool = false);
 
-  bool            onAdd();
-  bool            preload(bool server, String &errorStr);
-  void            packData(BitStream* stream);
-  void            unpackData(BitStream* stream);
+  bool            onAdd() override;
+  bool            preload(bool server, String &errorStr) override;
+  void            packData(BitStream* stream) override;
+  void            unpackData(BitStream* stream) override;
 
-  virtual bool    allowSubstitutions() const { return true; }
+  bool    allowSubstitutions() const override { return true; }
 
   static void     initPersistFields();
 
-  afxXM_Base*     create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*     create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_PathConformData);
 };
@@ -89,8 +89,8 @@ public:
   /*C*/         afxXM_PathConform(afxXM_PathConformData*, afxEffectWrapper*);
   /*D*/         ~afxXM_PathConform();
 
-  virtual void  start(F32 timestamp);
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  start(F32 timestamp) override;
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_PivotNodeOffset.cpp b/Engine/source/afx/xm/afxXM_PivotNodeOffset.cpp
index 5a274f162..6401c7c79 100644
--- a/Engine/source/afx/xm/afxXM_PivotNodeOffset.cpp
+++ b/Engine/source/afx/xm/afxXM_PivotNodeOffset.cpp
@@ -45,14 +45,14 @@ public:
   /*C*/         afxXM_PivotNodeOffsetData();
   /*C*/         afxXM_PivotNodeOffsetData(const afxXM_PivotNodeOffsetData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_PivotNodeOffsetData);
 };
@@ -72,7 +72,7 @@ class afxXM_PivotNodeOffset : public afxXM_Base
 public:
   /*C*/         afxXM_PivotNodeOffset(afxXM_PivotNodeOffsetData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_RandomRot.cpp b/Engine/source/afx/xm/afxXM_RandomRot.cpp
index 1580e5f16..7ea3217cd 100644
--- a/Engine/source/afx/xm/afxXM_RandomRot.cpp
+++ b/Engine/source/afx/xm/afxXM_RandomRot.cpp
@@ -49,15 +49,15 @@ public:
   /*C*/         afxXM_RandomRotData(); 
   /*C*/         afxXM_RandomRotData(const afxXM_RandomRotData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
-  bool          onAdd();
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
+  bool          onAdd() override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_RandomRotData);
 };
@@ -71,7 +71,7 @@ class afxXM_RandomRot : public afxXM_Base
 public:
   /*C*/         afxXM_RandomRot(afxXM_RandomRotData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_Scale.cpp b/Engine/source/afx/xm/afxXM_Scale.cpp
index 5d4b7e528..db5528571 100644
--- a/Engine/source/afx/xm/afxXM_Scale.cpp
+++ b/Engine/source/afx/xm/afxXM_Scale.cpp
@@ -47,14 +47,14 @@ public:
   /*C*/         afxXM_ScaleData();
   /*C*/         afxXM_ScaleData(const afxXM_ScaleData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_ScaleData);
 };
@@ -70,7 +70,7 @@ class afxXM_Scale_weighted : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_Scale_weighted(afxXM_ScaleData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_Shockwave.cpp b/Engine/source/afx/xm/afxXM_Shockwave.cpp
index b4152c583..27c632df0 100644
--- a/Engine/source/afx/xm/afxXM_Shockwave.cpp
+++ b/Engine/source/afx/xm/afxXM_Shockwave.cpp
@@ -48,14 +48,14 @@ public:
   /*C*/         afxXM_ShockwaveData();
   /*C*/         afxXM_ShockwaveData(const afxXM_ShockwaveData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_ShockwaveData);
 };
@@ -73,7 +73,7 @@ class afxXM_Shockwave : public afxXM_Base
 public:
   /*C*/         afxXM_Shockwave(afxXM_ShockwaveData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_Spin.cpp b/Engine/source/afx/xm/afxXM_Spin.cpp
index f87b9d970..2fffa6c5a 100644
--- a/Engine/source/afx/xm/afxXM_Spin.cpp
+++ b/Engine/source/afx/xm/afxXM_Spin.cpp
@@ -51,15 +51,15 @@ public:
   /*C*/         afxXM_SpinData() : spin_axis(0,0,1), spin_angle(0),  spin_angle_var(0), spin_rate(0), spin_rate_var(0) { }
   /*C*/         afxXM_SpinData(const afxXM_SpinData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
-  bool          onAdd();
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
+  bool          onAdd() override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_SpinData);
 };
@@ -77,7 +77,7 @@ class afxXM_Spin_weighted : public afxXM_WeightedBase
 public:
   /*C*/         afxXM_Spin_weighted(afxXM_SpinData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -93,7 +93,7 @@ class afxXM_Spin_fixed : public afxXM_Base
 public:
   /*C*/         afxXM_Spin_fixed(afxXM_SpinData*, afxEffectWrapper*);
 
-  virtual void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void  updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_VelocityOffset.cpp b/Engine/source/afx/xm/afxXM_VelocityOffset.cpp
index ca2ea29df..2c9e97eb4 100644
--- a/Engine/source/afx/xm/afxXM_VelocityOffset.cpp
+++ b/Engine/source/afx/xm/afxXM_VelocityOffset.cpp
@@ -50,14 +50,14 @@ public:
   /*C*/         afxXM_VelocityOffsetData();
   /*C*/         afxXM_VelocityOffsetData(const afxXM_VelocityOffsetData&, bool = false);
   
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
   
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
   
   DECLARE_CONOBJECT(afxXM_VelocityOffsetData);
 };
@@ -75,8 +75,8 @@ class afxXM_VelocityOffset_weighted : public afxXM_WeightedBase
 public:
   /*C*/           afxXM_VelocityOffset_weighted(afxXM_VelocityOffsetData*, afxEffectWrapper*);
   
-  virtual void    start(F32 timestamp);
-  virtual void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void    start(F32 timestamp) override;
+  void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -95,8 +95,8 @@ class afxXM_VelocityOffset_fixed : public afxXM_Base
 public:
   /*C*/           afxXM_VelocityOffset_fixed(afxXM_VelocityOffsetData*, afxEffectWrapper*);
 
-  virtual void    start(F32 timestamp);
-  virtual void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void    start(F32 timestamp) override;
+  void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -112,8 +112,8 @@ class afxXM_VelocityOffset2_weighted : public afxXM_WeightedBase
 public:
   /*C*/           afxXM_VelocityOffset2_weighted(afxXM_VelocityOffsetData*, afxEffectWrapper*);
   
-  virtual void    start(F32 timestamp);
-  virtual void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void    start(F32 timestamp) override;
+  void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@@ -132,8 +132,8 @@ class afxXM_VelocityOffset2_fixed : public afxXM_Base
 public:
   /*C*/           afxXM_VelocityOffset2_fixed(afxXM_VelocityOffsetData*, afxEffectWrapper*);
 
-  virtual void    start(F32 timestamp);
-  virtual void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void    start(F32 timestamp) override;
+  void    updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_WaveBase.h b/Engine/source/afx/xm/afxXM_WaveBase.h
index 0931b937b..6d4f37982 100644
--- a/Engine/source/afx/xm/afxXM_WaveBase.h
+++ b/Engine/source/afx/xm/afxXM_WaveBase.h
@@ -42,37 +42,37 @@ public:
 class afxXM_WaveformSine : public afxXM_Waveform
 {
 public:
-  virtual F32 evaluate(F32 t);
+  F32 evaluate(F32 t) override;
 };
 
 class afxXM_WaveformSquare : public afxXM_Waveform
 {
 public:
-  virtual F32 evaluate(F32 t);
+  F32 evaluate(F32 t) override;
 };
 
 class afxXM_WaveformTriangle : public afxXM_Waveform
 {
 public:
-  virtual F32 evaluate(F32 t);
+  F32 evaluate(F32 t) override;
 };
 
 class afxXM_WaveformSawtooth : public afxXM_Waveform
 {
 public:
-  virtual F32 evaluate(F32 t) { return t; }
+  F32 evaluate(F32 t) override { return t; }
 };
 
 class afxXM_WaveformNoise : public afxXM_Waveform
 {
 public:
-  virtual F32 evaluate(F32 t) { return gRandGen.randF(); };
+  F32 evaluate(F32 t) override { return gRandGen.randF(); };
 };
 
 class afxXM_WaveformOne : public afxXM_Waveform
 {
 public:
-  virtual F32 evaluate(F32 t) { return 1.0f; };
+  F32 evaluate(F32 t) override { return 1.0f; };
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -163,8 +163,8 @@ public:
   /*C*/           afxXM_WaveBaseData();
   /*C*/           afxXM_WaveBaseData(const afxXM_WaveBaseData&, bool = false);
 
-  void            packData(BitStream* stream);
-  void            unpackData(BitStream* stream);
+  void            packData(BitStream* stream) override;
+  void            unpackData(BitStream* stream) override;
 
   static void     initPersistFields();
 
@@ -203,8 +203,8 @@ public:
   /*C*/           afxXM_WaveRiderBaseData();
   /*C*/           afxXM_WaveRiderBaseData(const afxXM_WaveRiderBaseData&, bool = false);
 
-  void            packData(BitStream* stream);
-  void            unpackData(BitStream* stream);
+  void            packData(BitStream* stream) override;
+  void            unpackData(BitStream* stream) override;
 
   static void     initPersistFields();
 
@@ -249,7 +249,7 @@ public:
   /*C*/                 afxXM_WaveBase(afxXM_WaveBaseData*, afxEffectWrapper*, afxXM_WaveInterp*);
   /*D*/                 virtual ~afxXM_WaveBase();
 
-  virtual void          updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void          updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 inline F32 afxXM_WaveBase::calc_initial_speed()
@@ -302,7 +302,7 @@ public:
   /*C*/                 afxXM_WaveRiderBase(afxXM_WaveRiderBaseData*, afxEffectWrapper*, afxXM_WaveInterp*);
   /*D*/                 ~afxXM_WaveRiderBase();
 
-  virtual void          updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
+  void          updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
diff --git a/Engine/source/afx/xm/afxXM_WaveColor.cpp b/Engine/source/afx/xm/afxXM_WaveColor.cpp
index 3584ca011..441336e54 100644
--- a/Engine/source/afx/xm/afxXM_WaveColor.cpp
+++ b/Engine/source/afx/xm/afxXM_WaveColor.cpp
@@ -45,8 +45,8 @@ public:
 
   void set(LinearColorF& a, LinearColorF& b, LinearColorF& a_var, LinearColorF& b_var, bool sync_var);
 
-  virtual void interpolate(F32 t, afxXM_Params& params)=0;
-  virtual void pulse();
+  void interpolate(F32 t, afxXM_Params& params) override =0;
+  void pulse() override;
 };
 
 afxXM_WaveInterp_Color::afxXM_WaveInterp_Color() 
@@ -88,7 +88,7 @@ inline void afxXM_WaveInterp_Color::pulse()
 class afxXM_WaveInterp_Color_Add : public afxXM_WaveInterp_Color
 {
 public:
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     LinearColorF temp_color;
     temp_color.interpolate(mA, mB, t);
@@ -101,7 +101,7 @@ public:
 class afxXM_WaveInterp_Color_Mul : public afxXM_WaveInterp_Color
 {
 public:
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     LinearColorF temp_color;
     temp_color.interpolate(mA, mB, t);
@@ -114,7 +114,7 @@ public:
 class afxXM_WaveInterp_Color_Rep : public afxXM_WaveInterp_Color
 {
 public:
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     params.color.interpolate(mA, mB, t);
   }
@@ -171,14 +171,14 @@ public:
   /*C*/         afxXM_WaveColorData();
   /*C*/         afxXM_WaveColorData(const afxXM_WaveColorData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_WaveColorData);
 };
@@ -286,14 +286,14 @@ public:
   /*C*/         afxXM_WaveRiderColorData();
   /*C*/         afxXM_WaveRiderColorData(const afxXM_WaveRiderColorData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_WaveRiderColorData);
 };
diff --git a/Engine/source/afx/xm/afxXM_WaveScalar.cpp b/Engine/source/afx/xm/afxXM_WaveScalar.cpp
index 8bebc8f1b..97c5ae672 100644
--- a/Engine/source/afx/xm/afxXM_WaveScalar.cpp
+++ b/Engine/source/afx/xm/afxXM_WaveScalar.cpp
@@ -45,8 +45,8 @@ public:
 
   void set(F32 a, F32 b, F32 a_var, F32 b_var, bool sync_var);
 
-  virtual void interpolate(F32 t, afxXM_Params& params)=0;
-  virtual void pulse();
+  void interpolate(F32 t, afxXM_Params& params) override =0;
+  void pulse() override;
 };
 
 afxXM_WaveInterp_Scalar::afxXM_WaveInterp_Scalar() 
@@ -88,7 +88,7 @@ protected:
   U32 offset;
 public:
   afxXM_WaveInterp_Scalar_Add(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     *((F32*)(((char*)(&params)) + offset)) += mLerp(mA, mB,t);
   }
@@ -102,7 +102,7 @@ protected:
   U32 offset;
 public:
   afxXM_WaveInterp_Scalar_Mul(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     *((F32*)(((char*)(&params)) + offset)) *= mLerp(mA, mB,t);
   }
@@ -116,7 +116,7 @@ protected:
   U32 offset;
 public:
   afxXM_WaveInterp_Scalar_Rep(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     *((F32*)(((char*)(&params)) + offset)) = mLerp(mA, mB,t);
   }
@@ -130,7 +130,7 @@ protected:
   U32 offset;
 public:
   afxXM_WaveInterp_Scalar_PointAdd(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     F32 scalar_at_t = mLerp(mA, mB,t);
     Point3F point_at_t(scalar_at_t, scalar_at_t, scalar_at_t);
@@ -146,7 +146,7 @@ protected:
   U32 offset;
 public:
   afxXM_WaveInterp_Scalar_PointMul(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     *((Point3F*)(((char*)(&params)) + offset)) *= mLerp(mA, mB,t);
   }
@@ -160,7 +160,7 @@ protected:
   U32 offset;
 public:
   afxXM_WaveInterp_Scalar_PointRep(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     F32 scalar_at_t = mLerp(mA, mB,t);
     Point3F point_at_t(scalar_at_t, scalar_at_t, scalar_at_t);
@@ -177,7 +177,7 @@ protected:
   U32       offset;
 public:
   afxXM_WaveInterp_Scalar_Axis_PointAdd(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     Point3F point_at_t = axis* mLerp(mA, mB,t);
     *((Point3F*)(((char*)(&params)) + offset)) += point_at_t;
@@ -191,7 +191,7 @@ protected:
   U32       offset;
 public:
   afxXM_WaveInterp_Scalar_LocalAxis_PointAdd(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     Point3F local_axis(axis); 
     params.ori.mulV(local_axis);
@@ -209,7 +209,7 @@ protected:
   U32       offset;
 public:
   afxXM_WaveInterp_Scalar_Axis_PointMul(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     Point3F point_at_t = axis* mLerp(mA, mB,t);
     *((Point3F*)(((char*)(&params)) + offset)) *= point_at_t;
@@ -223,7 +223,7 @@ protected:
   U32       offset;
 public:
   afxXM_WaveInterp_Scalar_LocalAxis_PointMul(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     Point3F local_axis(axis); 
     params.ori.mulV(local_axis);
@@ -241,7 +241,7 @@ protected:
   U32       offset;
 public:
   afxXM_WaveInterp_Scalar_Axis_PointRep(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     Point3F point_at_t = axis* mLerp(mA, mB,t);
     *((Point3F*)(((char*)(&params)) + offset)) = point_at_t;
@@ -255,7 +255,7 @@ protected:
   U32       offset;
 public:
   afxXM_WaveInterp_Scalar_LocalAxis_PointRep(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     Point3F local_axis(axis); 
     params.ori.mulV(local_axis);
@@ -270,7 +270,7 @@ class afxXM_WaveInterp_Scalar_ColorAdd : public afxXM_WaveInterp_Scalar
 {
 public:
   afxXM_WaveInterp_Scalar_ColorAdd() : afxXM_WaveInterp_Scalar() { }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     F32 scalar_at_t = mLerp(mA, mB,t);
     LinearColorF color_at_t(scalar_at_t, scalar_at_t, scalar_at_t, scalar_at_t);
@@ -284,7 +284,7 @@ class afxXM_WaveInterp_Scalar_ColorMul : public afxXM_WaveInterp_Scalar
 {
 public:
   afxXM_WaveInterp_Scalar_ColorMul() : afxXM_WaveInterp_Scalar() { }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     params.color *= mLerp(mA, mB,t);
   }
@@ -296,7 +296,7 @@ class afxXM_WaveInterp_Scalar_ColorRep : public afxXM_WaveInterp_Scalar
 {
 public:
   afxXM_WaveInterp_Scalar_ColorRep() : afxXM_WaveInterp_Scalar() { }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     F32 scalar_at_t = mLerp(mA, mB,t);
     params.color.set(scalar_at_t, scalar_at_t, scalar_at_t, scalar_at_t);
@@ -311,7 +311,7 @@ protected:
   Point3F axis;
 public:
   afxXM_WaveInterp_Scalar_OriMul(Point3F& ax) : afxXM_WaveInterp_Scalar() { axis = ax;  }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     F32 theta = mDegToRad(mLerp(mA, mB,t));
     AngAxisF rot_aa(axis, theta);
@@ -328,7 +328,7 @@ protected:
   Point3F axis;
 public:
   afxXM_WaveInterp_Scalar_OriRep(Point3F& ax) : afxXM_WaveInterp_Scalar() { axis = ax;  }
-  virtual void interpolate(F32 t, afxXM_Params& params)
+  void interpolate(F32 t, afxXM_Params& params) override
   {
     F32 theta = mDegToRad(mLerp(mA, mB,t));
     AngAxisF rot_aa(axis, theta);
@@ -586,14 +586,14 @@ public:
   /*C*/         afxXM_WaveScalarData();
   /*C*/         afxXM_WaveScalarData(const afxXM_WaveScalarData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_WaveScalarData);
 };
@@ -712,14 +712,14 @@ public:
   /*C*/         afxXM_WaveRiderScalarData();
   /*C*/         afxXM_WaveRiderScalarData(const afxXM_WaveRiderScalarData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
-  virtual bool  allowSubstitutions() const { return true; }
+  bool  allowSubstitutions() const override { return true; }
 
   static void   initPersistFields();
 
-  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server);
+  afxXM_Base*   create(afxEffectWrapper* fx, bool on_server) override;
 
   DECLARE_CONOBJECT(afxXM_WaveRiderScalarData);
 };
diff --git a/Engine/source/afx/xm/afxXfmMod.h b/Engine/source/afx/xm/afxXfmMod.h
index 4a5e2911f..355f70659 100644
--- a/Engine/source/afx/xm/afxXfmMod.h
+++ b/Engine/source/afx/xm/afxXfmMod.h
@@ -83,8 +83,8 @@ public:
   /*C*/         afxXM_BaseData();
   /*C*/         afxXM_BaseData(const afxXM_BaseData&, bool = false);
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
   static void   initPersistFields();
 
@@ -140,8 +140,8 @@ public:
   bool          hasFixedWeight() const;
   F32           getWeightFactor() const;
 
-  void          packData(BitStream* stream);
-  void          unpackData(BitStream* stream);
+  void          packData(BitStream* stream) override;
+  void          unpackData(BitStream* stream) override;
 
   static void   initPersistFields();
 
diff --git a/Engine/source/app/net/net.h b/Engine/source/app/net/net.h
index c0aee9335..92d39f79f 100644
--- a/Engine/source/app/net/net.h
+++ b/Engine/source/app/net/net.h
@@ -37,13 +37,13 @@ public:
 
    ~RemoteCommandEvent();
 
-   virtual void pack(NetConnection* conn, BitStream *bstream);
+   void pack(NetConnection* conn, BitStream *bstream) override;
 
-   virtual void write(NetConnection* conn, BitStream *bstream);
+   void write(NetConnection* conn, BitStream *bstream) override;
 
-   virtual void unpack(NetConnection* conn, BitStream *bstream);
+   void unpack(NetConnection* conn, BitStream *bstream) override;
 
-   virtual void process(NetConnection *conn);
+   void process(NetConnection *conn) override;
 
    static void sendRemoteCommand(NetConnection *conn, S32 argc, const char **argv);
 	 
diff --git a/Engine/source/app/net/netExamples.cpp b/Engine/source/app/net/netExamples.cpp
index 1f53c6d21..92edc3147 100644
--- a/Engine/source/app/net/netExamples.cpp
+++ b/Engine/source/app/net/netExamples.cpp
@@ -42,13 +42,13 @@ public:
    ~SimpleMessageEvent()
       { dFree(msg); }
 
-   virtual void pack(NetConnection* /*ps*/, BitStream *bstream)
+   void pack(NetConnection* /*ps*/, BitStream *bstream) override
       { bstream->writeString(msg); }
-   virtual void write(NetConnection*, BitStream *bstream)
+   void write(NetConnection*, BitStream *bstream) override
       { bstream->writeString(msg); }
-   virtual void unpack(NetConnection* /*ps*/, BitStream *bstream)
+   void unpack(NetConnection* /*ps*/, BitStream *bstream) override
       { char buf[256]; bstream->readString(buf); msg = dStrdup(buf); }
-   virtual void process(NetConnection *)
+   void process(NetConnection *) override
       { Con::printf("RMSG %d  %s", mSourceId, msg); }
 
    DECLARE_CONOBJECT(SimpleMessageEvent);
@@ -112,12 +112,12 @@ public:
       mNetFlags.set(ScopeAlways | Ghostable);
       dStrcpy(message, "Hello World!", 256);
    }
-   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream)
+   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override
    {
       stream->writeString(message);
       return 0;
    }
-   void unpackUpdate(NetConnection *conn, BitStream *stream)
+   void unpackUpdate(NetConnection *conn, BitStream *stream) override
    {
       stream->readString(message);
       Con::printf("Got message: %s", message);
diff --git a/Engine/source/app/net/serverQuery.cpp b/Engine/source/app/net/serverQuery.cpp
index 1f48cd57c..11049704e 100644
--- a/Engine/source/app/net/serverQuery.cpp
+++ b/Engine/source/app/net/serverQuery.cpp
@@ -151,7 +151,7 @@ static U32 gHeartbeatSeq = 0;
 class DemoNetInterface : public NetInterface
 {
 public:
-   void handleInfoPacket(const NetAddress *address, U8 packetType, BitStream *stream);
+   void handleInfoPacket(const NetAddress *address, U8 packetType, BitStream *stream) override;
 };
 
 DemoNetInterface gNetInterface;
@@ -323,7 +323,7 @@ class ProcessMasterQueryEvent : public SimEvent
       {
          session = _session;
       }
-      void process( SimObject *object )
+      void process( SimObject *object ) override
       {
          processMasterServerQuery( session );
       }
@@ -338,7 +338,7 @@ class ProcessPingEvent : public SimEvent
       {
          session = _session;
       }
-      void process( SimObject *object )
+      void process( SimObject *object ) override
       {
          processPingsAndQueries( session );
       }
@@ -354,7 +354,7 @@ class ProcessPacketEvent : public SimEvent
          session = _session;
       }
 
-      void process( SimObject *object )
+      void process( SimObject *object ) override
       {
          processServerListPackets( session );
       }
@@ -369,7 +369,7 @@ class HeartbeatEvent : public SimEvent
       {
          mSeq = seq;
       }
-      void process( SimObject *object )
+      void process( SimObject *object ) override
       {
          processHeartbeat(mSeq);
       }
diff --git a/Engine/source/app/net/tcpObject.h b/Engine/source/app/net/tcpObject.h
index a869f48be..036fbea59 100644
--- a/Engine/source/app/net/tcpObject.h
+++ b/Engine/source/app/net/tcpObject.h
@@ -83,7 +83,7 @@ public:
    void disconnect();
    State getState() { return mState; }
 
-   bool processArguments(S32 argc, ConsoleValue *argv);
+   bool processArguments(S32 argc, ConsoleValue *argv) override;
    void send(const U8 *buffer, U32 bufferLen);
 
    ///Send an entire file over tcp
@@ -96,7 +96,7 @@ public:
 
    void setPort(U16 port) { mPort = port; }
 
-   bool onAdd();
+   bool onAdd() override;
 
    DECLARE_CONOBJECT(TCPObject);
 
diff --git a/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h b/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h
index 54a4de8e9..69be7e840 100644
--- a/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h
+++ b/Engine/source/assets/tamlAssetDeclaredUpdateVisitor.h
@@ -101,10 +101,10 @@ public:
     }
     const char* getAssetIdTo( void ) const { return mAssetIdTo; }
 
-    virtual bool wantsPropertyChanges( void ) { return true; }
-    virtual bool wantsRootOnly( void ) { return true; }
+    bool wantsPropertyChanges( void ) override { return true; }
+    bool wantsRootOnly( void ) override { return true; }
 
-    virtual bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState )
+    bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) override
     {
         // Debug Profiling.
         PROFILE_SCOPE(TamlAssetDeclaredUpdateVisitor_Visit);
diff --git a/Engine/source/assets/tamlAssetDeclaredVisitor.h b/Engine/source/assets/tamlAssetDeclaredVisitor.h
index bbab18ebe..dd768034a 100644
--- a/Engine/source/assets/tamlAssetDeclaredVisitor.h
+++ b/Engine/source/assets/tamlAssetDeclaredVisitor.h
@@ -71,10 +71,10 @@ public:
 
     void clear( void ) { mAssetDefinition.reset(); mAssetDependencies.clear(); mAssetLooseFiles.clear(); }
 
-    virtual bool wantsPropertyChanges( void ) { return false; }
-    virtual bool wantsRootOnly( void ) { return false; }
+    bool wantsPropertyChanges( void ) override { return false; }
+    bool wantsRootOnly( void ) override { return false; }
 
-    virtual bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState )
+    bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) override
     {    
         // Debug Profiling.
         PROFILE_SCOPE(TamlAssetDeclaredVisitor_Visit);
diff --git a/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h b/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h
index 499fc7428..a30d95808 100644
--- a/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h
+++ b/Engine/source/assets/tamlAssetReferencedUpdateVisitor.h
@@ -76,10 +76,10 @@ public:
     }
     const char* getAssetIdTo( void ) const { return mAssetIdTo; }
 
-    virtual bool wantsPropertyChanges( void ) { return true; }
-    virtual bool wantsRootOnly( void ) { return false; }
+    bool wantsPropertyChanges( void ) override { return true; }
+    bool wantsRootOnly( void ) override { return false; }
 
-    virtual bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState )
+    bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) override
     {
         // Debug Profiling.
         PROFILE_SCOPE(TamlAssetReferencedUpdateVisitor_Visit);
diff --git a/Engine/source/assets/tamlAssetReferencedVisitor.h b/Engine/source/assets/tamlAssetReferencedVisitor.h
index c744a880c..49c972ea9 100644
--- a/Engine/source/assets/tamlAssetReferencedVisitor.h
+++ b/Engine/source/assets/tamlAssetReferencedVisitor.h
@@ -57,10 +57,10 @@ public:
 
     void clear( void ) { mAssetReferenced.clear(); }
 
-    virtual bool wantsPropertyChanges( void ) { return false; }
-    virtual bool wantsRootOnly( void ) { return false; }
+    bool wantsPropertyChanges( void ) override { return false; }
+    bool wantsRootOnly( void ) override { return false; }
 
-    virtual bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState )
+    bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) override
     {    
         // Debug Profiling.
         PROFILE_SCOPE(TamlAssetReferencedVisitor_Visit);
diff --git a/Engine/source/collision/depthSortList.h b/Engine/source/collision/depthSortList.h
index 5781f65fd..3e46ef820 100644
--- a/Engine/source/collision/depthSortList.h
+++ b/Engine/source/collision/depthSortList.h
@@ -92,14 +92,14 @@ class DepthSortList : public ClippedPolyList
    void depthPartition(const Point3F * sourceVerts, U32 numVerts, Vector<Poly> & partition, Vector<Point3F> & partitionVerts);
 
    // Virtual methods
-   void end();
+   void end() override;
    // U32  addPoint(const Point3F& p);
    // bool isEmpty() const;
    // void begin(U32 material,U32 surfaceKey);
    // void plane(U32 v1,U32 v2,U32 v3);
    // void plane(const PlaneF& p);
    // void vertex(U32 vi);
-   bool getMapping(MatrixF *, Box3F *);
+   bool getMapping(MatrixF *, Box3F *) override;
 
    // access to the polys in order (note: returned pointers are volatile, may change if polys added).
    void getOrderedPoly(U32 ith, Poly ** poly, PolyExtents ** polyExtent);
diff --git a/Engine/source/collision/gjk.h b/Engine/source/collision/gjk.h
index 906007bb3..3980f95e5 100644
--- a/Engine/source/collision/gjk.h
+++ b/Engine/source/collision/gjk.h
@@ -63,19 +63,19 @@ struct GjkCollisionState: public CollisionState
    bool closest(VectorF& v);
    bool degenerate(const VectorF& w);
    void nextBit();
-   void swap();
+   void swap() override;
    void reset(const MatrixF& a2w, const MatrixF& b2w);
 
    GjkCollisionState();
    ~GjkCollisionState();
 
-   void set(Convex* a,Convex* b,const MatrixF& a2w, const MatrixF& b2w);
+   void set(Convex* a,Convex* b,const MatrixF& a2w, const MatrixF& b2w) override;
 
    void getCollisionInfo(const MatrixF& mat, Collision* info);
    void getClosestPoints(Point3F& p1, Point3F& p2);
    bool intersect(const MatrixF& a2w, const MatrixF& b2w);
    F32 distance(const MatrixF& a2w, const MatrixF& b2w, const F32 dontCareDist,
-                       const MatrixF* w2a = NULL, const MatrixF* _w2b = NULL);
+                       const MatrixF* w2a = NULL, const MatrixF* _w2b = NULL) override;
 };
 
 
diff --git a/Engine/source/collision/vertexPolyList.h b/Engine/source/collision/vertexPolyList.h
index c2fe5669b..241ee0c47 100644
--- a/Engine/source/collision/vertexPolyList.h
+++ b/Engine/source/collision/vertexPolyList.h
@@ -37,21 +37,21 @@ public:
    virtual ~VertexPolyList() {}
 
    // AbstractPolyList
-   U32 addPoint(const Point3F& p);
-   U32 addPlane(const PlaneF& plane) { return 0; } 
-   void begin(BaseMatInstance* material,U32 surfaceKey) {}
-   void plane(U32 v1,U32 v2,U32 v3) {}
-   void plane(const PlaneF& p) {}
-   void plane(const U32 index) {}
-   void vertex(U32 vi) {}
-   void end() {}
-   const PlaneF& getIndexedPlane(const U32 index);
+   U32 addPoint(const Point3F& p) override;
+   U32 addPlane(const PlaneF& plane) override { return 0; } 
+   void begin(BaseMatInstance* material,U32 surfaceKey) override {}
+   void plane(U32 v1,U32 v2,U32 v3) override {}
+   void plane(const PlaneF& p) override {}
+   void plane(const U32 index) override {}
+   void vertex(U32 vi) override {}
+   void end() override {}
+   const PlaneF& getIndexedPlane(const U32 index) override;
 
    /// Clears any captured verts.
    void clear();
 
    /// Returns true if the polylist contains no verts.
-   bool isEmpty() const { return mVertexList.empty(); }
+   bool isEmpty() const override { return mVertexList.empty(); }
 
    /// Returns the vertex list.
    Vector<Point3F>& getVertexList() { return mVertexList; }
diff --git a/Engine/source/console/SimXMLDocument.h b/Engine/source/console/SimXMLDocument.h
index 2a12a50ba..96d63eeb8 100644
--- a/Engine/source/console/SimXMLDocument.h
+++ b/Engine/source/console/SimXMLDocument.h
@@ -56,9 +56,9 @@ class SimXMLDocument: public SimObject
       // tie in to the script language.  The .cc file has more in depth
       // comments on these.
       //-----------------------------------------------------------------------
-      bool processArguments(S32 argc, ConsoleValue *argv);
-      bool onAdd();
-      void onRemove();
+      bool processArguments(S32 argc, ConsoleValue *argv) override;
+      bool onAdd() override;
+      void onRemove() override;
       static void initPersistFields();
       
       // Set this to default state at construction.
diff --git a/Engine/source/console/consoleLogger.h b/Engine/source/console/consoleLogger.h
index e969f3ac1..062da62cb 100644
--- a/Engine/source/console/consoleLogger.h
+++ b/Engine/source/console/consoleLogger.h
@@ -81,7 +81,7 @@ class ConsoleLogger : public SimObject
       /// // Example script constructor usage.
       /// %obj = new ConsoleLogger( objName, logFileName, [append = false] );
       /// @endcode
-      bool processArguments( S32 argc, ConsoleValue *argv );
+      bool processArguments( S32 argc, ConsoleValue *argv ) override;
 
       /// Default constructor, make sure to initalize
       ConsoleLogger();
diff --git a/Engine/source/console/fieldBrushObject.h b/Engine/source/console/fieldBrushObject.h
index aeed548cf..96b213f44 100644
--- a/Engine/source/console/fieldBrushObject.h
+++ b/Engine/source/console/fieldBrushObject.h
@@ -71,7 +71,7 @@ public:
     StringTableEntry getSortName(void) const     { return mSortName; }
 
     static void initPersistFields();                    ///< Persist Fields.
-    virtual void onRemove();                            ///< Called when the object is removed from the sim.
+    void onRemove() override;                            ///< Called when the object is removed from the sim.
 
     DECLARE_CONOBJECT(FieldBrushObject);
 };
diff --git a/Engine/source/console/runtimeClassRep.h b/Engine/source/console/runtimeClassRep.h
index d684652cf..4cab0dbd9 100644
--- a/Engine/source/console/runtimeClassRep.h
+++ b/Engine/source/console/runtimeClassRep.h
@@ -60,7 +60,7 @@ public:
       parentClass     = parent;
    };
 
-   virtual AbstractClassRep* getContainerChildClass(const bool recurse)
+   AbstractClassRep* getContainerChildClass(const bool recurse) override
    {
       // Fetch container children type.
       AbstractClassRep* pChildren = T::getContainerChildStaticClassRep();
@@ -76,7 +76,7 @@ public:
       return pParent->getContainerChildClass(recurse);
    }
 
-   virtual WriteCustomTamlSchema getCustomTamlSchema(void)
+   WriteCustomTamlSchema getCustomTamlSchema(void) override
    {
       return T::getStaticWriteCustomTamlSchema();
    }
@@ -100,7 +100,7 @@ public:
    }
 
    /// Wrap constructor.
-   ConsoleObject *create() const { return new T; }
+   ConsoleObject *create() const override { return new T; }
 
    //-----------------------------------------------------------------------------
 
@@ -148,7 +148,7 @@ public:
    /// @name Console Type Interface
    /// @{
 
-   virtual void setData( void* dptr, S32 argc, const char** argv, const EnumTable* tbl, BitSet32 flag )
+   void setData( void* dptr, S32 argc, const char** argv, const EnumTable* tbl, BitSet32 flag ) override
    {
       if( argc == 1 )
       {
@@ -159,14 +159,14 @@ public:
          Con::errorf( "Cannot set multiple args to a single ConsoleObject*.");
    }
    
-   virtual const char* getData( void* dptr, const EnumTable* tbl, BitSet32 flag )
+   const char* getData( void* dptr, const EnumTable* tbl, BitSet32 flag ) override
    {
       T** obj = ( T** ) dptr;
       return Con::getReturnBuffer( T::__getObjectId( *obj ) );
    }
    
-   virtual const char* getTypeClassName() { return mClassName; }
-   virtual const bool isDatablock() { return T::__smIsDatablock; };
+   const char* getTypeClassName() override { return mClassName; }
+   const bool isDatablock() override { return T::__smIsDatablock; };
    
    /// @}
 };
diff --git a/Engine/source/console/scriptObjects.h b/Engine/source/console/scriptObjects.h
index 4686a547b..45de8aa17 100644
--- a/Engine/source/console/scriptObjects.h
+++ b/Engine/source/console/scriptObjects.h
@@ -41,8 +41,8 @@ class ScriptObject : public SimObject
 
 public:
    ScriptObject();
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    DECLARE_CONOBJECT(ScriptObject);
 
@@ -64,12 +64,12 @@ protected:
 public:
    ScriptTickObject();
    static void initPersistFields();
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
-   virtual void interpolateTick( F32 delta );
-   virtual void processTick();
-   virtual void advanceTime( F32 timeDelta );
+   void interpolateTick( F32 delta ) override;
+   void processTick() override;
+   void advanceTime( F32 timeDelta ) override;
 
    DECLARE_CONOBJECT(ScriptTickObject);
 
@@ -88,8 +88,8 @@ class ScriptGroup : public SimGroup
    
 public:
    ScriptGroup();
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    DECLARE_CONOBJECT(ScriptGroup);
 
diff --git a/Engine/source/console/simObject.cpp b/Engine/source/console/simObject.cpp
index c3a45c3be..8417a9883 100644
--- a/Engine/source/console/simObject.cpp
+++ b/Engine/source/console/simObject.cpp
@@ -751,7 +751,7 @@ void SimObject::destroySelf()
 class SimObjectDeleteEvent : public SimEvent
 {
 public:
-   void process(SimObject *object)
+   void process(SimObject *object) override
    {
       object->deleteObject();
    }
diff --git a/Engine/source/console/simPersistSet.h b/Engine/source/console/simPersistSet.h
index e09a828ff..ea1cc72b8 100644
--- a/Engine/source/console/simPersistSet.h
+++ b/Engine/source/console/simPersistSet.h
@@ -56,9 +56,9 @@ class SimPersistSet : public SimSet
       void resolvePIDs();
 
       // SimSet.
-      virtual void addObject( SimObject* );
-      virtual void write( Stream &stream, U32 tabStop, U32 flags = 0 );
-      virtual bool processArguments( S32 argc, ConsoleValue *argv );
+      void addObject( SimObject* ) override;
+      void write( Stream &stream, U32 tabStop, U32 flags = 0 ) override;
+      bool processArguments( S32 argc, ConsoleValue *argv ) override;
       
       DECLARE_CONOBJECT( SimPersistSet );
       DECLARE_CATEGORY( "Console" );
diff --git a/Engine/source/console/torquescript/ast.h b/Engine/source/console/torquescript/ast.h
index d9de3dd02..1c41958a3 100644
--- a/Engine/source/console/torquescript/ast.h
+++ b/Engine/source/console/torquescript/ast.h
@@ -110,7 +110,7 @@ struct BreakStmtNode : StmtNode
    static BreakStmtNode* alloc(S32 lineNumber);
 
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(BreakStmtNode);
 };
 
@@ -118,7 +118,7 @@ struct ContinueStmtNode : StmtNode
 {
    static ContinueStmtNode* alloc(S32 lineNumber);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(ContinueStmtNode);
 };
 
@@ -127,7 +127,7 @@ struct ExprNode : StmtNode
 {
    ExprNode* optimizedNode;
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
 
    virtual U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) = 0;
    virtual TypeReq getPreferredType() = 0;
@@ -140,7 +140,7 @@ struct ReturnStmtNode : StmtNode
 
    static ReturnStmtNode* alloc(S32 lineNumber, ExprNode* expr);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(ReturnStmtNode);
 };
 
@@ -157,7 +157,7 @@ struct IfStmtNode : StmtNode
    void propagateSwitchExpr(ExprNode* left, bool string);
    ExprNode* getSwitchOR(ExprNode* left, ExprNode* list, bool string);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(IfStmtNode);
 };
 
@@ -175,7 +175,7 @@ struct LoopStmtNode : StmtNode
 
    static LoopStmtNode* alloc(S32 lineNumber, ExprNode* testExpr, ExprNode* initExpr, ExprNode* endLoopExpr, StmtNode* loopBlock, bool isDoLoop);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(LoopStmtNode);
 };
 
@@ -199,7 +199,7 @@ struct IterStmtNode : StmtNode
 
    static IterStmtNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* containerExpr, StmtNode* body, bool isStringIter);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
 };
 
 /// A binary mathematical expression (ie, left op right).
@@ -214,11 +214,11 @@ struct FloatBinaryExprNode : BinaryExprNode
 {
    static FloatBinaryExprNode* alloc(S32 lineNumber, S32 op, ExprNode* left, ExprNode* right);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
 
    bool optimize();
 
-   TypeReq getPreferredType();
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(FloatBinaryExprNode);
 };
 
@@ -230,8 +230,8 @@ struct ConditionalExprNode : ExprNode
    bool integer;
    static ConditionalExprNode* alloc(S32 lineNumber, ExprNode* testExpr, ExprNode* trueExpr, ExprNode* falseExpr);
 
-   virtual U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   virtual TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(ConditionalExprNode);
 };
 
@@ -246,8 +246,8 @@ struct IntBinaryExprNode : BinaryExprNode
 
    bool optimize();
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(IntBinaryExprNode);
 };
 
@@ -256,8 +256,8 @@ struct StreqExprNode : BinaryExprNode
    bool eq;
    static StreqExprNode* alloc(S32 lineNumber, ExprNode* left, ExprNode* right, bool eq);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(StreqExprNode);
 };
 
@@ -266,8 +266,8 @@ struct StrcatExprNode : BinaryExprNode
    S32 appendChar;
    static StrcatExprNode* alloc(S32 lineNumber, ExprNode* left, ExprNode* right, S32 appendChar);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(StrcatExprNode);
 };
 
@@ -276,8 +276,8 @@ struct CommaCatExprNode : BinaryExprNode
    static CommaCatExprNode* alloc(S32 lineNumber, ExprNode* left, ExprNode* right);
 
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(CommaCatExprNode);
 };
 
@@ -289,8 +289,8 @@ struct IntUnaryExprNode : ExprNode
 
    static IntUnaryExprNode* alloc(S32 lineNumber, S32 op, ExprNode* expr);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(IntUnaryExprNode);
 };
 
@@ -301,8 +301,8 @@ struct FloatUnaryExprNode : ExprNode
 
    static FloatUnaryExprNode* alloc(S32 lineNumber, S32 op, ExprNode* expr);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(FloatUnaryExprNode);
 };
 
@@ -313,9 +313,9 @@ struct VarNode : ExprNode
 
    static VarNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* arrayIndex);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
-   virtual ExprNodeName getExprNodeNameEnum() const { return NameVarNode; }
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
+   ExprNodeName getExprNodeNameEnum() const override { return NameVarNode; }
    DBG_STMT_TYPE(VarNode);
 };
 
@@ -326,9 +326,9 @@ struct IntNode : ExprNode
 
    static IntNode* alloc(S32 lineNumber, S32 value);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
-   virtual ExprNodeName getExprNodeNameEnum() const { return NameIntNode; }
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
+   ExprNodeName getExprNodeNameEnum() const override { return NameIntNode; }
    DBG_STMT_TYPE(IntNode);
 };
 
@@ -339,9 +339,9 @@ struct FloatNode : ExprNode
 
    static FloatNode* alloc(S32 lineNumber, F64 value);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
-   virtual ExprNodeName getExprNodeNameEnum() const { return NameFloatNode; }
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
+   ExprNodeName getExprNodeNameEnum() const override { return NameFloatNode; }
    DBG_STMT_TYPE(FloatNode);
 };
 
@@ -355,8 +355,8 @@ struct StrConstNode : ExprNode
 
    static StrConstNode* alloc(S32 lineNumber, const char* str, bool tag, bool doc = false);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(StrConstNode);
 };
 
@@ -368,8 +368,8 @@ struct ConstantNode : ExprNode
 
    static ConstantNode* alloc(S32 lineNumber, StringTableEntry value);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(ConstantNode);
 };
 
@@ -382,8 +382,8 @@ struct AssignExprNode : ExprNode
 
    static AssignExprNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* arrayIndex, ExprNode* expr);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(AssignExprNode);
 };
 
@@ -406,8 +406,8 @@ struct AssignOpExprNode : ExprNode
 
    static AssignOpExprNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* arrayIndex, ExprNode* expr, S32 op);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(AssignOpExprNode);
 };
 
@@ -419,7 +419,7 @@ struct TTagSetStmtNode : StmtNode
 
    static TTagSetStmtNode* alloc(S32 lineNumber, StringTableEntry tag, ExprNode* valueExpr, ExprNode* stringExpr);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(TTagSetStmtNode);
 };
 
@@ -429,8 +429,8 @@ struct TTagDerefNode : ExprNode
 
    static TTagDerefNode* alloc(S32 lineNumber, ExprNode* expr);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(TTagDerefNode);
 };
 
@@ -440,8 +440,8 @@ struct TTagExprNode : ExprNode
 
    static TTagExprNode* alloc(S32 lineNumber, StringTableEntry tag);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(TTagExprNode);
 };
 
@@ -460,8 +460,8 @@ struct FuncCallExprNode : ExprNode
 
    static FuncCallExprNode* alloc(S32 lineNumber, StringTableEntry funcName, StringTableEntry nameSpace, ExprNode* args, bool dot);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(FuncCallExprNode);
 };
 
@@ -473,8 +473,8 @@ struct AssertCallExprNode : ExprNode
 
    static AssertCallExprNode* alloc(S32 lineNumber, ExprNode* testExpr, const char* message);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(AssertCallExprNode);
 };
 
@@ -493,8 +493,8 @@ struct SlotAccessNode : ExprNode
 
    static SlotAccessNode* alloc(S32 lineNumber, ExprNode* objectExpr, ExprNode* arrayExpr, StringTableEntry slotName);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(SlotAccessNode);
 };
 
@@ -513,8 +513,8 @@ struct InternalSlotAccessNode : ExprNode
 
    static InternalSlotAccessNode* alloc(S32 lineNumber, ExprNode* objectExpr, ExprNode* slotExpr, bool recurse);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(InternalSlotAccessNode);
 };
 
@@ -527,8 +527,8 @@ struct SlotAssignNode : ExprNode
 
    static SlotAssignNode* alloc(S32 lineNumber, ExprNode* objectExpr, ExprNode* arrayExpr, StringTableEntry slotName, ExprNode* valueExpr, U32 typeID = -1);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(SlotAssignNode);
 };
 
@@ -543,8 +543,8 @@ struct SlotAssignOpNode : ExprNode
 
    static SlotAssignOpNode* alloc(S32 lineNumber, ExprNode* objectExpr, StringTableEntry slotName, ExprNode* arrayExpr, S32 op, ExprNode* valueExpr);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(SlotAssignOpNode);
 };
 
@@ -564,9 +564,9 @@ struct ObjectDeclNode : ExprNode
    static ObjectDeclNode* alloc(S32 lineNumber, ExprNode* classNameExpr, ExprNode* objectNameExpr, ExprNode* argList, StringTableEntry parentObject, SlotAssignNode* slotDecls, ObjectDeclNode* subObjects, bool isDatablock, bool classNameInternal, bool isSingleton);
 
    U32 precompileSubObject(bool);
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
    U32 compileSubObject(CodeStream& codeStream, U32 ip, bool);
-   TypeReq getPreferredType();
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(ObjectDeclNode);
 };
 
@@ -588,8 +588,8 @@ struct FunctionDeclStmtNode : StmtNode
 
    static FunctionDeclStmtNode* alloc(S32 lineNumber, StringTableEntry fnName, StringTableEntry nameSpace, VarNode* args, StmtNode* stmts);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
-   void setPackage(StringTableEntry packageName);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
+   void setPackage(StringTableEntry packageName) override;
    DBG_STMT_TYPE(FunctionDeclStmtNode);
 };
 
diff --git a/Engine/source/core/filterStream.h b/Engine/source/core/filterStream.h
index adb024e16..27a1834be 100644
--- a/Engine/source/core/filterStream.h
+++ b/Engine/source/core/filterStream.h
@@ -43,14 +43,14 @@ class FilterStream : public Stream
    // Mandatory overrides.  By default, these are simply passed to
    //  whatever is returned from getStream();
   protected:
-   bool _read(const U32 in_numBytes,  void* out_pBuffer);
-   bool _write(const U32 in_numBytes, const void* in_pBuffer);
+   bool _read(const U32 in_numBytes,  void* out_pBuffer) override;
+   bool _write(const U32 in_numBytes, const void* in_pBuffer) override;
   public:
-   bool hasCapability(const Capability) const;
+   bool hasCapability(const Capability) const override;
 
-   U32  getPosition() const;
-   bool setPosition(const U32 in_newPosition);
-   U32  getStreamSize();
+   U32  getPosition() const override;
+   bool setPosition(const U32 in_newPosition) override;
+   U32  getStreamSize() override;
 };
 
 #endif //_FILTERSTREAM_H_
diff --git a/Engine/source/core/memVolume.h b/Engine/source/core/memVolume.h
index bc45bcec2..f3dbe95a7 100644
--- a/Engine/source/core/memVolume.h
+++ b/Engine/source/core/memVolume.h
@@ -48,14 +48,14 @@ namespace Torque
          MemFileSystem(String volume);
          ~MemFileSystem();
 
-         String   getTypeStr() const { return "Mem"; }
+         String   getTypeStr() const override { return "Mem"; }
 
-         FileNodeRef resolve(const Path& path);
-         FileNodeRef create(const Path& path,FileNode::Mode);
-         bool remove(const Path& path);
-         bool rename(const Path& from,const Path& to);
-         Path mapTo(const Path& path);
-         Path mapFrom(const Path& path);
+         FileNodeRef resolve(const Path& path) override;
+         FileNodeRef create(const Path& path,FileNode::Mode) override;
+         bool remove(const Path& path) override;
+         bool rename(const Path& from,const Path& to) override;
+         Path mapTo(const Path& path) override;
+         Path mapFrom(const Path& path) override;
 
       private:
          String mVolume;
@@ -73,21 +73,21 @@ namespace Torque
          MemFile(MemFileSystem* fs, MemFileData* fileData);
          virtual ~MemFile();
 
-         Path getName() const;
-         NodeStatus getStatus() const;
-         bool getAttributes(Attributes*);
+         Path getName() const override;
+         NodeStatus getStatus() const override;
+         bool getAttributes(Attributes*) override;
 
-         U32 getPosition();
-         U32 setPosition(U32,SeekMode);
+         U32 getPosition() override;
+         U32 setPosition(U32,SeekMode) override;
 
-         bool open(AccessMode);
-         bool close();
+         bool open(AccessMode) override;
+         bool close() override;
 
-         U32 read(void* dst, U32 size);
-         U32 write(const void* src, U32 size);
+         U32 read(void* dst, U32 size) override;
+         U32 write(const void* src, U32 size) override;
 
       private:
-         U32 calculateChecksum();
+         U32 calculateChecksum() override;
 
          MemFileSystem* mFileSystem;
          MemFileData* mFileData;
@@ -107,20 +107,20 @@ namespace Torque
          MemDirectory(MemFileSystem* fs, MemDirectoryData* dir);
          ~MemDirectory();
 
-         Path getName() const;
-         NodeStatus getStatus() const;
-         bool getAttributes(Attributes*);
+         Path getName() const override;
+         NodeStatus getStatus() const override;
+         bool getAttributes(Attributes*) override;
 
-         bool open();
-         bool close();
-         bool read(Attributes*);
+         bool open() override;
+         bool close() override;
+         bool read(Attributes*) override;
 
       private:
          friend class MemFileSystem;
          MemFileSystem* mFileSystem;
          MemDirectoryData* mDirectoryData;
 
-         U32 calculateChecksum();         
+         U32 calculateChecksum() override;         
          
          NodeStatus   mStatus;
          U32 mSearchIndex;         
diff --git a/Engine/source/core/ogg/oggTheoraDecoder.h b/Engine/source/core/ogg/oggTheoraDecoder.h
index b148aba1f..dc5a6245c 100644
--- a/Engine/source/core/ogg/oggTheoraDecoder.h
+++ b/Engine/source/core/ogg/oggTheoraDecoder.h
@@ -177,9 +177,9 @@ class OggTheoraDecoder : public OggDecoder,
       void _transcode420toRGBA_SSE2( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height, U32 pitch );
 #endif
       // OggDecoder.
-      virtual bool _detect( ogg_page* startPage );
-      virtual bool _init();
-      virtual bool _packetin( ogg_packet* packet );
+      bool _detect( ogg_page* startPage ) override;
+      bool _init() override;
+      bool _packetin( ogg_packet* packet ) override;
 
       ///
       U32 _getPixelOffset( th_ycbcr_buffer buffer, U32 plane, U32 x, U32 y ) const
@@ -258,10 +258,10 @@ class OggTheoraDecoder : public OggDecoder,
       void reusePacket( OggTheoraFrame* packet ) { mFreePackets.pushBack( packet ); }
          
       // OggDecoder.
-      virtual const char* getName() const { return "Theora"; }
+      const char* getName() const override { return "Theora"; }
       
       // IInputStream.
-      virtual U32 read( OggTheoraFrame** buffer, U32 num );
+      U32 read( OggTheoraFrame** buffer, U32 num ) override;
 };
 
 #endif // !_OGGTHEORADECODER_H_
diff --git a/Engine/source/core/ogg/oggVorbisDecoder.h b/Engine/source/core/ogg/oggVorbisDecoder.h
index 20ca6c65a..3319cd3be 100644
--- a/Engine/source/core/ogg/oggVorbisDecoder.h
+++ b/Engine/source/core/ogg/oggVorbisDecoder.h
@@ -64,9 +64,9 @@ class OggVorbisDecoder : public OggDecoder,
       #endif
 
       // OggDecoder.
-      virtual bool _detect( ogg_page* startPage );
-      virtual bool _init();
-      virtual bool _packetin( ogg_packet* packet );
+      bool _detect( ogg_page* startPage ) override;
+      bool _init() override;
+      bool _packetin( ogg_packet* packet ) override;
    
    public:
    
@@ -82,10 +82,10 @@ class OggVorbisDecoder : public OggDecoder,
       U32 getSamplesPerSecond() const { return mVorbisInfo.rate; }
       
       // OggDecoder.
-      virtual const char* getName() const { return "Vorbis"; }
+      const char* getName() const override { return "Vorbis"; }
       
       // IInputStream.
-      virtual U32 read( RawData** buffer, U32 num );
+      U32 read( RawData** buffer, U32 num ) override;
 };
 
 #endif // !_OGGVORBISDECODER_H_
diff --git a/Engine/source/core/resizeStream.h b/Engine/source/core/resizeStream.h
index 38875eeff..c925921c5 100644
--- a/Engine/source/core/resizeStream.h
+++ b/Engine/source/core/resizeStream.h
@@ -45,25 +45,25 @@ class ResizeFilterStream : public FilterStream, public IStreamByteCount
    ResizeFilterStream();
    ~ResizeFilterStream();
 
-   bool    attachStream(Stream* io_pSlaveStream);
-   void    detachStream();
-   Stream* getStream();
+   bool    attachStream(Stream* io_pSlaveStream) override;
+   void    detachStream() override;
+   Stream* getStream() override;
 
    bool setStreamOffset(const U32 in_startOffset,
                         const U32 in_streamLen);
 
    // Mandatory overrides.
   protected:
-   bool _read(const U32 in_numBytes,  void* out_pBuffer);
+   bool _read(const U32 in_numBytes,  void* out_pBuffer) override;
   public:
-   U32  getPosition() const;
-   bool setPosition(const U32 in_newPosition);
+   U32  getPosition() const override;
+   bool setPosition(const U32 in_newPosition) override;
 
-   U32  getStreamSize();
+   U32  getStreamSize() override;
 
    // IStreamByteCount
-   U32 getLastBytesRead() { return m_lastBytesRead; }
-   U32 getLastBytesWritten() { return 0; }
+   U32 getLastBytesRead() override { return m_lastBytesRead; }
+   U32 getLastBytesWritten() override { return 0; }
 };
 
 #endif //_RESIZESTREAM_H_
diff --git a/Engine/source/core/stream/fileStreamObject.h b/Engine/source/core/stream/fileStreamObject.h
index 5063da3e2..2db6c9348 100644
--- a/Engine/source/core/stream/fileStreamObject.h
+++ b/Engine/source/core/stream/fileStreamObject.h
@@ -44,7 +44,7 @@ public:
    virtual ~FileStreamObject();
    DECLARE_CONOBJECT(FileStreamObject);
 
-   virtual bool onAdd();
+   bool onAdd() override;
 
    //-----------------------------------------------------------------------------
    /// @brief Open a file
diff --git a/Engine/source/core/stream/memStream.h b/Engine/source/core/stream/memStream.h
index 538c8d93e..9cb99a5a5 100644
--- a/Engine/source/core/stream/memStream.h
+++ b/Engine/source/core/stream/memStream.h
@@ -81,16 +81,16 @@ class MemStream : public Stream
    protected:
 
       // Stream
-      bool _read( const U32 in_numBytes,  void *out_pBuffer );
-      bool _write( const U32 in_numBytes, const void *in_pBuffer );
+      bool _read( const U32 in_numBytes,  void *out_pBuffer ) override;
+      bool _write( const U32 in_numBytes, const void *in_pBuffer ) override;
 
    public:
 
       // Stream
-      bool hasCapability( const Capability caps ) const;
-      U32 getPosition() const;
-      bool setPosition( const U32 in_newPosition );
-      U32 getStreamSize();
+      bool hasCapability( const Capability caps ) const override;
+      U32 getPosition() const override;
+      bool setPosition( const U32 in_newPosition ) override;
+      U32 getStreamSize() override;
 
       /// Returns the memory buffer.
       void *getBuffer() { return mBufferBase; }
diff --git a/Engine/source/core/stream/streamObject.h b/Engine/source/core/stream/streamObject.h
index b70fa236b..be5c1d69a 100644
--- a/Engine/source/core/stream/streamObject.h
+++ b/Engine/source/core/stream/streamObject.h
@@ -53,7 +53,7 @@ public:
 
    DECLARE_CONOBJECT(StreamObject);
 
-   virtual bool onAdd();
+   bool onAdd() override;
 
    /// Set the stream to allow reuse of the object
    void setStream(Stream *stream)      { mStream = stream; }
diff --git a/Engine/source/core/threadStatic.h b/Engine/source/core/threadStatic.h
index 830ba260c..29d63731e 100644
--- a/Engine/source/core/threadStatic.h
+++ b/Engine/source/core/threadStatic.h
@@ -143,8 +143,8 @@ private:
 
 public:
    TorqueThreadStatic( T instanceVal ) : mInstance( instanceVal ) {}
-   virtual void *getMemInstPtr() { return &mInstance; }
-   virtual const void *getConstMemInstPtr() const { return &mInstance; }
+   void *getMemInstPtr() override { return &mInstance; }
+   const void *getConstMemInstPtr() const override { return &mInstance; }
 
    // I am not sure these are needed, and I don't want to create confusing-to-debug code
 #if 0
diff --git a/Engine/source/core/util/dxt5nmSwizzle.h b/Engine/source/core/util/dxt5nmSwizzle.h
index 58acbac66..26ce6ccc8 100644
--- a/Engine/source/core/util/dxt5nmSwizzle.h
+++ b/Engine/source/core/util/dxt5nmSwizzle.h
@@ -31,7 +31,7 @@ class DXT5nmSwizzle : public Swizzle<U8, 4>
 public:
    DXT5nmSwizzle() : Swizzle<U8, 4>( NULL ) {};
 
-   virtual void InPlace( void *memory, const dsize_t size ) const
+   void InPlace( void *memory, const dsize_t size ) const override
    {
       AssertFatal( size % 4 == 0, "Bad buffer size for DXT5nm Swizzle" );
 
@@ -50,7 +50,7 @@ public:
       }
    }
 
-   virtual void ToBuffer( void *destination, const void *source, const dsize_t size ) const
+   void ToBuffer( void *destination, const void *source, const dsize_t size ) const override
    {
       AssertFatal( size % 4 == 0, "Bad buffer size for DXT5nm Swizzle" );
 
@@ -77,12 +77,12 @@ class DXT5nmSwizzleUp24t32 : public Swizzle<U8, 3>
 public:
    DXT5nmSwizzleUp24t32() : Swizzle<U8, 3>( NULL ) {};
 
-   virtual void InPlace( void *memory, const dsize_t size ) const
+   void InPlace( void *memory, const dsize_t size ) const override
    {
       AssertISV( false, "Cannot swizzle in place a 24->32 bit swizzle." );
    }
 
-   virtual void ToBuffer( void *destination, const void *source, const dsize_t size ) const
+   void ToBuffer( void *destination, const void *source, const dsize_t size ) const override
    {
       AssertFatal( size % 3 == 0, "Bad buffer size for DXT5nm Swizzle" );
       const S32 pixels = size / 3;
diff --git a/Engine/source/core/util/swizzle.h b/Engine/source/core/util/swizzle.h
index f8038f624..1c3d723a7 100644
--- a/Engine/source/core/util/swizzle.h
+++ b/Engine/source/core/util/swizzle.h
@@ -81,9 +81,9 @@ class NullSwizzle : public Swizzle<T, mapLength>
 public:
    NullSwizzle( const dsize_t *map = NULL ) : Swizzle<T, mapLength>( map ) {};
 
-   virtual void InPlace( void *memory, const dsize_t size ) const {}
+   void InPlace( void *memory, const dsize_t size ) const override {}
 
-   virtual void ToBuffer( void *destination, const void *source, const dsize_t size ) const
+   void ToBuffer( void *destination, const void *source, const dsize_t size ) const override
    {
       dMemcpy( destination, source, size );
    }
diff --git a/Engine/source/core/util/zip/centralDir.h b/Engine/source/core/util/zip/centralDir.h
index 4f582b206..e679c67af 100644
--- a/Engine/source/core/util/zip/centralDir.h
+++ b/Engine/source/core/util/zip/centralDir.h
@@ -65,8 +65,8 @@ public:
    CentralDir(FileHeader &fh);
    virtual ~CentralDir();
 
-   virtual bool read(Stream *stream);
-   virtual bool write(Stream *stream);
+   bool read(Stream *stream) override;
+   bool write(Stream *stream) override;
 
    void setFileComment(const char *comment);
 };
diff --git a/Engine/source/core/util/zip/zipCryptStream.h b/Engine/source/core/util/zip/zipCryptStream.h
index dcdae35fa..88694b1b1 100644
--- a/Engine/source/core/util/zip/zipCryptStream.h
+++ b/Engine/source/core/util/zip/zipCryptStream.h
@@ -51,15 +51,15 @@ public:
    inline void setFileEndPos(S32 pos)        { mFileEndPos = pos; }
 
    // Overrides of FilterStream
-   bool attachStream(Stream* io_pSlaveStream);
-   void detachStream();
-   Stream *getStream()                       { return mStream; }
+   bool attachStream(Stream* io_pSlaveStream) override;
+   void detachStream() override;
+   Stream *getStream() override                       { return mStream; }
 
-   U32  getPosition() const;
-   bool setPosition(const U32 in_newPosition);
+   U32  getPosition() const override;
+   bool setPosition(const U32 in_newPosition) override;
 
 protected:
-   bool _read(const U32 in_numBytes,  void* out_pBuffer);
+   bool _read(const U32 in_numBytes,  void* out_pBuffer) override;
 
    void updateKeys(const U8 c);
    U8 decryptByte();
diff --git a/Engine/source/core/util/zip/zipStatFilter.h b/Engine/source/core/util/zip/zipStatFilter.h
index 17d377c61..e37184e1a 100644
--- a/Engine/source/core/util/zip/zipStatFilter.h
+++ b/Engine/source/core/util/zip/zipStatFilter.h
@@ -109,7 +109,7 @@ protected:
 
    CentralDir *mCD;
 
-   virtual bool _write(const U32 numBytes, const void *buffer)
+   bool _write(const U32 numBytes, const void *buffer) override
    {
       if(! mStream->write(numBytes, buffer))
          return false;
@@ -120,7 +120,7 @@ protected:
       return true;
    }
 
-   virtual bool _read(const U32 numBytes, void *buffer)
+   bool _read(const U32 numBytes, void *buffer) override
    {
       if(! mStream->read(numBytes, buffer))
          return false;
@@ -139,7 +139,7 @@ public:
       detachStream();
    }
 
-   virtual bool attachStream(Stream *stream)
+   bool attachStream(Stream *stream) override
    {
       if(mCD == NULL)
          return false;
@@ -150,7 +150,7 @@ public:
       return true;
    }
 
-   virtual void detachStream()
+   void detachStream() override
    {
       if(mStream == NULL)
          return;
@@ -160,7 +160,7 @@ public:
       mStream = NULL;
    }
 
-   virtual Stream *getStream()                     { return mStream; }
+   Stream *getStream() override                     { return mStream; }
 
    void setCentralDir(CentralDir *cd)              { mCD = cd; }
    CentralDir *getCentralDir()                     { return mCD; }
diff --git a/Engine/source/core/util/zip/zipSubStream.h b/Engine/source/core/util/zip/zipSubStream.h
index db672b1dd..395d9960f 100644
--- a/Engine/source/core/util/zip/zipSubStream.h
+++ b/Engine/source/core/util/zip/zipSubStream.h
@@ -47,8 +47,8 @@ class ZipSubRStream : public FilterStream, public IStreamByteCount
 
    U32 fillBuffer(const U32 in_attemptSize);
 public:
-   virtual U32 getLastBytesRead() { return m_lastBytesRead; }
-   virtual U32 getLastBytesWritten() { return 0; }
+   U32 getLastBytesRead() override { return m_lastBytesRead; }
+   U32 getLastBytesWritten() override { return 0; }
    
 
   public:
@@ -57,23 +57,23 @@ public:
 
    // Overrides of NFilterStream
   public:
-   bool    attachStream(Stream* io_pSlaveStream);
-   void    detachStream();
-   Stream* getStream();
+   bool    attachStream(Stream* io_pSlaveStream) override;
+   void    detachStream() override;
+   Stream* getStream() override;
 
    void setUncompressedSize(const U32);
 
    // Mandatory overrides.  By default, these are simply passed to
    //  whatever is returned from getStream();
   protected:
-   bool _read(const U32 in_numBytes,  void* out_pBuffer);
+   bool _read(const U32 in_numBytes,  void* out_pBuffer) override;
   public:
-   bool hasCapability(const Capability) const;
+   bool hasCapability(const Capability) const override;
 
-   U32  getPosition() const;
-   bool setPosition(const U32 in_newPosition);
+   U32  getPosition() const override;
+   bool setPosition(const U32 in_newPosition) override;
 
-   U32  getStreamSize();
+   U32  getStreamSize() override;
 };
 
 class ZipSubWStream : public FilterStream, public IStreamByteCount
@@ -91,8 +91,8 @@ class ZipSubWStream : public FilterStream, public IStreamByteCount
    U32 m_lastBytesWritten;
 
 public:
-   virtual U32 getLastBytesRead() { return m_lastBytesRead; }
-   virtual U32 getLastBytesWritten() { return m_lastBytesWritten; }
+   U32 getLastBytesRead() override { return m_lastBytesRead; }
+   U32 getLastBytesWritten() override { return m_lastBytesWritten; }
 
   public:
    ZipSubWStream();
@@ -100,22 +100,22 @@ public:
 
    // Overrides of NFilterStream
   public:
-   bool    attachStream(Stream* io_pSlaveStream);
-   void    detachStream();
-   Stream* getStream();
+   bool    attachStream(Stream* io_pSlaveStream) override;
+   void    detachStream() override;
+   Stream* getStream() override;
 
    // Mandatory overrides.  By default, these are simply passed to
    //  whatever is returned from getStream();
   protected:
-   bool _read(const U32 in_numBytes,  void* out_pBuffer);
-   bool _write(const U32 in_numBytes, const void* in_pBuffer);
+   bool _read(const U32 in_numBytes,  void* out_pBuffer) override;
+   bool _write(const U32 in_numBytes, const void* in_pBuffer) override;
   public:
-   bool hasCapability(const Capability) const;
+   bool hasCapability(const Capability) const override;
 
-   U32  getPosition() const;
-   bool setPosition(const U32 in_newPosition);
+   U32  getPosition() const override;
+   bool setPosition(const U32 in_newPosition) override;
 
-   U32  getStreamSize();
+   U32  getStreamSize() override;
 };
 
 #endif //_ZIPSUBSTREAM_H_
diff --git a/Engine/source/core/util/zip/zipTempStream.h b/Engine/source/core/util/zip/zipTempStream.h
index 7efcb141b..ca1771075 100644
--- a/Engine/source/core/util/zip/zipTempStream.h
+++ b/Engine/source/core/util/zip/zipTempStream.h
@@ -60,7 +60,7 @@ public:
       return open(String(), Torque::FS::File::ReadWrite);
    }
 
-   virtual void close()
+   void close() override
    {
       Parent::close();
 
@@ -70,7 +70,7 @@ public:
    }
 
    /// Disallow setPosition() 
-   virtual bool setPosition(const U32 i_newPosition)        { return false; }
+   bool setPosition(const U32 i_newPosition) override        { return false; }
 
    /// Seek back to the start of the file.
    /// This is used internally by the zip code and should never be called whilst
diff --git a/Engine/source/core/util/zip/zipVolume.cpp b/Engine/source/core/util/zip/zipVolume.cpp
index 6fe6edb37..80fa81dcd 100644
--- a/Engine/source/core/util/zip/zipVolume.cpp
+++ b/Engine/source/core/util/zip/zipVolume.cpp
@@ -54,8 +54,8 @@ public:
       close();
    }
 
-   virtual Path   getName() const { return mZipFilename; }
-   virtual NodeStatus getStatus() const
+   Path   getName() const override { return mZipFilename; }
+   NodeStatus getStatus() const override
    { 
       if (mZipStream) 
       {
@@ -76,7 +76,7 @@ public:
          return FileNode::Closed;
    }
 
-   virtual bool   getAttributes(Attributes* attr) 
+   bool   getAttributes(Attributes* attr) override 
    { 
       if (!attr)
          return false;
@@ -92,7 +92,7 @@ public:
       return true; 
    }
 
-   virtual U32 getPosition()
+   U32 getPosition() override
    {
       if (mZipStream)
          return mZipStream->getPosition();
@@ -100,7 +100,7 @@ public:
          return 0;
    }
 
-   virtual U32 setPosition(U32 pos, SeekMode mode)
+   U32 setPosition(U32 pos, SeekMode mode) override
    {
       if (!mZipStream || mode != Begin)
          return 0;
@@ -108,7 +108,7 @@ public:
          return mZipStream->setPosition(pos);
    }
 
-   virtual bool open(AccessMode mode)
+   bool open(AccessMode mode) override
    {
       // stream is already open so just check to make sure that they are using a valid mode
       if (mode == Read)
@@ -120,7 +120,7 @@ public:
       }
    }
 
-   virtual bool close()
+   bool close() override
    {
       if (mZipStream != NULL && mArchive != NULL)
       {
@@ -131,7 +131,7 @@ public:
       return true;
    }
 
-   virtual U32 read(void* dst, U32 size)
+   U32 read(void* dst, U32 size) override
    {
       if (mZipStream && mZipStream->read(size, dst) && mByteCount)
          return mByteCount->getLastBytesRead();
@@ -139,7 +139,7 @@ public:
          return 0;
    }
 
-   virtual U32 write(const void* src, U32 size)
+   U32 write(const void* src, U32 size) override
    {
       if (mZipStream && mZipStream->write(size, src) && mByteCount)
          return mByteCount->getLastBytesWritten();
@@ -148,7 +148,7 @@ public:
    }
 
    protected:
-      virtual U32    calculateChecksum()
+      U32    calculateChecksum() override
       {
          // JMQ: implement
          return 0;
@@ -180,15 +180,15 @@ public:
    {
    }
 
-   Torque::Path getName() const { return mPath; }
+   Torque::Path getName() const override { return mPath; }
 
    // getStatus() doesn't appear to be used for directories
-   NodeStatus getStatus() const
+   NodeStatus getStatus() const override
    {
       return FileNode::Open;
    }
 
-   bool getAttributes(Attributes* attr)
+   bool getAttributes(Attributes* attr) override
    {
       if (!attr)
          return false;
@@ -204,20 +204,20 @@ public:
       return true; 
    }
 
-   bool open()
+   bool open() override
    {
       // reset iterator
       if (mZipEntry)
          mChildIter = mZipEntry->mChildren.begin();
       return (mZipEntry != NULL && mArchive.getPointer() != NULL);
    }
-   bool close()
+   bool close() override
    {
       if (mZipEntry)
          mChildIter = mZipEntry->mChildren.end();
       return true;
    }
-   bool read(Attributes* attr)
+   bool read(Attributes* attr) override
    {
       if (!attr)
          return false;
@@ -244,7 +244,7 @@ public:
    }
 
 private:
-   U32 calculateChecksum() 
+   U32 calculateChecksum() override 
    {
       return 0;
    }
@@ -273,15 +273,15 @@ public:
    {
    }
 
-   Torque::Path getName() const { return mPath; }
+   Torque::Path getName() const override { return mPath; }
 
    // getStatus() doesn't appear to be used for directories
-   NodeStatus getStatus() const
+   NodeStatus getStatus() const override
    {
       return FileNode::Open;
    }
 
-   bool getAttributes(Attributes* attr)
+   bool getAttributes(Attributes* attr) override
    {
       if (!attr)
          return false;
@@ -299,17 +299,17 @@ public:
       return true; 
    }
 
-   bool open()
+   bool open() override
    {
       mRead = false;
       return (mArchive.getPointer() != NULL);
    }
-   bool close()
+   bool close() override
    {
       mRead = false;
       return true;
    }
-   bool read(Attributes* attr)
+   bool read(Attributes* attr) override
    {
       if (!attr)
          return false;
@@ -336,7 +336,7 @@ public:
    }
 
 private:
-   U32 calculateChecksum() 
+   U32 calculateChecksum() override 
    {
       return 0;
    }
diff --git a/Engine/source/core/util/zip/zipVolume.h b/Engine/source/core/util/zip/zipVolume.h
index db1a7faab..99c2cc089 100644
--- a/Engine/source/core/util/zip/zipVolume.h
+++ b/Engine/source/core/util/zip/zipVolume.h
@@ -38,25 +38,25 @@ public:
    ZipFileSystem(String& zipFilename, bool zipNameIsDir = false);
    virtual ~ZipFileSystem();
 
-   String   getTypeStr() const { return "Zip"; }
+   String   getTypeStr() const override { return "Zip"; }
 
    // Strict resolve function will reteurn a node if it is mounted *AS* the requested path.
-   FileNodeRef resolve(const Path& path);
+   FileNodeRef resolve(const Path& path) override;
 
    // Loose resolve function will return a node if it is mounted as or under the requested path.
    // This is needed so mounted subdirectories will be included in recursive FindByPatern searches.
    // i.e. If data/ui.zip is mounted as data/ui, a search for data/*.module will only include files
    // under data/ui if the loose resolve function is used.
-   FileNodeRef resolveLoose(const Path& path);
+   FileNodeRef resolveLoose(const Path& path) override;
 
    // these are unsupported, ZipFileSystem is currently read only access
-   FileNodeRef create(const Path& path,FileNode::Mode) { return 0; }
-   bool remove(const Path& path) { return 0; }
-   bool rename(const Path& a,const Path& b) { return 0; }
+   FileNodeRef create(const Path& path,FileNode::Mode) override { return 0; }
+   bool remove(const Path& path) override { return 0; }
+   bool rename(const Path& a,const Path& b) override { return 0; }
 
    // these are unsupported
-   Path mapTo(const Path& path) { return path; }
-   Path mapFrom(const Path& path) { return path; }
+   Path mapTo(const Path& path) override { return path; }
+   Path mapFrom(const Path& path) override { return path; }
 
 public:
    /// Private interface for use by unit test only. 
diff --git a/Engine/source/core/virtualMountSystem.h b/Engine/source/core/virtualMountSystem.h
index 875e68993..14824a886 100644
--- a/Engine/source/core/virtualMountSystem.h
+++ b/Engine/source/core/virtualMountSystem.h
@@ -55,17 +55,17 @@ namespace FS
       VirtualMountSystem() : mUseParentFind(false) {}
 
       virtual ~VirtualMountSystem() { }
-      virtual bool mount(String root, FileSystemRef fs);
-      virtual bool mount(String root, const Path &path);
-      virtual FileSystemRef unmount(String root);
-      virtual bool unmount(FileSystemRef fs);
-      virtual S32 findByPattern( const Path &inBasePath, const String &inFilePattern, bool inRecursive, Vector<String> &outList, bool includeDirs=false, bool multiMatch = true );
-      virtual bool createPath(const Path& path);
+      bool mount(String root, FileSystemRef fs) override;
+      bool mount(String root, const Path &path) override;
+      FileSystemRef unmount(String root) override;
+      bool unmount(FileSystemRef fs) override;
+      S32 findByPattern( const Path &inBasePath, const String &inFilePattern, bool inRecursive, Vector<String> &outList, bool includeDirs=false, bool multiMatch = true ) override;
+      bool createPath(const Path& path) override;
 
    protected:
-      virtual void _log(const String& msg);
-      virtual FileSystemRef _removeMountFromList(String root);
-      virtual FileSystemRef _getFileSystemFromList(const Path& path) const ;
+      void _log(const String& msg) override;
+      FileSystemRef _removeMountFromList(String root) override;
+      FileSystemRef _getFileSystemFromList(const Path& path) const override ;
       
       // Vector of file system refs
       typedef Vector<FileSystemRef> RootToFSVec;
diff --git a/Engine/source/core/volume.cpp b/Engine/source/core/volume.cpp
index 6d2e4cab7..1a8ecbfb1 100644
--- a/Engine/source/core/volume.cpp
+++ b/Engine/source/core/volume.cpp
@@ -384,14 +384,14 @@ class FileSystemRedirect: public FileSystem
 public:
    FileSystemRedirect(MountSystem* mfs,const Path& path);
 
-   String   getTypeStr() const { return "Redirect"; }
+   String   getTypeStr() const override { return "Redirect"; }
 
-   FileNodeRef resolve(const Path& path);
-   FileNodeRef create(const Path& path,FileNode::Mode);
-   bool remove(const Path& path);
-   bool rename(const Path& a,const Path& b);
-   Path mapTo(const Path& path);
-   Path mapFrom(const Path& path);
+   FileNodeRef resolve(const Path& path) override;
+   FileNodeRef create(const Path& path,FileNode::Mode) override;
+   bool remove(const Path& path) override;
+   bool rename(const Path& a,const Path& b) override;
+   Path mapTo(const Path& path) override;
+   Path mapFrom(const Path& path) override;
    
 private:
    Path _merge(const Path& path);
@@ -406,14 +406,14 @@ public:
 
    FileSystemRedirectChangeNotifier( FileSystem *fs );
 
-   bool addNotification( const Path &path, ChangeDelegate callback );   
-   bool removeNotification( const Path &path, ChangeDelegate callback );
+   bool addNotification( const Path &path, ChangeDelegate callback ) override;   
+   bool removeNotification( const Path &path, ChangeDelegate callback ) override;
 
 protected:
 
-   virtual void  internalProcessOnce() {}
-   virtual bool  internalAddNotification( const Path &dir ) { return false; }
-   virtual bool  internalRemoveNotification( const Path &dir ) { return false; }
+   void  internalProcessOnce() override {}
+   bool  internalAddNotification( const Path &dir ) override { return false; }
+   bool  internalRemoveNotification( const Path &dir ) override { return false; }
 };
 
 FileSystemRedirectChangeNotifier::FileSystemRedirectChangeNotifier( FileSystem *fs ) 
diff --git a/Engine/source/environment/VolumetricFog.h b/Engine/source/environment/VolumetricFog.h
index c9206a5dc..a85ef1665 100644
--- a/Engine/source/environment/VolumetricFog.h
+++ b/Engine/source/environment/VolumetricFog.h
@@ -205,8 +205,8 @@ class VolumetricFog : public SceneObject
    
    protected:
       // Protected methods
-      bool onAdd();
-      void onRemove();
+      bool onAdd() override;
+      void onRemove() override;
       void handleResize(VolumetricFogRTManager *RTM, bool resize);
       void handleCanvasResize(GuiCanvas* canvas);
    
@@ -215,7 +215,7 @@ class VolumetricFog : public SceneObject
       void InitTexture();
       bool UpdateBuffers(U32 dl,bool force=true);
    
-      void processTick(const Move *move);
+      void processTick(const Move *move) override;
       void _enterFog(ShapeBase *control);
       void _leaveFog(ShapeBase *control);
 
@@ -229,12 +229,12 @@ class VolumetricFog : public SceneObject
       ~VolumetricFog();
    
       static void initPersistFields();
-      virtual void inspectPostApply();
+      void inspectPostApply() override;
    
-      U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
-      void unpackUpdate(NetConnection *conn, BitStream *stream);
+      U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
+      void unpackUpdate(NetConnection *conn, BitStream *stream) override;
    
-      void prepRenderImage(SceneRenderState* state);
+      void prepRenderImage(SceneRenderState* state) override;
       void render(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat);
       void reflect_render(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat);
    
diff --git a/Engine/source/environment/VolumetricFogRTManager.h b/Engine/source/environment/VolumetricFogRTManager.h
index d4b2bcbd4..021fd66f9 100644
--- a/Engine/source/environment/VolumetricFogRTManager.h
+++ b/Engine/source/environment/VolumetricFogRTManager.h
@@ -62,8 +62,8 @@ class VolumetricFogRTManager : public SceneObject
       U32 mWidth;
       U32 mHeight;
    
-      void onRemove();
-      void onSceneRemove();
+      void onRemove() override;
+      void onSceneRemove() override;
       void ResizeRT(WindowId did, S32 width, S32 height);
    
       static VolumetricFogRTMResizeSignal smVolumetricFogRTMResizeSignal;
diff --git a/Engine/source/environment/basicClouds.h b/Engine/source/environment/basicClouds.h
index 2e7468de8..982b9cf9c 100644
--- a/Engine/source/environment/basicClouds.h
+++ b/Engine/source/environment/basicClouds.h
@@ -68,17 +68,17 @@ public:
    DECLARE_CATEGORY("Environment \t Weather");
 
    // ConsoleObject
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
    static void initPersistFields();
-   virtual void inspectPostApply();   
+   void inspectPostApply() override;   
 
    // NetObject
-   virtual U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
-   virtual void unpackUpdate( NetConnection *conn, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    // SceneObject
-   virtual void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
    void renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *mi );
 
 protected:
diff --git a/Engine/source/environment/cloudLayer.h b/Engine/source/environment/cloudLayer.h
index 3634dbfa8..ba8110c39 100644
--- a/Engine/source/environment/cloudLayer.h
+++ b/Engine/source/environment/cloudLayer.h
@@ -71,17 +71,17 @@ public:
    DECLARE_CATEGORY("Environment \t Weather");
 
    // ConsoleObject
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
    static void initPersistFields();
-   virtual void inspectPostApply();   
+   void inspectPostApply() override;   
 
    // NetObject
-   virtual U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
-   virtual void unpackUpdate( NetConnection *conn, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    // SceneObject
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
    void renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *mi );
 
    void onImageChanged() {}
diff --git a/Engine/source/environment/decalRoad.cpp b/Engine/source/environment/decalRoad.cpp
index 4ee7b98de..b5ba0c8d4 100644
--- a/Engine/source/environment/decalRoad.cpp
+++ b/Engine/source/environment/decalRoad.cpp
@@ -75,11 +75,11 @@ public:
    DecalRoadNodeEvent() { mNodeList = NULL; }
    virtual ~DecalRoadNodeEvent() { }
 
-   virtual void pack(NetConnection*, BitStream*);
-   virtual void unpack(NetConnection*, BitStream*);
+   void pack(NetConnection*, BitStream*) override;
+   void unpack(NetConnection*, BitStream*) override;
 
-   virtual void copyIntoList(NodeListManager::NodeList* copyInto);
-   virtual void padListToSize();
+   void copyIntoList(NodeListManager::NodeList* copyInto) override;
+   void padListToSize() override;
 
    DECLARE_CONOBJECT(DecalRoadNodeEvent);
 };
@@ -192,7 +192,7 @@ public:
    DecalRoadNodeListNotify( DecalRoad* road, U32 listId ) { mRoad = road; mListId = listId; }
    virtual ~DecalRoadNodeListNotify() { mRoad = NULL; }
 
-   virtual void sendNotification( NodeListManager::NodeList* list );
+   void sendNotification( NodeListManager::NodeList* list ) override;
 };
 
 void DecalRoadNodeListNotify::sendNotification( NodeListManager::NodeList* list )
diff --git a/Engine/source/environment/decalRoad.h b/Engine/source/environment/decalRoad.h
index f7759b447..f1aecf187 100644
--- a/Engine/source/environment/decalRoad.h
+++ b/Engine/source/environment/decalRoad.h
@@ -51,7 +51,7 @@ class DecalRoadUpdateEvent : public SimEvent
 public:
 
    DecalRoadUpdateEvent( U32 mask, U32 ms ) { mMask = mask; mMs = ms; }
-   virtual void process( SimObject *object );
+   void process( SimObject *object ) override;
 
    U32 mMask;
    U32 mMs;
@@ -161,23 +161,23 @@ public:
    static void consoleInit();
 
 	// SimObject      
-	bool onAdd();
-	void onRemove();
-	void onEditorEnable();
-	void onEditorDisable();
-	void inspectPostApply();
-   void onStaticModified(const char* slotName, const char*newValue = NULL);
-   void writeFields(Stream &stream, U32 tabStop);
-   bool writeField( StringTableEntry fieldname, const char *value );
+	bool onAdd() override;
+	void onRemove() override;
+	void onEditorEnable() override;
+	void onEditorDisable() override;
+	void inspectPostApply() override;
+   void onStaticModified(const char* slotName, const char*newValue = NULL) override;
+   void writeFields(Stream &stream, U32 tabStop) override;
+   bool writeField( StringTableEntry fieldname, const char *value ) override;
    
 	// NetObject
-	U32 packUpdate(NetConnection *, U32, BitStream *);
-	void unpackUpdate(NetConnection *, BitStream *);	
+	U32 packUpdate(NetConnection *, U32, BitStream *) override;
+	void unpackUpdate(NetConnection *, BitStream *) override;	
 
    // SceneObject
-	virtual void prepRenderImage( SceneRenderState* state );
-   virtual void setTransform( const MatrixF &mat );
-   virtual void setScale( const VectorF &scale );
+	void prepRenderImage( SceneRenderState* state ) override;
+   void setTransform( const MatrixF &mat ) override;
+   void setScale( const VectorF &scale ) override;
    virtual bool containsPoint( const Point3F& point ) const { return containsPoint( point, NULL ); } 
 
    // fxRoad Public Methods
diff --git a/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h b/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h
index 497dd14f8..96098273c 100644
--- a/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h
+++ b/Engine/source/environment/editors/guiMeshRoadEditorCtrl.h
@@ -63,25 +63,25 @@ class GuiMeshRoadEditorCtrl : public EditTSCtrl
       DECLARE_CONOBJECT(GuiMeshRoadEditorCtrl);
 
       // SimObject
-      bool onAdd();
+      bool onAdd() override;
       static void initPersistFields();
 
       // GuiControl
-      virtual void onSleep();
+      void onSleep() override;
 
       // EditTSCtrl      
-		bool onKeyDown(const GuiEvent& event);
-      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
-      void on3DMouseDown(const Gui3DMouseEvent & event);
-      void on3DMouseUp(const Gui3DMouseEvent & event);
-      void on3DMouseMove(const Gui3DMouseEvent & event);
-      void on3DMouseDragged(const Gui3DMouseEvent & event);
-      void on3DMouseEnter(const Gui3DMouseEvent & event);
-      void on3DMouseLeave(const Gui3DMouseEvent & event);
-      void on3DRightMouseDown(const Gui3DMouseEvent & event);
-      void on3DRightMouseUp(const Gui3DMouseEvent & event);
-      void updateGuiInfo();      
-      void renderScene(const RectI & updateRect);
+		bool onKeyDown(const GuiEvent& event) override;
+      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
+      void on3DMouseDown(const Gui3DMouseEvent & event) override;
+      void on3DMouseUp(const Gui3DMouseEvent & event) override;
+      void on3DMouseMove(const Gui3DMouseEvent & event) override;
+      void on3DMouseDragged(const Gui3DMouseEvent & event) override;
+      void on3DMouseEnter(const Gui3DMouseEvent & event) override;
+      void on3DMouseLeave(const Gui3DMouseEvent & event) override;
+      void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
+      void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
+      void updateGuiInfo() override;      
+      void renderScene(const RectI & updateRect) override;
 
       // GuiRiverEditorCtrl      
       bool getStaticPos( const Gui3DMouseEvent & event, Point3F &tpos );
@@ -189,8 +189,8 @@ class GuiMeshRoadEditorUndoAction : public UndoAction
       SimObjectId mObjId;
       F32 mMetersPerSegment;
 
-      virtual void undo();
-      virtual void redo() { undo(); }
+      void undo() override;
+      void redo() override { undo(); }
 };
 
 #endif // _GUIMESHROADEDITORCTRL_H_
diff --git a/Engine/source/environment/editors/guiRiverEditorCtrl.h b/Engine/source/environment/editors/guiRiverEditorCtrl.h
index a5dae237d..29938513c 100644
--- a/Engine/source/environment/editors/guiRiverEditorCtrl.h
+++ b/Engine/source/environment/editors/guiRiverEditorCtrl.h
@@ -68,26 +68,26 @@ class GuiRiverEditorCtrl : public EditTSCtrl
       DECLARE_CONOBJECT(GuiRiverEditorCtrl);
 
       // SimObject
-      bool onAdd();
+      bool onAdd() override;
       static void initPersistFields();
 
       // GuiControl
-      virtual void onSleep();
-      virtual void onRender(Point2I offset, const RectI &updateRect);
+      void onSleep() override;
+      void onRender(Point2I offset, const RectI &updateRect) override;
 
       // EditTSCtrl      
-		bool onKeyDown(const GuiEvent& event);
-      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
-      void on3DMouseDown(const Gui3DMouseEvent & event);
-      void on3DMouseUp(const Gui3DMouseEvent & event);
-      void on3DMouseMove(const Gui3DMouseEvent & event);
-      void on3DMouseDragged(const Gui3DMouseEvent & event);
-      void on3DMouseEnter(const Gui3DMouseEvent & event);
-      void on3DMouseLeave(const Gui3DMouseEvent & event);
-      void on3DRightMouseDown(const Gui3DMouseEvent & event);
-      void on3DRightMouseUp(const Gui3DMouseEvent & event);
-      void updateGuiInfo();      
-      void renderScene(const RectI & updateRect);
+		bool onKeyDown(const GuiEvent& event) override;
+      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
+      void on3DMouseDown(const Gui3DMouseEvent & event) override;
+      void on3DMouseUp(const Gui3DMouseEvent & event) override;
+      void on3DMouseMove(const Gui3DMouseEvent & event) override;
+      void on3DMouseDragged(const Gui3DMouseEvent & event) override;
+      void on3DMouseEnter(const Gui3DMouseEvent & event) override;
+      void on3DMouseLeave(const Gui3DMouseEvent & event) override;
+      void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
+      void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
+      void updateGuiInfo() override;      
+      void renderScene(const RectI & updateRect) override;
 
       // GuiRiverEditorCtrl      
       bool getStaticPos( const Gui3DMouseEvent & event, Point3F &tpos );
@@ -195,8 +195,8 @@ class GuiRiverEditorUndoAction : public UndoAction
       F32 mMetersPerSegment;
       U32 mSegmentsPerBatch;
 
-      virtual void undo();
-      virtual void redo() { undo(); }
+      void undo() override;
+      void redo() override { undo(); }
 };
 
 #endif
diff --git a/Engine/source/environment/editors/guiRoadEditorCtrl.h b/Engine/source/environment/editors/guiRoadEditorCtrl.h
index 9d2c5d014..39a109b84 100644
--- a/Engine/source/environment/editors/guiRoadEditorCtrl.h
+++ b/Engine/source/environment/editors/guiRoadEditorCtrl.h
@@ -59,27 +59,27 @@ class GuiRoadEditorCtrl : public EditTSCtrl
       DECLARE_CONOBJECT(GuiRoadEditorCtrl);
 
       // SimObject
-      bool onAdd();
+      bool onAdd() override;
       static void initPersistFields();
 
       // GuiControl
-      virtual void onSleep();
-      virtual void onRender(Point2I offset, const RectI &updateRect);
+      void onSleep() override;
+      void onRender(Point2I offset, const RectI &updateRect) override;
 
       // EditTSCtrl      
-		bool onKeyDown(const GuiEvent& event);
-      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
-      void on3DMouseDown(const Gui3DMouseEvent & event);
-      void on3DMouseUp(const Gui3DMouseEvent & event);
-      void on3DMouseMove(const Gui3DMouseEvent & event);
-      void on3DMouseDragged(const Gui3DMouseEvent & event);
-      void on3DMouseEnter(const Gui3DMouseEvent & event);
-      void on3DMouseLeave(const Gui3DMouseEvent & event);
-      void on3DRightMouseDown(const Gui3DMouseEvent & event);
-      void on3DRightMouseUp(const Gui3DMouseEvent & event);
-      void updateGuiInfo();      
-      void renderScene(const RectI & updateRect);
-      void renderGui(Point2I offset, const RectI &updateRect);
+		bool onKeyDown(const GuiEvent& event) override;
+      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
+      void on3DMouseDown(const Gui3DMouseEvent & event) override;
+      void on3DMouseUp(const Gui3DMouseEvent & event) override;
+      void on3DMouseMove(const Gui3DMouseEvent & event) override;
+      void on3DMouseDragged(const Gui3DMouseEvent & event) override;
+      void on3DMouseEnter(const Gui3DMouseEvent & event) override;
+      void on3DMouseLeave(const Gui3DMouseEvent & event) override;
+      void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
+      void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
+      void updateGuiInfo() override;      
+      void renderScene(const RectI & updateRect) override;
+      void renderGui(Point2I offset, const RectI &updateRect) override;
 
       bool getTerrainPos( const Gui3DMouseEvent & event, Point3F &tpos );
       void deleteSelectedNode();
@@ -165,8 +165,8 @@ class GuiRoadEditorUndoAction : public UndoAction
       U32 mSegmentsPerBatch;
       F32 mTextureLength;
 
-      virtual void undo();
-      virtual void redo() { undo(); }
+      void undo() override;
+      void redo() override { undo(); }
 };
 
 #endif
diff --git a/Engine/source/environment/meshRoad.cpp b/Engine/source/environment/meshRoad.cpp
index 5e8d42a6d..93593df7a 100644
--- a/Engine/source/environment/meshRoad.cpp
+++ b/Engine/source/environment/meshRoad.cpp
@@ -120,11 +120,11 @@ public:
    MeshRoadNodeEvent() { mNodeList = NULL; }
    virtual ~MeshRoadNodeEvent() { }
 
-   virtual void pack(NetConnection*, BitStream*);
-   virtual void unpack(NetConnection*, BitStream*);
+   void pack(NetConnection*, BitStream*) override;
+   void unpack(NetConnection*, BitStream*) override;
 
-   virtual void copyIntoList(NodeListManager::NodeList* copyInto);
-   virtual void padListToSize();
+   void copyIntoList(NodeListManager::NodeList* copyInto) override;
+   void padListToSize() override;
 
    DECLARE_CONOBJECT(MeshRoadNodeEvent);
 };
@@ -253,7 +253,7 @@ public:
    MeshRoadNodeListNotify( MeshRoad* road, U32 listId ) { mRoad = road; mListId = listId; }
    virtual ~MeshRoadNodeListNotify() { mRoad = NULL; }
 
-   virtual void sendNotification( NodeListManager::NodeList* list );
+   void sendNotification( NodeListManager::NodeList* list ) override;
 };
 
 void MeshRoadNodeListNotify::sendNotification( NodeListManager::NodeList* list )
diff --git a/Engine/source/environment/meshRoad.h b/Engine/source/environment/meshRoad.h
index abc3074b0..17747e83b 100644
--- a/Engine/source/environment/meshRoad.h
+++ b/Engine/source/environment/meshRoad.h
@@ -166,12 +166,12 @@ public:
       box        = cv.box;
    }
 
-   const MatrixF& getTransform() const;
-   Box3F getBoundingBox() const;
-   Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const;
-   Point3F support(const VectorF& vec) const;
-   void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf);
-   void getPolyList(AbstractPolyList* list);
+   const MatrixF& getTransform() const override;
+   Box3F getBoundingBox() const override;
+   Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const override;
+   Point3F support(const VectorF& vec) const override;
+   void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf) override;
+   void getPolyList(AbstractPolyList* list) override;
 };
 
 
@@ -516,29 +516,29 @@ public:
    static void consoleInit();
 
    // SimObject      
-   bool onAdd();
-   void onRemove();
-   void onEditorEnable();
-   void onEditorDisable();
-   void inspectPostApply();
-   void onStaticModified(const char* slotName, const char*newValue = NULL);
-   void writeFields(Stream &stream, U32 tabStop);
-   bool writeField( StringTableEntry fieldname, const char *value );
+   bool onAdd() override;
+   void onRemove() override;
+   void onEditorEnable() override;
+   void onEditorDisable() override;
+   void inspectPostApply() override;
+   void onStaticModified(const char* slotName, const char*newValue = NULL) override;
+   void writeFields(Stream &stream, U32 tabStop) override;
+   bool writeField( StringTableEntry fieldname, const char *value ) override;
 
    // NetObject
-   U32 packUpdate(NetConnection *, U32, BitStream *);
-   void unpackUpdate(NetConnection *, BitStream *);
+   U32 packUpdate(NetConnection *, U32, BitStream *) override;
+   void unpackUpdate(NetConnection *, BitStream *) override;
 
    // SceneObject
-   virtual void prepRenderImage( SceneRenderState* sceneState );
-   virtual void setTransform( const MatrixF &mat );
-   virtual void setScale( const VectorF &scale );
+   void prepRenderImage( SceneRenderState* sceneState ) override;
+   void setTransform( const MatrixF &mat ) override;
+   void setScale( const VectorF &scale ) override;
 
    // SceneObject - Collision
-   virtual void buildConvex(const Box3F& box,Convex* convex);
-   virtual bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere);
-   virtual bool castRay(const Point3F &start, const Point3F &end, RayInfo* info);
-   virtual bool collideBox(const Point3F &start, const Point3F &end, RayInfo* info);
+   void buildConvex(const Box3F& box,Convex* convex) override;
+   bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere) override;
+   bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
+   bool collideBox(const Point3F &start, const Point3F &end, RayInfo* info) override;
 
    // MeshRoad
    void regenerate();   
diff --git a/Engine/source/environment/nodeListManager.h b/Engine/source/environment/nodeListManager.h
index f6e46b23a..39f5fb232 100644
--- a/Engine/source/environment/nodeListManager.h
+++ b/Engine/source/environment/nodeListManager.h
@@ -118,10 +118,10 @@ public:
    NodeListEvent() { mId = 0; mNodeList = NULL; mTotalNodes = mLocalListStart = 0; }
    virtual ~NodeListEvent();
 
-   virtual void pack(NetConnection*, BitStream*);
-   virtual void write(NetConnection*, BitStream*);
-   virtual void unpack(NetConnection*, BitStream*);
-   virtual void process(NetConnection*);
+   void pack(NetConnection*, BitStream*) override;
+   void write(NetConnection*, BitStream*) override;
+   void unpack(NetConnection*, BitStream*) override;
+   void process(NetConnection*) override;
    virtual void mergeLists(NodeListManager::NodeList* oldList);
 
    virtual void copyIntoList(NodeListManager::NodeList* copyInto) { }
diff --git a/Engine/source/environment/river.cpp b/Engine/source/environment/river.cpp
index e5862710a..725f4a350 100644
--- a/Engine/source/environment/river.cpp
+++ b/Engine/source/environment/river.cpp
@@ -134,11 +134,11 @@ public:
    RiverNodeEvent() { mNodeList = NULL; }
    virtual ~RiverNodeEvent() { }
 
-   virtual void pack(NetConnection*, BitStream*);
-   virtual void unpack(NetConnection*, BitStream*);
+   void pack(NetConnection*, BitStream*) override;
+   void unpack(NetConnection*, BitStream*) override;
 
-   virtual void copyIntoList(NodeListManager::NodeList* copyInto);
-   virtual void padListToSize();
+   void copyIntoList(NodeListManager::NodeList* copyInto) override;
+   void padListToSize() override;
 
    DECLARE_CONOBJECT(RiverNodeEvent);
 };
@@ -266,7 +266,7 @@ public:
    RiverNodeListNotify( River* river, U32 listId ) { mRiver = river; mListId = listId; }
    virtual ~RiverNodeListNotify() { mRiver = NULL; }
 
-   virtual void sendNotification( NodeListManager::NodeList* list );
+   void sendNotification( NodeListManager::NodeList* list ) override;
 };
 
 void RiverNodeListNotify::sendNotification( NodeListManager::NodeList* list )
diff --git a/Engine/source/environment/river.h b/Engine/source/environment/river.h
index f91217955..ded0e7e37 100644
--- a/Engine/source/environment/river.h
+++ b/Engine/source/environment/river.h
@@ -387,33 +387,33 @@ public:
    static void consoleInit();
 
    // SimObject      
-   bool onAdd();
-   void onRemove();
-   void inspectPostApply();
-   void onStaticModified(const char* slotName, const char*newValue = NULL);
-   void writeFields(Stream &stream, U32 tabStop);
-   bool writeField( StringTableEntry fieldname, const char *value );
+   bool onAdd() override;
+   void onRemove() override;
+   void inspectPostApply() override;
+   void onStaticModified(const char* slotName, const char*newValue = NULL) override;
+   void writeFields(Stream &stream, U32 tabStop) override;
+   bool writeField( StringTableEntry fieldname, const char *value ) override;
 
    // NetObject
-   U32 packUpdate(NetConnection *, U32, BitStream *);
-   void unpackUpdate(NetConnection *, BitStream *);
+   U32 packUpdate(NetConnection *, U32, BitStream *) override;
+   void unpackUpdate(NetConnection *, BitStream *) override;
 
    // SceneObject   
-   virtual void setTransform( const MatrixF &mat );
-   virtual void setScale( const VectorF &scale );
-	virtual bool castRay(const Point3F &start, const Point3F &end, RayInfo* info);
-	virtual bool collideBox(const Point3F &start, const Point3F &end, RayInfo* info);
+   void setTransform( const MatrixF &mat ) override;
+   void setScale( const VectorF &scale ) override;
+	bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
+	bool collideBox(const Point3F &start, const Point3F &end, RayInfo* info) override;
    virtual bool containsPoint( const Point3F& point ) const { return containsPoint( point, NULL ); }
-   virtual bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere );
+   bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere ) override;
 
    // WaterObject
-   virtual F32 getWaterCoverage( const Box3F &worldBox ) const;   
-   virtual F32 getSurfaceHeight( const Point2F &pos ) const;
-   virtual VectorF getFlow( const Point3F &pos ) const;   
+   F32 getWaterCoverage( const Box3F &worldBox ) const override;   
+   F32 getSurfaceHeight( const Point2F &pos ) const override;
+   VectorF getFlow( const Point3F &pos ) const override;   
    virtual void onReflectionInfoChanged();
-   virtual void updateUnderwaterEffect( SceneRenderState *state );
+   void updateUnderwaterEffect( SceneRenderState *state ) override;
    
-   virtual bool isUnderwater( const Point3F &pnt ) const;
+   bool isUnderwater( const Point3F &pnt ) const override;
    F32 distanceToSurface( const Point3F &pnt, U32 segmentIdx );
    bool containsPoint( const Point3F &worldPos, U32 *nodeIdx ) const;
 
@@ -487,9 +487,9 @@ protected:
    bool _getTerrainHeight( F32 x, F32 y, F32 &height ); 
 
    // WaterObject
-   virtual void setShaderParams( SceneRenderState *state, BaseMatInstance *mat, const WaterMatParams &paramHandles );   
-   virtual void innerRender( SceneRenderState *state );
-   virtual void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos );
+   void setShaderParams( SceneRenderState *state, BaseMatInstance *mat, const WaterMatParams &paramHandles ) override;   
+   void innerRender( SceneRenderState *state ) override;
+   void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos ) override;
 
 protected:
 
diff --git a/Engine/source/environment/scatterSky.h b/Engine/source/environment/scatterSky.h
index 7f71183bb..aecfeab19 100644
--- a/Engine/source/environment/scatterSky.h
+++ b/Engine/source/environment/scatterSky.h
@@ -76,24 +76,24 @@ public:
    ~ScatterSky();
 
    // SimObject
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    // ISceneLight
-   virtual void submitLights( LightManager *lm, bool staticLighting );
-   virtual LightInfo* getLight() { return mLight; }
+   void submitLights( LightManager *lm, bool staticLighting ) override;
+   LightInfo* getLight() override { return mLight; }
 
    // ConsoleObject
    DECLARE_CONOBJECT(ScatterSky);
    DECLARE_CATEGORY("Environment \t Background");
-   void inspectPostApply();
+   void inspectPostApply() override;
    static void initPersistFields();
 
    // Network
-   U32  packUpdate  ( NetConnection *conn, U32 mask, BitStream *stream );
-   void unpackUpdate( NetConnection *conn,           BitStream *stream );
+   U32  packUpdate  ( NetConnection *conn, U32 mask, BitStream *stream ) override;
+   void unpackUpdate( NetConnection *conn,           BitStream *stream ) override;
 
-   void prepRenderImage( SceneRenderState* state );
+   void prepRenderImage( SceneRenderState* state ) override;
   
    ///
    void setAzimuth( F32 azimuth );
@@ -158,8 +158,8 @@ protected:
    static bool ptSetAzimuth( void *object, const char *index, const char *data );
 
    // SimObject.
-   virtual void _onSelected();
-   virtual void _onUnselected();
+   void _onSelected() override;
+   void _onUnselected() override;
 
 protected:
 
diff --git a/Engine/source/environment/skyBox.h b/Engine/source/environment/skyBox.h
index 0daddb8a7..6a59f133c 100644
--- a/Engine/source/environment/skyBox.h
+++ b/Engine/source/environment/skyBox.h
@@ -78,20 +78,20 @@ public:
    DECLARE_CATEGORY("Environment \t Background");
 
    // SimObject
-   void onStaticModified( const char *slotName, const char *newValue );
+   void onStaticModified( const char *slotName, const char *newValue ) override;
 
    // ConsoleObject
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
    static void initPersistFields();
-   virtual void inspectPostApply();      
+   void inspectPostApply() override;      
 
    // NetObject
-   virtual U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
-   virtual void unpackUpdate( NetConnection *conn, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    // SceneObject
-   void prepRenderImage( SceneRenderState* state );
+   void prepRenderImage( SceneRenderState* state ) override;
 
    /// Our render delegate.
    void _renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *mi );
diff --git a/Engine/source/environment/skySphere.h b/Engine/source/environment/skySphere.h
index 9c50b9bfc..7aeebb5f1 100644
--- a/Engine/source/environment/skySphere.h
+++ b/Engine/source/environment/skySphere.h
@@ -69,20 +69,20 @@ public:
    DECLARE_CATEGORY("Environment \t Background");
 
    // SimObject
-   void onStaticModified(const char* slotName, const char* newValue);
+   void onStaticModified(const char* slotName, const char* newValue) override;
 
    // ConsoleObject
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
    static void initPersistFields();
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    // NetObject
-   virtual U32 packUpdate(NetConnection* conn, U32 mask, BitStream* stream);
-   virtual void unpackUpdate(NetConnection* conn, BitStream* stream);
+   U32 packUpdate(NetConnection* conn, U32 mask, BitStream* stream) override;
+   void unpackUpdate(NetConnection* conn, BitStream* stream) override;
 
    // SceneObject
-   void prepRenderImage(SceneRenderState* state);
+   void prepRenderImage(SceneRenderState* state) override;
 
    /// Our render delegate.
    void _renderObject(ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* mi);
diff --git a/Engine/source/environment/sun.h b/Engine/source/environment/sun.h
index b87611a25..f47a5ecb9 100644
--- a/Engine/source/environment/sun.h
+++ b/Engine/source/environment/sun.h
@@ -98,8 +98,8 @@ protected:
    void _updateTimeOfDay( TimeOfDay *timeOfDay, F32 time );
 
    // SimObject.
-   virtual void _onSelected();
-   virtual void _onUnselected();
+   void _onSelected() override;
+   void _onUnselected() override;
 
    enum NetMaskBits 
    {
@@ -112,28 +112,28 @@ public:
    virtual ~Sun();
 
    // SimObject
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    // ConsoleObject
    DECLARE_CONOBJECT(Sun);
    DECLARE_CATEGORY("Lighting \t Lights");
    static void initPersistFields();
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    // NetObject
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
-   void unpackUpdate( NetConnection *conn, BitStream *stream ); 
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override; 
 
    // ISceneLight
-   virtual void submitLights( LightManager *lm, bool staticLighting );
-   virtual LightInfo* getLight() { return mLight; }   
+   void submitLights( LightManager *lm, bool staticLighting ) override;
+   LightInfo* getLight() override { return mLight; }   
 
    // SceneObject   
-   virtual void prepRenderImage( SceneRenderState* state );
+   void prepRenderImage( SceneRenderState* state ) override;
 
    // ProcessObject
-   virtual void advanceTime( F32 dt );
+   void advanceTime( F32 dt ) override;
 
    ///
    void setAzimuth( F32 azimuth );
diff --git a/Engine/source/environment/timeOfDay.h b/Engine/source/environment/timeOfDay.h
index 94a48f14a..e4dfcc321 100644
--- a/Engine/source/environment/timeOfDay.h
+++ b/Engine/source/environment/timeOfDay.h
@@ -77,18 +77,18 @@ public:
    static void consoleInit();
    DECLARE_CONOBJECT( TimeOfDay );
    DECLARE_CATEGORY("Environment \t Weather");
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    // SimObject
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    // NetObject
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
-   void unpackUpdate( NetConnection *conn, BitStream *stream );  
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;  
 
    // ProcessObject   
-   virtual void processTick( const Move *move );
+   void processTick( const Move *move ) override;
 
    F32 getAzimuthRads() { return mAzimuth; }
    F32 getElevationRads() { return mElevation; }
diff --git a/Engine/source/environment/waterPlane.h b/Engine/source/environment/waterPlane.h
index 682e34074..0f21166e0 100644
--- a/Engine/source/environment/waterPlane.h
+++ b/Engine/source/environment/waterPlane.h
@@ -92,10 +92,10 @@ private:
    Frustum        mFrustum;
    
    SceneData setupSceneGraphInfo( SceneRenderState *state );
-   void setShaderParams( SceneRenderState *state, BaseMatInstance* mat, const WaterMatParams& paramHandles );
+   void setShaderParams( SceneRenderState *state, BaseMatInstance* mat, const WaterMatParams& paramHandles ) override;
    void setupVBIB( SceneRenderState *state );
-   virtual void prepRenderImage( SceneRenderState *state );
-   virtual void innerRender( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
+   void innerRender( SceneRenderState *state ) override;
    void setMultiPassProjection();
 
 protected:
@@ -103,11 +103,11 @@ protected:
    //-------------------------------------------------------
    // Standard engine functions
    //-------------------------------------------------------
-   bool onAdd();
-   void onRemove();   
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
-   void unpackUpdate(NetConnection *conn,           BitStream *stream);
-   bool castRay(const Point3F &start, const Point3F &end, RayInfo* info);
+   bool onAdd() override;
+   void onRemove() override;   
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
+   void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
+   bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
 
 public:
    WaterPlane();
@@ -116,17 +116,17 @@ public:
    DECLARE_CONOBJECT(WaterPlane);   
 
    static void initPersistFields();
-   void onStaticModified( const char* slotName, const char*newValue = NULL );
-   virtual void inspectPostApply();
-   virtual void setTransform( const MatrixF & mat );
-   virtual F32 distanceTo( const Point3F& point ) const;
-   virtual bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere );
+   void onStaticModified( const char* slotName, const char*newValue = NULL ) override;
+   void inspectPostApply() override;
+   void setTransform( const MatrixF & mat ) override;
+   F32 distanceTo( const Point3F& point ) const override;
+   bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere ) override;
 
    // WaterObject
-   virtual F32 getWaterCoverage( const Box3F &worldBox ) const;
-   virtual F32 getSurfaceHeight( const Point2F &pos ) const;
+   F32 getWaterCoverage( const Box3F &worldBox ) const override;
+   F32 getSurfaceHeight( const Point2F &pos ) const override;
    virtual void onReflectionInfoChanged();
-   virtual bool isUnderwater( const Point3F &pnt ) const;
+   bool isUnderwater( const Point3F &pnt ) const override;
 
    // WaterBlock   
    bool isPointSubmerged ( const Point3F &pos, bool worldSpace = true ) const{ return true; }
@@ -142,7 +142,7 @@ public:
 protected:
 
    // WaterObject
-   virtual void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos );
+   void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos ) override;
 };
 
 #endif // _WATERPLANE_H_
diff --git a/Engine/source/forest/editor/forestBrushElement.h b/Engine/source/forest/editor/forestBrushElement.h
index 6a7d98973..a5b14650d 100644
--- a/Engine/source/forest/editor/forestBrushElement.h
+++ b/Engine/source/forest/editor/forestBrushElement.h
@@ -109,9 +109,9 @@ public:
 
    DECLARE_CONOBJECT( ForestBrush );
 
-   virtual bool onAdd();
+   bool onAdd() override;
 
-   virtual void addObject(SimObject*);
+   void addObject(SimObject*) override;
 
    static SimGroup* getGroup();
 
@@ -135,9 +135,9 @@ public:
 
    DECLARE_CONOBJECT(ForestBrushGroup);
 
-   virtual bool onAdd();
+   bool onAdd() override;
 
-   virtual void addObject(SimObject*);
+   void addObject(SimObject*) override;
 
    bool containsBrushData(const ForestBrush* inData);
 protected:
diff --git a/Engine/source/forest/editor/forestBrushTool.h b/Engine/source/forest/editor/forestBrushTool.h
index 0debad616..9c41d1047 100644
--- a/Engine/source/forest/editor/forestBrushTool.h
+++ b/Engine/source/forest/editor/forestBrushTool.h
@@ -62,20 +62,20 @@ public:
    // SimObject
    DECLARE_CONOBJECT( ForestBrushTool );
    static void initPersistFields();
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    // ForestTool
-   virtual void on3DMouseDown( const Gui3DMouseEvent &evt );
-   virtual void on3DMouseUp( const Gui3DMouseEvent &evt );
-   virtual void on3DMouseMove( const Gui3DMouseEvent &evt );
-   virtual void on3DMouseDragged( const Gui3DMouseEvent &evt );
-   virtual bool onMouseWheel(const GuiEvent &evt );   
-   virtual void onRender3D();
-   virtual void onRender2D();
-   virtual void onActivated( const Gui3DMouseEvent &lastEvent );
-   virtual void onDeactivated();
-   virtual bool updateGuiInfo();
+   void on3DMouseDown( const Gui3DMouseEvent &evt ) override;
+   void on3DMouseUp( const Gui3DMouseEvent &evt ) override;
+   void on3DMouseMove( const Gui3DMouseEvent &evt ) override;
+   void on3DMouseDragged( const Gui3DMouseEvent &evt ) override;
+   bool onMouseWheel(const GuiEvent &evt ) override;   
+   void onRender3D() override;
+   void onRender2D() override;
+   void onActivated( const Gui3DMouseEvent &lastEvent ) override;
+   void onDeactivated() override;
+   bool updateGuiInfo() override;
 
    // ForestBrushTool
    void setSize( F32 val );
@@ -139,7 +139,7 @@ class ForestBrushToolEvent : public SimEvent
 {
 public:
 
-   void process( SimObject *object )
+   void process( SimObject *object ) override
    {
       ((ForestBrushTool*)object)->_onStroke();
    }
diff --git a/Engine/source/forest/editor/forestEditorCtrl.h b/Engine/source/forest/editor/forestEditorCtrl.h
index b91310a58..d8fc6aae6 100644
--- a/Engine/source/forest/editor/forestEditorCtrl.h
+++ b/Engine/source/forest/editor/forestEditorCtrl.h
@@ -58,30 +58,30 @@ class ForestEditorCtrl : public EditTSCtrl
       DECLARE_CONOBJECT( ForestEditorCtrl );
 
       // SimObject
-      bool onAdd();
+      bool onAdd() override;
       static void initPersistFields();
 
       // GuiControl
-      virtual bool onWake();
-      virtual void onSleep();      
-      virtual void onMouseUp( const GuiEvent &event_ );
+      bool onWake() override;
+      void onSleep() override;      
+      void onMouseUp( const GuiEvent &event_ ) override;
 
       // EditTSCtrl      
-      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
-      void on3DMouseDown( const Gui3DMouseEvent &event_ );
-      void on3DMouseUp( const Gui3DMouseEvent &event_ );
-      void on3DMouseMove( const Gui3DMouseEvent &event_ );
-      void on3DMouseDragged( const Gui3DMouseEvent &event_ );
-      void on3DMouseEnter( const Gui3DMouseEvent &event_ );
-      void on3DMouseLeave( const Gui3DMouseEvent &event_ );
-      void on3DRightMouseDown( const Gui3DMouseEvent &event_ );
-      void on3DRightMouseUp( const Gui3DMouseEvent &event_ );
-      bool onMouseWheelUp(const GuiEvent &event_);
-      bool onMouseWheelDown(const GuiEvent &event_);
-      void updateGuiInfo();      
-      void updateGizmo();
-      void renderScene( const RectI &updateRect );
-      void renderGui( Point2I offset, const RectI &updateRect );
+      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
+      void on3DMouseDown( const Gui3DMouseEvent &event_ ) override;
+      void on3DMouseUp( const Gui3DMouseEvent &event_ ) override;
+      void on3DMouseMove( const Gui3DMouseEvent &event_ ) override;
+      void on3DMouseDragged( const Gui3DMouseEvent &event_ ) override;
+      void on3DMouseEnter( const Gui3DMouseEvent &event_ ) override;
+      void on3DMouseLeave( const Gui3DMouseEvent &event_ ) override;
+      void on3DRightMouseDown( const Gui3DMouseEvent &event_ ) override;
+      void on3DRightMouseUp( const Gui3DMouseEvent &event_ ) override;
+      bool onMouseWheelUp(const GuiEvent &event_) override;
+      bool onMouseWheelDown(const GuiEvent &event_) override;
+      void updateGuiInfo() override;      
+      void updateGizmo() override;
+      void renderScene( const RectI &updateRect ) override;
+      void renderGui( Point2I offset, const RectI &updateRect ) override;
 
       /// Causes the editor to reselect the active forest.
       bool updateActiveForest( bool createNew );
diff --git a/Engine/source/forest/editor/forestSelectionTool.h b/Engine/source/forest/editor/forestSelectionTool.h
index c7185e89d..90945c2b0 100644
--- a/Engine/source/forest/editor/forestSelectionTool.h
+++ b/Engine/source/forest/editor/forestSelectionTool.h
@@ -47,9 +47,9 @@ public:
 
 protected:
 
-   void offsetObject( ForestItem &object, const Point3F &delta );
-   void rotateObject( ForestItem &object, const EulerF &delta, const Point3F &origin );
-   void scaleObject( ForestItem &object, const Point3F &delta );
+   void offsetObject( ForestItem &object, const Point3F &delta ) override;
+   void rotateObject( ForestItem &object, const EulerF &delta, const Point3F &origin ) override;
+   void scaleObject( ForestItem &object, const Point3F &delta ) override;
 
 protected:
 
@@ -93,17 +93,17 @@ class ForestSelectionTool : public ForestTool
       DECLARE_CONOBJECT( ForestSelectionTool );
 
       // ForestTool
-      virtual void setParentEditor( ForestEditorCtrl *editor );
-      virtual void setActiveForest( Forest *forest );
-      virtual void on3DMouseDown( const Gui3DMouseEvent &evt );
-      virtual void on3DMouseUp( const Gui3DMouseEvent &evt );
-      virtual void on3DMouseMove( const Gui3DMouseEvent &evt );
-      virtual void on3DMouseDragged( const Gui3DMouseEvent &evt );
-      virtual void onRender3D();
-      virtual void onRender2D();
-      virtual bool updateGuiInfo();
-      virtual void updateGizmo();
-      virtual void onUndoAction();
+      void setParentEditor( ForestEditorCtrl *editor ) override;
+      void setActiveForest( Forest *forest ) override;
+      void on3DMouseDown( const Gui3DMouseEvent &evt ) override;
+      void on3DMouseUp( const Gui3DMouseEvent &evt ) override;
+      void on3DMouseMove( const Gui3DMouseEvent &evt ) override;
+      void on3DMouseDragged( const Gui3DMouseEvent &evt ) override;
+      void onRender3D() override;
+      void onRender2D() override;
+      bool updateGuiInfo() override;
+      void updateGizmo() override;
+      void onUndoAction() override;
 
       S32 getSelectionCount() const { return mSelection.size(); }
 
diff --git a/Engine/source/forest/editor/forestUndo.h b/Engine/source/forest/editor/forestUndo.h
index 1d63c85e9..bf85e811c 100644
--- a/Engine/source/forest/editor/forestUndo.h
+++ b/Engine/source/forest/editor/forestUndo.h
@@ -45,8 +45,8 @@ public:
    ForestUndoAction( const Resource<ForestData> &data, ForestEditorCtrl *editor, const char *description );   
 
    // UndoAction
-   virtual void undo() {}
-   virtual void redo() {}
+   void undo() override {}
+   void redo() override {}
 
 protected:
 
@@ -72,8 +72,8 @@ public:
                  F32 scale );
 
    // UndoAction
-   virtual void undo();
-   virtual void redo();
+   void undo() override;
+   void redo() override;
 };
 
 
@@ -91,8 +91,8 @@ public:
    void removeItem( const Vector<ForestItem> &itemList );
 
    // UndoAction
-   virtual void undo();
-   virtual void redo();
+   void undo() override;
+   void redo() override;
 };
 
 
@@ -107,8 +107,8 @@ public:
 
    void saveItem( const ForestItem &item );
 
-   virtual void undo() { _swapState(); }
-   virtual void redo() { _swapState(); }
+   void undo() override { _swapState(); }
+   void redo() override { _swapState(); }
 
 protected:
 
diff --git a/Engine/source/forest/forest.h b/Engine/source/forest/forest.h
index 7fed73f4d..e446fd3de 100644
--- a/Engine/source/forest/forest.h
+++ b/Engine/source/forest/forest.h
@@ -152,37 +152,37 @@ public:
    static void initPersistFields();   
 
    // SimObject
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    /// Overloaded from SceneObject to properly update
    /// the client side forest when changes occur within
    /// the mission editor.
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    /// Overloaded from SceneObject for updating the 
    /// client side position of the forest.
-   void setTransform( const MatrixF &mat );
+   void setTransform( const MatrixF &mat ) override;
 
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
 
    bool isTreeInRange( const Point2F& point, F32 radius ) const;
 
    // Network
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
-   void unpackUpdate( NetConnection *conn, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    //IForestCollision *getCollision() const { return mCollision; }
 
    // SceneObject - Collision
-   virtual void buildConvex( const Box3F& box, Convex* convex );
-   virtual bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere );
-   virtual bool castRay( const Point3F &start, const Point3F &end, RayInfo *outInfo );
-   virtual bool castRayRendered( const Point3F &start, const Point3F &end, RayInfo *outInfo );
-   virtual bool collideBox( const Point3F &start, const Point3F &end, RayInfo *outInfo );
+   void buildConvex( const Box3F& box, Convex* convex ) override;
+   bool buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere ) override;
+   bool castRay( const Point3F &start, const Point3F &end, RayInfo *outInfo ) override;
+   bool castRayRendered( const Point3F &start, const Point3F &end, RayInfo *outInfo ) override;
+   bool collideBox( const Point3F &start, const Point3F &end, RayInfo *outInfo ) override;
 
    // SceneObject - Other
-   virtual void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude );
+   void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ) override;
 
    bool castRayBase( const Point3F &start, const Point3F &end, RayInfo *outInfo, bool rendered );
      
@@ -203,7 +203,7 @@ public:
    void saveDataFile( const char *path = NULL );
 
    ///
-   void clear() { mData->clear(); }
+   void clear() override { mData->clear(); }
 
    /// Called to rebuild the collision state.
    void updateCollision();
diff --git a/Engine/source/forest/forestCollision.h b/Engine/source/forest/forestCollision.h
index 0118307ec..4628ab290 100644
--- a/Engine/source/forest/forestCollision.h
+++ b/Engine/source/forest/forestCollision.h
@@ -66,12 +66,12 @@ public:
    }
 
    void           calculateTransform( const MatrixF &worldXfrm );
-   const MatrixF& getTransform() const { return mTransform; }
-   Box3F          getBoundingBox() const;
-   Box3F          getBoundingBox( const MatrixF &mat, const Point3F &scale) const;
-   Point3F        support( const VectorF &v ) const;
-   void           getFeatures( const MatrixF &mat, const VectorF &n, ConvexFeature *cf );
-   void           getPolyList( AbstractPolyList *list);
+   const MatrixF& getTransform() const override { return mTransform; }
+   Box3F          getBoundingBox() const override;
+   Box3F          getBoundingBox( const MatrixF &mat, const Point3F &scale) const override;
+   Point3F        support( const VectorF &v ) const override;
+   void           getFeatures( const MatrixF &mat, const VectorF &n, ConvexFeature *cf ) override;
+   void           getPolyList( AbstractPolyList *list) override;
 
 public:
 
diff --git a/Engine/source/forest/forestItem.h b/Engine/source/forest/forestItem.h
index 2ffb9f9ab..42bf56a5f 100644
--- a/Engine/source/forest/forestItem.h
+++ b/Engine/source/forest/forestItem.h
@@ -111,10 +111,10 @@ public:
    static void  consoleInit();
    static void  initPersistFields();   
 
-   virtual void onNameChange(const char *name);
-   virtual bool onAdd();
-   virtual void packData(BitStream* stream);
-   virtual void unpackData(BitStream* stream);
+   void onNameChange(const char *name) override;
+   bool onAdd() override;
+   void packData(BitStream* stream) override;
+   void unpackData(BitStream* stream) override;
 
    /// Called from Forest the first time a datablock is used
    /// in order to lazy load content.
diff --git a/Engine/source/forest/forestWindEmitter.h b/Engine/source/forest/forestWindEmitter.h
index 9c3c51859..4597ad5ca 100644
--- a/Engine/source/forest/forestWindEmitter.h
+++ b/Engine/source/forest/forestWindEmitter.h
@@ -196,20 +196,20 @@ public:
    void updateMountPosition();
 
    // SceneObject
-   virtual void setTransform( const MatrixF &mat );
-   void prepRenderImage( SceneRenderState *state );
+   void setTransform( const MatrixF &mat ) override;
+   void prepRenderImage( SceneRenderState *state ) override;
 
    // SimObject
-   bool onAdd();
-   void onRemove();
-   void inspectPostApply();
-   void onEditorEnable();
-   void onEditorDisable();
-   void onDeleteNotify(SimObject *object);
+   bool onAdd() override;
+   void onRemove() override;
+   void inspectPostApply() override;
+   void onEditorEnable() override;
+   void onEditorDisable() override;
+   void onDeleteNotify(SimObject *object) override;
 
    // NetObject
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
-   void unpackUpdate( NetConnection *conn, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    // ConObject.
    static void initPersistFields();
diff --git a/Engine/source/forest/forestWindMgr.h b/Engine/source/forest/forestWindMgr.h
index 32fdab67a..3258ed8f6 100644
--- a/Engine/source/forest/forestWindMgr.h
+++ b/Engine/source/forest/forestWindMgr.h
@@ -62,9 +62,9 @@ protected:
 
    static WindAdvanceSignal smAdvanceSignal;
 
-   virtual void interpolateTick( F32 delta ) {};
-   virtual void processTick();
-   virtual void advanceTime( F32 timeDelta ) {};   
+   void interpolateTick( F32 delta ) override {};
+   void processTick() override;
+   void advanceTime( F32 timeDelta ) override {};   
 
 public:
 
diff --git a/Engine/source/forest/glsl/windDeformationGLSL.h b/Engine/source/forest/glsl/windDeformationGLSL.h
index cce0fe51c..5fe6b4a75 100644
--- a/Engine/source/forest/glsl/windDeformationGLSL.h
+++ b/Engine/source/forest/glsl/windDeformationGLSL.h
@@ -43,22 +43,22 @@ public:
 
    WindDeformationGLSL();
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Wind Effect";
    }
 
-   virtual void determineFeature(   Material *material,
+   void determineFeature(   Material *material,
                                     const GFXVertexFormat *vertexFormat,
                                     U32 stageNum,
                                     const FeatureType &type,
                                     const FeatureSet &features,
-                                    MaterialFeatureData *outFeatureData );
+                                    MaterialFeatureData *outFeatureData ) override;
 
-   virtual ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject );
+   ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ) override;
 };
 
 DeclareFeatureType( MFT_WindEffect );
diff --git a/Engine/source/forest/hlsl/windDeformationHLSL.h b/Engine/source/forest/hlsl/windDeformationHLSL.h
index 8c2c182d8..99aa49fe0 100644
--- a/Engine/source/forest/hlsl/windDeformationHLSL.h
+++ b/Engine/source/forest/hlsl/windDeformationHLSL.h
@@ -43,22 +43,22 @@ public:
 
    WindDeformationHLSL();
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Wind Effect";
    }
 
-   virtual void determineFeature(   Material *material,
+   void determineFeature(   Material *material,
                                     const GFXVertexFormat *vertexFormat,
                                     U32 stageNum,
                                     const FeatureType &type,
                                     const FeatureSet &features,
-                                    MaterialFeatureData *outFeatureData );
+                                    MaterialFeatureData *outFeatureData ) override;
 
-   virtual ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject );
+   ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ) override;
 };
 
 DeclareFeatureType( MFT_WindEffect );
diff --git a/Engine/source/forest/ts/tsForestCellBatch.h b/Engine/source/forest/ts/tsForestCellBatch.h
index a2911addc..2283bd439 100644
--- a/Engine/source/forest/ts/tsForestCellBatch.h
+++ b/Engine/source/forest/ts/tsForestCellBatch.h
@@ -52,9 +52,9 @@ protected:
    TSLastDetail *mDetail;
 
    // ForestCellBatch
-   virtual bool _prepBatch( const ForestItem &item );
-   virtual void _rebuildBatch();
-   virtual void _render( const SceneRenderState *state );
+   bool _prepBatch( const ForestItem &item ) override;
+   void _rebuildBatch() override;
+   void _render( const SceneRenderState *state ) override;
 
 public:
    
diff --git a/Engine/source/forest/ts/tsForestItemData.h b/Engine/source/forest/ts/tsForestItemData.h
index a46c51684..46b4c33c7 100644
--- a/Engine/source/forest/ts/tsForestItemData.h
+++ b/Engine/source/forest/ts/tsForestItemData.h
@@ -63,7 +63,7 @@ protected:
    void _updateCollisionDetails();
 
    // ForestItemData
-   void _preload() { _loadShape(); }
+   void _preload() override { _loadShape(); }
 
 public:
   
@@ -71,11 +71,11 @@ public:
    TSForestItemData();
    virtual ~TSForestItemData();
    
-   bool preload( bool server, String &errorBuffer );   
-   void onRemove();
-   bool onAdd();
+   bool preload( bool server, String &errorBuffer ) override;   
+   void onRemove() override;
+   bool onAdd() override;
 
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    TSLastDetail* getLastDetail() const;
 
@@ -86,10 +86,10 @@ public:
    const Vector<S32>& getLOSDetails() const { return mLOSDetails; }
 
    // ForestItemData
-   const Box3F& getObjBox() const { return mShape ? mShape->mBounds : Box3F::Zero; }
-   bool render( TSRenderState *rdata, const ForestItem& item ) const;
-   ForestCellBatch* allocateBatch() const;
-   bool canBillboard( const SceneRenderState *state, const ForestItem &item, F32 distToCamera ) const;
+   const Box3F& getObjBox() const override { return mShape ? mShape->mBounds : Box3F::Zero; }
+   bool render( TSRenderState *rdata, const ForestItem& item ) const override;
+   ForestCellBatch* allocateBatch() const override;
+   bool canBillboard( const SceneRenderState *state, const ForestItem &item, F32 distToCamera ) const override;
    bool buildPolyList( const ForestItem& item, AbstractPolyList *polyList, const Box3F *box ) const { return false; }
 };
 
diff --git a/Engine/source/forest/windDeformation.h b/Engine/source/forest/windDeformation.h
index 46c2f7b8f..8ec644634 100644
--- a/Engine/source/forest/windDeformation.h
+++ b/Engine/source/forest/windDeformation.h
@@ -40,10 +40,10 @@ public:
    GFXShaderConstHandle *mWindParams;
 
    // ShaderFeatureConstHandles
-   virtual void init( GFXShader *shader );
-   virtual void setConsts( SceneRenderState *state, 
+   void init( GFXShader *shader ) override;
+   void setConsts( SceneRenderState *state, 
                            const SceneData &sgData,
-                           GFXShaderConstBuffer *buffer );
+                           GFXShaderConstBuffer *buffer ) override;
 };
 
 
diff --git a/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h b/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h
index c26432928..06b6e90dd 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h
@@ -33,14 +33,14 @@ private:
 public:
    GFXD3D11CardProfiler();
    ~GFXD3D11CardProfiler();
-   void init();
+   void init() override;
 
 protected:
-   const String &getRendererString() const { static String sRS("Direct3D11"); return sRS; }
+   const String &getRendererString() const override { static String sRS("Direct3D11"); return sRS; }
 
-   void setupCardCapabilities();
-   bool _queryCardCap(const String &query, U32 &foundResult);
-   bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips);
+   void setupCardCapabilities() override;
+   bool _queryCardCap(const String &query, U32 &foundResult) override;
+   bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips) override;
 };
 
 #endif
diff --git a/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h b/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h
index 02cc91627..f8621b485 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11Cubemap.h
@@ -34,21 +34,21 @@ const U32 MaxMipMaps = 13; //todo this needs a proper static value somewhere to
 class GFXD3D11Cubemap : public GFXCubemap
 {
 public:
-   virtual void initStatic( GFXTexHandle *faces );
-   virtual void initStatic( DDSFile *dds );
-   virtual void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0);
-   virtual void setToTexUnit( U32 tuNum );
-   virtual U32 getSize() const { return mTexSize; }
-   virtual GFXFormat getFormat() const { return mFaceFormat; }
+   void initStatic( GFXTexHandle *faces ) override;
+   void initStatic( DDSFile *dds ) override;
+   void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0) override;
+   void setToTexUnit( U32 tuNum ) override;
+   U32 getSize() const override { return mTexSize; }
+   GFXFormat getFormat() const override { return mFaceFormat; }
 
    GFXD3D11Cubemap();
    virtual ~GFXD3D11Cubemap();
 
    // GFXResource interface
-   virtual void zombify();
-   virtual void resurrect();
+   void zombify() override;
+   void resurrect() override;
 
-   virtual bool isInitialized() { return mTexture ? true : false; }
+   bool isInitialized() override { return mTexture ? true : false; }
 
    // Get functions
    ID3D11ShaderResourceView* getSRView();
@@ -83,18 +83,18 @@ class GFXD3D11CubemapArray : public GFXCubemapArray
 public:
    GFXD3D11CubemapArray();
    virtual ~GFXD3D11CubemapArray();
-   virtual void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount);
-   virtual void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format);
-   virtual void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot);
-   virtual void copyTo(GFXCubemapArray *pDstCubemap);
-   virtual void setToTexUnit(U32 tuNum);
+   void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount) override;
+   void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format) override;
+   void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot) override;
+   void copyTo(GFXCubemapArray *pDstCubemap) override;
+   void setToTexUnit(U32 tuNum) override;
 
    ID3D11ShaderResourceView* getSRView() { return mSRView; }
    ID3D11Texture2D* get2DTex() { return mTexture; }
 
    // GFXResource interface
-   virtual void zombify();
-   virtual void resurrect();
+   void zombify() override;
+   void resurrect() override;
 
 private:
    friend class GFXD3D11TextureTarget;
diff --git a/Engine/source/gfx/D3D11/gfxD3D11Device.h b/Engine/source/gfx/D3D11/gfxD3D11Device.h
index 41b3415e9..05f4deda3 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11Device.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11Device.h
@@ -63,17 +63,17 @@ private:
 	friend class OculusVRHMDDevice;
 	friend class D3D11OculusTexture;
 
-   virtual GFXFormat selectSupportedFormat(GFXTextureProfile *profile,
-   const Vector<GFXFormat> &formats, bool texture, bool mustblend, bool mustfilter);
+   GFXFormat selectSupportedFormat(GFXTextureProfile *profile,
+   const Vector<GFXFormat> &formats, bool texture, bool mustblend, bool mustfilter) override;
 
-   virtual void enumerateVideoModes();
+   void enumerateVideoModes() override;
 
-   virtual GFXWindowTarget *allocWindowTarget(PlatformWindow *window);
-   virtual GFXTextureTarget *allocRenderToTextureTarget(bool genMips = true);
+   GFXWindowTarget *allocWindowTarget(PlatformWindow *window) override;
+   GFXTextureTarget *allocRenderToTextureTarget(bool genMips = true) override;
 
-   virtual void enterDebugEvent(ColorI color, const char *name);
-   virtual void leaveDebugEvent();
-   virtual void setDebugMarker(ColorI color, const char *name);
+   void enterDebugEvent(ColorI color, const char *name) override;
+   void leaveDebugEvent() override;
+   void setDebugMarker(ColorI color, const char *name) override;
 
 protected:
 
@@ -89,7 +89,7 @@ protected:
       ID3D11InputLayout *decl;
    };
 
-   virtual void initStates() { };
+   void initStates() override { };
 
    static GFXAdapter::CreateDeviceInstanceDelegate mCreateDeviceInstance;
 
@@ -167,33 +167,33 @@ protected:
    // {
 
    ///
-   virtual void setTextureInternal(U32 textureUnit, const GFXTextureObject* texture);
+   void setTextureInternal(U32 textureUnit, const GFXTextureObject* texture) override;
 
    /// Called by GFXDevice to create a device specific stateblock
-   virtual GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc);
+   GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc) override;
    /// Called by GFXDevice to actually set a stateblock.
-   virtual void setStateBlockInternal(GFXStateBlock* block, bool force);
+   void setStateBlockInternal(GFXStateBlock* block, bool force) override;
 
    /// Track the last const buffer we've used.  Used to notify new constant buffers that
    /// they should send all of their constants up
    StrongRefPtr<GFXD3D11ShaderConstBuffer> mCurrentConstBuffer;
    /// Called by base GFXDevice to actually set a const buffer
-   virtual void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer);
+   void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer) override;
 
    // }
 
    // Index buffer management
    // {
    virtual void _setPrimitiveBuffer( GFXPrimitiveBuffer *buffer );
-   virtual void drawIndexedPrimitive(  GFXPrimitiveType primType,
+   void drawIndexedPrimitive(  GFXPrimitiveType primType,
                                        U32 startVertex,
                                        U32 minIndex,
                                        U32 numVerts,
                                        U32 startIndex,
-                                       U32 primitiveCount );
+                                       U32 primitiveCount ) override;
    // }
 
-   virtual GFXShader* createShader();
+   GFXShader* createShader() override;
 
    /// Device helper function
    virtual DXGI_SWAP_CHAIN_DESC setupPresentParams( const GFXVideoMode &mode, const HWND &hwnd );
@@ -220,41 +220,41 @@ public:
 
    // Activate/deactivate
    // {
-   virtual void init( const GFXVideoMode &mode, PlatformWindow *window = NULL );
+   void init( const GFXVideoMode &mode, PlatformWindow *window = NULL ) override;
 
-   virtual void preDestroy() { GFXDevice::preDestroy(); if(mTextureManager) mTextureManager->kill(); }
+   void preDestroy() override { GFXDevice::preDestroy(); if(mTextureManager) mTextureManager->kill(); }
 
-   GFXAdapterType getAdapterType(){ return Direct3D11; }
+   GFXAdapterType getAdapterType() override{ return Direct3D11; }
 
    U32 getAdaterIndex() const { return mAdapterIndex; }
 
-   virtual GFXCubemap *createCubemap();
-   virtual GFXCubemapArray *createCubemapArray();
-   virtual GFXTextureArray* createTextureArray();
+   GFXCubemap *createCubemap() override;
+   GFXCubemapArray *createCubemapArray() override;
+   GFXTextureArray* createTextureArray() override;
 
-   virtual F32  getPixelShaderVersion() const { return mPixVersion; }
-   virtual void setPixelShaderVersion( F32 version ){ mPixVersion = version;}
+   F32  getPixelShaderVersion() const override { return mPixVersion; }
+   void setPixelShaderVersion( F32 version ) override{ mPixVersion = version;}
 
-   virtual void setShader(GFXShader *shader, bool force = false);
-   virtual U32  getNumSamplers() const { return 16; }
-   virtual U32  getNumRenderTargets() const { return 8; }
+   void setShader(GFXShader *shader, bool force = false) override;
+   U32  getNumSamplers() const override { return 16; }
+   U32  getNumRenderTargets() const override { return 8; }
    // }
 
    // Copy methods
    // {
-   virtual void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face);
+   void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face) override;
    // }
 
    // Misc rendering control
    // {
-   virtual void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil );
-   virtual void clearColorAttachment(const U32 attachment, const LinearColorF& color);
+   void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ) override;
+   void clearColorAttachment(const U32 attachment, const LinearColorF& color) override;
 
-   virtual bool beginSceneInternal();
-   virtual void endSceneInternal();
+   bool beginSceneInternal() override;
+   void endSceneInternal() override;
 
-   virtual void setClipRect( const RectI &rect );
-   virtual const RectI& getClipRect() const { return mClipRect; }
+   void setClipRect( const RectI &rect ) override;
+   const RectI& getClipRect() const override { return mClipRect; }
 
    // }
 
@@ -262,37 +262,37 @@ public:
 
    /// @name Render Targets
    /// @{
-   virtual void _updateRenderTargets();
+   void _updateRenderTargets() override;
    /// @}
 
    // Vertex/Index buffer management
    // {
-   virtual GFXVertexBuffer* allocVertexBuffer(  U32 numVerts,
+   GFXVertexBuffer* allocVertexBuffer(  U32 numVerts,
                                                 const GFXVertexFormat *vertexFormat,
                                                 U32 vertSize,
                                                 GFXBufferType bufferType,
-                                                void* data = NULL);
+                                                void* data = NULL) override;
 
-   virtual GFXPrimitiveBuffer *allocPrimitiveBuffer(  U32 numIndices,
+   GFXPrimitiveBuffer *allocPrimitiveBuffer(  U32 numIndices,
                                                       U32 numPrimitives,
                                                       GFXBufferType bufferType,
-                                                      void* data = NULL);
+                                                      void* data = NULL) override;
 
-   virtual GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat );
-   virtual void setVertexDecl( const GFXVertexDecl *decl );
+   GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ) override;
+   void setVertexDecl( const GFXVertexDecl *decl ) override;
 
-   virtual void setVertexStream( U32 stream, GFXVertexBuffer *buffer );
-   virtual void setVertexStreamFrequency( U32 stream, U32 frequency );
+   void setVertexStream( U32 stream, GFXVertexBuffer *buffer ) override;
+   void setVertexStreamFrequency( U32 stream, U32 frequency ) override;
    // }
 
-   virtual U32 getMaxDynamicVerts() { return GFX_MAX_DYNAMIC_VERTS; }
-   virtual U32 getMaxDynamicIndices() { return GFX_MAX_DYNAMIC_INDICES; }
+   U32 getMaxDynamicVerts() override { return GFX_MAX_DYNAMIC_VERTS; }
+   U32 getMaxDynamicIndices() override { return GFX_MAX_DYNAMIC_INDICES; }
 
    inline U32 primCountToIndexCount(GFXPrimitiveType primType, U32 primitiveCount);
 
    // Rendering
    // {
-   virtual void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount );
+   void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ) override;
    // }
 
    ID3D11DeviceContext* getDeviceContext(){ return mD3DDeviceContext; }
@@ -304,14 +304,14 @@ public:
    void beginReset();
    void endReset(GFXD3D11WindowTarget* windowTarget);
 
-   virtual void setupGenericShaders( GenericShaderType type  = GSColor );
+   void setupGenericShaders( GenericShaderType type  = GSColor ) override;
 
-   inline virtual F32 getFillConventionOffset() const { return 0.0f; }
-   virtual void doParanoidStateCheck() {};
+   inline F32 getFillConventionOffset() const override { return 0.0f; }
+   void doParanoidStateCheck() override {};
 
-   GFXFence *createFence();
+   GFXFence *createFence() override;
 
-   GFXOcclusionQuery* createOcclusionQuery();
+   GFXOcclusionQuery* createOcclusionQuery() override;
 
    // Default multisample parameters
    DXGI_SAMPLE_DESC getMultisampleType() const { return mMultisampleDesc; }
@@ -327,7 +327,7 @@ public:
    // grab the sampler map
    const SamplerMap &getSamplersMap() const { return mSamplersMap; }
    SamplerMap &getSamplersMap(){ return mSamplersMap; }
-   const char* interpretDebugResult(long result);
+   const char* interpretDebugResult(long result) override;
 
    // grab device buffer.
    ID3D11Buffer* getDeviceBuffer(const GFXShaderConstDesc desc);
diff --git a/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h b/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h
index 52a722c2f..71e7f0ac3 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11OcclusionQuery.h
@@ -45,14 +45,14 @@ public:
    GFXD3D11OcclusionQuery(GFXDevice *device);
    virtual ~GFXD3D11OcclusionQuery();
 
-   virtual bool begin();
-   virtual void end();   
-   virtual OcclusionQueryStatus getStatus(bool block, U32 *data = NULL);
+   bool begin() override;
+   void end() override;   
+   OcclusionQueryStatus getStatus(bool block, U32 *data = NULL) override;
 
    // GFXResource
-   virtual void zombify();   
-   virtual void resurrect();
-   virtual const String describeSelf() const;
+   void zombify() override;   
+   void resurrect() override;
+   const String describeSelf() const override;
 };
 
 #endif
\ No newline at end of file
diff --git a/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h b/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h
index 948176af6..3226c1fd1 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11PrimitiveBuffer.h
@@ -51,14 +51,14 @@ public:
 
    virtual ~GFXD3D11PrimitiveBuffer();
 
-   virtual void lock(U32 indexStart, U32 indexEnd, void **indexPtr);
-   virtual void unlock();
+   void lock(U32 indexStart, U32 indexEnd, void **indexPtr) override;
+   void unlock() override;
 
-   virtual void prepare();      
+   void prepare() override;      
 
    // GFXResource interface
-   virtual void zombify();
-   virtual void resurrect();
+   void zombify() override;
+   void resurrect() override;
 };
 
 inline GFXD3D11PrimitiveBuffer::GFXD3D11PrimitiveBuffer(   GFXDevice *device, 
diff --git a/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h b/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h
index 5113651c9..30231c795 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11QueryFence.h
@@ -36,14 +36,14 @@ public:
    GFXD3D11QueryFence( GFXDevice *device ) : GFXFence( device ), mQuery( NULL ) {};
    virtual ~GFXD3D11QueryFence();
 
-   virtual void issue();
-   virtual FenceStatus getStatus() const;
-   virtual void block();
+   void issue() override;
+   FenceStatus getStatus() const override;
+   void block() override;
 
    // GFXResource interface
-   virtual void zombify();
-   virtual void resurrect();
-   virtual const String describeSelf() const;
+   void zombify() override;
+   void resurrect() override;
+   const String describeSelf() const override;
 };
 
 #endif
\ No newline at end of file
diff --git a/Engine/source/gfx/D3D11/gfxD3D11Shader.h b/Engine/source/gfx/D3D11/gfxD3D11Shader.h
index 80bb55b5e..5e8b367fd 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11Shader.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11Shader.h
@@ -69,15 +69,15 @@ public:
    virtual ~GFXD3D11ShaderConstHandle();
    void addDesc(GFXShaderStage stage, const GFXShaderConstDesc& desc);
    const GFXShaderConstDesc getDesc(GFXShaderStage stage);
-   const String& getName() const { return mDesc.name; }
-   GFXShaderConstType getType() const { return mDesc.constType; }
-   U32 getArraySize() const { return mDesc.arraySize; }
+   const String& getName() const override { return mDesc.name; }
+   GFXShaderConstType getType() const override { return mDesc.constType; }
+   U32 getArraySize() const override { return mDesc.arraySize; }
 
    U32 getSize() const { return mDesc.size; }
    void setValid(bool valid) { mValid = valid; }
    /// @warning This will always return the value assigned when the shader was
    /// initialized.  If the value is later changed this method won't reflect that.
-   S32 getSamplerRegister() const { return (!isSampler() || !mValid) ? -1 : mDesc.samplerReg; }
+   S32 getSamplerRegister() const override { return (!isSampler() || !mValid) ? -1 : mDesc.samplerReg; }
 
    // Returns true if this is a handle to a sampler register.
    bool isSampler() const
@@ -124,32 +124,32 @@ public:
    void onShaderReload(GFXD3D11Shader *shader);
 
    // GFXShaderConstBuffer
-   virtual GFXShader* getShader();
-   virtual void set(GFXShaderConstHandle* handle, const F32 fv);
-   virtual void set(GFXShaderConstHandle* handle, const Point2F& fv);
-   virtual void set(GFXShaderConstHandle* handle, const Point3F& fv);
-   virtual void set(GFXShaderConstHandle* handle, const Point4F& fv);
-   virtual void set(GFXShaderConstHandle* handle, const PlaneF& fv);
-   virtual void set(GFXShaderConstHandle* handle, const LinearColorF& fv);
-   virtual void set(GFXShaderConstHandle* handle, const S32 f);
-   virtual void set(GFXShaderConstHandle* handle, const Point2I& fv);
-   virtual void set(GFXShaderConstHandle* handle, const Point3I& fv);
-   virtual void set(GFXShaderConstHandle* handle, const Point4I& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<F32>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point2F>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point3F>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point4F>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<S32>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point2I>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point3I>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point4I>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const MatrixF& mat, const GFXShaderConstType matType = GFXSCT_Float4x4);
-   virtual void set(GFXShaderConstHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4);
+   GFXShader* getShader() override;
+   void set(GFXShaderConstHandle* handle, const F32 fv) override;
+   void set(GFXShaderConstHandle* handle, const Point2F& fv) override;
+   void set(GFXShaderConstHandle* handle, const Point3F& fv) override;
+   void set(GFXShaderConstHandle* handle, const Point4F& fv) override;
+   void set(GFXShaderConstHandle* handle, const PlaneF& fv) override;
+   void set(GFXShaderConstHandle* handle, const LinearColorF& fv) override;
+   void set(GFXShaderConstHandle* handle, const S32 f) override;
+   void set(GFXShaderConstHandle* handle, const Point2I& fv) override;
+   void set(GFXShaderConstHandle* handle, const Point3I& fv) override;
+   void set(GFXShaderConstHandle* handle, const Point4I& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<F32>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point2F>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point3F>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point4F>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<S32>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point2I>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point3I>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point4I>& fv) override;
+   void set(GFXShaderConstHandle* handle, const MatrixF& mat, const GFXShaderConstType matType = GFXSCT_Float4x4) override;
+   void set(GFXShaderConstHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override;
 
    // GFXResource
-   virtual const String describeSelf() const;
-   virtual void zombify() {}
-   virtual void resurrect() {}
+   const String describeSelf() const override;
+   void zombify() override {}
+   void resurrect() override {}
 
 protected:
    friend class GFXD3D11Shader;
@@ -182,19 +182,19 @@ public:
    virtual ~GFXD3D11Shader();
 
    // GFXShader
-   virtual GFXShaderConstBufferRef allocConstBuffer();
-   virtual const Vector<GFXShaderConstDesc>& getShaderConstDesc() const;
-   virtual GFXShaderConstHandle* getShaderConstHandle(const String& name);
-   virtual GFXShaderConstHandle* findShaderConstHandle(const String& name);
-   virtual U32 getAlignmentValue(const GFXShaderConstType constType) const;
+   GFXShaderConstBufferRef allocConstBuffer() override;
+   const Vector<GFXShaderConstDesc>& getShaderConstDesc() const override;
+   GFXShaderConstHandle* getShaderConstHandle(const String& name) override;
+   GFXShaderConstHandle* findShaderConstHandle(const String& name) override;
+   U32 getAlignmentValue(const GFXShaderConstType constType) const override;
 
    // GFXResource
-   virtual void zombify();
-   virtual void resurrect();
+   void zombify() override;
+   void resurrect() override;
 
 protected:
 
-   virtual bool _init();
+   bool _init() override;
 
    ID3D11VertexShader *mVertShader;
    ID3D11PixelShader *mPixShader;
diff --git a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h
index e2205b036..496bb8ec9 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h
@@ -47,17 +47,17 @@ public:
    //
 
    /// Returns the hash value of the desc that created this block
-   virtual U32 getHashValue() const;
+   U32 getHashValue() const override;
 
    /// Returns a GFXStateBlockDesc that this block represents
-   virtual const GFXStateBlockDesc& getDesc() const;
+   const GFXStateBlockDesc& getDesc() const override;
 
    //
    // GFXResource
    //
-   virtual void zombify() { }
+   void zombify() override { }
    /// When called the resource should restore all device sensitive information destroyed by zombify()
-   virtual void resurrect() { }
+   void resurrect() override { }
 private:
 
    D3D11_BLEND_DESC mBlendDesc;
diff --git a/Engine/source/gfx/D3D11/gfxD3D11Target.h b/Engine/source/gfx/D3D11/gfxD3D11Target.h
index d77ab42fb..1173a4ee4 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11Target.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11Target.h
@@ -55,20 +55,20 @@ public:
    ~GFXD3D11TextureTarget();
 
    // Public interface.
-   virtual const Point2I getSize() { return mTargetSize; }
-   virtual GFXFormat getFormat() { return mTargetFormat; }
-   virtual void attachTexture(RenderSlot slot, GFXTextureObject *tex, U32 mipLevel=0, U32 zOffset = 0);
-   virtual void attachTexture(RenderSlot slot, GFXCubemap *tex, U32 face, U32 mipLevel=0);
-   virtual void resolve();
+   const Point2I getSize() override { return mTargetSize; }
+   GFXFormat getFormat() override { return mTargetFormat; }
+   void attachTexture(RenderSlot slot, GFXTextureObject *tex, U32 mipLevel=0, U32 zOffset = 0) override;
+   void attachTexture(RenderSlot slot, GFXCubemap *tex, U32 face, U32 mipLevel=0) override;
+   void resolve() override;
 
    /// Note we always copy the Color0 RenderSlot.
-   virtual void resolveTo( GFXTextureObject *tex );
+   void resolveTo( GFXTextureObject *tex ) override;
 
-   virtual void activate();
-   virtual void deactivate();
+   void activate() override;
+   void deactivate() override;
 
-   void zombify();
-   void resurrect();
+   void zombify() override;
+   void resurrect() override;
 };
 
 class GFXD3D11WindowTarget : public GFXWindowTarget
@@ -87,7 +87,7 @@ class GFXD3D11WindowTarget : public GFXWindowTarget
    /// D3D presentation info.
    DXGI_SWAP_CHAIN_DESC mPresentationParams;
    /// Internal interface that notifies us we need to reset our video mode.
-   void resetMode();
+   void resetMode() override;
 
    /// Is this a secondary window
    bool mSecondaryWindow;
@@ -97,21 +97,21 @@ public:
    GFXD3D11WindowTarget();
    ~GFXD3D11WindowTarget();
  
-   virtual const Point2I getSize();
-   virtual GFXFormat getFormat();
-   virtual bool present();
+   const Point2I getSize() override;
+   GFXFormat getFormat() override;
+   bool present() override;
 
    void initPresentationParams();
    void createSwapChain();
    void createBuffersAndViews();
    void setBackBuffer();
 
-   virtual void activate();   
+   void activate() override;   
 
-   void zombify();
-   void resurrect();
+   void zombify() override;
+   void resurrect() override;
 
-   virtual void resolveTo( GFXTextureObject *tex );
+   void resolveTo( GFXTextureObject *tex ) override;
 
    // These are all reference counted and must be released by whomever uses the get* function
    IDXGISwapChain* getSwapChain();
diff --git a/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h b/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h
index be7851d75..1626c39b7 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11TextureArray.h
@@ -22,7 +22,7 @@ public:
 
    ~GFXD3D11TextureArray() { Release();  };
 
-   void init();
+   void init() override;
    void setToTexUnit(U32 tuNum) override;
 
    void createResourceView(DXGI_FORMAT format, U32 numMipLevels, U32 usageFlags);
diff --git a/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h b/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h
index 9698f4a6e..b035bd6b7 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11TextureManager.h
@@ -45,13 +45,13 @@ protected:
                                              U32 numMipLevels,
                                              bool forceMips = false,
                                              S32 antialiasLevel = 0,
-                                             GFXTextureObject *inTex = NULL );
+                                             GFXTextureObject *inTex = NULL ) override;
    
-   bool _loadTexture(GFXTextureObject *texture, DDSFile *dds);
-   bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp);
-   bool _loadTexture(GFXTextureObject *texture, void *raw);
-   bool _refreshTexture(GFXTextureObject *texture);
-   bool _freeTexture(GFXTextureObject *texture, bool zombify = false);
+   bool _loadTexture(GFXTextureObject *texture, DDSFile *dds) override;
+   bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp) override;
+   bool _loadTexture(GFXTextureObject *texture, void *raw) override;
+   bool _refreshTexture(GFXTextureObject *texture) override;
+   bool _freeTexture(GFXTextureObject *texture, bool zombify = false) override;
    
 private:
    U32 mCurTexSet[GFX_TEXTURE_STAGE_COUNT];
diff --git a/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h b/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h
index 2152cc62a..a99cb7e58 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11TextureObject.h
@@ -70,19 +70,19 @@ public:
 
    bool isManaged; //setting to true tells this texture not to be released from being zombify
 
-   virtual GFXLockedRect * lock(U32 mipLevel = 0, RectI *inRect = NULL);
-   virtual void unlock(U32 mipLevel = 0 );
+   GFXLockedRect * lock(U32 mipLevel = 0, RectI *inRect = NULL) override;
+   void unlock(U32 mipLevel = 0 ) override;
 
-   virtual bool			copyToBmp(GBitmap* bmp);
+   bool			copyToBmp(GBitmap* bmp) override;
    ID3D11Texture2D*		getSurface() {return mD3DSurface;}
    ID3D11Texture2D**	getSurfacePtr() {return &mD3DSurface;}
 
    // GFXResource
-   void zombify();
-   void resurrect();
+   void zombify() override;
+   void resurrect() override;
 
 #ifdef TORQUE_DEBUG
-   virtual void pureVirtualCrash() {};
+   void pureVirtualCrash() override {};
 #endif
 };
 
diff --git a/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h b/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h
index 9e961cc87..b677171d6 100644
--- a/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h
+++ b/Engine/source/gfx/D3D11/gfxD3D11VertexBuffer.h
@@ -49,13 +49,13 @@ public:
                         GFXBufferType bufferType );
    virtual ~GFXD3D11VertexBuffer();
 
-   void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr);
-   void unlock();
-   void prepare() {}
+   void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr) override;
+   void unlock() override;
+   void prepare() override {}
 
    // GFXResource interface
-   virtual void zombify();
-   virtual void resurrect();
+   void zombify() override;
+   void resurrect() override;
 };
 
 //-----------------------------------------------------------------------------
diff --git a/Engine/source/gfx/D3D11/screenshotD3D11.h b/Engine/source/gfx/D3D11/screenshotD3D11.h
index 1a3de23b7..ce890a473 100644
--- a/Engine/source/gfx/D3D11/screenshotD3D11.h
+++ b/Engine/source/gfx/D3D11/screenshotD3D11.h
@@ -31,7 +31,7 @@ class ScreenShotD3D11 : public ScreenShot
 {
 protected:
 
-   GBitmap* _captureBackBuffer();
+   GBitmap* _captureBackBuffer() override;
 
 };
 
diff --git a/Engine/source/gfx/Null/gfxNullDevice.cpp b/Engine/source/gfx/Null/gfxNullDevice.cpp
index ea5d8b05d..4731b58af 100644
--- a/Engine/source/gfx/Null/gfxNullDevice.cpp
+++ b/Engine/source/gfx/Null/gfxNullDevice.cpp
@@ -42,17 +42,17 @@ private:
 public:
 
    ///
-   virtual const String &getRendererString() const { static String sRS("GFX Null Device Renderer"); return sRS; }
+   const String &getRendererString() const override { static String sRS("GFX Null Device Renderer"); return sRS; }
 
 protected:
 
-   virtual void setupCardCapabilities() { };
+   void setupCardCapabilities() override { };
 
-   virtual bool _queryCardCap(const String &query, U32 &foundResult){ return false; }
-   virtual bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips) { inOutAutogenMips = false; return false; }
+   bool _queryCardCap(const String &query, U32 &foundResult) override{ return false; }
+   bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips) override { inOutAutogenMips = false; return false; }
    
 public:
-   virtual void init()
+   void init() override
    {
       mCardDescription = "GFX Null Device Card";
       mChipSet = "NULL Device";
@@ -68,14 +68,14 @@ public:
    GFXNullTextureObject(GFXDevice * aDevice, GFXTextureProfile *profile); 
    ~GFXNullTextureObject() { kill(); };
 
-   virtual void pureVirtualCrash() { };
+   void pureVirtualCrash() override { };
 
-   virtual GFXLockedRect * lock( U32 mipLevel = 0, RectI *inRect = NULL ) { return NULL; };
-   virtual void unlock( U32 mipLevel = 0) {};
-   virtual bool copyToBmp(GBitmap *) { return false; };
+   GFXLockedRect * lock( U32 mipLevel = 0, RectI *inRect = NULL ) override { return NULL; };
+   void unlock( U32 mipLevel = 0) override {};
+   bool copyToBmp(GBitmap *) override { return false; };
 
-   virtual void zombify() {}
-   virtual void resurrect() {}
+   void zombify() override {}
+   void resurrect() override {}
 };
 
 GFXNullTextureObject::GFXNullTextureObject(GFXDevice * aDevice, GFXTextureProfile *profile) :
@@ -88,13 +88,13 @@ GFXNullTextureObject::GFXNullTextureObject(GFXDevice * aDevice, GFXTextureProfil
 class GFXNullTextureManager : public GFXTextureManager
 {
 public:
-   GFXTextureObject* createTexture(GBitmap* bmp, const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) { return nullptr; } // _createNullTextureObject();}
-   GFXTextureObject* createTexture(DDSFile* dds, GFXTextureProfile* profile, bool deleteDDS) { return nullptr; }
-   GFXTextureObject* createTexture(const Torque::Path& path, GFXTextureProfile* profile) { return nullptr; }
-   GFXTextureObject* createTexture(U32 width, U32 height, void* pixels, GFXFormat format, GFXTextureProfile* profile) { return nullptr; }
-   GFXTextureObject* createTexture(U32 width, U32 height, U32 depth, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels = 1) { return nullptr; }
-   GFXTextureObject* createTexture(U32 width, U32 height, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels, S32 antialiasLevel) { return nullptr; }
-   GFXTextureObject* createCompositeTexture(GBitmap* bmp[4], U32 inputKey[4], const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) { return nullptr; }
+   GFXTextureObject* createTexture(GBitmap* bmp, const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) override { return nullptr; } // _createNullTextureObject();}
+   GFXTextureObject* createTexture(DDSFile* dds, GFXTextureProfile* profile, bool deleteDDS) override { return nullptr; }
+   GFXTextureObject* createTexture(const Torque::Path& path, GFXTextureProfile* profile) override { return nullptr; }
+   GFXTextureObject* createTexture(U32 width, U32 height, void* pixels, GFXFormat format, GFXTextureProfile* profile) override { return nullptr; }
+   GFXTextureObject* createTexture(U32 width, U32 height, U32 depth, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels = 1) override { return nullptr; }
+   GFXTextureObject* createTexture(U32 width, U32 height, GFXFormat format, GFXTextureProfile* profile, U32 numMipLevels, S32 antialiasLevel) override { return nullptr; }
+   GFXTextureObject* createCompositeTexture(GBitmap* bmp[4], U32 inputKey[4], const String& resourceName, GFXTextureProfile* profile, bool deleteBmp) override { return nullptr; }
 protected:
       GFXTextureObject *_createTextureObject( U32 height, 
                                                       U32 width, 
@@ -104,7 +104,7 @@ protected:
                                                       U32 numMipLevels, 
                                                       bool forceMips = false, 
                                                       S32 antialiasLevel = 0, 
-                                                      GFXTextureObject *inTex = NULL )
+                                                      GFXTextureObject *inTex = NULL ) override
       { 
          GFXNullTextureObject *retTex;
          if ( inTex )
@@ -124,26 +124,26 @@ protected:
       };
 
       /// Load a texture from a proper DDSFile instance.
-      virtual bool _loadTexture(GFXTextureObject *texture, DDSFile *dds){ return true; };
+      bool _loadTexture(GFXTextureObject *texture, DDSFile *dds) override{ return true; };
 
       /// Load data into a texture from a GBitmap using the internal API.
-      virtual bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp){ return true; };
+      bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp) override{ return true; };
 
       /// Load data into a texture from a raw buffer using the internal API.
       ///
       /// Note that the size of the buffer is assumed from the parameters used
       /// for this GFXTextureObject's _createTexture call.
-      virtual bool _loadTexture(GFXTextureObject *texture, void *raw){ return true; };
+      bool _loadTexture(GFXTextureObject *texture, void *raw) override{ return true; };
 
       /// Refresh a texture using the internal API.
-      virtual bool _refreshTexture(GFXTextureObject *texture){ return true; };
+      bool _refreshTexture(GFXTextureObject *texture) override{ return true; };
 
       /// Free a texture (but do not delete the GFXTextureObject) using the internal
       /// API.
       ///
       /// This is only called during zombification for textures which need it, so you
       /// don't need to do any internal safety checks.
-      virtual bool _freeTexture(GFXTextureObject *texture, bool zombify=false) { return true; };
+      bool _freeTexture(GFXTextureObject *texture, bool zombify=false) override { return true; };
 
       virtual U32 _getTotalVideoMemory() { return 0; };
       virtual U32 _getFreeVideoMemory() { return 0; };
@@ -154,19 +154,19 @@ class GFXNullCubemap : public GFXCubemap
    friend class GFXDevice;
 private:
    // should only be called by GFXDevice
-   virtual void setToTexUnit( U32 tuNum ) { };
+   void setToTexUnit( U32 tuNum ) override { };
 
 public:
-   virtual void initStatic( GFXTexHandle *faces ) { };
-   virtual void initStatic( DDSFile *dds ) { };
-   virtual void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0) { };
-   virtual U32 getSize() const { return 0; }
-   virtual GFXFormat getFormat() const { return GFXFormatR8G8B8A8; }
+   void initStatic( GFXTexHandle *faces ) override { };
+   void initStatic( DDSFile *dds ) override { };
+   void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0) override { };
+   U32 getSize() const override { return 0; }
+   GFXFormat getFormat() const override { return GFXFormatR8G8B8A8; }
 
    virtual ~GFXNullCubemap(){};
 
-   virtual void zombify() {}
-   virtual void resurrect() {}
+   void zombify() override {}
+   void resurrect() override {}
 };
 
 class GFXNullCubemapArray : public GFXCubemapArray
@@ -174,16 +174,16 @@ class GFXNullCubemapArray : public GFXCubemapArray
    friend class GFXDevice;
 private:
    // should only be called by GFXDevice
-   virtual void setToTexUnit(U32 tuNum) { };
+   void setToTexUnit(U32 tuNum) override { };
 
 public:
-   virtual void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount) { };
-   virtual void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format) { };
-   virtual void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot) { };
-   virtual void copyTo(GFXCubemapArray *pDstCubemap) { }
+   void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount) override { };
+   void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format) override { };
+   void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot) override { };
+   void copyTo(GFXCubemapArray *pDstCubemap) override { }
    virtual ~GFXNullCubemapArray() {};
-   virtual void zombify() {}
-   virtual void resurrect() {}
+   void zombify() override {}
+   void resurrect() override {}
 };
 
 class GFXNullTextureArray : public GFXTextureArray
@@ -209,12 +209,12 @@ public:
                         U32 vertexSize, 
                         GFXBufferType bufferType ) :
       GFXVertexBuffer(device, numVerts, vertexFormat, vertexSize, bufferType) {tempBuf =NULL;};
-   virtual void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr);
-   virtual void unlock();
-   virtual void prepare();
+   void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr) override;
+   void unlock() override;
+   void prepare() override;
 
-   virtual void zombify() {}
-   virtual void resurrect() {}
+   void zombify() override {}
+   void resurrect() override {}
 };
 
 void GFXNullVertexBuffer::lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr) 
@@ -246,12 +246,12 @@ public:
                            GFXBufferType bufferType ) :
       GFXPrimitiveBuffer(device, indexCount, primitiveCount, bufferType), temp( NULL ) {};
 
-   virtual void lock(U32 indexStart, U32 indexEnd, void **indexPtr); ///< locks this primitive buffer for writing into
-   virtual void unlock(); ///< unlocks this primitive buffer.
-   virtual void prepare() { };  ///< prepares this primitive buffer for use on the device it was allocated on
+   void lock(U32 indexStart, U32 indexEnd, void **indexPtr) override; ///< locks this primitive buffer for writing into
+   void unlock() override; ///< unlocks this primitive buffer.
+   void prepare() override { };  ///< prepares this primitive buffer for use on the device it was allocated on
 
-   virtual void zombify() {}
-   virtual void resurrect() {}
+   void zombify() override {}
+   void resurrect() override {}
 };
 
 void GFXNullPrimitiveBuffer::lock(U32 indexStart, U32 indexEnd, void **indexPtr)
@@ -273,17 +273,17 @@ class GFXNullStateBlock : public GFXStateBlock
 {
 public:
    /// Returns the hash value of the desc that created this block
-   virtual U32 getHashValue() const { return 0; };
+   U32 getHashValue() const override { return 0; };
 
    /// Returns a GFXStateBlockDesc that this block represents
-   virtual const GFXStateBlockDesc& getDesc() const { return mDefaultDesc; }
+   const GFXStateBlockDesc& getDesc() const override { return mDefaultDesc; }
 
    //
    // GFXResource
    //
-   virtual void zombify() { }
+   void zombify() override { }
    /// When called the resource should restore all device sensitive information destroyed by zombify()
-   virtual void resurrect() { }
+   void resurrect() override { }
 private:
    GFXStateBlockDesc mDefaultDesc;
 };
diff --git a/Engine/source/gfx/Null/gfxNullDevice.h b/Engine/source/gfx/Null/gfxNullDevice.h
index 320c3fee1..259fac5f2 100644
--- a/Engine/source/gfx/Null/gfxNullDevice.h
+++ b/Engine/source/gfx/Null/gfxNullDevice.h
@@ -34,26 +34,26 @@
 class GFXNullWindowTarget : public GFXWindowTarget
 {
 public:
-   virtual bool present()
+   bool present() override
    {
       return true;
    }
 
-   virtual const Point2I getSize()
+   const Point2I getSize() override
    {
       // Return something stupid.
       return Point2I(1,1);
    }
 
-   virtual GFXFormat getFormat() { return GFXFormatR8G8B8A8; }
+   GFXFormat getFormat() override { return GFXFormatR8G8B8A8; }
 
-   virtual void resetMode()
+   void resetMode() override
    {
 
    }
 
-   virtual void zombify() {};
-   virtual void resurrect() {};
+   void zombify() override {};
+   void resurrect() override {};
 
 };
 
@@ -67,21 +67,21 @@ public:
 
    static void enumerateAdapters( Vector<GFXAdapter*> &adapterList );
 
-   void init( const GFXVideoMode &mode, PlatformWindow *window = NULL );
+   void init( const GFXVideoMode &mode, PlatformWindow *window = NULL ) override;
 
    virtual void activate() { };
    virtual void deactivate() { };
-   virtual GFXAdapterType getAdapterType() { return NullDevice; };
+   GFXAdapterType getAdapterType() override { return NullDevice; };
 
    /// @name Debug Methods
    /// @{
-   virtual void enterDebugEvent(ColorI color, const char *name) { };
-   virtual void leaveDebugEvent() { };
-   virtual void setDebugMarker(ColorI color, const char *name) { };
+   void enterDebugEvent(ColorI color, const char *name) override { };
+   void leaveDebugEvent() override { };
+   void setDebugMarker(ColorI color, const char *name) override { };
    /// @}
 
    /// Enumerates the supported video modes of the device
-   virtual void enumerateVideoModes() { };
+   void enumerateVideoModes() override { };
 
    /// Sets the video mode for the device
    virtual void setVideoMode( const GFXVideoMode &mode ) { };
@@ -89,15 +89,15 @@ protected:
    static GFXAdapter::CreateDeviceInstanceDelegate mCreateDeviceInstance; 
 
    /// Called by GFXDevice to create a device specific stateblock
-   virtual GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc);
+   GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc) override;
    /// Called by GFXDevice to actually set a stateblock.
-   virtual void setStateBlockInternal(GFXStateBlock* block, bool force) { };
+   void setStateBlockInternal(GFXStateBlock* block, bool force) override { };
    /// @}
 
    /// Called by base GFXDevice to actually set a const buffer
-   virtual void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer) { };
+   void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer) override { };
 
-   virtual void setTextureInternal(U32 textureUnit, const GFXTextureObject*texture) { };
+   void setTextureInternal(U32 textureUnit, const GFXTextureObject*texture) override { };
 
 
    /// @name State Initalization.
@@ -105,77 +105,77 @@ protected:
 
    /// State initalization. This MUST BE CALLED in setVideoMode after the device
    /// is created.
-   virtual void initStates() { };
+   void initStates() override { };
 
-   virtual GFXVertexBuffer *allocVertexBuffer(  U32 numVerts, 
+   GFXVertexBuffer *allocVertexBuffer(  U32 numVerts, 
                                                 const GFXVertexFormat *vertexFormat, 
                                                 U32 vertSize, 
                                                 GFXBufferType bufferType,
-                                                void* data = NULL );
-   virtual GFXPrimitiveBuffer *allocPrimitiveBuffer(  U32 numIndices, 
+                                                void* data = NULL ) override;
+   GFXPrimitiveBuffer *allocPrimitiveBuffer(  U32 numIndices, 
                                                       U32 numPrimitives, 
                                                       GFXBufferType bufferType,
-                                                      void* data = NULL );
+                                                      void* data = NULL ) override;
 
-   virtual GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ) { return NULL; }
-   virtual void setVertexDecl( const GFXVertexDecl *decl ) {  }
-   virtual void setVertexStream( U32 stream, GFXVertexBuffer *buffer ) { }
-   virtual void setVertexStreamFrequency( U32 stream, U32 frequency ) { }
+   GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ) override { return NULL; }
+   void setVertexDecl( const GFXVertexDecl *decl ) override {  }
+   void setVertexStream( U32 stream, GFXVertexBuffer *buffer ) override { }
+   void setVertexStreamFrequency( U32 stream, U32 frequency ) override { }
 
 public:
-   virtual GFXCubemap * createCubemap();
-   virtual GFXCubemapArray *createCubemapArray();
-   virtual GFXTextureArray *createTextureArray();
+   GFXCubemap * createCubemap() override;
+   GFXCubemapArray *createCubemapArray() override;
+   GFXTextureArray *createTextureArray() override;
 
-   virtual F32 getFillConventionOffset() const { return 0.0f; };
+   F32 getFillConventionOffset() const override { return 0.0f; };
 
    ///@}
 
-   virtual GFXTextureTarget *allocRenderToTextureTarget(bool genMips=true){return NULL;};
-   virtual GFXWindowTarget *allocWindowTarget(PlatformWindow *window)
+   GFXTextureTarget *allocRenderToTextureTarget(bool genMips=true) override{return NULL;};
+   GFXWindowTarget *allocWindowTarget(PlatformWindow *window) override
    {
       return new GFXNullWindowTarget();
    };
 
-   virtual void _updateRenderTargets(){};
+   void _updateRenderTargets() override{};
 
-   virtual F32 getPixelShaderVersion() const { return 0.0f; };
-   virtual void setPixelShaderVersion( F32 version ) { };
-   virtual U32 getNumSamplers() const { return 0; };
-   virtual U32 getNumRenderTargets() const { return 0; };
+   F32 getPixelShaderVersion() const override { return 0.0f; };
+   void setPixelShaderVersion( F32 version ) override { };
+   U32 getNumSamplers() const override { return 0; };
+   U32 getNumRenderTargets() const override { return 0; };
 
-   virtual GFXShader* createShader() { return NULL; };
+   GFXShader* createShader() override { return NULL; };
 
-   virtual void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face) { };
-   virtual void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ) { };
-   virtual void clearColorAttachment(const U32 attachment, const LinearColorF& color) { };
-   virtual bool beginSceneInternal() { return true; };
-   virtual void endSceneInternal() { };
+   void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face) override { };
+   void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ) override { };
+   void clearColorAttachment(const U32 attachment, const LinearColorF& color) override { };
+   bool beginSceneInternal() override { return true; };
+   void endSceneInternal() override { };
 
-   virtual void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ) { };
-   virtual void drawIndexedPrimitive(  GFXPrimitiveType primType, 
+   void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ) override { };
+   void drawIndexedPrimitive(  GFXPrimitiveType primType, 
                                        U32 startVertex, 
                                        U32 minIndex, 
                                        U32 numVerts, 
                                        U32 startIndex, 
-                                       U32 primitiveCount ) { };
+                                       U32 primitiveCount ) override { };
 
-   virtual void setClipRect( const RectI &rect ) { };
-   virtual const RectI &getClipRect() const { return clip; };
+   void setClipRect( const RectI &rect ) override { };
+   const RectI &getClipRect() const override { return clip; };
 
-   virtual void preDestroy() { Parent::preDestroy(); };
+   void preDestroy() override { Parent::preDestroy(); };
 
-   virtual U32 getMaxDynamicVerts() { return 16384; };
-   virtual U32 getMaxDynamicIndices() { return 16384; };
+   U32 getMaxDynamicVerts() override { return 16384; };
+   U32 getMaxDynamicIndices() override { return 16384; };
 
-   virtual GFXFormat selectSupportedFormat(  GFXTextureProfile *profile, 
+   GFXFormat selectSupportedFormat(  GFXTextureProfile *profile, 
                                              const Vector<GFXFormat> &formats, 
                                              bool texture, 
                                              bool mustblend, 
-                                             bool mustfilter ) { return GFXFormatR8G8B8A8; };
+                                             bool mustfilter ) override { return GFXFormatR8G8B8A8; };
 
-   GFXFence *createFence() { return new GFXGeneralFence( this ); }
-   GFXOcclusionQuery* createOcclusionQuery() { return NULL; }
+   GFXFence *createFence() override { return new GFXGeneralFence( this ); }
+   GFXOcclusionQuery* createOcclusionQuery() override { return NULL; }
    
 private:
    typedef GFXDevice Parent;
diff --git a/Engine/source/gfx/bitmap/imageUtils.cpp b/Engine/source/gfx/bitmap/imageUtils.cpp
index ed8d108da..3426eecd3 100644
--- a/Engine/source/gfx/bitmap/imageUtils.cpp
+++ b/Engine/source/gfx/bitmap/imageUtils.cpp
@@ -78,7 +78,7 @@ namespace ImageUtil
          : pSrc(srcRGBA),pDst(dst), width(w), height(h), format(compressFormat),quality(compressQuality) {}
 
    protected:
-      virtual void execute()
+      void execute() override
       {
          rawCompress(pSrc,pDst, width, height, format,quality);
       }
diff --git a/Engine/source/gfx/gl/gfxGLAppleFence.h b/Engine/source/gfx/gl/gfxGLAppleFence.h
index 6968e7fc6..8d36ff1e1 100644
--- a/Engine/source/gfx/gl/gfxGLAppleFence.h
+++ b/Engine/source/gfx/gl/gfxGLAppleFence.h
@@ -33,14 +33,14 @@ public:
    virtual ~GFXGLAppleFence();
    
    // GFXFence interface
-   virtual void issue();
-   virtual FenceStatus getStatus() const;
-   virtual void block();
+   void issue() override;
+   FenceStatus getStatus() const override;
+   void block() override;
    
    // GFXResource interface
-   virtual void zombify();
-   virtual void resurrect();
-   virtual const String describeSelf() const;
+   void zombify() override;
+   void resurrect() override;
+   const String describeSelf() const override;
    
 private:
    GLuint mHandle;
diff --git a/Engine/source/gfx/gl/gfxGLCardProfiler.h b/Engine/source/gfx/gl/gfxGLCardProfiler.h
index 01d54d7ac..e32d26ecd 100644
--- a/Engine/source/gfx/gl/gfxGLCardProfiler.h
+++ b/Engine/source/gfx/gl/gfxGLCardProfiler.h
@@ -38,13 +38,13 @@
 class GFXGLCardProfiler : public GFXCardProfiler
 {
 public:
-   void init();
+   void init() override;
 
 protected:
-   virtual const String& getRendererString() const { return mRendererString; }
-   virtual void setupCardCapabilities();
-   virtual bool _queryCardCap(const String& query, U32& foundResult);
-   virtual bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips);
+   const String& getRendererString() const override { return mRendererString; }
+   void setupCardCapabilities() override;
+   bool _queryCardCap(const String& query, U32& foundResult) override;
+   bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips) override;
 
 private:
    String mRendererString;
diff --git a/Engine/source/gfx/gl/gfxGLCubemap.h b/Engine/source/gfx/gl/gfxGLCubemap.h
index eeab2e4a1..4e889f856 100644
--- a/Engine/source/gfx/gl/gfxGLCubemap.h
+++ b/Engine/source/gfx/gl/gfxGLCubemap.h
@@ -40,13 +40,13 @@ public:
    GFXGLCubemap();
    virtual ~GFXGLCubemap();
 
-   virtual void initStatic( GFXTexHandle *faces );
-   virtual void initStatic( DDSFile *dds );
-   virtual void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0);
-   virtual U32 getSize() const { return mWidth; }
-   virtual GFXFormat getFormat() const { return mFaceFormat; }
+   void initStatic( GFXTexHandle *faces ) override;
+   void initStatic( DDSFile *dds ) override;
+   void initDynamic( U32 texSize, GFXFormat faceFormat = GFXFormatR8G8B8A8, U32 mipLevels = 0) override;
+   U32 getSize() const override { return mWidth; }
+   GFXFormat getFormat() const override { return mFaceFormat; }
 
-   virtual bool isInitialized() { return mCubemap != 0 ? true : false; }
+   bool isInitialized() override { return mCubemap != 0 ? true : false; }
 
    // Convenience methods for GFXGLTextureTarget
    U32 getWidth() { return mWidth; }
@@ -54,8 +54,8 @@ public:
    U32 getHandle() { return mCubemap; }
    
    // GFXResource interface
-   virtual void zombify();
-   virtual void resurrect();
+   void zombify() override;
+   void resurrect() override;
    
    /// Called by texCB; this is to ensure that all textures have been resurrected before we attempt to res the cubemap.
    void tmResurrect();
@@ -90,7 +90,7 @@ protected:
    Resource<DDSFile> mDDSFile;
 
    // should only be called by GFXDevice
-   virtual void setToTexUnit( U32 tuNum ); ///< Binds the cubemap to the given texture unit
+   void setToTexUnit( U32 tuNum ) override; ///< Binds the cubemap to the given texture unit
    virtual void bind(U32 textureUnit) const; ///< Notifies our owning device that we want to be set to the given texture unit (used for GL internal state tracking)
    void fillCubeTextures(GFXTexHandle* faces); ///< Copies the textures in faces into the cubemap
    
@@ -102,15 +102,15 @@ public:
    GFXGLCubemapArray();
    virtual ~GFXGLCubemapArray();
    //virtual void initStatic(GFXCubemapHandle *cubemaps, const U32 cubemapCount);
-   virtual void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount);
-   virtual void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format);
-   virtual void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot);
-   virtual void copyTo(GFXCubemapArray *pDstCubemap);
-   virtual void setToTexUnit(U32 tuNum);
+   void init(GFXCubemapHandle *cubemaps, const U32 cubemapCount) override;
+   void init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format) override;
+   void updateTexture(const GFXCubemapHandle &cubemap, const U32 slot) override;
+   void copyTo(GFXCubemapArray *pDstCubemap) override;
+   void setToTexUnit(U32 tuNum) override;
 
    // GFXResource interface
-   virtual void zombify() {}
-   virtual void resurrect() {}
+   void zombify() override {}
+   void resurrect() override {}
 
 protected:
    friend class GFXGLDevice;
diff --git a/Engine/source/gfx/gl/gfxGLDevice.h b/Engine/source/gfx/gl/gfxGLDevice.h
index 981aff662..52f0a39e6 100644
--- a/Engine/source/gfx/gl/gfxGLDevice.h
+++ b/Engine/source/gfx/gl/gfxGLDevice.h
@@ -74,26 +74,26 @@ public:
    static void enumerateAdapters( Vector<GFXAdapter*> &adapterList );
    static GFXDevice *createInstance( U32 adapterIndex );
 
-   virtual void init( const GFXVideoMode &mode, PlatformWindow *window = NULL );
+   void init( const GFXVideoMode &mode, PlatformWindow *window = NULL ) override;
 
    virtual void activate() { }
    virtual void deactivate() { }
-   virtual GFXAdapterType getAdapterType() { return OpenGL; }
+   GFXAdapterType getAdapterType() override { return OpenGL; }
 
-   virtual void enterDebugEvent(ColorI color, const char *name);
-   virtual void leaveDebugEvent();
-   virtual void setDebugMarker(ColorI color, const char *name);
+   void enterDebugEvent(ColorI color, const char *name) override;
+   void leaveDebugEvent() override;
+   void setDebugMarker(ColorI color, const char *name) override;
 
-   virtual void enumerateVideoModes();
+   void enumerateVideoModes() override;
 
    virtual U32 getTotalVideoMemory_GL_EXT();
    virtual U32 getTotalVideoMemory();
 
-   virtual GFXCubemap * createCubemap();
-   virtual GFXCubemapArray *createCubemapArray();
-   virtual GFXTextureArray *createTextureArray();
+   GFXCubemap * createCubemap() override;
+   GFXCubemapArray *createCubemapArray() override;
+   GFXTextureArray *createTextureArray() override;
 
-   virtual F32 getFillConventionOffset() const { return 0.0f; }
+   F32 getFillConventionOffset() const override { return 0.0f; }
 
 
    ///@}
@@ -102,61 +102,61 @@ public:
    /// @{
 
    ///
-   virtual GFXTextureTarget *allocRenderToTextureTarget(bool genMips = true);
-   virtual GFXWindowTarget *allocWindowTarget(PlatformWindow *window);
-   virtual void _updateRenderTargets();
+   GFXTextureTarget *allocRenderToTextureTarget(bool genMips = true) override;
+   GFXWindowTarget *allocWindowTarget(PlatformWindow *window) override;
+   void _updateRenderTargets() override;
 
    ///@}
 
    /// @name Shader functions
    /// @{
-   virtual F32 getPixelShaderVersion() const { return mPixelShaderVersion; }
-   virtual void  setPixelShaderVersion( F32 version ) { mPixelShaderVersion = version; }
+   F32 getPixelShaderVersion() const override { return mPixelShaderVersion; }
+   void  setPixelShaderVersion( F32 version ) override { mPixelShaderVersion = version; }
 
-   virtual void setShader(GFXShader *shader, bool force = false);
+   void setShader(GFXShader *shader, bool force = false) override;
 
    /// @attention GL cannot check if the given format supports blending or filtering!
-   virtual GFXFormat selectSupportedFormat(GFXTextureProfile *profile,
-	   const Vector<GFXFormat> &formats, bool texture, bool mustblend, bool mustfilter);
+   GFXFormat selectSupportedFormat(GFXTextureProfile *profile,
+	   const Vector<GFXFormat> &formats, bool texture, bool mustblend, bool mustfilter) override;
 
    /// Returns the number of texture samplers that can be used in a shader rendering pass
-   virtual U32 getNumSamplers() const;
+   U32 getNumSamplers() const override;
 
    /// Returns the number of simultaneous render targets supported by the device.
-   virtual U32 getNumRenderTargets() const;
+   U32 getNumRenderTargets() const override;
 
-   virtual GFXShader* createShader();
+   GFXShader* createShader() override;
    //TODO: implement me!
-   virtual void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face);
-   virtual void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil );
-   virtual void clearColorAttachment(const U32 attachment, const LinearColorF& color);
-   virtual bool beginSceneInternal();
-   virtual void endSceneInternal();
+   void copyResource(GFXTextureObject *pDst, GFXCubemap *pSrc, const U32 face) override;
+   void clear( U32 flags, const LinearColorF& color, F32 z, U32 stencil ) override;
+   void clearColorAttachment(const U32 attachment, const LinearColorF& color) override;
+   bool beginSceneInternal() override;
+   void endSceneInternal() override;
 
-   virtual void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount );
+   void drawPrimitive( GFXPrimitiveType primType, U32 vertexStart, U32 primitiveCount ) override;
 
-   virtual void drawIndexedPrimitive(  GFXPrimitiveType primType,
+   void drawIndexedPrimitive(  GFXPrimitiveType primType,
                                        U32 startVertex,
                                        U32 minIndex,
                                        U32 numVerts,
                                        U32 startIndex,
-                                       U32 primitiveCount );
+                                       U32 primitiveCount ) override;
 
-   virtual void setClipRect( const RectI &rect );
-   virtual const RectI &getClipRect() const { return mClip; }
+   void setClipRect( const RectI &rect ) override;
+   const RectI &getClipRect() const override { return mClip; }
 
-   virtual void preDestroy() { Parent::preDestroy(); }
+   void preDestroy() override { Parent::preDestroy(); }
 
-   virtual U32 getMaxDynamicVerts() { return GFX_MAX_DYNAMIC_VERTS; }
-   virtual U32 getMaxDynamicIndices() { return GFX_MAX_DYNAMIC_INDICES; }
+   U32 getMaxDynamicVerts() override { return GFX_MAX_DYNAMIC_VERTS; }
+   U32 getMaxDynamicIndices() override { return GFX_MAX_DYNAMIC_INDICES; }
 
-   GFXFence *createFence();
+   GFXFence *createFence() override;
 
-   GFXOcclusionQuery* createOcclusionQuery();
+   GFXOcclusionQuery* createOcclusionQuery() override;
 
    GFXGLStateBlockRef getCurrentStateBlock() { return mCurrentGLStateBlock; }
 
-   virtual void setupGenericShaders( GenericShaderType type = GSColor );
+   void setupGenericShaders( GenericShaderType type = GSColor ) override;
 
    ///
    bool supportsAnisotropic() const { return mCapabilities.anisotropicFiltering; }
@@ -169,17 +169,17 @@ public:
    const U32 getNumVertexStreams() const { return mNumVertexStream; }
 
    bool glUseMap() const { return mUseGlMap; }
-   const char* interpretDebugResult(long result) { return "Not Implemented"; };
+   const char* interpretDebugResult(long result) override { return "Not Implemented"; };
 protected:
    /// Called by GFXDevice to create a device specific stateblock
-   virtual GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc);
+   GFXStateBlockRef createStateBlockInternal(const GFXStateBlockDesc& desc) override;
    /// Called by GFXDevice to actually set a stateblock.
-   virtual void setStateBlockInternal(GFXStateBlock* block, bool force);
+   void setStateBlockInternal(GFXStateBlock* block, bool force) override;
 
    /// Called by base GFXDevice to actually set a const buffer
-   virtual void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer);
+   void setShaderConstBufferInternal(GFXShaderConstBuffer* buffer) override;
 
-   virtual void setTextureInternal(U32 textureUnit, const GFXTextureObject*texture);
+   void setTextureInternal(U32 textureUnit, const GFXTextureObject*texture) override;
    virtual void setCubemapInternal(U32 textureUnit, const GFXGLCubemap* texture);
    virtual void setCubemapArrayInternal(U32 textureUnit, const GFXGLCubemapArray* texture);
    virtual void setTextureArrayInternal(U32 textureUnit, const GFXGLTextureArray* texture);
@@ -189,24 +189,24 @@ protected:
 
    /// State initalization. This MUST BE CALLED in setVideoMode after the device
    /// is created.
-   virtual void initStates() { }
+   void initStates() override { }
 
-   virtual GFXVertexBuffer *allocVertexBuffer(  U32 numVerts,
+   GFXVertexBuffer *allocVertexBuffer(  U32 numVerts,
                                                 const GFXVertexFormat *vertexFormat,
                                                 U32 vertSize,
                                                 GFXBufferType bufferType,
-                                                void* data = NULL);
-   virtual GFXPrimitiveBuffer *allocPrimitiveBuffer( U32 numIndices, U32 numPrimitives, GFXBufferType bufferType, void* data = NULL );
+                                                void* data = NULL) override;
+   GFXPrimitiveBuffer *allocPrimitiveBuffer( U32 numIndices, U32 numPrimitives, GFXBufferType bufferType, void* data = NULL ) override;
 
    // NOTE: The GL device doesn't need a vertex declaration at
    // this time, but we need to return something to keep the system
    // from retrying to allocate one on every call.
-   virtual GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat );
+   GFXVertexDecl* allocVertexDecl( const GFXVertexFormat *vertexFormat ) override;
 
-   virtual void setVertexDecl( const GFXVertexDecl *decl );
+   void setVertexDecl( const GFXVertexDecl *decl ) override;
 
-   virtual void setVertexStream( U32 stream, GFXVertexBuffer *buffer );
-   virtual void setVertexStreamFrequency( U32 stream, U32 frequency );
+   void setVertexStream( U32 stream, GFXVertexBuffer *buffer ) override;
+   void setVertexStreamFrequency( U32 stream, U32 frequency ) override;
    StrongRefPtr<GFXGLShaderConstBuffer> mCurrentConstBuffer;
    DeviceBufferMap mDeviceBufferMap;
 
diff --git a/Engine/source/gfx/gl/gfxGLOcclusionQuery.h b/Engine/source/gfx/gl/gfxGLOcclusionQuery.h
index efc290722..b603bdfa5 100644
--- a/Engine/source/gfx/gl/gfxGLOcclusionQuery.h
+++ b/Engine/source/gfx/gl/gfxGLOcclusionQuery.h
@@ -33,14 +33,14 @@ public:
    GFXGLOcclusionQuery( GFXDevice *device );
    virtual ~GFXGLOcclusionQuery();
 
-   virtual bool begin();
-   virtual void end();
-   virtual OcclusionQueryStatus getStatus( bool block, U32 *data = NULL );
+   bool begin() override;
+   void end() override;
+   OcclusionQueryStatus getStatus( bool block, U32 *data = NULL ) override;
 
    // GFXResource
-   virtual void zombify(); 
-   virtual void resurrect();
-   virtual const String describeSelf() const;
+   void zombify() override; 
+   void resurrect() override;
+   const String describeSelf() const override;
    
 private:
    U32 mQuery;
diff --git a/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h b/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h
index ad447804b..3fc0a30e0 100644
--- a/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h
+++ b/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.h
@@ -33,16 +33,16 @@ public:
 	GFXGLPrimitiveBuffer(GFXDevice *device, U32 indexCount, U32 primitiveCount, GFXBufferType bufferType);
 	~GFXGLPrimitiveBuffer();
 
-	virtual void lock(U32 indexStart, U32 indexEnd, void **indexPtr); ///< only write lock are supported
-	virtual void unlock(); ///<
-	virtual void prepare();  ///< binds the buffer
+	void lock(U32 indexStart, U32 indexEnd, void **indexPtr) override; ///< only write lock are supported
+	void unlock() override; ///<
+	void prepare() override;  ///< binds the buffer
    virtual void finish(); ///< We're done with this buffer
 
 	virtual void* getBuffer(); ///< returns NULL
 
    // GFXResource interface
-   virtual void zombify();
-   virtual void resurrect();
+   void zombify() override;
+   void resurrect() override;
    
 private:
 	/// Handle to our GL buffer object
diff --git a/Engine/source/gfx/gl/gfxGLShader.h b/Engine/source/gfx/gl/gfxGLShader.h
index 1ca420b9e..45896e89e 100644
--- a/Engine/source/gfx/gl/gfxGLShader.h
+++ b/Engine/source/gfx/gl/gfxGLShader.h
@@ -69,15 +69,15 @@ public:
 
    virtual ~GFXGLShaderConstHandle();
    const GFXShaderConstDesc getDesc();
-   const String& getName() const { return mDesc.name; }
-   GFXShaderConstType getType() const { return mDesc.constType; }
-   U32 getArraySize() const { return mDesc.arraySize; }
+   const String& getName() const override { return mDesc.name; }
+   GFXShaderConstType getType() const override { return mDesc.constType; }
+   U32 getArraySize() const override { return mDesc.arraySize; }
 
    U32 getSize() const { return mDesc.size; }
    void setValid(bool valid) { mValid = valid; }
    /// @warning This will always return the value assigned when the shader was
    /// initialized.  If the value is later changed this method won't reflect that.
-   S32 getSamplerRegister() const { return (!isSampler() || !mValid) ? -1 : mDesc.samplerReg; }
+   S32 getSamplerRegister() const override { return (!isSampler() || !mValid) ? -1 : mDesc.samplerReg; }
 
    // Returns true if this is a handle to a sampler register.
    bool isSampler() const
@@ -117,32 +117,32 @@ public:
    void onShaderReload(GFXGLShader* shader);
 
    // GFXShaderConstBuffer
-   virtual GFXShader* getShader();
-   virtual void set(GFXShaderConstHandle* handle, const F32 fv);
-   virtual void set(GFXShaderConstHandle* handle, const Point2F& fv);
-   virtual void set(GFXShaderConstHandle* handle, const Point3F& fv);
-   virtual void set(GFXShaderConstHandle* handle, const Point4F& fv);
-   virtual void set(GFXShaderConstHandle* handle, const PlaneF& fv);
-   virtual void set(GFXShaderConstHandle* handle, const LinearColorF& fv);
-   virtual void set(GFXShaderConstHandle* handle, const S32 f);
-   virtual void set(GFXShaderConstHandle* handle, const Point2I& fv);
-   virtual void set(GFXShaderConstHandle* handle, const Point3I& fv);
-   virtual void set(GFXShaderConstHandle* handle, const Point4I& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<F32>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point2F>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point3F>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point4F>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<S32>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point2I>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point3I>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const AlignedArray<Point4I>& fv);
-   virtual void set(GFXShaderConstHandle* handle, const MatrixF& mat, const GFXShaderConstType matType = GFXSCT_Float4x4);
-   virtual void set(GFXShaderConstHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4);
+   GFXShader* getShader() override;
+   void set(GFXShaderConstHandle* handle, const F32 fv) override;
+   void set(GFXShaderConstHandle* handle, const Point2F& fv) override;
+   void set(GFXShaderConstHandle* handle, const Point3F& fv) override;
+   void set(GFXShaderConstHandle* handle, const Point4F& fv) override;
+   void set(GFXShaderConstHandle* handle, const PlaneF& fv) override;
+   void set(GFXShaderConstHandle* handle, const LinearColorF& fv) override;
+   void set(GFXShaderConstHandle* handle, const S32 f) override;
+   void set(GFXShaderConstHandle* handle, const Point2I& fv) override;
+   void set(GFXShaderConstHandle* handle, const Point3I& fv) override;
+   void set(GFXShaderConstHandle* handle, const Point4I& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<F32>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point2F>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point3F>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point4F>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<S32>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point2I>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point3I>& fv) override;
+   void set(GFXShaderConstHandle* handle, const AlignedArray<Point4I>& fv) override;
+   void set(GFXShaderConstHandle* handle, const MatrixF& mat, const GFXShaderConstType matType = GFXSCT_Float4x4) override;
+   void set(GFXShaderConstHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override;
 
    // GFXResource
-   virtual const String describeSelf() const;
-   virtual void zombify() {}
-   virtual void resurrect() {}
+   const String describeSelf() const override;
+   void zombify() override {}
+   void resurrect() override {}
 
 private:
 
@@ -171,31 +171,31 @@ public:
 
    /// @name GFXShader interface
    /// @{
-   virtual GFXShaderConstHandle* getShaderConstHandle(const String& name);
-   virtual GFXShaderConstHandle* findShaderConstHandle(const String& name);
+   GFXShaderConstHandle* getShaderConstHandle(const String& name) override;
+   GFXShaderConstHandle* findShaderConstHandle(const String& name) override;
 
    /// Returns our list of shader constants, the material can get this and just set the constants it knows about
-   virtual const Vector<GFXShaderConstDesc>& getShaderConstDesc() const;
+   const Vector<GFXShaderConstDesc>& getShaderConstDesc() const override;
 
    /// Returns the alignment value for constType
-   virtual U32 getAlignmentValue(const GFXShaderConstType constType) const;
+   U32 getAlignmentValue(const GFXShaderConstType constType) const override;
 
-   virtual GFXShaderConstBufferRef allocConstBuffer();
+   GFXShaderConstBufferRef allocConstBuffer() override;
 
    /// @}
 
    /// @name GFXResource interface
    /// @{
-   virtual void zombify();
-   virtual void resurrect() { reload(); }
-   virtual const String describeSelf() const;
+   void zombify() override;
+   void resurrect() override { reload(); }
+   const String describeSelf() const override;
    /// @}
 
    /// Activates this shader in the GL context.
    void useProgram();
 
 protected:
-   virtual bool _init();
+   bool _init() override;
 
    bool initShader(const Torque::Path& file,
       GFXShaderStage stage,
diff --git a/Engine/source/gfx/gl/gfxGLStateBlock.h b/Engine/source/gfx/gl/gfxGLStateBlock.h
index 1a9ec9c3e..be19c583d 100644
--- a/Engine/source/gfx/gl/gfxGLStateBlock.h
+++ b/Engine/source/gfx/gl/gfxGLStateBlock.h
@@ -49,17 +49,17 @@ public:
    //
 
    /// Returns the hash value of the desc that created this block
-   virtual U32 getHashValue() const;
+   U32 getHashValue() const override;
 
    /// Returns a GFXStateBlockDesc that this block represents
-   virtual const GFXStateBlockDesc& getDesc() const;   
+   const GFXStateBlockDesc& getDesc() const override;   
 
    //
    // GFXResource
    //
-   virtual void zombify() { }
+   void zombify() override { }
    /// When called the resource should restore all device sensitive information destroyed by zombify()
-   virtual void resurrect() { }
+   void resurrect() override { }
 private:
    GFXStateBlockDesc mDesc;
    U32 mCachedHashValue;
diff --git a/Engine/source/gfx/gl/gfxGLTextureManager.h b/Engine/source/gfx/gl/gfxGLTextureManager.h
index 30f4ce1c6..5e5aaf529 100644
--- a/Engine/source/gfx/gl/gfxGLTextureManager.h
+++ b/Engine/source/gfx/gl/gfxGLTextureManager.h
@@ -45,12 +45,12 @@ protected:
                                              U32 numMipLevels,
                                              bool forceMips = false,
                                              S32 antialiasLevel = 0,
-                                             GFXTextureObject *inTex = NULL );
-   bool _loadTexture(GFXTextureObject *texture, DDSFile *dds);
-   bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp);
-   bool _loadTexture(GFXTextureObject *texture, void *raw);
-   bool _refreshTexture(GFXTextureObject *texture);
-   bool _freeTexture(GFXTextureObject *texture, bool zombify = false);
+                                             GFXTextureObject *inTex = NULL ) override;
+   bool _loadTexture(GFXTextureObject *texture, DDSFile *dds) override;
+   bool _loadTexture(GFXTextureObject *texture, GBitmap *bmp) override;
+   bool _loadTexture(GFXTextureObject *texture, void *raw) override;
+   bool _refreshTexture(GFXTextureObject *texture) override;
+   bool _freeTexture(GFXTextureObject *texture, bool zombify = false) override;
 
 private:
    friend class GFXGLTextureObject;
diff --git a/Engine/source/gfx/gl/gfxGLTextureObject.h b/Engine/source/gfx/gl/gfxGLTextureObject.h
index f07cb9138..2bd7b1b7f 100644
--- a/Engine/source/gfx/gl/gfxGLTextureObject.h
+++ b/Engine/source/gfx/gl/gfxGLTextureObject.h
@@ -53,28 +53,28 @@ public:
    /// @note You are responsible for deleting the returned data! (Use delete[])
    U8* getTextureData( U32 mip = 0);
 
-   virtual F32 getMaxUCoord() const;
-   virtual F32 getMaxVCoord() const;
+   F32 getMaxUCoord() const override;
+   F32 getMaxVCoord() const override;
    
    void reloadFromCache(); ///< Reloads texture from zombie cache, used by GFXGLTextureManager to resurrect the texture.
    
 #ifdef TORQUE_DEBUG
-   virtual void pureVirtualCrash() {}
+   void pureVirtualCrash() override {}
 #endif
 
    /// Get/set data from texture (for dynamic textures and render targets)
    /// @attention DO NOT READ FROM THE RETURNED RECT! It is not guaranteed to work and may incur significant performance penalties.
-   virtual GFXLockedRect* lock(U32 mipLevel = 0, RectI *inRect = NULL);
-   virtual void unlock(U32 mipLevel = 0 );
+   GFXLockedRect* lock(U32 mipLevel = 0, RectI *inRect = NULL) override;
+   void unlock(U32 mipLevel = 0 ) override;
 
-   virtual bool copyToBmp(GBitmap *); ///< Not implemented
+   bool copyToBmp(GBitmap *) override; ///< Not implemented
    
    bool mIsNPoT2;
 
    // GFXResource interface
-   virtual void zombify();
-   virtual void resurrect();
-   virtual const String describeSelf() const;
+   void zombify() override;
+   void resurrect() override;
+   const String describeSelf() const override;
 
    void initSamplerState(const GFXSamplerStateDesc &ssd);
    
diff --git a/Engine/source/gfx/gl/gfxGLTextureTarget.cpp b/Engine/source/gfx/gl/gfxGLTextureTarget.cpp
index 4cfc47854..9a5661b3b 100644
--- a/Engine/source/gfx/gl/gfxGLTextureTarget.cpp
+++ b/Engine/source/gfx/gl/gfxGLTextureTarget.cpp
@@ -69,14 +69,14 @@ public:
    
    virtual ~_GFXGLTextureTargetDesc() {}
    
-   virtual U32 getHandle() { return mTex->getHandle(); }
-   virtual U32 getWidth() { return mTex->getWidth(); }
-   virtual U32 getHeight() { return mTex->getHeight(); }
-   virtual U32 getDepth() { return mTex->getDepth(); }
-   virtual bool hasMips() { return mTex->mMipLevels != 1; }
-   virtual GLenum getBinding() { return mTex->getBinding(); }
-   virtual GFXFormat getFormat() { return mTex->getFormat(); }
-   virtual bool isCompatible(const GFXGLTextureObject* tex)
+   U32 getHandle() override { return mTex->getHandle(); }
+   U32 getWidth() override { return mTex->getWidth(); }
+   U32 getHeight() override { return mTex->getHeight(); }
+   U32 getDepth() override { return mTex->getDepth(); }
+   bool hasMips() override { return mTex->mMipLevels != 1; }
+   GLenum getBinding() override { return mTex->getBinding(); }
+   GFXFormat getFormat() override { return mTex->getFormat(); }
+   bool isCompatible(const GFXGLTextureObject* tex) override
    {
       return mTex->getFormat() == tex->getFormat()
          && mTex->getWidth() == tex->getWidth()
@@ -99,14 +99,14 @@ public:
    
    virtual ~_GFXGLCubemapTargetDesc() {}
    
-   virtual U32 getHandle() { return mTex->getHandle(); }
-   virtual U32 getWidth() { return mTex->getWidth(); }
-   virtual U32 getHeight() { return mTex->getHeight(); }
-   virtual U32 getDepth() { return 0; }
-   virtual bool hasMips() { return mTex->getMipMapLevels() != 1; }
-   virtual GLenum getBinding() { return GFXGLCubemap::getEnumForFaceNumber(mFace); }
-   virtual GFXFormat getFormat() { return mTex->getFormat(); }
-   virtual bool isCompatible(const GFXGLTextureObject* tex)
+   U32 getHandle() override { return mTex->getHandle(); }
+   U32 getWidth() override { return mTex->getWidth(); }
+   U32 getHeight() override { return mTex->getHeight(); }
+   U32 getDepth() override { return 0; }
+   bool hasMips() override { return mTex->getMipMapLevels() != 1; }
+   GLenum getBinding() override { return GFXGLCubemap::getEnumForFaceNumber(mFace); }
+   GFXFormat getFormat() override { return mTex->getFormat(); }
+   bool isCompatible(const GFXGLTextureObject* tex) override
    {
       return mTex->getFormat() == tex->getFormat()
          && mTex->getWidth() == tex->getWidth()
@@ -141,9 +141,9 @@ public:
    _GFXGLTextureTargetFBOImpl(GFXGLTextureTarget* target);
    virtual ~_GFXGLTextureTargetFBOImpl();
    
-   virtual void applyState();
-   virtual void makeActive();
-   virtual void finish();
+   void applyState() override;
+   void makeActive() override;
+   void finish() override;
 };
 
 _GFXGLTextureTargetFBOImpl::_GFXGLTextureTargetFBOImpl(GFXGLTextureTarget* target)
diff --git a/Engine/source/gfx/gl/gfxGLTextureTarget.h b/Engine/source/gfx/gl/gfxGLTextureTarget.h
index 99b744082..605d7b29e 100644
--- a/Engine/source/gfx/gl/gfxGLTextureTarget.h
+++ b/Engine/source/gfx/gl/gfxGLTextureTarget.h
@@ -48,10 +48,10 @@ public:
    GFXGLTextureTarget(bool genMips);
    virtual ~GFXGLTextureTarget();
 
-   virtual const Point2I getSize();
-   virtual GFXFormat getFormat();
-   virtual void attachTexture(RenderSlot slot, GFXTextureObject *tex, U32 mipLevel=0, U32 zOffset = 0);
-   virtual void attachTexture(RenderSlot slot, GFXCubemap *tex, U32 face, U32 mipLevel=0);
+   const Point2I getSize() override;
+   GFXFormat getFormat() override;
+   void attachTexture(RenderSlot slot, GFXTextureObject *tex, U32 mipLevel=0, U32 zOffset = 0) override;
+   void attachTexture(RenderSlot slot, GFXCubemap *tex, U32 face, U32 mipLevel=0) override;
    virtual void clearAttachments();
 
    /// Functions to query internal state
@@ -62,14 +62,14 @@ public:
 
    /// @}
    
-   void deactivate();
-   void zombify();
-   void resurrect();
-   virtual const String describeSelf() const;
+   void deactivate() override;
+   void zombify() override;
+   void resurrect() override;
+   const String describeSelf() const override;
    
-   virtual void resolve();
+   void resolve() override;
    
-   virtual void resolveTo(GFXTextureObject* obj);
+   void resolveTo(GFXTextureObject* obj) override;
    
 protected:
 
diff --git a/Engine/source/gfx/gl/gfxGLVertexBuffer.h b/Engine/source/gfx/gl/gfxGLVertexBuffer.h
index 571192b3b..a995da1a2 100644
--- a/Engine/source/gfx/gl/gfxGLVertexBuffer.h
+++ b/Engine/source/gfx/gl/gfxGLVertexBuffer.h
@@ -42,9 +42,9 @@ public:
 
 	~GFXGLVertexBuffer();
 
-	virtual void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr); ///< Only write lock are supported. 
-	virtual void unlock(); ///<
-	virtual void prepare(); ///< Do nothing. Use void prepare(U32 stream, U32 divisor).
+	void lock(U32 vertexStart, U32 vertexEnd, void **vertexPtr) override; ///< Only write lock are supported. 
+	void unlock() override; ///<
+	void prepare() override; ///< Do nothing. Use void prepare(U32 stream, U32 divisor).
    virtual void finish(); ///< Do nothing.
 
    void prepare(U32 stream, U32 divisor);
@@ -52,8 +52,8 @@ public:
 	GLvoid* getBuffer(); ///< returns NULL
 
    // GFXResource interface
-   virtual void zombify();
-   virtual void resurrect();
+   void zombify() override;
+   void resurrect() override;
 
 private:
    friend class GFXGLDevice;
diff --git a/Engine/source/gfx/gl/gfxGLWindowTarget.h b/Engine/source/gfx/gl/gfxGLWindowTarget.h
index 823f5427f..297357bd8 100644
--- a/Engine/source/gfx/gl/gfxGLWindowTarget.h
+++ b/Engine/source/gfx/gl/gfxGLWindowTarget.h
@@ -32,22 +32,22 @@ public:
    GFXGLWindowTarget(PlatformWindow *win, GFXDevice *d);
    ~GFXGLWindowTarget();
 
-   const Point2I getSize() 
+   const Point2I getSize() override 
    { 
       return mWindow->getClientExtent();
    }
-   virtual GFXFormat getFormat()
+   GFXFormat getFormat() override
    {
       // TODO: Fix me!
       return GFXFormatR8G8B8A8_SRGB;
    }
    void makeActive();
-   virtual bool present();
-   virtual void resetMode();
-   virtual void zombify() { }
-   virtual void resurrect() { }
+   bool present() override;
+   void resetMode() override;
+   void zombify() override { }
+   void resurrect() override { }
    
-   virtual void resolveTo(GFXTextureObject* obj);
+   void resolveTo(GFXTextureObject* obj) override;
    
    void _onAppSignal(WindowId wnd, S32 event);
 
diff --git a/Engine/source/gfx/gl/screenshotGL.h b/Engine/source/gfx/gl/screenshotGL.h
index 028e9d351..442d8bb0f 100644
--- a/Engine/source/gfx/gl/screenshotGL.h
+++ b/Engine/source/gfx/gl/screenshotGL.h
@@ -31,7 +31,7 @@ class ScreenShotGL : public ScreenShot
 {
 protected:
 
-   GBitmap* _captureBackBuffer();
+   GBitmap* _captureBackBuffer() override;
 
 };
 
diff --git a/Engine/source/gfx/video/theoraTexture.h b/Engine/source/gfx/video/theoraTexture.h
index 29341db0f..8c0748068 100644
--- a/Engine/source/gfx/video/theoraTexture.h
+++ b/Engine/source/gfx/video/theoraTexture.h
@@ -171,7 +171,7 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >,
             TheoraTextureFrame* mFrame;
             
             // WorkItem.
-            virtual void execute();
+            void execute() override;
             
          public:
          
@@ -293,8 +293,8 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >,
          private:
          
             // IPositionable.
-            virtual U32 getPosition() const { return mCurrentTime; }
-            virtual void setPosition( U32 pos ) {}
+            U32 getPosition() const override { return mCurrentTime; }
+            void setPosition( U32 pos ) override {}
       };
       
       /// The Theora video file.
@@ -351,7 +351,7 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >,
       void _onTextureEvent( GFXTexCallbackCode code );
                   
       // IOutputStream.
-      virtual void write( TheoraTextureFrame* const* frames, U32 num );
+      void write( TheoraTextureFrame* const* frames, U32 num ) override;
 
    public:
    
@@ -410,8 +410,8 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >,
       GFXTexHandle& getTexture() { return mCurrentFrame->mTexture; }
       
       // IPositionable.
-      virtual U32 getPosition() const { return _getTimeSource()->getPosition(); }
-      virtual void setPosition( U32 pos ) {} // Not (yet?) implemented.
+      U32 getPosition() const override { return _getTimeSource()->getPosition(); }
+      void setPosition( U32 pos ) override {} // Not (yet?) implemented.
 };
 
 #endif // TORQUE_OGGTHEORA
diff --git a/Engine/source/gfx/video/theoraTextureObject.h b/Engine/source/gfx/video/theoraTextureObject.h
index 74d7f066c..48cbe5fd1 100644
--- a/Engine/source/gfx/video/theoraTextureObject.h
+++ b/Engine/source/gfx/video/theoraTextureObject.h
@@ -82,8 +82,8 @@ public:
    // SimObject.
    DECLARE_CONOBJECT( TheoraTextureObject );
 
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    static void initPersistFields();
 };
diff --git a/Engine/source/gfx/video/videoEncoderPNG.cpp b/Engine/source/gfx/video/videoEncoderPNG.cpp
index b6375a8ca..4c8db65fd 100644
--- a/Engine/source/gfx/video/videoEncoderPNG.cpp
+++ b/Engine/source/gfx/video/videoEncoderPNG.cpp
@@ -33,7 +33,7 @@ class VideoEncoderPNG : public VideoEncoder
 
 public:
    /// Begins accepting frames for encoding
-   bool begin()
+   bool begin() override
    {
       mPath += "\\";
       mCurrentFrame = 0;
@@ -42,7 +42,7 @@ public:
    }
 
    /// Pushes a new frame into the video stream
-   bool pushFrame( GBitmap * bitmap )
+   bool pushFrame( GBitmap * bitmap ) override
    {
       String framePath = mPath + String::ToString("%.6u.png", mCurrentFrame);
 
@@ -56,12 +56,12 @@ public:
    }
 
    /// Finishes the encoding and closes the video
-   bool end()
+   bool end() override
    {
       return true;
    }
 
-   void setResolution( Point2I* resolution ) 
+   void setResolution( Point2I* resolution ) override 
    {      
       mResolution = *resolution; 
    }
diff --git a/Engine/source/gfx/video/videoEncoderTheora.cpp b/Engine/source/gfx/video/videoEncoderTheora.cpp
index ef88787f8..4133ee19b 100644
--- a/Engine/source/gfx/video/videoEncoderTheora.cpp
+++ b/Engine/source/gfx/video/videoEncoderTheora.cpp
@@ -203,7 +203,7 @@ public:
       setStatus(false);      
    }
       
-   virtual void run( void* arg )
+   void run( void* arg ) override
    {      
       _setName( "TheoraEncoderThread" );
       while (!checkForStop())
@@ -214,7 +214,7 @@ public:
    }   
 
    /// Begins accepting frames for encoding
-   bool begin()
+   bool begin() override
    {
       mPath += ".ogv";
       mCurrentFrame = 0;
@@ -340,7 +340,7 @@ public:
    }
 
    /// Pushes a new frame into the video stream
-   bool pushFrame( GBitmap * bitmap )
+   bool pushFrame( GBitmap * bitmap ) override
    {      
                   
       // Push the bitmap into the frame list
@@ -356,7 +356,7 @@ public:
    }
 
    /// Finishes the encoding and closes the video
-   bool end()
+   bool end() override
    {  
       //Let's wait the thread stop doing whatever it needs to do
       stop();
@@ -375,7 +375,7 @@ public:
    }
    
 
-   void setResolution( Point2I* resolution ) 
+   void setResolution( Point2I* resolution ) override 
    { 
       /* Theora has a divisible-by-sixteen restriction for the encoded frame size */
       /* scale the picture size up to the nearest /16 and calculate offsets */
diff --git a/Engine/source/gui/buttons/guiBorderButton.cpp b/Engine/source/gui/buttons/guiBorderButton.cpp
index 24f4a50f3..a74ac60fe 100644
--- a/Engine/source/gui/buttons/guiBorderButton.cpp
+++ b/Engine/source/gui/buttons/guiBorderButton.cpp
@@ -37,7 +37,7 @@ protected:
 public:
    DECLARE_CONOBJECT(GuiBorderButtonCtrl);
 
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 };
 
 IMPLEMENT_CONOBJECT(GuiBorderButtonCtrl);
diff --git a/Engine/source/gui/buttons/guiIconButtonCtrl.h b/Engine/source/gui/buttons/guiIconButtonCtrl.h
index 492602397..d4b00bfbc 100644
--- a/Engine/source/gui/buttons/guiIconButtonCtrl.h
+++ b/Engine/source/gui/buttons/guiIconButtonCtrl.h
@@ -103,18 +103,18 @@ public:
    static void initPersistFields();
 
    //Parent methods
-   bool onWake();
-   void onSleep();
-   void inspectPostApply();
-   void onStaticModified(const char* slotName, const char* newValue = NULL);
-   bool resize(const Point2I &newPosition, const Point2I &newExtent);
+   bool onWake() override;
+   void onSleep() override;
+   void inspectPostApply() override;
+   void onStaticModified(const char* slotName, const char* newValue = NULL) override;
+   bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
 
    void setBitmap(const char *name);
 
    //  Used to set the optional error bitmap
    void setErrorBitmap(const char *name);
 
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
    void onImageChanged() {}
 };
diff --git a/Engine/source/gui/buttons/guiSwatchButtonCtrl.h b/Engine/source/gui/buttons/guiSwatchButtonCtrl.h
index ac7b2f992..e457eb4f2 100644
--- a/Engine/source/gui/buttons/guiSwatchButtonCtrl.h
+++ b/Engine/source/gui/buttons/guiSwatchButtonCtrl.h
@@ -57,8 +57,8 @@ class GuiSwatchButtonCtrl : public GuiButtonBaseCtrl
       void setColor( const LinearColorF &color ) { mSwatchColor = color; }
 
       // GuiButtonBaseCtrl
-      virtual bool onWake();
-      virtual void onRender(Point2I offset, const RectI &updateRect);
+      bool onWake() override;
+      void onRender(Point2I offset, const RectI &updateRect) override;
 
       static void initPersistFields();
 
diff --git a/Engine/source/gui/buttons/guiToggleButtonCtrl.h b/Engine/source/gui/buttons/guiToggleButtonCtrl.h
index 6b379224e..e8ae9f860 100644
--- a/Engine/source/gui/buttons/guiToggleButtonCtrl.h
+++ b/Engine/source/gui/buttons/guiToggleButtonCtrl.h
@@ -34,8 +34,8 @@ public:
    DECLARE_CONOBJECT(GuiToggleButtonCtrl);
    GuiToggleButtonCtrl();
 
-   virtual void onPreRender();
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onPreRender() override;
+   void onRender(Point2I offset, const RectI &updateRect) override;
 };
 
 #endif //_GUITOGGLEBUTTONCTRL_H_
diff --git a/Engine/source/gui/buttons/guiToolboxButtonCtrl.h b/Engine/source/gui/buttons/guiToolboxButtonCtrl.h
index fd3e360ad..9d56308ad 100644
--- a/Engine/source/gui/buttons/guiToolboxButtonCtrl.h
+++ b/Engine/source/gui/buttons/guiToolboxButtonCtrl.h
@@ -60,16 +60,16 @@ public:
    static void initPersistFields();
 
    //Parent methods
-   bool onWake();
-   void onSleep();
-   void inspectPostApply();
+   bool onWake() override;
+   void onSleep() override;
+   void inspectPostApply() override;
 
    void setNormalBitmap( StringTableEntry bitmapName );
    void setLoweredBitmap( StringTableEntry bitmapName );
    void setHoverBitmap( StringTableEntry bitmapName );
    
 
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 };
 
 
diff --git a/Engine/source/gui/containers/guiAutoScrollCtrl.h b/Engine/source/gui/containers/guiAutoScrollCtrl.h
index 6e63fadf4..7c5b6d167 100644
--- a/Engine/source/gui/containers/guiAutoScrollCtrl.h
+++ b/Engine/source/gui/containers/guiAutoScrollCtrl.h
@@ -136,17 +136,17 @@ class GuiAutoScrollCtrl : public GuiTickCtrl
       
       void reset();
             
-      virtual bool onWake();
-      virtual void onSleep();
+      bool onWake() override;
+      void onSleep() override;
 
-      virtual void onChildAdded( GuiControl* control );
-      virtual void onChildRemoved( GuiControl* control );
-      virtual bool resize( const Point2I& newPosition, const Point2I& newExtent );
-      virtual void childResized( GuiControl *child );
+      void onChildAdded( GuiControl* control ) override;
+      void onChildRemoved( GuiControl* control ) override;
+      bool resize( const Point2I& newPosition, const Point2I& newExtent ) override;
+      void childResized( GuiControl *child ) override;
 
-      virtual void processTick();
-      virtual void advanceTime( F32 timeDelta );
-      virtual void inspectPostApply();
+      void processTick() override;
+      void advanceTime( F32 timeDelta ) override;
+      void inspectPostApply() override;
 
       static void initPersistFields();
 
diff --git a/Engine/source/gui/containers/guiCtrlArrayCtrl.h b/Engine/source/gui/containers/guiCtrlArrayCtrl.h
index c3bfbf425..9e040dcef 100644
--- a/Engine/source/gui/containers/guiCtrlArrayCtrl.h
+++ b/Engine/source/gui/containers/guiCtrlArrayCtrl.h
@@ -47,18 +47,18 @@ private:
 public:
    GuiControlArrayControl();
 
-   bool resize(const Point2I &newPosition, const Point2I &newExtent);
+   bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
 
-   bool onWake();
-   void onSleep();
-   void inspectPostApply();
+   bool onWake() override;
+   void onSleep() override;
+   void inspectPostApply() override;
 
    bool updateArray();
 
-   void addObject(SimObject *obj);
-   void removeObject(SimObject *obj);
+   void addObject(SimObject *obj) override;
+   void removeObject(SimObject *obj) override;
 
-   bool reOrder(SimObject* obj, SimObject* target = 0);
+   bool reOrder(SimObject* obj, SimObject* target = 0) override;
 
    static void initPersistFields();
    DECLARE_CONOBJECT(GuiControlArrayControl);
diff --git a/Engine/source/gui/containers/guiDragAndDropCtrl.h b/Engine/source/gui/containers/guiDragAndDropCtrl.h
index a9806a7ee..74d9e298a 100644
--- a/Engine/source/gui/containers/guiDragAndDropCtrl.h
+++ b/Engine/source/gui/containers/guiDragAndDropCtrl.h
@@ -72,9 +72,9 @@ class GuiDragAndDropControl : public GuiControl
       void startDragging(Point2I offset = Point2I(0, 0));
 
       // GuiControl.
-      virtual void onMouseDown(const GuiEvent& event);
-      virtual void onMouseDragged(const GuiEvent& event);
-      virtual void onMouseUp(const GuiEvent& event);
+      void onMouseDown(const GuiEvent& event) override;
+      void onMouseDragged(const GuiEvent& event) override;
+      void onMouseUp(const GuiEvent& event) override;
 
       static void initPersistFields();
 
diff --git a/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h b/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h
index 8a39b1872..4dcca66d7 100644
--- a/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h
+++ b/Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h
@@ -47,14 +47,14 @@ public:
    static void initPersistFields();
 
    // SimObject
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    // SimSet
-   void addObject(SimObject *obj);
+   void addObject(SimObject *obj) override;
 
    // GuiControl
-   bool resize(const Point2I &newPosition, const Point2I &newExtent);
-   void childResized(GuiControl *child);
+   bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
+   void childResized(GuiControl *child) override;
 
    // GuiDynamicCtrlArrayCtrl
    void refresh();
diff --git a/Engine/source/gui/containers/guiFormCtrl.h b/Engine/source/gui/containers/guiFormCtrl.h
index 255053127..c33596220 100644
--- a/Engine/source/gui/containers/guiFormCtrl.h
+++ b/Engine/source/gui/containers/guiFormCtrl.h
@@ -95,21 +95,21 @@ public:
    void setCaption( const char* caption ) { mCaption = caption; }
    void setHasMenu( bool value );
 
-   bool resize(const Point2I &newPosition, const Point2I &newExtent);
-   void onRender(Point2I offset, const RectI &updateRect);
+   bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
-   bool onWake();
-   void onSleep();
+   bool onWake() override;
+   void onSleep() override;
 
-   virtual void addObject( SimObject *object );
-   virtual void removeObject( SimObject* object );
-   virtual bool acceptsAsChild( SimObject* object ) const;
+   void addObject( SimObject *object ) override;
+   void removeObject( SimObject* object ) override;
+   bool acceptsAsChild( SimObject* object ) const override;
 
-   void onMouseDown(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
-   void onMouseMove(const GuiEvent &event);
-   void onMouseLeave(const GuiEvent &event);
-   void onMouseEnter(const GuiEvent &event);
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseUp(const GuiEvent &event) override;
+   void onMouseMove(const GuiEvent &event) override;
+   void onMouseLeave(const GuiEvent &event) override;
+   void onMouseEnter(const GuiEvent &event) override;
 
    U32  getMenuBarID();
 
diff --git a/Engine/source/gui/containers/guiFrameCtrl.h b/Engine/source/gui/containers/guiFrameCtrl.h
index 8f5ff99db..52357cb58 100644
--- a/Engine/source/gui/containers/guiFrameCtrl.h
+++ b/Engine/source/gui/containers/guiFrameCtrl.h
@@ -99,17 +99,17 @@ public:
    GuiFrameSetCtrl(U32 columns, U32 rows, const U32 columnOffsets[] = NULL, const U32 rowOffsets[] = NULL);
    virtual ~GuiFrameSetCtrl();
 
-   void addObject(SimObject *obj);
-   void removeObject(SimObject *obj);
+   void addObject(SimObject *obj) override;
+   void removeObject(SimObject *obj) override;
 
-   virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
+   bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
 
-   virtual void onMouseDown(const GuiEvent &event);
-   virtual void onMouseUp(const GuiEvent &event);
-   virtual void onMouseDragged(const GuiEvent &event);
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseUp(const GuiEvent &event) override;
+   void onMouseDragged(const GuiEvent &event) override;
 
-   bool onAdd();
-   void onRender(Point2I offset, const RectI &updateRect );
+   bool onAdd() override;
+   void onRender(Point2I offset, const RectI &updateRect ) override;
 protected:
    /* member variables */
    Vector<S32> mColumnOffsets;
@@ -133,7 +133,7 @@ protected:
    bool hitVerticalDivider(S32 x, const Point2I &point);
    bool hitHorizontalDivider(S32 y, const Point2I &point);
 
-   virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
+   void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
    void rebalance(const Point2I &newExtent);
 
    void computeSizes(bool balanceFrames = false);
@@ -159,7 +159,7 @@ public:
    void balanceFrames()    { computeSizes(true); }
    void updateSizes()      { computeSizes();     }
 
-   bool onWake();
+   bool onWake() override;
 
 private:
    GuiFrameSetCtrl(const GuiFrameSetCtrl &);
diff --git a/Engine/source/gui/containers/guiPaneCtrl.h b/Engine/source/gui/containers/guiPaneCtrl.h
index aaec12d29..9a3bd0901 100644
--- a/Engine/source/gui/containers/guiPaneCtrl.h
+++ b/Engine/source/gui/containers/guiPaneCtrl.h
@@ -97,16 +97,16 @@ class GuiPaneControl : public GuiControl
       virtual void setCaptionID(const char *id);
       
       // GuiControl.
-      virtual bool onWake();
+      bool onWake() override;
 
-      virtual void onMouseDown(const GuiEvent &event);
-      virtual void onMouseUp(const GuiEvent &event);
-      virtual void onMouseMove(const GuiEvent &event);
-      virtual void onMouseLeave(const GuiEvent &event);
-      virtual void onMouseEnter(const GuiEvent &event);
+      void onMouseDown(const GuiEvent &event) override;
+      void onMouseUp(const GuiEvent &event) override;
+      void onMouseMove(const GuiEvent &event) override;
+      void onMouseLeave(const GuiEvent &event) override;
+      void onMouseEnter(const GuiEvent &event) override;
 
-      virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
-      virtual void onRender(Point2I offset, const RectI &updateRect);
+      bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
+      void onRender(Point2I offset, const RectI &updateRect) override;
 
       static void initPersistFields();
       
diff --git a/Engine/source/gui/containers/guiPanel.h b/Engine/source/gui/containers/guiPanel.h
index da75a6175..ac9bc0693 100644
--- a/Engine/source/gui/containers/guiPanel.h
+++ b/Engine/source/gui/containers/guiPanel.h
@@ -52,8 +52,8 @@ public:
    DECLARE_CONOBJECT(GuiPanel);
 
    // GuiControl
-   void onRender(Point2I offset, const RectI &updateRect);
-   void setVisible(bool value) { Parent::setVisible(value); setUpdateLayout( updateParent ); }
+   void onRender(Point2I offset, const RectI &updateRect) override;
+   void setVisible(bool value) override { Parent::setVisible(value); setUpdateLayout( updateParent ); }
 };
 /// @}
 
diff --git a/Engine/source/gui/containers/guiSplitContainer.h b/Engine/source/gui/containers/guiSplitContainer.h
index ab78fb0ff..3ac1c108e 100644
--- a/Engine/source/gui/containers/guiSplitContainer.h
+++ b/Engine/source/gui/containers/guiSplitContainer.h
@@ -68,24 +68,24 @@ public:
 
    // ConsoleObject
    static void initPersistFields();
-   virtual bool onAdd();
+   bool onAdd() override;
 
    // GuiControl   
-   virtual bool onWake();
-   virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect);
-   virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );   
-   virtual void onRender(Point2I offset, const RectI &updateRect);
-   virtual void onMouseDown(const GuiEvent &event);
-   virtual void onMouseUp(const GuiEvent &event);
-   virtual void onMouseDragged(const GuiEvent &event); 
+   bool onWake() override;
+   void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override;
+   bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;   
+   void onRender(Point2I offset, const RectI &updateRect) override;
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseUp(const GuiEvent &event) override;
+   void onMouseDragged(const GuiEvent &event) override; 
 
-   virtual bool layoutControls( RectI &clientRect );
-   virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
+   bool layoutControls( RectI &clientRect ) override;
+   void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
    virtual inline Point2I getSplitPoint() { return mSplitPoint; };
    /// The Splitters entire Client Rectangle, this takes into account padding of this control
    virtual inline RectI getSplitRect() { return mSplitRect; };
    virtual void solvePanelConstraints(Point2I newDragPos, GuiContainer * firstPanel, GuiContainer * secondPanel, const RectI& clientRect);
-   virtual Point2I getMinExtent() const;   
+   Point2I getMinExtent() const override;   
 
    //Set the positin of the split handler
    void setSplitPoint(Point2I splitPoint);
diff --git a/Engine/source/gui/containers/guiTabBookCtrl.h b/Engine/source/gui/containers/guiTabBookCtrl.h
index 38ae2c69d..12140587f 100644
--- a/Engine/source/gui/containers/guiTabBookCtrl.h
+++ b/Engine/source/gui/containers/guiTabBookCtrl.h
@@ -133,18 +133,18 @@ class GuiTabBookCtrl : public GuiContainer
       /// @name Control Events
       /// @{
        
-      bool onWake();
-      void onRender( Point2I offset, const RectI &updateRect );
+      bool onWake() override;
+      void onRender( Point2I offset, const RectI &updateRect ) override;
       
       /// @}
 
       /// @name Child events
       /// @{
       
-      void onChildRemoved( GuiControl* child );
-      void onChildAdded( GuiControl *child );
-      bool reOrder(SimObject* obj, SimObject* target);
-      bool acceptsAsChild( SimObject* object ) const;
+      void onChildRemoved( GuiControl* child ) override;
+      void onChildAdded( GuiControl *child ) override;
+      bool reOrder(SimObject* obj, SimObject* target) override;
+      bool acceptsAsChild( SimObject* object ) const override;
       
       /// @}
 
@@ -203,7 +203,7 @@ class GuiTabBookCtrl : public GuiContainer
       /// @{
 
       /// Update ourselves by hooking common GuiControl functionality.
-      void setUpdate();
+      void setUpdate() override;
 
       /// Balance a top/bottom tab row
       void balanceRow( S32 row, S32 totalTabWidth );
@@ -218,7 +218,7 @@ class GuiTabBookCtrl : public GuiContainer
       void calculatePageTabs();
 
       /// Get client area of tab book
-      virtual const RectI getClientRect();
+      const RectI getClientRect() override;
 
       /// Find the tab that was hit by the current event, if any
       /// @param   event   The GuiEvent that caused this function call
@@ -240,7 +240,7 @@ class GuiTabBookCtrl : public GuiContainer
       ///
       /// @param   newPosition   The new position of the control
       /// @param   newExtent   The new extent of the control
-      bool resize(const Point2I &newPosition, const Point2I &newExtent);
+      bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
 
       /// Called when a child page is resized
       /// This method is overridden so that we may handle resizing of our child tab
@@ -248,23 +248,23 @@ class GuiTabBookCtrl : public GuiContainer
       /// This ensures we keep our sizing in sync when we our children are sized or moved.
       ///
       /// @param   child   A pointer to the child control that has been resized
-      void childResized(GuiControl *child);
+      void childResized(GuiControl *child) override;
 
       /// @}
 
-      virtual bool onKeyDown(const GuiEvent &event);
+      bool onKeyDown(const GuiEvent &event) override;
 
 
       /// @name Mouse Events
       /// @{
       
-      virtual void onMouseDown( const GuiEvent &event );
-      virtual void onMouseUp( const GuiEvent &event );
-      virtual void onMouseDragged( const GuiEvent &event );
-      virtual void onMouseMove( const GuiEvent &event );
-      virtual void onMouseLeave( const GuiEvent &event );
-      virtual bool onMouseDownEditor( const GuiEvent &event, Point2I offset );
-      virtual void onRightMouseUp( const GuiEvent& event );
+      void onMouseDown( const GuiEvent &event ) override;
+      void onMouseUp( const GuiEvent &event ) override;
+      void onMouseDragged( const GuiEvent &event ) override;
+      void onMouseMove( const GuiEvent &event ) override;
+      void onMouseLeave( const GuiEvent &event ) override;
+      bool onMouseDownEditor( const GuiEvent &event, Point2I offset ) override;
+      void onRightMouseUp( const GuiEvent& event ) override;
       
       /// @}
 };
diff --git a/Engine/source/gui/containers/guiWindowCtrl.h b/Engine/source/gui/containers/guiWindowCtrl.h
index 294ff7a9e..79d6f090a 100644
--- a/Engine/source/gui/containers/guiWindowCtrl.h
+++ b/Engine/source/gui/containers/guiWindowCtrl.h
@@ -214,26 +214,26 @@ class GuiWindowCtrl : public GuiContainer
 
       bool isMinimized(S32 &index);
 
-      virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
+      void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
 
       void setFont(S32 fntTag);
 
       void setCloseCommand(const char *newCmd);
 
-      GuiControl* findHitControl (const Point2I &pt, S32 initialLayer = -1 );
+      GuiControl* findHitControl (const Point2I &pt, S32 initialLayer = -1 ) override;
       S32 findHitEdges( const Point2I &globalPoint );
       void getSnappableWindows( Vector<GuiWindowCtrl*> &windowOutVector, bool canCollapse = false );
-      bool resize( const Point2I &newPosition, const Point2I &newExtent );
+      bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
 
       //only cycle tabs through the current window, so overwrite the method
-      GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true);
-      GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true);
+      GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true) override;
+      GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true) override;
 
       S32 getTabIndex(void) { return mTabIndex; }
       void selectWindow(void);
 
       ////
-      const RectI getClientRect();
+      const RectI getClientRect() override;
 
       /// Mutators for window properties from code.
       /// Using setDataField is a bit overkill.
@@ -271,15 +271,15 @@ class GuiWindowCtrl : public GuiContainer
       /// @}
 
       // GuiContainer.
-      virtual bool onWake();
-      virtual void onSleep();
-		virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect);
-      virtual void onMouseDown(const GuiEvent &event);
-      virtual void onMouseDragged(const GuiEvent &event);
-      virtual void onMouseUp(const GuiEvent &event);
-		virtual void onMouseMove(const GuiEvent &event);
-      virtual bool onKeyDown(const GuiEvent &event);
-      virtual void onRender(Point2I offset, const RectI &updateRect);
+      bool onWake() override;
+      void onSleep() override;
+		void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override;
+      void onMouseDown(const GuiEvent &event) override;
+      void onMouseDragged(const GuiEvent &event) override;
+      void onMouseUp(const GuiEvent &event) override;
+		void onMouseMove(const GuiEvent &event) override;
+      bool onKeyDown(const GuiEvent &event) override;
+      void onRender(Point2I offset, const RectI &updateRect) override;
 
       DECLARE_CONOBJECT( GuiWindowCtrl );
       DECLARE_DESCRIPTION( "A control that shows an independent window inside the canvas." );
diff --git a/Engine/source/gui/controls/gui3DProjectionCtrl.h b/Engine/source/gui/controls/gui3DProjectionCtrl.h
index b2d1949b0..939a28f92 100644
--- a/Engine/source/gui/controls/gui3DProjectionCtrl.h
+++ b/Engine/source/gui/controls/gui3DProjectionCtrl.h
@@ -57,12 +57,12 @@ public:
    Point2I                   mUseEyePoint;      /// optionally use the eye point. x != 0 -> horiz.  y != 0 -> vert.  
   
   
-   virtual void   onRender            (Point2I offset, const RectI &updateRect);  
+   void   onRender            (Point2I offset, const RectI &updateRect) override;  
    virtual void   resizeDuringRender  ();  
   
-   virtual bool   onWake              ();  
-   virtual void   onSleep             ();  
-   virtual void   onDeleteNotify      (SimObject *object);  
+   bool   onWake              () override;  
+   void   onSleep             () override;  
+   void   onDeleteNotify      (SimObject *object) override;  
   
    void           doPositioning       ();  
    void           doProjection        ();  
diff --git a/Engine/source/gui/controls/guiAnimBitmapCtrl.h b/Engine/source/gui/controls/guiAnimBitmapCtrl.h
index ba50649f2..e7cf08754 100644
--- a/Engine/source/gui/controls/guiAnimBitmapCtrl.h
+++ b/Engine/source/gui/controls/guiAnimBitmapCtrl.h
@@ -54,10 +54,10 @@ protected:
 public:
    guiAnimBitmapCtrl();
    ~guiAnimBitmapCtrl();
-   bool onAdd();
+   bool onAdd() override;
 
    static void initPersistFields();
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
    DECLARE_CONOBJECT(guiAnimBitmapCtrl);
    DECLARE_CATEGORY("Gui Images");
    DECLARE_DESCRIPTION("A control that clips a bitmap based on %.");
diff --git a/Engine/source/gui/controls/guiBitmapBarCtrl.h b/Engine/source/gui/controls/guiBitmapBarCtrl.h
index 5450e0df0..b98df4863 100644
--- a/Engine/source/gui/controls/guiBitmapBarCtrl.h
+++ b/Engine/source/gui/controls/guiBitmapBarCtrl.h
@@ -39,7 +39,7 @@ protected:
 public:
    GuiBitmapBarCtrl();
    static void initPersistFields();
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
    DECLARE_CONOBJECT(GuiBitmapBarCtrl);
    DECLARE_CATEGORY("Gui Images");
diff --git a/Engine/source/gui/controls/guiBitmapBorderCtrl.cpp b/Engine/source/gui/controls/guiBitmapBorderCtrl.cpp
index 0d3cd3c96..05d0fea47 100644
--- a/Engine/source/gui/controls/guiBitmapBorderCtrl.cpp
+++ b/Engine/source/gui/controls/guiBitmapBorderCtrl.cpp
@@ -55,9 +55,9 @@ public:
 
    static void initPersistFields();
 
-   bool onWake();
-   void onSleep();
-   void onRender(Point2I offset, const RectI &updateRect);
+   bool onWake() override;
+   void onSleep() override;
+   void onRender(Point2I offset, const RectI &updateRect) override;
    DECLARE_CONOBJECT(GuiBitmapBorderCtrl);
    DECLARE_CATEGORY( "Gui Images" );
    DECLARE_DESCRIPTION( "A control that renders a skinned border." );
diff --git a/Engine/source/gui/controls/guiColorPicker.h b/Engine/source/gui/controls/guiColorPicker.h
index 58dee46e5..ad6c52d0f 100644
--- a/Engine/source/gui/controls/guiColorPicker.h
+++ b/Engine/source/gui/controls/guiColorPicker.h
@@ -119,7 +119,7 @@ class GuiColorPickerCtrl : public GuiControl
    ~GuiColorPickerCtrl();
 
    static void initPersistFields();
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
    bool mShowReticle;       ///< Show reticle on render
    /// @name Color Value Functions
    /// @{
@@ -127,8 +127,8 @@ class GuiColorPickerCtrl : public GuiControl
    void setValue(LinearColorF &value) {mBaseColor = value;}
    /// NOTE: getValue() returns baseColor if pallet (since pallet controls can't "pick" colours themselves)
    LinearColorF getValue() { return mDisplayMode == pPallet ? mBaseColor : mPickColor; }
-   const char *getScriptValue();
-   void setScriptValue(const char *value);
+   const char *getScriptValue() override;
+   void setScriptValue(const char *value) override;
    void updateColor() {mPositionChanged = true;}
    /// @}
 
@@ -141,13 +141,13 @@ class GuiColorPickerCtrl : public GuiControl
 
    /// @name Input Events
    /// @{
-   void onMouseDown(const GuiEvent &);
-   void onMouseUp(const GuiEvent &);
-   void onMouseMove(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
+   void onMouseDown(const GuiEvent &) override;
+   void onMouseUp(const GuiEvent &) override;
+   void onMouseMove(const GuiEvent &event) override;
+   void onMouseDragged(const GuiEvent &event) override;
 
-   void onMouseEnter(const GuiEvent &);
-   void onMouseLeave(const GuiEvent &);
+   void onMouseEnter(const GuiEvent &) override;
+   void onMouseLeave(const GuiEvent &) override;
    /// @}
 };
 
diff --git a/Engine/source/gui/controls/guiConsole.h b/Engine/source/gui/controls/guiConsole.h
index 2ef9eb7c8..e4c0abe24 100644
--- a/Engine/source/gui/controls/guiConsole.h
+++ b/Engine/source/gui/controls/guiConsole.h
@@ -59,7 +59,7 @@ class GuiConsole : public GuiArrayCtrl
       /// @}
 
       // GuiArrayCtrl.
-      virtual void onCellSelected( Point2I cell );
+      void onCellSelected( Point2I cell ) override;
 
    public:
       GuiConsole();
@@ -68,9 +68,9 @@ class GuiConsole : public GuiArrayCtrl
       DECLARE_DESCRIPTION( "Control that displays the console log text." );
 
       // GuiArrayCtrl.
-      virtual bool onWake();
-      virtual void onPreRender();
-      virtual void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
+      bool onWake() override;
+      void onPreRender() override;
+      void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override;
 
       void setDisplayFilters(bool errors, bool warns, bool normal);
       bool getErrorFilter() { return mDisplayErrors; }
diff --git a/Engine/source/gui/controls/guiConsoleEditCtrl.h b/Engine/source/gui/controls/guiConsoleEditCtrl.h
index af1648649..e37a6f836 100644
--- a/Engine/source/gui/controls/guiConsoleEditCtrl.h
+++ b/Engine/source/gui/controls/guiConsoleEditCtrl.h
@@ -50,7 +50,7 @@ public:
 
    static void initPersistFields();
 
-   bool onKeyDown(const GuiEvent &event);
+   bool onKeyDown(const GuiEvent &event) override;
 };
 
 #endif //_GUI_TEXTEDIT_CTRL_H
diff --git a/Engine/source/gui/controls/guiConsoleTextCtrl.h b/Engine/source/gui/controls/guiConsoleTextCtrl.h
index 689b62534..47351cd31 100644
--- a/Engine/source/gui/controls/guiConsoleTextCtrl.h
+++ b/Engine/source/gui/controls/guiConsoleTextCtrl.h
@@ -62,8 +62,8 @@ public:
    static void initPersistFields();
 
    //Parental methods
-   bool onWake();
-   void onSleep();
+   bool onWake() override;
+   void onSleep() override;
 
    //text methods
    virtual void setText( const char *txt = NULL );
@@ -71,12 +71,12 @@ public:
 
    //rendering methods
    void calcResize();
-   void onPreRender();    // do special pre render processing
-   void onRender( Point2I offset, const RectI &updateRect );
+   void onPreRender() override;    // do special pre render processing
+   void onRender( Point2I offset, const RectI &updateRect ) override;
 
    //Console methods
-   const char* getScriptValue();
-   void setScriptValue( const char *value );
+   const char* getScriptValue() override;
+   void setScriptValue( const char *value ) override;
 };
 
 #endif //_GUI_TEXT_CONTROL_H_
diff --git a/Engine/source/gui/controls/guiDecoyCtrl.h b/Engine/source/gui/controls/guiDecoyCtrl.h
index d1d194b56..f1171b169 100644
--- a/Engine/source/gui/controls/guiDecoyCtrl.h
+++ b/Engine/source/gui/controls/guiDecoyCtrl.h
@@ -48,22 +48,22 @@ public:
    Point2I mMouseDownPosition;
 
 
-   virtual void onMouseUp(const GuiEvent &event);
-   virtual void onMouseDown(const GuiEvent &event);
-   virtual void onMouseMove(const GuiEvent &event);
-   virtual void onMouseDragged(const GuiEvent &event);
-   virtual void onMouseEnter(const GuiEvent &event);
-   virtual void onMouseLeave(const GuiEvent &event);
+   void onMouseUp(const GuiEvent &event) override;
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseMove(const GuiEvent &event) override;
+   void onMouseDragged(const GuiEvent &event) override;
+   void onMouseEnter(const GuiEvent &event) override;
+   void onMouseLeave(const GuiEvent &event) override;
 
-   virtual bool onMouseWheelUp(const GuiEvent &event);
-   virtual bool onMouseWheelDown(const GuiEvent &event);
+   bool onMouseWheelUp(const GuiEvent &event) override;
+   bool onMouseWheelDown(const GuiEvent &event) override;
 
-   virtual void onRightMouseDown(const GuiEvent &event);
-   virtual void onRightMouseUp(const GuiEvent &event);
-   virtual void onRightMouseDragged(const GuiEvent &event);
+   void onRightMouseDown(const GuiEvent &event) override;
+   void onRightMouseUp(const GuiEvent &event) override;
+   void onRightMouseDragged(const GuiEvent &event) override;
 
-   virtual void onMiddleMouseDown(const GuiEvent &event);
-   virtual void onMiddleMouseUp(const GuiEvent &event);
-   virtual void onMiddleMouseDragged(const GuiEvent &event);
+   void onMiddleMouseDown(const GuiEvent &event) override;
+   void onMiddleMouseUp(const GuiEvent &event) override;
+   void onMiddleMouseDragged(const GuiEvent &event) override;
 };
 #endif
diff --git a/Engine/source/gui/controls/guiDirectoryFileListCtrl.h b/Engine/source/gui/controls/guiDirectoryFileListCtrl.h
index 391ed591a..46462504d 100644
--- a/Engine/source/gui/controls/guiDirectoryFileListCtrl.h
+++ b/Engine/source/gui/controls/guiDirectoryFileListCtrl.h
@@ -72,8 +72,8 @@ public:
    /// Get the currently selected file's name
    StringTableEntry getSelectedFileName();
 
-   virtual void onMouseDown(const GuiEvent &event);
-   virtual bool onWake();
+   void onMouseDown(const GuiEvent &event) override;
+   bool onWake() override;
 };
 
 #endif
diff --git a/Engine/source/gui/controls/guiFileTreeCtrl.h b/Engine/source/gui/controls/guiFileTreeCtrl.h
index e0e8c054e..49871b3a7 100644
--- a/Engine/source/gui/controls/guiFileTreeCtrl.h
+++ b/Engine/source/gui/controls/guiFileTreeCtrl.h
@@ -57,9 +57,9 @@ public:
    
    GuiFileTreeCtrl();
 
-   bool onWake();
-   bool onVirtualParentExpand(Item *item);
-   void onItemSelected( Item *item );
+   bool onWake() override;
+   bool onVirtualParentExpand(Item *item) override;
+   void onItemSelected( Item *item ) override;
    const String& getSelectedPath() { return mSelPath; }
    bool setSelectedPath( const char* path );
       
diff --git a/Engine/source/gui/controls/guiGameListMenuCtrl.h b/Engine/source/gui/controls/guiGameListMenuCtrl.h
index 3e6c3c7b0..fd71490e3 100644
--- a/Engine/source/gui/controls/guiGameListMenuCtrl.h
+++ b/Engine/source/gui/controls/guiGameListMenuCtrl.h
@@ -266,7 +266,7 @@ public:
    GuiGameListMenuCtrl();
    ~GuiGameListMenuCtrl();
 
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
    void onRenderListOption(Row* row, Point2I currentOffset);
    void onRenderSliderOption(Row* row, Point2I currentOffset);
@@ -276,67 +276,67 @@ public:
    /// Callback when the object is registered with the sim.
    ///
    /// \return True if the profile was successfully added, false otherwise.
-   bool onAdd();
+   bool onAdd() override;
 
    /// Callback when the control wakes up.
-   bool onWake();
+   bool onWake() override;
 
    /// Callback when a key is pressed.
    ///
    /// \param event The event that triggered this callback.
-   bool onKeyDown(const GuiEvent &event);
+   bool onKeyDown(const GuiEvent &event) override;
 
    /// Callback when a key is repeating.
    ///
    /// \param event The event that triggered this callback.
-   bool onKeyRepeat(const GuiEvent &event){ return onKeyDown(event); }
+   bool onKeyRepeat(const GuiEvent &event) override{ return onKeyDown(event); }
 
    /// Callback when the mouse button is clicked on the control.
    ///
    /// \param event A reference to the event that triggered the callback.
-   void onMouseDown(const GuiEvent &event);
+   void onMouseDown(const GuiEvent &event) override;
 
    /// Callback when the mouse is dragged on the control.
    ///
    /// \param event A reference to the event that triggered the callback.
-   void onMouseDragged(const GuiEvent &event){ onMouseDown(event); }
+   void onMouseDragged(const GuiEvent &event) override{ onMouseDown(event); }
 
    /// Callback when the mouse leaves the control.
    ///
    /// \param event A reference to the event that triggered the callback.
-   void onMouseLeave(const GuiEvent &event);
+   void onMouseLeave(const GuiEvent &event) override;
 
    /// Callback when the mouse is moving over this control
    ///
    /// \param event A reference to the event that triggered the callback.
-   void onMouseMove(const GuiEvent &event);
+   void onMouseMove(const GuiEvent &event) override;
 
    /// Callback when the mouse button is released.
    ///
    /// \param event A reference to the event that triggered the callback.
-   void onMouseUp(const GuiEvent &event);
+   void onMouseUp(const GuiEvent &event) override;
 
-   virtual bool onInputEvent(const InputEventInfo& event);
+   bool onInputEvent(const InputEventInfo& event) override;
 
    /// Callback when the gamepad axis is activated.
    ///
    /// \param event A reference to the event that triggered the callback.
-   virtual bool onGamepadAxisUp(const GuiEvent & event);
+   bool onGamepadAxisUp(const GuiEvent & event) override;
 
    /// Callback when the gamepad axis is activated.
    ///
    /// \param event A reference to the event that triggered the callback.
-   virtual bool onGamepadAxisDown(const GuiEvent & event);
+   bool onGamepadAxisDown(const GuiEvent & event) override;
 
    /// Callback when the gamepad axis is activated.
    ///
    /// \param event A reference to the event that triggered the callback.
-   virtual bool onGamepadAxisLeft(const GuiEvent& event);
+   bool onGamepadAxisLeft(const GuiEvent& event) override;
 
    /// Callback when the gamepad axis is activated.
    ///
    /// \param event A reference to the event that triggered the callback.
-   virtual bool onGamepadAxisRight(const GuiEvent& event);
+   bool onGamepadAxisRight(const GuiEvent& event) override;
 
    void clearRows();
 
@@ -458,7 +458,7 @@ private:
 private:
    /// Recalculates the height of this control based on the stored row height and
    /// and padding on the rows.
-   virtual Point2I getMinExtent() const;
+   Point2I getMinExtent() const override;
 
    /// Makes sure the height will allow all rows to be displayed without being
    /// truncated.
@@ -537,7 +537,7 @@ public:
    /// Callback when the object is registered with the sim.
    ///
    /// \return True if the profile was successfully added, false otherwise.
-   bool onAdd();
+   bool onAdd() override;
 
    Point2I  mHitAreaUpperLeft;   ///< Offset for the upper left corner of the hit area
    Point2I  mHitAreaLowerRight;  ///< Offset for the lower right corner of the hit area
diff --git a/Engine/source/gui/controls/guiGameListOptionsCtrl.h b/Engine/source/gui/controls/guiGameListOptionsCtrl.h
index f72c44c0b..e78b8d974 100644
--- a/Engine/source/gui/controls/guiGameListOptionsCtrl.h
+++ b/Engine/source/gui/controls/guiGameListOptionsCtrl.h
@@ -93,32 +93,32 @@ public:
    /// \param enabled [optional] If this row is initially enabled. Default true.
    void addRow(const char* label, const char* optionsList, bool wrapOptions, const char* callback, S32 icon = -1, S32 yPad = 0, bool enabled = true);
 
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
    /// Callback when the mouse button is released.
    ///
    /// \param event A reference to the event that triggered the callback.
-   void onMouseUp(const GuiEvent &event);
+   void onMouseUp(const GuiEvent &event) override;
 
    /// Callback when a key is pressed.
    ///
    /// \param event The event that triggered this callback.
-   bool onKeyDown(const GuiEvent &event);
+   bool onKeyDown(const GuiEvent &event) override;
 
    /// Callback when a key is repeating.
    ///
    /// \param event The event that triggered this callback.
-   bool onKeyRepeat(const GuiEvent &event){ return onKeyDown(event); }
+   bool onKeyRepeat(const GuiEvent &event) override{ return onKeyDown(event); }
 
    /// Callback when the gamepad axis is activated.
    ///
    /// \param event A reference to the event that triggered the callback.
-   virtual bool onGamepadAxisLeft(const GuiEvent &event);
+   bool onGamepadAxisLeft(const GuiEvent &event) override;
 
    /// Callback when the gamepad axis is activated.
    ///
    /// \param event A reference to the event that triggered the callback.
-   virtual bool onGamepadAxisRight(const GuiEvent &event);
+   bool onGamepadAxisRight(const GuiEvent &event) override;
 
    virtual void clearRows();
 
@@ -128,7 +128,7 @@ public:
    DECLARE_CONOBJECT(GuiGameListOptionsCtrl);
    DECLARE_DESCRIPTION( "A control for showing pages of options that are gamepad friendly." );
    
-   virtual bool onAdd();
+   bool onAdd() override;
 
    /// Initializes fields accessible through the console.
    static void initPersistFields();
@@ -140,15 +140,15 @@ protected:
    ///
    /// \return True if the profile is of type GuiGameListOptionsProfile or false
    /// if the profile is of any other type.
-   bool hasValidProfile() const;
+   bool hasValidProfile() const override;
 
    /// Enforces the validity of the fields on this control and its profile (if the
    /// profile is valid, see: hasValidProfile).
-   void enforceConstraints();
+   void enforceConstraints() override;
 
    /// Adds lines around the column divisions to the feedback already provided
    /// in the Parent.
-   void onDebugRender(Point2I offset);
+   void onDebugRender(Point2I offset) override;
 
 private:
    /// Performs a click on the current option row. The x position is used to
@@ -183,7 +183,7 @@ class GuiGameListOptionsProfile : public GuiGameListMenuProfile
 
 public:
    /// Enforces range constraints on all required fields.
-   void enforceConstraints();
+   void enforceConstraints() override;
 
    GuiGameListOptionsProfile();
 
diff --git a/Engine/source/gui/controls/guiGameSettingsCtrl.h b/Engine/source/gui/controls/guiGameSettingsCtrl.h
index 8a6a730dc..737761745 100644
--- a/Engine/source/gui/controls/guiGameSettingsCtrl.h
+++ b/Engine/source/gui/controls/guiGameSettingsCtrl.h
@@ -230,7 +230,7 @@ public:
    GuiGameSettingsCtrl();
    ~GuiGameSettingsCtrl();
 
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
    void onRenderListOption(Point2I currentOffset);
    void onRenderSliderOption(Point2I currentOffset);
@@ -240,17 +240,17 @@ public:
    /// Callback when the object is registered with the sim.
    ///
    /// \return True if the profile was successfully added, false otherwise.
-   bool onAdd();
+   bool onAdd() override;
 
    /// Callback when the control wakes up.
-   bool onWake();
+   bool onWake() override;
 
-   void onSleep();
+   void onSleep() override;
 
-   void clear();
+   void clear() override;
 
-   virtual void onMouseMove(const GuiEvent& event);
-   virtual void onMouseUp(const GuiEvent& event);
+   void onMouseMove(const GuiEvent& event) override;
+   void onMouseUp(const GuiEvent& event) override;
 
    DECLARE_CONOBJECT(GuiGameSettingsCtrl);
    DECLARE_CATEGORY( "Gui Game" );
diff --git a/Engine/source/gui/controls/guiGradientCtrl.h b/Engine/source/gui/controls/guiGradientCtrl.h
index 75f3f85ef..2d4ab01bb 100644
--- a/Engine/source/gui/controls/guiGradientCtrl.h
+++ b/Engine/source/gui/controls/guiGradientCtrl.h
@@ -42,11 +42,11 @@ public:
 	DECLARE_CALLBACK( void, onMouseDown, ());
 	DECLARE_CALLBACK( void, onDoubleClick, ());
 	GuiGradientSwatchCtrl();
-	void onMouseDown(const GuiEvent &);
-	void onRightMouseDown(const GuiEvent &);
-   void onMouseDragged(const GuiEvent &event);
-	void onRender(Point2I offset, const RectI &updateRect);
-	bool onWake();
+	void onMouseDown(const GuiEvent &) override;
+	void onRightMouseDown(const GuiEvent &) override;
+   void onMouseDragged(const GuiEvent &event) override;
+	void onRender(Point2I offset, const RectI &updateRect) override;
+	bool onWake() override;
 protected:
 	StringTableEntry  mColorFunction;
 };
@@ -121,7 +121,7 @@ public:
    GuiGradientCtrl();
 
    static void initPersistFields();
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
    bool mShowReticle;       ///< Show reticle on render
    /// @name Color Value Functions
    /// @{
@@ -134,19 +134,19 @@ public:
    
    /// @name Input Events
    /// @{
-   void onMouseDown(const GuiEvent &);
-   void onMouseUp(const GuiEvent &);
+   void onMouseDown(const GuiEvent &) override;
+   void onMouseUp(const GuiEvent &) override;
 
-   void onMouseEnter(const GuiEvent &);
-   void onMouseLeave(const GuiEvent &);
+   void onMouseEnter(const GuiEvent &) override;
+   void onMouseLeave(const GuiEvent &) override;
    /// @}
 
 	void addColorRange(ColorI color);
 	void setupDefaultRange();
 
-	bool onAdd();
-	void inspectPreApply();
-	void inspectPostApply();
+	bool onAdd() override;
+	void inspectPreApply() override;
+	void inspectPostApply() override;
 	void reInitSwatches( GuiGradientCtrl::PickMode );
    void addColorRange(Point2I pos, const LinearColorF& color);
 	void removeColorRange( GuiGradientSwatchCtrl* swatch );
diff --git a/Engine/source/gui/controls/guiListBoxCtrl.h b/Engine/source/gui/controls/guiListBoxCtrl.h
index 1c0159205..12a213452 100644
--- a/Engine/source/gui/controls/guiListBoxCtrl.h
+++ b/Engine/source/gui/controls/guiListBoxCtrl.h
@@ -123,21 +123,21 @@ public:
 
    // Sizing
    void              updateSize();
-   virtual void      parentResized(const RectI& oldParentRect, const RectI& newParentRect);
-   virtual bool      onWake();
+   void      parentResized(const RectI& oldParentRect, const RectI& newParentRect) override;
+   bool      onWake() override;
 
    // Rendering
-   virtual void      onRender( Point2I offset, const RectI &updateRect );
+   void      onRender( Point2I offset, const RectI &updateRect ) override;
    virtual void      onRenderItem(const RectI& itemRect, LBItem *item);
    void              drawBox( const Point2I &box, S32 size, ColorI &outlineColor, ColorI &boxColor );
    bool              renderTooltip( const Point2I &hoverPos, const Point2I& cursorPos, const char* tipText );
 	void					addFilteredItem( String item );
 	void					removeFilteredItem( String item );
    // Mouse/Key Events
-   virtual void      onMouseDown( const GuiEvent &event );
-   virtual void      onMouseDragged(const GuiEvent &event);
-   virtual void      onMouseUp( const GuiEvent& event );
-   virtual bool      onKeyDown( const GuiEvent &event );   
+   void      onMouseDown( const GuiEvent &event ) override;
+   void      onMouseDragged(const GuiEvent &event) override;
+   void      onMouseUp( const GuiEvent& event ) override;
+   bool      onKeyDown( const GuiEvent &event ) override;   
 
    // String Utility
    static U32        getStringElementCount( const char *string );
diff --git a/Engine/source/gui/controls/guiMLTextCtrl.h b/Engine/source/gui/controls/guiMLTextCtrl.h
index 57360a6b2..fb825a451 100644
--- a/Engine/source/gui/controls/guiMLTextCtrl.h
+++ b/Engine/source/gui/controls/guiMLTextCtrl.h
@@ -167,8 +167,8 @@ class GuiMLTextCtrl : public GuiControl
    
    static void initPersistFields();
 
-   void setScriptValue(const char *value);
-   const char *getScriptValue();
+   void setScriptValue(const char *value) override;
+   const char *getScriptValue() override;
 
    static char *stripControlChars(const char *inString);
 
@@ -291,30 +291,30 @@ class GuiMLTextCtrl : public GuiControl
    S32 getTextPosition(const Point2I& localPosition);
 
 	// Gui control overrides
-   bool onWake();
-   void onSleep();
-   void onPreRender();
-   void onRender(Point2I offset, const RectI &updateRect);
+   bool onWake() override;
+   void onSleep() override;
+   void onPreRender() override;
+   void onRender(Point2I offset, const RectI &updateRect) override;
    void getCursorPositionAndColor(Point2I &cursorTop, Point2I &cursorBottom, ColorI &color);
-   void inspectPostApply();
-   void parentResized(const RectI& oldParentRect, const RectI& newParentRect);
-   bool onKeyDown(const GuiEvent& event);
-   void onMouseDown(const GuiEvent&);
-   void onMouseDragged(const GuiEvent&);
-   void onMouseUp(const GuiEvent&);
+   void inspectPostApply() override;
+   void parentResized(const RectI& oldParentRect, const RectI& newParentRect) override;
+   bool onKeyDown(const GuiEvent& event) override;
+   void onMouseDown(const GuiEvent&) override;
+   void onMouseDragged(const GuiEvent&) override;
+   void onMouseUp(const GuiEvent&) override;
 
-   virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
+   void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
 
   public:
    // Gui control overrides
-   bool onAdd();
+   bool onAdd() override;
 
    void setSelectionStart( U32 start ) { clearSelection(); mSelectionStart = start; };
    void setSelectionEnd( U32 end ) { mSelectionEnd = end;};
    void setSelectionActive(bool active) { mSelectionActive = active; };
    S32 getCursorPosition()  { return( mCursorPosition ); }
 
-   virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
+   bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
 
    bool isTypingOut();
 };
diff --git a/Engine/source/gui/controls/guiMLTextEditCtrl.h b/Engine/source/gui/controls/guiMLTextEditCtrl.h
index c4611cef8..5e8d5411f 100644
--- a/Engine/source/gui/controls/guiMLTextEditCtrl.h
+++ b/Engine/source/gui/controls/guiMLTextEditCtrl.h
@@ -36,24 +36,24 @@ class GuiMLTextEditCtrl : public GuiMLTextCtrl
    StringTableEntry mEscapeCommand;
 
    // Events
-   bool onKeyDown(const GuiEvent&event);
+   bool onKeyDown(const GuiEvent&event) override;
 
    // Event forwards
    void handleMoveKeys(const GuiEvent&);
    void handleDeleteKeys(const GuiEvent&);
 
    // rendering
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
   public:
    GuiMLTextEditCtrl();
    ~GuiMLTextEditCtrl();
 
-   virtual void setFirstResponder();
-   virtual void onLoseFirstResponder();
+   void setFirstResponder() override;
+   void onLoseFirstResponder() override;
 
-   bool onWake();
-   bool resize(const Point2I &newPosition, const Point2I &newExtent);
+   bool onWake() override;
+   bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
 
    DECLARE_CONOBJECT(GuiMLTextEditCtrl);
    DECLARE_DESCRIPTION( "A control that allows to edit multiple lines of text." );
diff --git a/Engine/source/gui/controls/guiMaterialCtrl.h b/Engine/source/gui/controls/guiMaterialCtrl.h
index ff0b44efa..8a9ea343b 100644
--- a/Engine/source/gui/controls/guiMaterialCtrl.h
+++ b/Engine/source/gui/controls/guiMaterialCtrl.h
@@ -53,18 +53,18 @@ public:
 
    // ConsoleObject
    static void initPersistFields();
-   void inspectPostApply();
+   void inspectPostApply() override;
    
    DECLARE_CONOBJECT(GuiMaterialCtrl);
    DECLARE_CATEGORY( "Gui Editor" );
 
    // GuiControl
-   bool onWake();
-   void onSleep();
+   bool onWake() override;
+   void onSleep() override;
 
    bool setMaterial( const String &materialName );
 
-   void onRender( Point2I offset, const RectI &updateRect );
+   void onRender( Point2I offset, const RectI &updateRect ) override;
 };
 
 #endif // _GUIMATERIALCTRL_H_
diff --git a/Engine/source/gui/controls/guiSliderCtrl.h b/Engine/source/gui/controls/guiSliderCtrl.h
index a8f8b667c..c3ab1dc64 100644
--- a/Engine/source/gui/controls/guiSliderCtrl.h
+++ b/Engine/source/gui/controls/guiSliderCtrl.h
@@ -87,26 +87,26 @@ class GuiSliderCtrl : public GuiControl
       const Point2F& getRange() const { return mRange; }
 
       // GuiControl.
-      bool onWake();
+      bool onWake() override;
 
-      void onMouseDown(const GuiEvent &event);
-      void onMouseDragged(const GuiEvent &event);
-      void onMouseUp(const GuiEvent &);
-      void onMouseLeave(const GuiEvent &);
-      void onMouseEnter(const GuiEvent &);
-      bool onMouseWheelUp(const GuiEvent &event);
-      bool onMouseWheelDown(const GuiEvent &event);
+      void onMouseDown(const GuiEvent &event) override;
+      void onMouseDragged(const GuiEvent &event) override;
+      void onMouseUp(const GuiEvent &) override;
+      void onMouseLeave(const GuiEvent &) override;
+      void onMouseEnter(const GuiEvent &) override;
+      bool onMouseWheelUp(const GuiEvent &event) override;
+      bool onMouseWheelDown(const GuiEvent &event) override;
       
-      void setActive( bool value );
+      void setActive( bool value ) override;
 
       F32 getValue() const { return mValue; }
-      void setScriptValue(const char *val) { setValue(dAtof(val)); }
+      void setScriptValue(const char *val) override { setValue(dAtof(val)); }
       void setValue(F32 val, bool doCallback=false);
 
-      void onRender(Point2I offset, const RectI &updateRect);
+      void onRender(Point2I offset, const RectI &updateRect) override;
       
-      virtual bool resize( const Point2I& newSize, const Point2I& newExtent );
-      virtual void parentResized( const RectI& oldParentRect, const RectI& newParentRect );
+      bool resize( const Point2I& newSize, const Point2I& newExtent ) override;
+      void parentResized( const RectI& oldParentRect, const RectI& newParentRect ) override;
 
       static void initPersistFields();
 
diff --git a/Engine/source/gui/controls/guiTabPageCtrl.h b/Engine/source/gui/controls/guiTabPageCtrl.h
index 8b10718fd..b588ae5e8 100644
--- a/Engine/source/gui/controls/guiTabPageCtrl.h
+++ b/Engine/source/gui/controls/guiTabPageCtrl.h
@@ -44,29 +44,29 @@ class GuiTabPageCtrl : public GuiTextCtrl
       
       static void initPersistFields();
 
-      bool onWake();    ///< The page awakens (becomes active)!
-      void onSleep();   ///< The page sleeps (zzzzZZ - becomes inactive)
-      void inspectPostApply();
+      bool onWake() override;    ///< The page awakens (becomes active)!
+      void onSleep() override;   ///< The page sleeps (zzzzZZ - becomes inactive)
+      void inspectPostApply() override;
 
       bool getFitBook() { return mFitBook; }
       void setFitBook(bool state) { mFitBook = state; }
 
-      GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1); ///< Find which control is hit by the mouse starting at a specified layer
+      GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1) override; ///< Find which control is hit by the mouse starting at a specified layer
 
-      void onMouseDown(const GuiEvent &event);  ///< Called when a mouseDown event occurs
-      bool onMouseDownEditor(const GuiEvent &event, Point2I offset );   ///< Called when a mouseDown event occurs and the GUI editor is active
+      void onMouseDown(const GuiEvent &event) override;  ///< Called when a mouseDown event occurs
+      bool onMouseDownEditor(const GuiEvent &event, Point2I offset ) override;   ///< Called when a mouseDown event occurs and the GUI editor is active
 
       S32 getTabIndex(void) { return mTabIndex; }  ///< Get the tab index of this control
 
       //only cycle tabs through the current window, so overwrite the method
-      GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true);
-      GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true);
+      GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true) override;
+      GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true) override;
 
       void selectWindow(void);               ///< Select this window
 
-      virtual void setText(const char *txt = NULL); ///< Override setText function to signal parent we need to update.
+      void setText(const char *txt = NULL) override; ///< Override setText function to signal parent we need to update.
 
-      void onRender(Point2I offset, const RectI &updateRect);  ///< Called when it's time to render this page to the scene
+      void onRender(Point2I offset, const RectI &updateRect) override;  ///< Called when it's time to render this page to the scene
 };
 
 #endif //_GUI_WINDOW_CTRL_H
diff --git a/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h b/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h
index ebe35530a..76fd67735 100644
--- a/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h
+++ b/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h
@@ -56,23 +56,23 @@ public:
    virtual void getText(char *dest);  // dest must be of size
                                       // StructDes::MAX_STRING_LEN + 1
 
-   virtual void setText(const char *txt);
+   void setText(const char *txt) override;
 
    void setValue();
    void checkRange();
    void checkIncValue();
    void timeInc(U32 elapseTime);
 
-   virtual bool onKeyDown(const GuiEvent &event);
-   virtual void onMouseDown(const GuiEvent &event);
-   virtual void onMouseDragged(const GuiEvent &event);
-   virtual void onMouseUp(const GuiEvent &event);
-   virtual bool onMouseWheelUp(const GuiEvent &event);
-   virtual bool onMouseWheelDown(const GuiEvent &event);
+   bool onKeyDown(const GuiEvent &event) override;
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseDragged(const GuiEvent &event) override;
+   void onMouseUp(const GuiEvent &event) override;
+   bool onMouseWheelUp(const GuiEvent &event) override;
+   bool onMouseWheelDown(const GuiEvent &event) override;
 	
-	bool onWake();
-   virtual void onPreRender();
-   virtual void onRender(Point2I offset, const RectI &updateRect);
+	bool onWake() override;
+   void onPreRender() override;
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
 	void setBitmap(const char *name);
 
diff --git a/Engine/source/gui/core/guiScriptNotifyControl.h b/Engine/source/gui/core/guiScriptNotifyControl.h
index c94d3e283..29f658a9e 100644
--- a/Engine/source/gui/core/guiScriptNotifyControl.h
+++ b/Engine/source/gui/core/guiScriptNotifyControl.h
@@ -56,11 +56,11 @@ public:
     virtual ~GuiScriptNotifyCtrl();
     static void initPersistFields();
 
-    virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
+    bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
     virtual void childResized(GuiScriptNotifyCtrl *child);
-    virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect);
-    virtual void onChildRemoved( GuiControl *child );
-    virtual void onChildAdded( GuiControl *child );
+    void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override;
+    void onChildRemoved( GuiControl *child ) override;
+    void onChildAdded( GuiControl *child ) override;
 
 	DECLARE_CALLBACK(void, onResize, (SimObjectId ID) );
 	DECLARE_CALLBACK(void, onChildAdded, (SimObjectId ID, SimObjectId childID));
@@ -94,10 +94,10 @@ public:
     //virtual void onMouseDownEditor(const GuiEvent &event, Point2I offset);
     //virtual void onRightMouseDownEditor(const GuiEvent &event, Point2I offset);
 
-    virtual void setFirstResponder(GuiControl *firstResponder);
-    virtual void setFirstResponder();
+    void setFirstResponder(GuiControl *firstResponder) override;
+    void setFirstResponder() override;
     void clearFirstResponder();
-    virtual void onLoseFirstResponder();
+    void onLoseFirstResponder() override;
 
     //virtual void acceleratorKeyPress(U32 index);
     //virtual void acceleratorKeyRelease(U32 index);
@@ -107,8 +107,8 @@ public:
 
     virtual void onMessage(GuiScriptNotifyCtrl *sender, S32 msg);    ///< Receive a message from another control
 
-    virtual void onDialogPush();
-    virtual void onDialogPop();
+    void onDialogPush() override;
+    void onDialogPop() override;
 
 };
 
diff --git a/Engine/source/gui/editor/guiDebugger.h b/Engine/source/gui/editor/guiDebugger.h
index 9255cc4e9..3537ae759 100644
--- a/Engine/source/gui/editor/guiDebugger.h
+++ b/Engine/source/gui/editor/guiDebugger.h
@@ -75,9 +75,9 @@ class DbgFileView : public GuiArrayCtrl
    DECLARE_CONOBJECT(DbgFileView);
    DECLARE_CATEGORY( "Gui Editor" );
 
-   bool onWake();
+   bool onWake() override;
 
-   void clear();
+   void clear() override;
    void clearBreakPositions();
 
    void setCurrentLine(S32 lineNumber, bool setCurrentLine);
@@ -90,12 +90,12 @@ class DbgFileView : public GuiArrayCtrl
 
    bool findString(const char *text);
 
-   void onMouseDown(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseDragged(const GuiEvent &event) override;
+   void onMouseUp(const GuiEvent &event) override;
 
-   void onPreRender();
-   void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
+   void onPreRender() override;
+   void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override;
 };
 
 #endif //_GUI_DEBUGGER_H
diff --git a/Engine/source/gui/editor/guiEaseViewCtrl.h b/Engine/source/gui/editor/guiEaseViewCtrl.h
index 28737f33a..937ad2371 100644
--- a/Engine/source/gui/editor/guiEaseViewCtrl.h
+++ b/Engine/source/gui/editor/guiEaseViewCtrl.h
@@ -49,10 +49,10 @@ class GuiEaseViewCtrl : public GuiControl
    
       GuiEaseViewCtrl();
 
-      bool onWake();
-      void onSleep();
+      bool onWake() override;
+      void onSleep() override;
 
-      void onRender( Point2I, const RectI &);
+      void onRender( Point2I, const RectI &) override;
       static void initPersistFields();
       
       DECLARE_CONOBJECT( GuiEaseViewCtrl );
diff --git a/Engine/source/gui/editor/guiEditCtrl.cpp b/Engine/source/gui/editor/guiEditCtrl.cpp
index c47529da3..c30dab15d 100644
--- a/Engine/source/gui/editor/guiEditCtrl.cpp
+++ b/Engine/source/gui/editor/guiEditCtrl.cpp
@@ -2834,7 +2834,7 @@ class GuiEditorRuler : public GuiControl
             return ORIENTATION_Vertical;
       }
       
-      bool onWake()
+      bool onWake() override
       {
          if( !Parent::onWake() )
             return false;
@@ -2848,12 +2848,12 @@ class GuiEditorRuler : public GuiControl
          return true;
       }
 
-      void onPreRender()
+      void onPreRender() override
       {
          setUpdate();
       }
       
-      void onMouseDown( const GuiEvent& event )
+      void onMouseDown( const GuiEvent& event ) override
       {         
          if( !mEditCtrl )
             return;
@@ -2872,7 +2872,7 @@ class GuiEditorRuler : public GuiControl
          mEditCtrl->startMouseGuideDrag( axis, guideIndex );
       }
       
-      void onRender(Point2I offset, const RectI &updateRect)
+      void onRender(Point2I offset, const RectI &updateRect) override
       {
          GFX->getDrawUtil()->drawRectFill(updateRect, ColorI::DARK);
          
diff --git a/Engine/source/gui/editor/guiEditCtrl.h b/Engine/source/gui/editor/guiEditCtrl.h
index 38a1ddf34..3e1fbb4d3 100644
--- a/Engine/source/gui/editor/guiEditCtrl.h
+++ b/Engine/source/gui/editor/guiEditCtrl.h
@@ -246,8 +246,8 @@ class GuiEditCtrl : public GuiControl
       DECLARE_CATEGORY( "Gui Editor" );
       DECLARE_DESCRIPTION( "Implements the framework for the GUI editor." );
 
-      bool onWake();
-      void onSleep();
+      bool onWake() override;
+      void onSleep() override;
       
       static void initPersistFields();
 
@@ -258,8 +258,8 @@ class GuiEditCtrl : public GuiControl
       void              getDragRect(RectI &b);
       void              drawNut(const Point2I &nut, ColorI &outlineColor, ColorI &nutColor);
       void              drawNuts(RectI &box, ColorI &outlineColor, ColorI &nutColor);
-      void              onPreRender();
-      void              onRender(Point2I offset, const RectI &updateRect);
+      void              onPreRender() override;
+      void              onRender(Point2I offset, const RectI &updateRect) override;
       void              addNewControl(GuiControl *ctrl);
       void              setCurrentAddSet(GuiControl *ctrl, bool clearSelection = true);
       GuiControl*       getCurrentAddSet();
@@ -314,7 +314,7 @@ class GuiEditCtrl : public GuiControl
       void              controlInspectPostApply(GuiControl* object);
 
       // Sizing Cursors
-      void              getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
+      void              getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
 
       U32               getSelectionSize() const { return mSelectedControls.size(); }
       const Vector<GuiControl *>& getSelected() const { return mSelectedControls; }
@@ -322,16 +322,16 @@ class GuiEditCtrl : public GuiControl
       SimGroup* getTrash() { return mTrash; }
       GuiControl* getAddSet() const { return mCurrentAddSet; }; //JDD
 
-      bool              onKeyDown(const GuiEvent &event);
-      void              onMouseDown(const GuiEvent &event);
-      void              onMouseUp(const GuiEvent &event);
-      void              onMouseDragged(const GuiEvent &event);
-      void              onRightMouseDown(const GuiEvent &event);
+      bool              onKeyDown(const GuiEvent &event) override;
+      void              onMouseDown(const GuiEvent &event) override;
+      void              onMouseUp(const GuiEvent &event) override;
+      void              onMouseDragged(const GuiEvent &event) override;
+      void              onRightMouseDown(const GuiEvent &event) override;
       
       mouseModes        getMouseMode() const { return mMouseDownMode; }
 
-      virtual bool      onAdd();
-      virtual void      onRemove();
+      bool      onAdd() override;
+      void      onRemove() override;
 
       void              setSnapToGrid(U32 gridsize);
 };
diff --git a/Engine/source/gui/editor/guiFilterCtrl.h b/Engine/source/gui/editor/guiFilterCtrl.h
index b40dee26b..7f5a92101 100644
--- a/Engine/source/gui/editor/guiFilterCtrl.h
+++ b/Engine/source/gui/editor/guiFilterCtrl.h
@@ -66,11 +66,11 @@ public:
    static void initPersistFields();
 
    //Parental methods
-   bool onWake();
+   bool onWake() override;
 
-   void onMouseDown(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &);
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseDragged(const GuiEvent &event) override;
+   void onMouseUp(const GuiEvent &) override;
 
    F32  getValue(S32 n);
    const Filter* get() { return &mFilter; }
@@ -78,8 +78,8 @@ public:
    S32  getNumControlPoints() {return mFilter.size(); }
    void identity();
 
-   void onPreRender();
-   void onRender(Point2I offset, const RectI &updateRect );
+   void onPreRender() override;
+   void onRender(Point2I offset, const RectI &updateRect ) override;
 };
 
 
diff --git a/Engine/source/gui/editor/guiGraphCtrl.h b/Engine/source/gui/editor/guiGraphCtrl.h
index 99139fbd7..72c367cfe 100644
--- a/Engine/source/gui/editor/guiGraphCtrl.h
+++ b/Engine/source/gui/editor/guiGraphCtrl.h
@@ -73,7 +73,7 @@ class GuiGraphCtrl : public GuiControl
       void setMax( S32 plotID, F32 max ) { mGraphMax[ plotID ] = max; }
 
       // GuiControl.
-      virtual void onRender(Point2I offset, const RectI &updateRect);
+      void onRender(Point2I offset, const RectI &updateRect) override;
 
       DECLARE_CONOBJECT(GuiGraphCtrl);
       DECLARE_CATEGORY( "Gui Other" );
diff --git a/Engine/source/gui/editor/guiMenuBar.h b/Engine/source/gui/editor/guiMenuBar.h
index d52672392..600f92a91 100644
--- a/Engine/source/gui/editor/guiMenuBar.h
+++ b/Engine/source/gui/editor/guiMenuBar.h
@@ -81,33 +81,33 @@ public:
 	
 	GuiMenuBar();
 
-   void onRemove();
-   bool onWake();
-   void onSleep();
+   void onRemove() override;
+   bool onWake() override;
+   void onSleep() override;
 
-   virtual void addObject(SimObject* object);
+   void addObject(SimObject* object) override;
 
 	MenuEntry *findHitMenu(Point2I mousePoint);
 
-   void onPreRender();
-	void onRender(Point2I offset, const RectI &updateRect);
+   void onPreRender() override;
+	void onRender(Point2I offset, const RectI &updateRect) override;
 
    void checkMenuMouseMove(const GuiEvent &event);
-   void onMouseMove(const GuiEvent &event);
-   void onMouseEnter(const GuiEvent &event);
-   void onMouseLeave(const GuiEvent &event);
-   void onMouseDown(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
+   void onMouseMove(const GuiEvent &event) override;
+   void onMouseEnter(const GuiEvent &event) override;
+   void onMouseLeave(const GuiEvent &event) override;
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseDragged(const GuiEvent &event) override;
+   void onMouseUp(const GuiEvent &event) override;
    
-   void onAction();
+   void onAction() override;
    void closeMenu();
    void buildWindowAcceleratorMap( WindowInputGenerator &inputGenerator );
    void removeWindowAcceleratorMap( WindowInputGenerator &inputGenerator );
-   void acceleratorKeyPress(U32 index);
+   void acceleratorKeyPress(U32 index) override;
 
    //  Added to support 'ticks'
-   void processTick();
+   void processTick() override;
 
    void insert(SimObject* pObject, S32 pos);
    void remove(SimObject* pObject);
diff --git a/Engine/source/gui/editor/guiParticleGraphCtrl.h b/Engine/source/gui/editor/guiParticleGraphCtrl.h
index 4ee59b98a..b61157021 100644
--- a/Engine/source/gui/editor/guiParticleGraphCtrl.h
+++ b/Engine/source/gui/editor/guiParticleGraphCtrl.h
@@ -99,18 +99,18 @@ public:
    GuiParticleGraphCtrl();
    virtual ~GuiParticleGraphCtrl() { };
 
-   void onMouseMove(const GuiEvent &event);
-   void onMouseDown( const GuiEvent &event );
-   void onMouseUp( const GuiEvent &event );
-   void onMouseDragged( const GuiEvent &event );
-   void onRightMouseDown( const GuiEvent &event );
-   void onRightMouseUp( const GuiEvent &event );
-   void onRightMouseDragged( const GuiEvent &event );
+   void onMouseMove(const GuiEvent &event) override;
+   void onMouseDown( const GuiEvent &event ) override;
+   void onMouseUp( const GuiEvent &event ) override;
+   void onMouseDragged( const GuiEvent &event ) override;
+   void onRightMouseDown( const GuiEvent &event ) override;
+   void onRightMouseUp( const GuiEvent &event ) override;
+   void onRightMouseDragged( const GuiEvent &event ) override;
 
    //Parental methods
-   bool onWake();
+   bool onWake() override;
 
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
    bool renderGraphTooltip(Point2I cursorPos, StringTableEntry tooltip);
 
    // Graph interface
diff --git a/Engine/source/gui/editor/guiPopupMenuCtrl.h b/Engine/source/gui/editor/guiPopupMenuCtrl.h
index 54632a009..f54fa8d8c 100644
--- a/Engine/source/gui/editor/guiPopupMenuCtrl.h
+++ b/Engine/source/gui/editor/guiPopupMenuCtrl.h
@@ -61,12 +61,12 @@ public:
    GuiPopupMenuTextListCtrl();
 
    // GuiControl overloads:
-   bool onKeyDown(const GuiEvent &event);
-   void onMouseDown(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
-   void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
+   bool onKeyDown(const GuiEvent &event) override;
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseUp(const GuiEvent &event) override;
+   void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override;
 
-   virtual void onCellHighlighted(Point2I cell); //  Added
+   void onCellHighlighted(Point2I cell) override; //  Added
 };
 
 class GuiPopupMenuBackgroundCtrl : public GuiControl
@@ -75,10 +75,10 @@ class GuiPopupMenuBackgroundCtrl : public GuiControl
 
 public:
    GuiPopupMenuBackgroundCtrl();
-   void onMouseDown(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
-   void onMouseMove(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseUp(const GuiEvent &event) override;
+   void onMouseMove(const GuiEvent &event) override;
+   void onMouseDragged(const GuiEvent &event) override;
 
    void close();
 
diff --git a/Engine/source/gui/editor/guiRectHandles.h b/Engine/source/gui/editor/guiRectHandles.h
index b9a3f7551..fb6cd18d5 100644
--- a/Engine/source/gui/editor/guiRectHandles.h
+++ b/Engine/source/gui/editor/guiRectHandles.h
@@ -49,11 +49,11 @@ public:
 
    static void initPersistFields();
 
-   virtual void onMouseUp(const GuiEvent &event);
-   virtual void onMouseDown(const GuiEvent &event);
-   virtual void onMouseDragged(const GuiEvent &event);
+   void onMouseUp(const GuiEvent &event) override;
+   void onMouseDown(const GuiEvent &event) override;
+   void onMouseDragged(const GuiEvent &event) override;
 
-   virtual void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 };
 
 #endif
diff --git a/Engine/source/gui/editor/guiSeparatorCtrl.h b/Engine/source/gui/editor/guiSeparatorCtrl.h
index beca62033..a5938dccb 100644
--- a/Engine/source/gui/editor/guiSeparatorCtrl.h
+++ b/Engine/source/gui/editor/guiSeparatorCtrl.h
@@ -58,7 +58,7 @@ public:
 
    static void initPersistFields();
 
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 };
 
 typedef GuiSeparatorCtrl::separatorTypeOptions GuiSeparatorType;
diff --git a/Engine/source/gui/editor/guiShapeEdPreview.h b/Engine/source/gui/editor/guiShapeEdPreview.h
index ba42d7265..36cad41aa 100644
--- a/Engine/source/gui/editor/guiShapeEdPreview.h
+++ b/Engine/source/gui/editor/guiShapeEdPreview.h
@@ -163,7 +163,7 @@ protected:
    void updateThreads(F32 delta);
 
    // Rendering
-   void renderGrid();
+   void renderGrid() override;
    void renderNodes() const;
    void renderNodeAxes(S32 index, const LinearColorF& nodeColor) const;
    void renderNodeName(S32 index, const LinearColorF& textColor) const;
@@ -171,27 +171,27 @@ protected:
    void renderCollisionMeshes() const;
 
 public:
-   bool onWake();
+   bool onWake() override;
 
-   void setDisplayType(S32 type);
+   void setDisplayType(S32 type) override;
 
    /// @name Mouse event handlers
    ///@{
-   void onMouseDown(const GuiEvent& event) { handleMouseDown(event, NoneMode); }
-   void onMouseUp(const GuiEvent& event) { handleMouseUp(event, NoneMode); }
-   void onMouseMove(const GuiEvent& event) { handleMouseMove(event, NoneMode); }
-   void onMouseDragged(const GuiEvent& event) { handleMouseDragged(event, NoneMode); }
+   void onMouseDown(const GuiEvent& event) override { handleMouseDown(event, NoneMode); }
+   void onMouseUp(const GuiEvent& event) override { handleMouseUp(event, NoneMode); }
+   void onMouseMove(const GuiEvent& event) override { handleMouseMove(event, NoneMode); }
+   void onMouseDragged(const GuiEvent& event) override { handleMouseDragged(event, NoneMode); }
 
-   void onMiddleMouseDown(const GuiEvent& event) { handleMouseDown(event, MoveMode); }
-   void onMiddleMouseUp(const GuiEvent& event) { handleMouseUp(event, MoveMode); }
-   void onMiddleMouseDragged(const GuiEvent& event) { handleMouseDragged(event, MoveMode); }
+   void onMiddleMouseDown(const GuiEvent& event) override { handleMouseDown(event, MoveMode); }
+   void onMiddleMouseUp(const GuiEvent& event) override { handleMouseUp(event, MoveMode); }
+   void onMiddleMouseDragged(const GuiEvent& event) override { handleMouseDragged(event, MoveMode); }
 
-   void onRightMouseDown(const GuiEvent& event) { handleMouseDown(event, RotateMode); }
-   void onRightMouseUp(const GuiEvent& event) { handleMouseUp(event, RotateMode); }
-   void onRightMouseDragged(const GuiEvent& event) { handleMouseDragged(event, RotateMode); }
+   void onRightMouseDown(const GuiEvent& event) override { handleMouseDown(event, RotateMode); }
+   void onRightMouseUp(const GuiEvent& event) override { handleMouseUp(event, RotateMode); }
+   void onRightMouseDragged(const GuiEvent& event) override { handleMouseDragged(event, RotateMode); }
 
-   void on3DMouseWheelUp(const Gui3DMouseEvent& event);
-   void on3DMouseWheelDown(const Gui3DMouseEvent& event);
+   void on3DMouseWheelUp(const Gui3DMouseEvent& event) override;
+   void on3DMouseWheelDown(const Gui3DMouseEvent& event) override;
    ///@}
 
    // Setters/Getters
@@ -234,7 +234,7 @@ public:
    void refreshShape();
    void updateNodeTransforms();
 
-   void get3DCursor(GuiCursor *& cursor, bool& visible, const Gui3DMouseEvent& event_);
+   void get3DCursor(GuiCursor *& cursor, bool& visible, const Gui3DMouseEvent& event_) override;
 
    void fitToShape();
    void setOrbitPos( const Point3F& pos );
@@ -243,15 +243,15 @@ public:
 
    /// @name Rendering
    ///@{
-   bool getCameraTransform(MatrixF* cameraMatrix);
-   void computeSceneBounds(Box3F& bounds);
+   bool getCameraTransform(MatrixF* cameraMatrix) override;
+   void computeSceneBounds(Box3F& bounds) override;
 
    bool getMeshHidden(const char* name) const;
    void setMeshHidden(const char* name, bool hidden);
    void setAllMeshesHidden(bool hidden);
 
-   void renderWorld(const RectI& updateRect);
-   void renderGui(Point2I offset, const RectI& updateRect);
+   void renderWorld(const RectI& updateRect) override;
+   void renderGui(Point2I offset, const RectI& updateRect) override;
    ///@}
 
    DECLARE_CONOBJECT(GuiShapeEdPreview);
diff --git a/Engine/source/gui/editor/inspector/customField.h b/Engine/source/gui/editor/inspector/customField.h
index 27cbd231b..41b70c382 100644
--- a/Engine/source/gui/editor/inspector/customField.h
+++ b/Engine/source/gui/editor/inspector/customField.h
@@ -38,27 +38,27 @@ public:
 
    DECLARE_CONOBJECT( GuiInspectorCustomField );
 
-   virtual void             setData( const char* data, bool callbacks = true );
-   virtual const char*      getData( U32 inspectObjectIndex = 0 );
-   virtual void             updateValue();
-   virtual StringTableEntry getFieldName() { return StringTable->EmptyString(); }
+   void             setData( const char* data, bool callbacks = true ) override;
+   const char*      getData( U32 inspectObjectIndex = 0 ) override;
+   void             updateValue() override;
+   StringTableEntry getFieldName() override { return StringTable->EmptyString(); }
 
    virtual void setDoc( const char* doc );
    virtual void setToolTip( StringTableEntry data );
 
-   virtual bool onAdd();
+   bool onAdd() override;
 
-   virtual void setInspectorField( AbstractClassRep::Field *field, 
+   void setInspectorField( AbstractClassRep::Field *field, 
                                    StringTableEntry caption = NULL,
-                                   const char *arrayIndex = NULL );
+                                   const char *arrayIndex = NULL ) override;
    
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
 
-   virtual void setValue( const char* newValue );
+   void setValue( const char* newValue ) override;
 
 protected:
 
-   virtual void _executeSelectedCallback();
+   void _executeSelectedCallback() override;
 
 protected:
 
diff --git a/Engine/source/gui/editor/inspector/datablockField.h b/Engine/source/gui/editor/inspector/datablockField.h
index b12224766..6c635b1ab 100644
--- a/Engine/source/gui/editor/inspector/datablockField.h
+++ b/Engine/source/gui/editor/inspector/datablockField.h
@@ -44,9 +44,9 @@ class GuiInspectorDatablockField : public GuiInspectorTypeMenuBase
       RectI mBrowseRect;
 
       virtual SimSet* _getDatablockSet() const { return Sim::getDataBlockSet(); }
-      virtual void _populateMenu( GuiPopUpMenuCtrlEx* menu );
-      virtual GuiControl* constructEditControl();
-      virtual bool updateRects();
+      void _populateMenu( GuiPopUpMenuCtrlEx* menu ) override;
+      GuiControl* constructEditControl() override;
+      bool updateRects() override;
       
    public:
       
@@ -69,7 +69,7 @@ class GuiInspectorTypeSFXDescriptionName : public GuiInspectorDatablockField
       
    protected:
    
-      virtual SimSet* _getDatablockSet() const { return Sim::getSFXDescriptionSet(); }
+      SimSet* _getDatablockSet() const override { return Sim::getSFXDescriptionSet(); }
    
    public:
       
@@ -89,7 +89,7 @@ class GuiInspectorTypeSFXTrackName : public GuiInspectorDatablockField
       
    protected:
    
-      virtual SimSet* _getDatablockSet() const { return Sim::getSFXTrackSet(); }
+      SimSet* _getDatablockSet() const override { return Sim::getSFXTrackSet(); }
       
    public:
 
@@ -109,7 +109,7 @@ class GuiInspectorTypeSFXEnvironmentName : public GuiInspectorDatablockField
       
    protected:
    
-      virtual SimSet* _getDatablockSet() const { return Sim::getSFXEnvironmentSet(); }
+      SimSet* _getDatablockSet() const override { return Sim::getSFXEnvironmentSet(); }
    
    public:
       DECLARE_CONOBJECT(GuiInspectorTypeSFXEnvironmentName);
@@ -128,7 +128,7 @@ class GuiInspectorTypeSFXAmbienceName : public GuiInspectorDatablockField
       
    protected:
    
-      virtual SimSet* _getDatablockSet() const { return Sim::getSFXAmbienceSet(); }
+      SimSet* _getDatablockSet() const override { return Sim::getSFXAmbienceSet(); }
    
    public:
    
diff --git a/Engine/source/gui/editor/inspector/dynamicField.h b/Engine/source/gui/editor/inspector/dynamicField.h
index 477873395..cca4845e6 100644
--- a/Engine/source/gui/editor/inspector/dynamicField.h
+++ b/Engine/source/gui/editor/inspector/dynamicField.h
@@ -39,24 +39,24 @@ public:
 
    DECLARE_CONOBJECT( GuiInspectorDynamicField );
 
-   virtual void             setData( const char* data, bool callbacks = true );
-   virtual const char*      getData( U32 inspectObjectIndex = 0 );
-   virtual StringTableEntry getFieldName() { return ( mDynField != NULL ) ? mDynField->slotName : StringTable->insert( "" ); }
-   virtual StringTableEntry getRawFieldName() { return getFieldName(); }
+   void             setData( const char* data, bool callbacks = true ) override;
+   const char*      getData( U32 inspectObjectIndex = 0 ) override;
+   StringTableEntry getFieldName() override { return ( mDynField != NULL ) ? mDynField->slotName : StringTable->insert( "" ); }
+   StringTableEntry getRawFieldName() override { return getFieldName(); }
 
-   virtual bool onAdd();
+   bool onAdd() override;
 
    void renameField( const char* newFieldName );
    GuiControl* constructRenameControl();
 
-   virtual bool updateRects();
-   virtual void setInspectorField( AbstractClassRep::Field *field, 
+   bool updateRects() override;
+   void setInspectorField( AbstractClassRep::Field *field, 
                                    StringTableEntry caption = NULL,
-                                   const char *arrayIndex = NULL );
+                                   const char *arrayIndex = NULL ) override;
 
 protected:
 
-   virtual void _executeSelectedCallback();
+   void _executeSelectedCallback() override;
 
 protected:
 
diff --git a/Engine/source/gui/editor/inspector/dynamicGroup.h b/Engine/source/gui/editor/inspector/dynamicGroup.h
index fdc8d19c2..ddfe8ab78 100644
--- a/Engine/source/gui/editor/inspector/dynamicGroup.h
+++ b/Engine/source/gui/editor/inspector/dynamicGroup.h
@@ -45,8 +45,8 @@ public:
    // inspectGroup is overridden in GuiInspectorDynamicGroup to inspect an 
    // objects FieldDictionary (dynamic fields) instead of regular persistent
    // fields.
-   bool inspectGroup();
-   virtual void updateAllFields();
+   bool inspectGroup() override;
+   void updateAllFields() override;
 
    // For scriptable dynamic field additions
    void addDynamicField();
@@ -58,7 +58,7 @@ public:
    virtual SimFieldDictionary::Entry* findDynamicFieldInDictionary( StringTableEntry fieldName );
 protected:
    // create our inner controls when we add
-   virtual bool createContent();
+   bool createContent() override;
 
 };
 
diff --git a/Engine/source/gui/editor/inspector/variableField.h b/Engine/source/gui/editor/inspector/variableField.h
index 8bb382a58..694ef379e 100644
--- a/Engine/source/gui/editor/inspector/variableField.h
+++ b/Engine/source/gui/editor/inspector/variableField.h
@@ -45,15 +45,15 @@ public:
    DECLARE_CONOBJECT( GuiInspectorVariableField );
    DECLARE_CATEGORY( "Gui Editor" );
 
-   virtual bool onAdd();
+   bool onAdd() override;
 
 
-   virtual void setValue( const char* newValue );
-   virtual const char* getValue() { return NULL; }
-   virtual void updateValue();
-   virtual void setData( const char* data, bool callbacks = true );
-   virtual const char* getData( U32 inspectObjectIndex = 0 );
-   virtual void updateData() {};
+   void setValue( const char* newValue ) override;
+   const char* getValue() override { return NULL; }
+   void updateValue() override;
+   void setData( const char* data, bool callbacks = true ) override;
+   const char* getData( U32 inspectObjectIndex = 0 ) override;
+   void updateData() override {};
 
 protected:
    StringTableEntry mVariableName;
diff --git a/Engine/source/gui/editor/inspector/variableGroup.h b/Engine/source/gui/editor/inspector/variableGroup.h
index 0711933a0..e6f53d719 100644
--- a/Engine/source/gui/editor/inspector/variableGroup.h
+++ b/Engine/source/gui/editor/inspector/variableGroup.h
@@ -67,9 +67,9 @@ public:
    DECLARE_CONOBJECT(GuiInspectorVariableGroup);
    DECLARE_CATEGORY( "Gui Editor" );
 
-   virtual GuiInspectorField* constructField( S32 fieldType );
+   GuiInspectorField* constructField( S32 fieldType ) override;
 
-   virtual bool inspectGroup();
+   bool inspectGroup() override;
 
    void clearFields();
    void addField(VariableField* field);
diff --git a/Engine/source/gui/editor/inspector/variableInspector.h b/Engine/source/gui/editor/inspector/variableInspector.h
index 2488e8206..563a74caf 100644
--- a/Engine/source/gui/editor/inspector/variableInspector.h
+++ b/Engine/source/gui/editor/inspector/variableInspector.h
@@ -43,7 +43,7 @@ public:
    DECLARE_CONOBJECT( GuiVariableInspector );
    DECLARE_CATEGORY( "Gui Editor" );
 
-   virtual void inspectObject( SimObject *object ) {}
+   void inspectObject( SimObject *object ) override {}
 
    virtual void loadVars( String searchString );
 
diff --git a/Engine/source/gui/editor/popupMenu.cpp b/Engine/source/gui/editor/popupMenu.cpp
index b5dc3cb69..783453f02 100644
--- a/Engine/source/gui/editor/popupMenu.cpp
+++ b/Engine/source/gui/editor/popupMenu.cpp
@@ -35,7 +35,7 @@ bool PopupMenu::smSelectionEventHandled = false;
 class PopUpNotifyRemoveEvent : public SimEvent
 {
 public:
-   void process(SimObject *object)
+   void process(SimObject *object) override
    {
       PopupMenu::smPopupMenuEvent.remove((PopupMenu *)object, &PopupMenu::handleSelectEvent);
    }
diff --git a/Engine/source/gui/editor/popupMenu.h b/Engine/source/gui/editor/popupMenu.h
index 2925b8ace..265523a79 100644
--- a/Engine/source/gui/editor/popupMenu.h
+++ b/Engine/source/gui/editor/popupMenu.h
@@ -97,8 +97,8 @@ public:
 
    static void initPersistFields();
 
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
 	static PopupMenuEvent smPopupMenuEvent;
 	static bool smSelectionEventHandled; /// Set to true if any menu or submenu handles a selection event
@@ -181,8 +181,8 @@ public:
 	/// it should work regardless of platform.
 	void handleSelectEvent(U32 popID, U32 command);
 
-   virtual bool onMessageReceived(StringTableEntry queue, const char* event, const char* data );
-   virtual bool onMessageObjectReceived(StringTableEntry queue, Message *msg );
+   bool onMessageReceived(StringTableEntry queue, const char* event, const char* data ) override;
+   bool onMessageObjectReceived(StringTableEntry queue, Message *msg ) override;
 
    bool isVisible() { return mVisible; }
    void setVisible(bool isVis) { mVisible = isVis; }
diff --git a/Engine/source/gui/game/guiChunkedBitmapCtrl.h b/Engine/source/gui/game/guiChunkedBitmapCtrl.h
index f5d3405b8..08db54166 100644
--- a/Engine/source/gui/game/guiChunkedBitmapCtrl.h
+++ b/Engine/source/gui/game/guiChunkedBitmapCtrl.h
@@ -32,12 +32,12 @@ public:
    static void initPersistFields();
 
    //Parental methods
-   bool onWake();
-   void onSleep();
+   bool onWake() override;
+   void onSleep() override;
 
    void setBitmap(const char *name);
 
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
    void onImageChanged() {}
 };
diff --git a/Engine/source/gui/game/guiFadeinBitmapCtrl.h b/Engine/source/gui/game/guiFadeinBitmapCtrl.h
index b6b3e0b77..b4c991430 100644
--- a/Engine/source/gui/game/guiFadeinBitmapCtrl.h
+++ b/Engine/source/gui/game/guiFadeinBitmapCtrl.h
@@ -69,12 +69,12 @@ class GuiFadeinBitmapCtrl : public GuiBitmapCtrl
       GuiFadeinBitmapCtrl();
 
       // GuiControl.
-      virtual void onPreRender();
-      virtual void onMouseDown(const GuiEvent &);
-      virtual bool onKeyDown(const GuiEvent &);
-      virtual bool onGamepadButtonDown(const GuiEvent& event);
-      virtual bool onWake();
-      virtual void onRender(Point2I offset, const RectI &updateRect);
+      void onPreRender() override;
+      void onMouseDown(const GuiEvent &) override;
+      bool onKeyDown(const GuiEvent &) override;
+      bool onGamepadButtonDown(const GuiEvent& event) override;
+      bool onWake() override;
+      void onRender(Point2I offset, const RectI &updateRect) override;
       
       static void initPersistFields();
 
diff --git a/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp b/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp
index 27c53721f..55a0891d6 100644
--- a/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp
+++ b/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp
@@ -53,21 +53,21 @@ public:
       doFadeIn    = false;
       doFadeOut   = false;
    }
-   void onPreRender()
+   void onPreRender() override
    {
       Parent::onPreRender();
       setUpdate();
    }
-   void onMouseDown(const GuiEvent &)
+   void onMouseDown(const GuiEvent &) override
    {
       Con::executef(this, "click");
    }
-   bool onKeyDown(const GuiEvent &)
+   bool onKeyDown(const GuiEvent &) override
    {
       Con::executef(this, "click");
       return true;
    }
-   bool onWake()
+   bool onWake() override
    {
       if(!Parent::onWake())
          return false;
@@ -91,7 +91,7 @@ public:
       done = false;
    }
 
-   void onRender(Point2I offset, const RectI &updateRect)
+   void onRender(Point2I offset, const RectI &updateRect) override
    {
       U32 elapsed = Platform::getRealMilliseconds() - wakeTime;
 
diff --git a/Engine/source/gui/game/guiMessageVectorCtrl.h b/Engine/source/gui/game/guiMessageVectorCtrl.h
index 05d4ffc7c..a98baf23e 100644
--- a/Engine/source/gui/game/guiMessageVectorCtrl.h
+++ b/Engine/source/gui/game/guiMessageVectorCtrl.h
@@ -63,17 +63,17 @@ class GuiMessageVectorCtrl : public GuiControl
 
    // Gui control overrides
   protected:
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
-   bool onWake();
-   void onSleep();
-   void onRender(Point2I offset, const RectI &updateRect);
-   void inspectPostApply();
-   void parentResized(const RectI& oldParentRect, const RectI& newParentRect);
+   bool onWake() override;
+   void onSleep() override;
+   void onRender(Point2I offset, const RectI &updateRect) override;
+   void inspectPostApply() override;
+   void parentResized(const RectI& oldParentRect, const RectI& newParentRect) override;
 
-   void onMouseUp(const GuiEvent &event);
-   void onMouseDown(const GuiEvent &event);
+   void onMouseUp(const GuiEvent &event) override;
+   void onMouseDown(const GuiEvent &event) override;
 //   void onMouseMove(const GuiEvent &event);
 
    // Overrideables
diff --git a/Engine/source/gui/game/guiProgressBitmapCtrl.h b/Engine/source/gui/game/guiProgressBitmapCtrl.h
index fba8aaa3c..54c702f19 100644
--- a/Engine/source/gui/game/guiProgressBitmapCtrl.h
+++ b/Engine/source/gui/game/guiProgressBitmapCtrl.h
@@ -70,13 +70,13 @@ class GuiProgressBitmapCtrl : public GuiTextCtrl
       void setBitmap( const char* name );
       
       //console related methods
-      virtual const char *getScriptValue();
-      virtual void setScriptValue(const char *value);
+      const char *getScriptValue() override;
+      void setScriptValue(const char *value) override;
 
       // GuiTextCtrl.
-      virtual void onPreRender();
-      virtual void onRender( Point2I offset, const RectI &updateRect );
-      virtual bool onWake();
+      void onPreRender() override;
+      void onRender( Point2I offset, const RectI &updateRect ) override;
+      bool onWake() override;
 
       DECLARE_CONOBJECT( GuiProgressBitmapCtrl );
       DECLARE_CATEGORY( "Gui Values" );
diff --git a/Engine/source/gui/game/guiProgressCtrl.h b/Engine/source/gui/game/guiProgressCtrl.h
index 9d1aacca2..a4885224d 100644
--- a/Engine/source/gui/game/guiProgressCtrl.h
+++ b/Engine/source/gui/game/guiProgressCtrl.h
@@ -48,11 +48,11 @@ public:
    GuiProgressCtrl();
 
    //console related methods
-   virtual const char *getScriptValue();
-   virtual void setScriptValue(const char *value);
+   const char *getScriptValue() override;
+   void setScriptValue(const char *value) override;
 
-   void onPreRender();
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onPreRender() override;
+   void onRender(Point2I offset, const RectI &updateRect) override;
 };
 
 #endif
diff --git a/Engine/source/gui/shaderEditor/guiShaderEditor.h b/Engine/source/gui/shaderEditor/guiShaderEditor.h
index a853951a4..1d79af328 100644
--- a/Engine/source/gui/shaderEditor/guiShaderEditor.h
+++ b/Engine/source/gui/shaderEditor/guiShaderEditor.h
@@ -111,26 +111,26 @@ public:
    DECLARE_CATEGORY("Shader Editor");
    DECLARE_DESCRIPTION("Implements a shader node based editor.");
 
-   bool onWake();
-   void onSleep();
+   bool onWake() override;
+   void onSleep() override;
    static void initPersistFields();
-   virtual bool onAdd() override;
-   virtual void onRemove() override;
+   bool onAdd() override;
+   void onRemove() override;
 
-   virtual void onPreRender() override;
+   void onPreRender() override;
    void drawThickLine(const Point2I& pt1, const Point2I& pt2, U32 thickness = 2, ColorI col1 = ColorI(255, 255, 255), ColorI col2 = ColorI(255, 255, 255));
-   virtual void onRender(Point2I offset, const RectI& updateRect) override;
+   void onRender(Point2I offset, const RectI& updateRect) override;
 
    // interaction
-   virtual bool onKeyDown(const GuiEvent& event) override;
-   virtual void onMouseDown(const GuiEvent& event) override;
-   virtual void onMouseUp(const GuiEvent& event) override;
-   virtual void onMouseDragged(const GuiEvent& event) override;
-   virtual void onMiddleMouseDown(const GuiEvent& event) override;
-   virtual void onMiddleMouseUp(const GuiEvent& event) override;
-   virtual void onMiddleMouseDragged(const GuiEvent& event) override;
-   virtual bool onMouseWheelUp(const GuiEvent& event) override;
-   virtual bool onMouseWheelDown(const GuiEvent& event) override;
+   bool onKeyDown(const GuiEvent& event) override;
+   void onMouseDown(const GuiEvent& event) override;
+   void onMouseUp(const GuiEvent& event) override;
+   void onMouseDragged(const GuiEvent& event) override;
+   void onMiddleMouseDown(const GuiEvent& event) override;
+   void onMiddleMouseUp(const GuiEvent& event) override;
+   void onMiddleMouseDragged(const GuiEvent& event) override;
+   bool onMouseWheelUp(const GuiEvent& event) override;
+   bool onMouseWheelDown(const GuiEvent& event) override;
 
    RectI getSelectionBounds();
    void deleteSelection();
diff --git a/Engine/source/gui/shaderEditor/guiShaderNode.h b/Engine/source/gui/shaderEditor/guiShaderNode.h
index 0ab409ca9..630b2c8a1 100644
--- a/Engine/source/gui/shaderEditor/guiShaderNode.h
+++ b/Engine/source/gui/shaderEditor/guiShaderNode.h
@@ -138,15 +138,15 @@ public:
 
    GuiShaderNode();
 
-   bool onWake();
-   void onSleep();
+   bool onWake() override;
+   void onSleep() override;
    static void initPersistFields();
-   virtual bool onAdd() override;
-   virtual void onRemove() override;
+   bool onAdd() override;
+   void onRemove() override;
 
    void renderNode(Point2I offset, const RectI& updateRect, const S32 nodeSize);
    // Serialization functions
-   void write(Stream& stream, U32 tabStop = 0, U32 flags = 0);
+   void write(Stream& stream, U32 tabStop = 0, U32 flags = 0) override;
    void read(Stream& stream);
 
    // is the parent that all other nodes are derived from.
diff --git a/Engine/source/gui/shiny/guiAudioCtrl.h b/Engine/source/gui/shiny/guiAudioCtrl.h
index 906fd7bf9..32a674cf6 100644
--- a/Engine/source/gui/shiny/guiAudioCtrl.h
+++ b/Engine/source/gui/shiny/guiAudioCtrl.h
@@ -58,9 +58,9 @@ private:
 protected:
 
    // So this can be instantiated and not be a pure virtual class
-   void interpolateTick( F32 delta ) {};
-   void processTick();
-   void advanceTime( F32 timeDelta ) {};
+   void interpolateTick( F32 delta ) override {};
+   void processTick() override;
+   void advanceTime( F32 timeDelta ) override {};
 
    S32 mTickPeriodMS;
    U32 mLastThink;
@@ -89,9 +89,9 @@ public:
    GuiAudioCtrl();
    ~GuiAudioCtrl();
    // GuiControl.
-   bool onWake();
-   void onSleep();
-   void setActive(bool value) {};
+   bool onWake() override;
+   void onSleep() override;
+   void setActive(bool value) override {};
    bool testCondition();
    static void initPersistFields();
    DECLARE_CONOBJECT(GuiAudioCtrl);
diff --git a/Engine/source/gui/theora/guiTheoraCtrl.h b/Engine/source/gui/theora/guiTheoraCtrl.h
index 9946e442f..8209f3cd9 100644
--- a/Engine/source/gui/theora/guiTheoraCtrl.h
+++ b/Engine/source/gui/theora/guiTheoraCtrl.h
@@ -110,10 +110,10 @@ class GuiTheoraCtrl : public GuiControl
       }
 
       // GuiControl.
-      virtual bool onWake();
-      virtual void onSleep();
-      virtual void onRender( Point2I offset, const RectI &updateRect );
-      virtual void inspectPostApply();
+      bool onWake() override;
+      void onSleep() override;
+      void onRender( Point2I offset, const RectI &updateRect ) override;
+      void inspectPostApply() override;
 
       static void initPersistFields();
 
diff --git a/Engine/source/gui/utility/guiBubbleTextCtrl.h b/Engine/source/gui/utility/guiBubbleTextCtrl.h
index c8175d0f7..5e0a668ac 100644
--- a/Engine/source/gui/utility/guiBubbleTextCtrl.h
+++ b/Engine/source/gui/utility/guiBubbleTextCtrl.h
@@ -54,7 +54,7 @@ class GuiBubbleTextCtrl : public GuiTextCtrl
 
       GuiBubbleTextCtrl() :mInAction(false), mDlg(NULL), mPopup(NULL), mMLText(NULL) {}
 
-      virtual void onMouseDown(const GuiEvent &event);
+      void onMouseDown(const GuiEvent &event) override;
 };
 
 #endif /* _GUI_BUBBLE_TEXT_CONTROL_H_ */
diff --git a/Engine/source/gui/utility/guiInputCtrl.h b/Engine/source/gui/utility/guiInputCtrl.h
index 5b87cc53f..62de1ea25 100644
--- a/Engine/source/gui/utility/guiInputCtrl.h
+++ b/Engine/source/gui/utility/guiInputCtrl.h
@@ -48,10 +48,10 @@ public:
    GuiInputCtrl();
 
    // GuiControl.
-   virtual bool onWake();
-   virtual void onSleep();
+   bool onWake() override;
+   void onSleep() override;
 
-   virtual bool onInputEvent( const InputEventInfo &event );
+   bool onInputEvent( const InputEventInfo &event ) override;
 
    static void initPersistFields();
 
diff --git a/Engine/source/gui/utility/guiMouseEventCtrl.h b/Engine/source/gui/utility/guiMouseEventCtrl.h
index dfb21482d..91f01aeae 100644
--- a/Engine/source/gui/utility/guiMouseEventCtrl.h
+++ b/Engine/source/gui/utility/guiMouseEventCtrl.h
@@ -52,15 +52,15 @@ class GuiMouseEventCtrl : public GuiControl
       DECLARE_CALLBACK( void, onRightMouseDragged, ( S32 modifier, Point2I mousePoint, S32 mouseClickCount ));
 
       // GuiControl
-      void onMouseDown(const GuiEvent & event);
-      void onMouseUp(const GuiEvent & event);
-      void onMouseMove(const GuiEvent & event);
-      void onMouseDragged(const GuiEvent & event);
-      void onMouseEnter(const GuiEvent & event);
-      void onMouseLeave(const GuiEvent & event);
-      void onRightMouseDown(const GuiEvent & event);
-      void onRightMouseUp(const GuiEvent & event);
-      void onRightMouseDragged(const GuiEvent & event);
+      void onMouseDown(const GuiEvent & event) override;
+      void onMouseUp(const GuiEvent & event) override;
+      void onMouseMove(const GuiEvent & event) override;
+      void onMouseDragged(const GuiEvent & event) override;
+      void onMouseEnter(const GuiEvent & event) override;
+      void onMouseLeave(const GuiEvent & event) override;
+      void onRightMouseDown(const GuiEvent & event) override;
+      void onRightMouseUp(const GuiEvent & event) override;
+      void onRightMouseDragged(const GuiEvent & event) override;
 
       static void initPersistFields();
 
diff --git a/Engine/source/gui/utility/guiRenderTargetVizCtrl.h b/Engine/source/gui/utility/guiRenderTargetVizCtrl.h
index e44d6c2f1..72c70fd7f 100644
--- a/Engine/source/gui/utility/guiRenderTargetVizCtrl.h
+++ b/Engine/source/gui/utility/guiRenderTargetVizCtrl.h
@@ -49,8 +49,8 @@ class GuiRenderTargetVizCtrl : public GuiControl
 public:
    DECLARE_CONOBJECT(GuiRenderTargetVizCtrl);
    GuiRenderTargetVizCtrl();
-   bool onWake();
-   void onRender(Point2I offset, const RectI &updateRect);
+   bool onWake() override;
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
    static void initPersistFields();
 };
diff --git a/Engine/source/gui/utility/messageVector.h b/Engine/source/gui/utility/messageVector.h
index 2169dd04f..fc5450d43 100644
--- a/Engine/source/gui/utility/messageVector.h
+++ b/Engine/source/gui/utility/messageVector.h
@@ -91,8 +91,8 @@ class MessageVector : public SimObject
 
    //-------------------------------------- Internal interface
   protected:
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
   private:
    struct SpectatorRef {
diff --git a/Engine/source/gui/worldEditor/creator.h b/Engine/source/gui/worldEditor/creator.h
index 074f34ad4..a2facfaac 100644
--- a/Engine/source/gui/worldEditor/creator.h
+++ b/Engine/source/gui/worldEditor/creator.h
@@ -98,20 +98,20 @@ class CreatorTree : public GuiArrayCtrl
 
       //
       void sort();
-      void clear();
+      void clear() override;
 
       S32                           mTabSize;
       S32                           mMaxWidth;
       S32                           mTxtOffset;
 
       // GuiControl
-      void onMouseDown(const GuiEvent & event);
-      void onMouseDragged(const GuiEvent & event);
-      void onMouseUp(const GuiEvent & event);
-      bool onWake();
+      void onMouseDown(const GuiEvent & event) override;
+      void onMouseDragged(const GuiEvent & event) override;
+      void onMouseUp(const GuiEvent & event) override;
+      bool onWake() override;
 
       // GuiArrayCtrl
-      void onRenderCell(Point2I offset, Point2I cell, bool, bool);
+      void onRenderCell(Point2I offset, Point2I cell, bool, bool) override;
 
       DECLARE_CONOBJECT(CreatorTree);
       DECLARE_CATEGORY( "Gui Editor" );
diff --git a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h
index 1c64e964a..3a6c99577 100644
--- a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h
+++ b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h
@@ -55,29 +55,29 @@ public:
    DECLARE_CONOBJECT( GuiConvexEditorCtrl );
 
    // SimObject
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
    static void initPersistFields();
 
    // GuiControl
-   virtual bool onWake();
-   virtual void onSleep();
-   virtual void setVisible(bool value);
+   bool onWake() override;
+   void onSleep() override;
+   void setVisible(bool value) override;
 
    // EditTSCtrl      
-   bool onKeyDown( const GuiEvent &event );
-   bool onKeyUp( const GuiEvent &event );
-   void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
-   void on3DMouseDown( const Gui3DMouseEvent &event );
-   void on3DMouseUp( const Gui3DMouseEvent &event );
-   void on3DMouseMove( const Gui3DMouseEvent &event );
-   void on3DMouseDragged( const Gui3DMouseEvent &event );
-   void on3DMouseEnter( const Gui3DMouseEvent &event );
-   void on3DMouseLeave( const Gui3DMouseEvent &event );
-   void on3DRightMouseDown( const Gui3DMouseEvent &event );
-   void on3DRightMouseUp( const Gui3DMouseEvent &event );
-   void renderScene(const RectI & updateRect);   
-   void updateGizmo();
+   bool onKeyDown( const GuiEvent &event ) override;
+   bool onKeyUp( const GuiEvent &event ) override;
+   void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
+   void on3DMouseDown( const Gui3DMouseEvent &event ) override;
+   void on3DMouseUp( const Gui3DMouseEvent &event ) override;
+   void on3DMouseMove( const Gui3DMouseEvent &event ) override;
+   void on3DMouseDragged( const Gui3DMouseEvent &event ) override;
+   void on3DMouseEnter( const Gui3DMouseEvent &event ) override;
+   void on3DMouseLeave( const Gui3DMouseEvent &event ) override;
+   void on3DRightMouseDown( const Gui3DMouseEvent &event ) override;
+   void on3DRightMouseUp( const Gui3DMouseEvent &event ) override;
+   void renderScene(const RectI & updateRect) override;   
+   void updateGizmo() override;
 
    void updateShape( ConvexShape *shape, S32 offsetFace = -1 );
    static void synchClientObject( const ConvexShape *serverConvex );
@@ -260,8 +260,8 @@ public:
    MatrixF mSavedObjToWorld;
    Point3F mSavedScale;   
 
-   virtual void undo();
-   virtual void redo() { undo(); }
+   void undo() override;
+   void redo() override { undo(); }
 };
 
 class ConvexEditorTool
@@ -311,15 +311,15 @@ public:
    ConvexEditorCreateTool( GuiConvexEditorCtrl *editor );
    virtual ~ConvexEditorCreateTool() {}
 
-   virtual void onActivated( ConvexEditorTool *prevTool );
-   virtual void onDeactivated( ConvexEditorTool *newTool );
+   void onActivated( ConvexEditorTool *prevTool ) override;
+   void onDeactivated( ConvexEditorTool *newTool ) override;
 
-   virtual EventResult on3DMouseDown( const Gui3DMouseEvent &event );
-   virtual EventResult on3DMouseUp( const Gui3DMouseEvent &event );
-   virtual EventResult on3DMouseMove( const Gui3DMouseEvent &event );
-   virtual EventResult on3DMouseDragged( const Gui3DMouseEvent &event );
+   EventResult on3DMouseDown( const Gui3DMouseEvent &event ) override;
+   EventResult on3DMouseUp( const Gui3DMouseEvent &event ) override;
+   EventResult on3DMouseMove( const Gui3DMouseEvent &event ) override;
+   EventResult on3DMouseDragged( const Gui3DMouseEvent &event ) override;
 
-   virtual void renderScene(const RectI & updateRect);   
+   void renderScene(const RectI & updateRect) override;   
 
    ConvexShape* extrudeShapeFromFace( ConvexShape *shape, S32 face );
 
diff --git a/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h b/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h
index 06903e049..b555418c0 100644
--- a/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h
+++ b/Engine/source/gui/worldEditor/guiDecalEditorCtrl.h
@@ -51,29 +51,29 @@ class GuiDecalEditorCtrl : public EditTSCtrl
       DECLARE_CONOBJECT(GuiDecalEditorCtrl);
 
       // SimObject
-      bool onAdd();
+      bool onAdd() override;
       static void initPersistFields();      
       static void consoleInit();
-      void onEditorDisable();
+      void onEditorDisable() override;
 
       // GuiControl
-      virtual bool onWake();
-      virtual void onSleep();
-      virtual void onRender(Point2I offset, const RectI &updateRect);
+      bool onWake() override;
+      void onSleep() override;
+      void onRender(Point2I offset, const RectI &updateRect) override;
 
       // EditTSCtrl      
-      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
-      void on3DMouseDown(const Gui3DMouseEvent & event);
-      void on3DMouseUp(const Gui3DMouseEvent & event);
-      void on3DMouseMove(const Gui3DMouseEvent & event);
-      void on3DMouseDragged(const Gui3DMouseEvent & event);
-      void on3DMouseEnter(const Gui3DMouseEvent & event);
-      void on3DMouseLeave(const Gui3DMouseEvent & event);
-      void on3DRightMouseDown(const Gui3DMouseEvent & event);
-      void on3DRightMouseUp(const Gui3DMouseEvent & event);
-      void updateGuiInfo();      
-      void renderScene(const RectI & updateRect);
-      void renderGui(Point2I offset, const RectI &updateRect);
+      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
+      void on3DMouseDown(const Gui3DMouseEvent & event) override;
+      void on3DMouseUp(const Gui3DMouseEvent & event) override;
+      void on3DMouseMove(const Gui3DMouseEvent & event) override;
+      void on3DMouseDragged(const Gui3DMouseEvent & event) override;
+      void on3DMouseEnter(const Gui3DMouseEvent & event) override;
+      void on3DMouseLeave(const Gui3DMouseEvent & event) override;
+      void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
+      void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
+      void updateGuiInfo() override;      
+      void renderScene(const RectI & updateRect) override;
+      void renderGui(Point2I offset, const RectI &updateRect) override;
 
       /// Find clicked point on "static collision" objects.
       bool getRayInfo( const Gui3DMouseEvent &event, RayInfo *rInfo );
@@ -132,8 +132,8 @@ public:
    void addDecal(const DecalInstance& decal);
 
    // UndoAction
-   virtual void undo();
-   virtual void redo();
+   void undo() override;
+   void redo() override;
 };
 
 //Decal Instance Delete Undo Actions
@@ -162,8 +162,8 @@ public:
    void deleteDecal(const DecalInstance& decal);
 
    // UndoAction
-   virtual void undo();
-   virtual void redo();
+   void undo() override;
+   void redo() override;
 };
 
 //Decal Datablock Delete Undo Actions
@@ -191,8 +191,8 @@ public:
    void deleteDecal(const DecalInstance& decal);
 
    // UndoAction
-   virtual void undo();
-   virtual void redo();
+   void undo() override;
+   void redo() override;
 };
 
 //Decal Datablock Retarget Undo Actions
@@ -221,8 +221,8 @@ public:
    void retargetDecal( DecalInstance* decal );
 
    // UndoAction
-   virtual void undo();
-   virtual void redo();
+   void undo() override;
+   void redo() override;
 };
 
 #endif // _GUIDECALEDITORCTRL_H_
diff --git a/Engine/source/gui/worldEditor/guiMissionArea.h b/Engine/source/gui/worldEditor/guiMissionArea.h
index 947cd5a8c..97c9013c5 100644
--- a/Engine/source/gui/worldEditor/guiMissionArea.h
+++ b/Engine/source/gui/worldEditor/guiMissionArea.h
@@ -119,20 +119,20 @@ public:
    DECLARE_CONOBJECT(GuiMissionAreaCtrl);
 
    // SimObject
-   bool onAdd();
+   bool onAdd() override;
    static void initPersistFields();
 
    // GuiControl
-   void onRender(Point2I offset, const RectI &updateRect);
-   bool onWake();
-   void onSleep();
+   void onRender(Point2I offset, const RectI &updateRect) override;
+   bool onWake() override;
+   void onSleep() override;
 
-   virtual void onMouseUp(const GuiEvent & event);
-   virtual void onMouseDown(const GuiEvent & event);
-   virtual void onMouseMove(const GuiEvent & event);
-   virtual void onMouseDragged(const GuiEvent & event);
-   virtual void onMouseEnter(const GuiEvent & event);
-   virtual void onMouseLeave(const GuiEvent & event);
+   void onMouseUp(const GuiEvent & event) override;
+   void onMouseDown(const GuiEvent & event) override;
+   void onMouseMove(const GuiEvent & event) override;
+   void onMouseDragged(const GuiEvent & event) override;
+   void onMouseEnter(const GuiEvent & event) override;
+   void onMouseLeave(const GuiEvent & event) override;
 
    void setMissionArea( MissionArea* area );
    void updateTerrain();
@@ -154,8 +154,8 @@ class GuiMissionAreaUndoAction : public UndoAction
       SimObjectId mObjId;
       RectI mArea;
 
-      virtual void undo();
-      virtual void redo() { undo(); }
+      void undo() override;
+      void redo() override { undo(); }
 };
 
 #endif // _GUIMISSIONAREA_H_
diff --git a/Engine/source/gui/worldEditor/guiMissionAreaEditor.h b/Engine/source/gui/worldEditor/guiMissionAreaEditor.h
index c934897a6..23f695efd 100644
--- a/Engine/source/gui/worldEditor/guiMissionAreaEditor.h
+++ b/Engine/source/gui/worldEditor/guiMissionAreaEditor.h
@@ -44,11 +44,11 @@ public:
    DECLARE_CONOBJECT(GuiMissionAreaEditorCtrl);
 
    // SimObject
-   bool onAdd();
+   bool onAdd() override;
    static void initPersistFields();
 
    // EditTSCtrl      
-   void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
+   void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
 
    void setSelectedMissionArea( MissionArea *missionArea );
    MissionArea* getSelectedMissionArea() { return mSelMissionArea; };
diff --git a/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h b/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h
index 68f670f82..0b2bdc3c8 100644
--- a/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h
+++ b/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h
@@ -65,9 +65,9 @@ public:
    static void initPersistFields();
 
    //Parental methods
-   bool onWake();
-   void onSleep();
-   bool onAdd();
+   bool onWake() override;
+   void onSleep() override;
+   bool onAdd() override;
 
   void setBitmap(const GFXTexHandle&);
 
@@ -80,8 +80,8 @@ public:
 
    //void setValue(const Point2F *center, const Point2F *camera);
    //const char *getScriptValue();
-   void onPreRender();
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onPreRender() override;
+   void onRender(Point2I offset, const RectI &updateRect) override;
 };
 
 
diff --git a/Engine/source/gui/worldEditor/terrainActions.h b/Engine/source/gui/worldEditor/terrainActions.h
index 2fc0b2df5..2d965c643 100644
--- a/Engine/source/gui/worldEditor/terrainActions.h
+++ b/Engine/source/gui/worldEditor/terrainActions.h
@@ -66,28 +66,28 @@ class SelectAction : public TerrainAction
 {
    public:
       SelectAction(TerrainEditor * editor) : TerrainAction(editor){};
-      StringTableEntry getName(){return("select");}
+      StringTableEntry getName() override{return("select");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 class DeselectAction : public TerrainAction
 {
    public:
       DeselectAction(TerrainEditor * editor) : TerrainAction(editor){};
-      StringTableEntry getName(){return("deselect");}
+      StringTableEntry getName() override{return("deselect");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 class ClearAction : public TerrainAction
 {
    public:
       ClearAction(TerrainEditor * editor) : TerrainAction(editor){};
-      StringTableEntry getName(){return("clear");}
+      StringTableEntry getName() override{return("clear");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) {};
-      bool useMouseBrush() { mTerrainEditor->getCurrentSel()->reset(); return true; }
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override {};
+      bool useMouseBrush() override { mTerrainEditor->getCurrentSel()->reset(); return true; }
 };
 
 
@@ -95,9 +95,9 @@ class SoftSelectAction : public TerrainAction
 {
    public:
       SoftSelectAction(TerrainEditor * editor) : TerrainAction(editor){};
-      StringTableEntry getName(){return("softSelect");}
+      StringTableEntry getName() override{return("softSelect");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 
       Filter   mFilter;
 };
@@ -108,10 +108,10 @@ class OutlineSelectAction : public TerrainAction
 {
    public:
       OutlineSelectAction(TerrainEditor * editor) : TerrainAction(editor){};
-      StringTableEntry getName(){return("outlineSelect");}
+      StringTableEntry getName() override{return("outlineSelect");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
-      bool useMouseBrush() { return(false); }
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
+      bool useMouseBrush() override { return(false); }
 
    private:
 
@@ -124,9 +124,9 @@ class PaintMaterialAction : public TerrainAction
 {
    public:
       PaintMaterialAction(TerrainEditor * editor) : TerrainAction(editor){}
-      StringTableEntry getName(){return("paintMaterial");}
+      StringTableEntry getName() override{return("paintMaterial");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 //------------------------------------------------------------------------------
@@ -135,9 +135,9 @@ class ClearMaterialsAction : public TerrainAction
 {
 public:
    ClearMaterialsAction(TerrainEditor * editor) : TerrainAction(editor){}
-   StringTableEntry getName(){return("clearMaterials");}
+   StringTableEntry getName() override{return("clearMaterials");}
 
-   void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+   void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 //------------------------------------------------------------------------------
@@ -146,9 +146,9 @@ class RaiseHeightAction : public TerrainAction
 {
    public:
       RaiseHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
-      StringTableEntry getName(){return("raiseHeight");}
+      StringTableEntry getName() override{return("raiseHeight");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 //------------------------------------------------------------------------------
@@ -157,9 +157,9 @@ class LowerHeightAction : public TerrainAction
 {
    public:
       LowerHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
-      StringTableEntry getName(){return("lowerHeight");}
+      StringTableEntry getName() override{return("lowerHeight");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 //------------------------------------------------------------------------------
@@ -168,9 +168,9 @@ class SetHeightAction : public TerrainAction
 {
    public:
       SetHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
-      StringTableEntry getName(){return("setHeight");}
+      StringTableEntry getName() override{return("setHeight");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 //------------------------------------------------------------------------------
@@ -179,9 +179,9 @@ class SetEmptyAction : public TerrainAction
 {
    public:
       SetEmptyAction(TerrainEditor * editor) : TerrainAction(editor){}
-      StringTableEntry getName(){return("setEmpty");}
+      StringTableEntry getName() override{return("setEmpty");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 //------------------------------------------------------------------------------
@@ -190,9 +190,9 @@ class ClearEmptyAction : public TerrainAction
 {
    public:
       ClearEmptyAction(TerrainEditor * editor) : TerrainAction(editor){}
-      StringTableEntry getName(){return("clearEmpty");}
+      StringTableEntry getName() override{return("clearEmpty");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 //------------------------------------------------------------------------------
@@ -201,9 +201,9 @@ class ScaleHeightAction : public TerrainAction
 {
    public:
       ScaleHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
-      StringTableEntry getName(){return("scaleHeight");}
+      StringTableEntry getName() override{return("scaleHeight");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 //------------------------------------------------------------------------------
@@ -212,9 +212,9 @@ class BrushAdjustHeightAction : public TerrainAction
 {
    public:
       BrushAdjustHeightAction(TerrainEditor* editor) : TerrainAction(editor) { mPreviousZ = 0.0f; }
-      StringTableEntry getName(){return("brushAdjustHeight");}
+      StringTableEntry getName() override{return("brushAdjustHeight");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 
    private:
       PlaneF mIntersectionPlane;
@@ -226,10 +226,10 @@ class AdjustHeightAction : public BrushAdjustHeightAction
 {
    public:
       AdjustHeightAction(TerrainEditor * editor);
-      StringTableEntry getName(){return("adjustHeight");}
+      StringTableEntry getName() override{return("adjustHeight");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
-      bool useMouseBrush() { return(false); }
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
+      bool useMouseBrush() override { return(false); }
 
    private:
       //
@@ -244,27 +244,27 @@ class FlattenHeightAction : public TerrainAction
 {
    public:
       FlattenHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
-      StringTableEntry getName(){return("flattenHeight");}
+      StringTableEntry getName() override{return("flattenHeight");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 class SmoothHeightAction : public TerrainAction
 {
    public:
       SmoothHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
-      StringTableEntry getName(){return("smoothHeight");}
+      StringTableEntry getName() override{return("smoothHeight");}
 
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
 };
 
 class SmoothSlopeAction : public TerrainAction  
 {  
    public:  
       SmoothSlopeAction(TerrainEditor * editor) : TerrainAction(editor){}  
-      StringTableEntry getName(){return("smoothSlope");}  
+      StringTableEntry getName() override{return("smoothSlope");}  
   
-      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);  
+      void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;  
 };  
 
 class PaintNoiseAction : public TerrainAction
@@ -285,9 +285,9 @@ class PaintNoiseAction : public TerrainAction
          mScale = 1.5f / ( mMinMaxNoise.x - mMinMaxNoise.y);
       }
       
-      StringTableEntry getName() { return "paintNoise"; }
+      StringTableEntry getName() override { return "paintNoise"; }
 
-      void process( Selection *sel, const Gui3DMouseEvent &event, bool selChanged, Type type );
+      void process( Selection *sel, const Gui3DMouseEvent &event, bool selChanged, Type type ) override;
 
    protected:
 
@@ -348,8 +348,8 @@ public:
    static void initPersistFields();
 
    // UndoAction
-   virtual void undo();
-   virtual void redo();
+   void undo() override;
+   void redo() override;
 
    /// Performs the initial smoothing and stores
    /// the heighfield state for later undo.
diff --git a/Engine/source/gui/worldEditor/terrainEditor.cpp b/Engine/source/gui/worldEditor/terrainEditor.cpp
index 3eb896f28..5a26dc1ff 100644
--- a/Engine/source/gui/worldEditor/terrainEditor.cpp
+++ b/Engine/source/gui/worldEditor/terrainEditor.cpp
@@ -1741,7 +1741,7 @@ public:
    {
       mSequence = seq;
    }
-   void process(SimObject *object)
+   void process(SimObject *object) override
    {
       ((TerrainEditor *) object)->processActionTick(mSequence);
    }
diff --git a/Engine/source/gui/worldEditor/terrainEditor.h b/Engine/source/gui/worldEditor/terrainEditor.h
index a2ed6b6de..27de51a6b 100644
--- a/Engine/source/gui/worldEditor/terrainEditor.h
+++ b/Engine/source/gui/worldEditor/terrainEditor.h
@@ -143,12 +143,12 @@ public:
 
    BoxBrush(TerrainEditor * editor) : Brush(editor){}
    
-   const char *getType() const { return "box"; }
-   void rebuild();
+   const char *getType() const override { return "box"; }
+   void rebuild() override;
 
 protected:
 
-   void _renderOutline();
+   void _renderOutline() override;
 };
 
 class EllipseBrush : public Brush
@@ -157,12 +157,12 @@ public:
 
    EllipseBrush(TerrainEditor * editor) : Brush(editor){}
    
-   const char *getType() const { return "ellipse"; }
-   void rebuild();
+   const char *getType() const override { return "ellipse"; }
+   void rebuild() override;
 
 protected:
 
-   void _renderOutline();
+   void _renderOutline() override;
 };
 
 class SelectionBrush : public Brush
@@ -171,14 +171,14 @@ public:
 
    SelectionBrush(TerrainEditor * editor);
 
-   const char *getType() const { return "selection"; }
-   void rebuild();
+   const char *getType() const override { return "selection"; }
+   void rebuild() override;
    void render(Vector<GFXVertexPCT> & vertexBuffer, S32 & verts, S32 & elems, S32 & prims, const LinearColorF & inColorFull, const LinearColorF & inColorNone, const LinearColorF & outColorFull, const LinearColorF & outColorNone) const;
-   void setSize(const Point2I &){}
+   void setSize(const Point2I &) override{}
 
 protected:
 
-   void _renderOutline() {}
+   void _renderOutline() override {}
 };
 
 
@@ -217,7 +217,7 @@ class TerrainEditor : public EditTSCtrl
 		
 		void mirrorTerrain(S32 mirrorIndex);
 		
-      TerrainBlock* getActiveTerrain() { return mActiveTerrain; };
+      TerrainBlock* getActiveTerrain() override { return mActiveTerrain; };
 
       void scheduleGridUpdate() { mNeedsGridUpdate = true; }
       void scheduleMaterialUpdate() { mNeedsMaterialUpdate = true; }
@@ -291,8 +291,8 @@ class TerrainEditor : public EditTSCtrl
 
          Selection *mSel;
          
-         virtual void undo();
-         virtual void redo() { undo(); }
+         void undo() override;
+         void redo() override { undo(); }
       };
 
       void submitUndo( Selection *sel );
@@ -315,8 +315,8 @@ class TerrainEditor : public EditTSCtrl
          Vector<U8> mLayerMap;         
          Vector<TerrainMaterial*> mMaterials;
 
-         virtual void undo();
-         virtual void redo();
+         void undo() override;
+         void redo() override;
       };
 
       bool mIsDirty; // dirty flag for writing terrain.
@@ -452,28 +452,28 @@ class TerrainEditor : public EditTSCtrl
    public:
 
       // SimObject
-      bool onAdd();
-      void onDeleteNotify(SimObject * object);
+      bool onAdd() override;
+      void onDeleteNotify(SimObject * object) override;
 
       static void initPersistFields();
 
       // GuiControl
-      bool onWake();
-      void onSleep();      
+      bool onWake() override;
+      void onSleep() override;      
 
       // EditTSCtrl
-      bool onInputEvent( const InputEventInfo & evt );
-      void on3DMouseUp( const Gui3DMouseEvent & evt );
-      void on3DMouseDown( const Gui3DMouseEvent & evt );
-      void on3DMouseMove( const Gui3DMouseEvent & evt );
-      void on3DMouseDragged( const Gui3DMouseEvent & evt );
-      bool onMouseWheelUp( const GuiEvent & evt );
-      bool onMouseWheelDown( const GuiEvent & evt );            
-      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &evt );   
-      void onPreRender();
-      void renderScene(const RectI & updateRect);
-      void renderGui( Point2I offset, const RectI &updateRect );
-      void updateGuiInfo();
+      bool onInputEvent( const InputEventInfo & evt ) override;
+      void on3DMouseUp( const Gui3DMouseEvent & evt ) override;
+      void on3DMouseDown( const Gui3DMouseEvent & evt ) override;
+      void on3DMouseMove( const Gui3DMouseEvent & evt ) override;
+      void on3DMouseDragged( const Gui3DMouseEvent & evt ) override;
+      bool onMouseWheelUp( const GuiEvent & evt ) override;
+      bool onMouseWheelDown( const GuiEvent & evt ) override;            
+      void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &evt ) override;   
+      void onPreRender() override;
+      void renderScene(const RectI & updateRect) override;
+      void renderGui( Point2I offset, const RectI &updateRect ) override;
+      void updateGuiInfo() override;
 
       // Determine if the given grid point is valid within a non-wrap
       // around terrain.
diff --git a/Engine/source/gui/worldEditor/tools/editorTool.h b/Engine/source/gui/worldEditor/tools/editorTool.h
index 4b872fe6b..cb1ac690c 100644
--- a/Engine/source/gui/worldEditor/tools/editorTool.h
+++ b/Engine/source/gui/worldEditor/tools/editorTool.h
@@ -53,8 +53,8 @@ public:
 
    DECLARE_CONOBJECT(EditorTool);
 
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    //Called when the tool is activated on the World Editor
    virtual void onActivated(WorldEditor*);
diff --git a/Engine/source/gui/worldEditor/undoActions.h b/Engine/source/gui/worldEditor/undoActions.h
index 48475647c..e11d52446 100644
--- a/Engine/source/gui/worldEditor/undoActions.h
+++ b/Engine/source/gui/worldEditor/undoActions.h
@@ -67,8 +67,8 @@ public:
    void addObject( SimObject *object );
 
    // UndoAction
-   virtual void undo();
-   virtual void redo();
+   void undo() override;
+   void redo() override;
 };
 
 
@@ -106,8 +106,8 @@ public:
    void deleteObject( const Vector<SimObject*> &objectList );
 
    // UndoAction
-   virtual void undo();
-   virtual void redo();
+   void undo() override;
+   void redo() override;
 };
 
 class InspectorFieldUndoAction : public UndoAction
@@ -130,8 +130,8 @@ public:
    String mData;         
 
    // UndoAction
-   virtual void undo();
-   virtual void redo() { undo(); }
+   void undo() override;
+   void redo() override { undo(); }
 };
 
 #endif // _GUI_WORLDEDITOR_UNDOACTIONS_H_
diff --git a/Engine/source/gui/worldEditor/worldEditorSelection.h b/Engine/source/gui/worldEditor/worldEditorSelection.h
index 9ff9eef9c..f42b2ebfd 100644
--- a/Engine/source/gui/worldEditor/worldEditorSelection.h
+++ b/Engine/source/gui/worldEditor/worldEditorSelection.h
@@ -137,9 +137,9 @@ class WorldEditorSelection : public SimPersistSet
       void invalidateCentroid() { mCentroidValid = false; }
       
       // SimSet.
-      virtual void addObject( SimObject* );
-      virtual void removeObject( SimObject* );
-      virtual void setCanSave( bool value );
+      void addObject( SimObject* ) override;
+      void removeObject( SimObject* ) override;
+      void setCanSave( bool value ) override;
       
       static void initPersistFields();
                   
diff --git a/Engine/source/lighting/advanced/advancedLightBufferConditioner.h b/Engine/source/lighting/advanced/advancedLightBufferConditioner.h
index 26e32c2b8..f0c010d5d 100644
--- a/Engine/source/lighting/advanced/advancedLightBufferConditioner.h
+++ b/Engine/source/lighting/advanced/advancedLightBufferConditioner.h
@@ -48,7 +48,7 @@ public:
 
    virtual ~AdvancedLightBufferConditioner();
 
-   virtual String getName()
+   String getName() override
    {
       return String("Light Buffer Conditioner ") + String( mColorFormat == RGB ? "[RGB]" : "[LUV]" );
    }
@@ -56,10 +56,10 @@ public:
 protected:
    ColorFormat mColorFormat;
 
-   virtual Var *_conditionOutput( Var *unconditionedOutput, MultiLine *meta );
-   virtual Var *_unconditionInput( Var *conditionedInput, MultiLine *meta );
-   virtual Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta );
-   virtual void printMethodFooter( MethodType methodType, Var *retVar, Stream &stream, MultiLine *meta );
+   Var *_conditionOutput( Var *unconditionedOutput, MultiLine *meta ) override;
+   Var *_unconditionInput( Var *conditionedInput, MultiLine *meta ) override;
+   Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ) override;
+   void printMethodFooter( MethodType methodType, Var *retVar, Stream &stream, MultiLine *meta ) override;
 };
 
 #endif // _ADVANCED_LIGHTBUFFER_CONDITIONER_H_
\ No newline at end of file
diff --git a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h
index f59231f2a..199d7b3c2 100644
--- a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h
+++ b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.h
@@ -48,25 +48,25 @@ protected:
 
 public:
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPixMacros(   Vector<GFXShaderMacro> &macros, 
-                                    const MaterialFeatureData &fd );
+   void processPixMacros(   Vector<GFXShaderMacro> &macros, 
+                                    const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::None; }
+   Material::BlendOp getBlendOp() override{ return Material::None; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual void setTexData(   Material::StageData &stageDat,
+   void setTexData(   Material::StageData &stageDat,
                               const MaterialFeatureData &fd,
                               RenderPassData &passData,
-                              U32 &texIndex );
+                              U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Deferred RT Lighting";
    }
@@ -79,22 +79,22 @@ class DeferredBumpFeatGLSL : public BumpFeatGLSL
    typedef BumpFeatGLSL Parent;
 
 public:
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override { return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual void setTexData(   Material::StageData &stageDat,
+   void setTexData(   Material::StageData &stageDat,
                               const MaterialFeatureData &fd,
                               RenderPassData &passData,
-                              U32 &texIndex );
+                              U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Bumpmap [Deferred]";
    }
@@ -106,22 +106,22 @@ class DeferredMinnaertGLSL : public ShaderFeatureGLSL
    typedef ShaderFeatureGLSL Parent;
    
 public:
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPixMacros(   Vector<GFXShaderMacro> &macros, 
-                                    const MaterialFeatureData &fd );
+   void processPixMacros(   Vector<GFXShaderMacro> &macros, 
+                                    const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual void setTexData(   Material::StageData &stageDat,
+   void setTexData(   Material::StageData &stageDat,
                               const MaterialFeatureData &fd,
                               RenderPassData &passData,
-                              U32 &texIndex );
+                              U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Minnaert Shading [Deferred]";
    }
@@ -134,10 +134,10 @@ class DeferredSubSurfaceGLSL : public ShaderFeatureGLSL
    typedef ShaderFeatureGLSL Parent;
 
 public:
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Sub-Surface Approximation [Deferred]";
    }
diff --git a/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h b/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h
index 3d8c46be6..d876cef3a 100644
--- a/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h
+++ b/Engine/source/lighting/advanced/glsl/deferredShadingFeaturesGLSL.h
@@ -30,63 +30,63 @@
 class DeferredOrmMapGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual String getName() { return "Deferred Shading: PBR Config Map"; }
+   String getName() override { return "Deferred Shading: PBR Config Map"; }
 
-   virtual U32 getOutputTargets(const MaterialFeatureData& fd) const;
+   U32 getOutputTargets(const MaterialFeatureData& fd) const override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-      const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+      const MaterialFeatureData &fd ) override;
    
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
    
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 };
 
 class MatInfoFlagsGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual String getName() { return "Deferred Shading: Mat Info Flags"; }
+   String getName() override { return "Deferred Shading: Mat Info Flags"; }
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-      const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+      const MaterialFeatureData &fd ) override;
 
-   virtual U32 getOutputTargets(const MaterialFeatureData& fd) const;
+   U32 getOutputTargets(const MaterialFeatureData& fd) const override;
 };
 
 class ORMConfigVarsGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual String getName() { return "Deferred Shading: PBR Config Explicit Numbers"; }
+   String getName() override { return "Deferred Shading: PBR Config Explicit Numbers"; }
 
-   virtual U32 getOutputTargets(const MaterialFeatureData& fd) const;
+   U32 getOutputTargets(const MaterialFeatureData& fd) const override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-      const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+      const MaterialFeatureData &fd ) override;
 };
 
 class GlowMapGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual String getName() { return "Glow Map"; }
+   String getName() override { return "Glow Map"; }
 
-   virtual void processPix(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processPix(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual U32 getOutputTargets(const MaterialFeatureData& fd) const;
+   U32 getOutputTargets(const MaterialFeatureData& fd) const override;
 
-   virtual Resources getResources(const MaterialFeatureData& fd);
+   Resources getResources(const MaterialFeatureData& fd) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData(Material::StageData& stageDat,
+   void setTexData(Material::StageData& stageDat,
       const MaterialFeatureData& fd,
       RenderPassData& passData,
-      U32& texIndex);
+      U32& texIndex) override;
 };
 #endif
diff --git a/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h b/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h
index 640891824..d818c10d5 100644
--- a/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h
+++ b/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.h
@@ -63,19 +63,19 @@ public:
    virtual ~GBufferConditionerGLSL();
 
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual String getName() { return "GBuffer Conditioner"; }
+   void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   String getName() override { return "GBuffer Conditioner"; }
 
 protected:
 
-   virtual Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta );
+   Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ) override;
 
    virtual GenOp* _posnegEncode( GenOp *val );
    virtual GenOp* _posnegDecode( GenOp *val );
-   virtual Var* _conditionOutput( Var *unconditionedOutput, MultiLine *meta );
-   virtual Var* _unconditionInput( Var *conditionedInput, MultiLine *meta );
+   Var* _conditionOutput( Var *unconditionedOutput, MultiLine *meta ) override;
+   Var* _unconditionInput( Var *conditionedInput, MultiLine *meta ) override;
 };
 
 #endif // _GBUFFER_CONDITIONER_GLSL_H_
diff --git a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h
index 1ab4225a4..17dd9b86d 100644
--- a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h
+++ b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h
@@ -48,25 +48,25 @@ protected:
 
 public:
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPixMacros(   Vector<GFXShaderMacro> &macros, 
-                                    const MaterialFeatureData &fd );
+   void processPixMacros(   Vector<GFXShaderMacro> &macros, 
+                                    const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::None; }
+   Material::BlendOp getBlendOp() override{ return Material::None; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual void setTexData(   Material::StageData &stageDat,
+   void setTexData(   Material::StageData &stageDat,
                               const MaterialFeatureData &fd,
                               RenderPassData &passData,
-                              U32 &texIndex );
+                              U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Deferred RT Lighting";
    }
@@ -79,22 +79,22 @@ class DeferredBumpFeatHLSL : public BumpFeatHLSL
    typedef BumpFeatHLSL Parent;
 
 public:
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override { return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual void setTexData(   Material::StageData &stageDat,
+   void setTexData(   Material::StageData &stageDat,
                               const MaterialFeatureData &fd,
                               RenderPassData &passData,
-                              U32 &texIndex );
+                              U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Bumpmap [Deferred]";
    }
@@ -107,22 +107,22 @@ class DeferredMinnaertHLSL : public ShaderFeatureHLSL
    typedef ShaderFeatureHLSL Parent;
    
 public:
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPixMacros(   Vector<GFXShaderMacro> &macros, 
-                                    const MaterialFeatureData &fd );
+   void processPixMacros(   Vector<GFXShaderMacro> &macros, 
+                                    const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual void setTexData(   Material::StageData &stageDat,
+   void setTexData(   Material::StageData &stageDat,
                               const MaterialFeatureData &fd,
                               RenderPassData &passData,
-                              U32 &texIndex );
+                              U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Minnaert Shading [Deferred]";
    }
@@ -135,10 +135,10 @@ class DeferredSubSurfaceHLSL : public ShaderFeatureHLSL
    typedef ShaderFeatureHLSL Parent;
 
 public:
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Sub-Surface Approximation [Deferred]";
    }
diff --git a/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h b/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h
index 5657c4d03..472f22115 100644
--- a/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h
+++ b/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h
@@ -29,64 +29,64 @@
 class DeferredOrmMapHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual String getName() { return "Deferred Shading: PBR Config Map"; }
+   String getName() override { return "Deferred Shading: PBR Config Map"; }
 
-   virtual U32 getOutputTargets(const MaterialFeatureData& fd) const;
+   U32 getOutputTargets(const MaterialFeatureData& fd) const override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-      const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+      const MaterialFeatureData &fd ) override;
    
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
    
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 };
 
 class MatInfoFlagsHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual String getName() { return "Deferred Shading: Mat Info Flags"; }
+   String getName() override { return "Deferred Shading: Mat Info Flags"; }
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-      const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+      const MaterialFeatureData &fd ) override;
 
-   virtual U32 getOutputTargets(const MaterialFeatureData& fd) const;
+   U32 getOutputTargets(const MaterialFeatureData& fd) const override;
 };
 
 class ORMConfigVarsHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual String getName() { return "Deferred Shading: PBR Config Explicit Numbers"; }
+   String getName() override { return "Deferred Shading: PBR Config Explicit Numbers"; }
 
-   virtual U32 getOutputTargets(const MaterialFeatureData& fd) const;
+   U32 getOutputTargets(const MaterialFeatureData& fd) const override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-      const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+      const MaterialFeatureData &fd ) override;
 };
 
 class GlowMapHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual String getName() { return "Glow Map"; }
+   String getName() override { return "Glow Map"; }
 
-   virtual void processPix(Vector<ShaderComponent*> &componentList,
-      const MaterialFeatureData &fd);
+   void processPix(Vector<ShaderComponent*> &componentList,
+      const MaterialFeatureData &fd) override;
 
-   virtual U32 getOutputTargets(const MaterialFeatureData& fd) const;
+   U32 getOutputTargets(const MaterialFeatureData& fd) const override;
 
-   virtual Resources getResources(const MaterialFeatureData& fd);
+   Resources getResources(const MaterialFeatureData& fd) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData(Material::StageData& stageDat,
+   void setTexData(Material::StageData& stageDat,
       const MaterialFeatureData& fd,
       RenderPassData& passData,
-      U32& texIndex);
+      U32& texIndex) override;
 };
 
 #endif
diff --git a/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h b/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h
index b28a05d79..1c4fd9b4c 100644
--- a/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h
+++ b/Engine/source/lighting/advanced/hlsl/gBufferConditionerHLSL.h
@@ -63,19 +63,19 @@ public:
    virtual ~GBufferConditionerHLSL();
 
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual String getName() { return "GBuffer Conditioner"; }
+   void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   String getName() override { return "GBuffer Conditioner"; }
 
 protected:
 
-   virtual Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta );
+   Var *printMethodHeader( MethodType methodType, const String &methodName, Stream &stream, MultiLine *meta ) override;
 
    virtual GenOp* _posnegEncode( GenOp *val );
    virtual GenOp* _posnegDecode( GenOp *val );
-   virtual Var* _conditionOutput( Var *unconditionedOutput, MultiLine *meta );
-   virtual Var* _unconditionInput( Var *conditionedInput, MultiLine *meta );
+   Var* _conditionOutput( Var *unconditionedOutput, MultiLine *meta ) override;
+   Var* _unconditionInput( Var *conditionedInput, MultiLine *meta ) override;
 };
 
 #endif // _GBUFFER_CONDITIONER_HLSL_H_
diff --git a/Engine/source/lighting/basic/basicLightManager.h b/Engine/source/lighting/basic/basicLightManager.h
index 1141f78f9..addda5556 100644
--- a/Engine/source/lighting/basic/basicLightManager.h
+++ b/Engine/source/lighting/basic/basicLightManager.h
@@ -56,19 +56,19 @@ class BasicLightManager : public LightManager
 public:
 
    // LightManager
-   virtual bool isCompatible() const;
-   virtual void activate( SceneManager *sceneManager );
-   virtual void deactivate();
-   virtual void setLightInfo(ProcessedMaterial* pmat, const Material* mat, const SceneData& sgData, const SceneRenderState *state, U32 pass, GFXShaderConstBuffer* shaderConsts);
-   virtual bool setTextureStage(const SceneData& sgData, const U32 currTexFlag, const U32 textureSlot, GFXShaderConstBuffer* shaderConsts, ShaderConstHandles* handles) { return false; }
+   bool isCompatible() const override;
+   void activate( SceneManager *sceneManager ) override;
+   void deactivate() override;
+   void setLightInfo(ProcessedMaterial* pmat, const Material* mat, const SceneData& sgData, const SceneRenderState *state, U32 pass, GFXShaderConstBuffer* shaderConsts) override;
+   bool setTextureStage(const SceneData& sgData, const U32 currTexFlag, const U32 textureSlot, GFXShaderConstBuffer* shaderConsts, ShaderConstHandles* handles) override { return false; }
 
    static F32 getShadowFilterDistance() { return smProjectedShadowFilterDistance; }
 
 protected:
 
    // LightManager
-   virtual void _addLightInfoEx( LightInfo *lightInfo ) { }
-   virtual void _initLightFields() { }
+   void _addLightInfoEx( LightInfo *lightInfo ) override { }
+   void _initLightFields() override { }
 
    void _onPreRender( SceneManager *sceneManger, const SceneRenderState *state );
 
diff --git a/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h b/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h
index ee7cac6fb..e241b16c5 100644
--- a/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h
+++ b/Engine/source/lighting/basic/basicSceneObjectLightingPlugin.h
@@ -63,10 +63,10 @@ public:
    virtual void renderShadow( SceneRenderState *state );
 
    // Called by statics
-   virtual U32  packUpdate(SceneObject* obj, U32 checkMask, NetConnection *conn, U32 mask, BitStream *stream) { return 0; }
-   virtual void unpackUpdate(SceneObject* obj, NetConnection *conn, BitStream *stream) { }
+   U32  packUpdate(SceneObject* obj, U32 checkMask, NetConnection *conn, U32 mask, BitStream *stream) override { return 0; }
+   void unpackUpdate(SceneObject* obj, NetConnection *conn, BitStream *stream) override { }
 
-   virtual void reset();
+   void reset() override;
 };
 
 class BasicSceneObjectPluginFactory : public ManagedSingleton< BasicSceneObjectPluginFactory >
diff --git a/Engine/source/lighting/basic/blTerrainSystem.cpp b/Engine/source/lighting/basic/blTerrainSystem.cpp
index fc3d301b4..c52472091 100644
--- a/Engine/source/lighting/basic/blTerrainSystem.cpp
+++ b/Engine/source/lighting/basic/blTerrainSystem.cpp
@@ -44,8 +44,8 @@ struct blTerrainChunk : public PersistInfo::PersistChunk
 
    GBitmap *mLightmap;
 
-   bool read(Stream &);
-   bool write(Stream &);
+   bool read(Stream &) override;
+   bool write(Stream &) override;
 };
 
 //------------------------------------------------------------------------------
@@ -134,18 +134,18 @@ public:
    bool getShadowedSquares(const Vector<PlaneF> &, Vector<U16> &);
 
    // lighting
-   void init();
-   bool preLight(LightInfo *);
-   void light(LightInfo *);
+   void init() override;
+   bool preLight(LightInfo *) override;
+   void light(LightInfo *) override;
 
    // persist
-   U32 getResourceCRC();
-   bool setPersistInfo(PersistInfo::PersistChunk *);
-   bool getPersistInfo(PersistInfo::PersistChunk *);
+   U32 getResourceCRC() override;
+   bool setPersistInfo(PersistInfo::PersistChunk *) override;
+   bool getPersistInfo(PersistInfo::PersistChunk *) override;
 
-   virtual bool supportsShadowVolume();
-   virtual void getClipPlanes(Vector<PlaneF>& planes);
-   virtual void addToShadowVolume(ShadowVolumeBSP * shadowVolume, LightInfo * light, S32 level);
+   bool supportsShadowVolume() override;
+   void getClipPlanes(Vector<PlaneF>& planes) override;
+   void addToShadowVolume(ShadowVolumeBSP * shadowVolume, LightInfo * light, S32 level) override;
 
    // events
    //virtual void processTGELightProcessEvent(U32 curr, U32 max, LightInfo* currlight); 
diff --git a/Engine/source/lighting/basic/blTerrainSystem.h b/Engine/source/lighting/basic/blTerrainSystem.h
index 2098d43e5..6a1b65969 100644
--- a/Engine/source/lighting/basic/blTerrainSystem.h
+++ b/Engine/source/lighting/basic/blTerrainSystem.h
@@ -36,14 +36,14 @@
 class blTerrainSystem : public SceneLightingInterface
 {
 public:
-   virtual void init();
-   virtual U32 addObjectType();
-   virtual SceneLighting::ObjectProxy* createObjectProxy(SceneObject* obj, SceneLighting::ObjectProxyList* sceneObjects);
-   virtual PersistInfo::PersistChunk* createPersistChunk(const U32 chunkType);
-   virtual bool createPersistChunkFromProxy(SceneLighting::ObjectProxy* objproxy, PersistInfo::PersistChunk **ret);      
+   void init() override;
+   U32 addObjectType() override;
+   SceneLighting::ObjectProxy* createObjectProxy(SceneObject* obj, SceneLighting::ObjectProxyList* sceneObjects) override;
+   PersistInfo::PersistChunk* createPersistChunk(const U32 chunkType) override;
+   bool createPersistChunkFromProxy(SceneLighting::ObjectProxy* objproxy, PersistInfo::PersistChunk **ret) override;      
 
    // Given a ray, this will return the color from the lightmap of this object, return true if handled
-   virtual bool getColorFromRayInfo(const RayInfo & collision, LinearColorF& result) const;
+   bool getColorFromRayInfo(const RayInfo & collision, LinearColorF& result) const override;
 };
 
 #endif // !_BLTERRAINSYSTEM_H_
diff --git a/Engine/source/lighting/common/blobShadow.h b/Engine/source/lighting/common/blobShadow.h
index a56f51dab..800d1ed78 100644
--- a/Engine/source/lighting/common/blobShadow.h
+++ b/Engine/source/lighting/common/blobShadow.h
@@ -76,9 +76,9 @@ public:
 
    bool shouldRender(F32 camDist);
 
-   void update( const SceneRenderState *state ) {}
-   void render( F32 camDist, const TSRenderState &rdata );
-   U32 getLastRenderTime() const { return mLastRenderTime; }
+   void update( const SceneRenderState *state ) override {}
+   void render( F32 camDist, const TSRenderState &rdata ) override;
+   U32 getLastRenderTime() const override { return mLastRenderTime; }
 
    static void generateGenericShadowBitmap(S32 dim);
    static void deleteGenericShadowBitmap();
diff --git a/Engine/source/lighting/common/lightMapParams.h b/Engine/source/lighting/common/lightMapParams.h
index 4d495537f..cc7ac8eb0 100644
--- a/Engine/source/lighting/common/lightMapParams.h
+++ b/Engine/source/lighting/common/lightMapParams.h
@@ -37,10 +37,10 @@ public:
    static LightInfoExType Type;
 
    // LightInfoEx
-   virtual void set( const LightInfoEx *ex );
-   virtual const LightInfoExType& getType() const { return Type; }
-   virtual void packUpdate( BitStream *stream ) const;
-   virtual void unpackUpdate( BitStream *stream );
+   void set( const LightInfoEx *ex ) override;
+   const LightInfoExType& getType() const override { return Type; }
+   void packUpdate( BitStream *stream ) const override;
+   void unpackUpdate( BitStream *stream ) override;
 
 public:
    // We're leaving these public for easy access 
diff --git a/Engine/source/lighting/common/projectedShadow.h b/Engine/source/lighting/common/projectedShadow.h
index e43501a8d..a8195ae7d 100644
--- a/Engine/source/lighting/common/projectedShadow.h
+++ b/Engine/source/lighting/common/projectedShadow.h
@@ -115,12 +115,12 @@ public:
    ProjectedShadow( SceneObject *object );
    virtual ~ProjectedShadow();
 
-   bool shouldRender( const SceneRenderState *state );
+   bool shouldRender( const SceneRenderState *state ) override;
 
-   void update( const SceneRenderState *state );
-   void render( F32 camDist, const TSRenderState &rdata );
-   U32 getLastRenderTime() const { return mLastRenderTime; }
-   const F32 getScore() const { return mScore; }
+   void update( const SceneRenderState *state ) override;
+   void render( F32 camDist, const TSRenderState &rdata ) override;
+   U32 getLastRenderTime() const override { return mLastRenderTime; }
+   const F32 getScore() const override { return mScore; }
 
 };
 
diff --git a/Engine/source/lighting/common/sceneLighting.h b/Engine/source/lighting/common/sceneLighting.h
index 31bed91b5..475bac5ac 100644
--- a/Engine/source/lighting/common/sceneLighting.h
+++ b/Engine/source/lighting/common/sceneLighting.h
@@ -201,7 +201,7 @@ public:
       sgObjectIndex = objectIndex;
       sgEvent = event;
    }
-   void process(SimObject * object)
+   void process(SimObject * object) override
    {
       AssertFatal(object, "SceneLightingProcessEvent:: null event object!");
       if(!object)
diff --git a/Engine/source/lighting/shadowMap/cubeLightShadowMap.h b/Engine/source/lighting/shadowMap/cubeLightShadowMap.h
index 5b30a8d89..083182f33 100644
--- a/Engine/source/lighting/shadowMap/cubeLightShadowMap.h
+++ b/Engine/source/lighting/shadowMap/cubeLightShadowMap.h
@@ -40,12 +40,12 @@ public:
    CubeLightShadowMap( LightInfo *light );
 
    // LightShadowMap
-   virtual bool hasShadowTex() const { return mCubemap.isValid(); }
-   virtual ShadowType getShadowType() const { return ShadowType_CubeMap; }
-   virtual void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState );
-   virtual void setShaderParameters( GFXShaderConstBuffer* params, LightingShaderConstants* lsc );
-   virtual void releaseTextures();
-   virtual bool setTextureStage( U32 currTexFlag, LightingShaderConstants* lsc );
+   bool hasShadowTex() const override { return mCubemap.isValid(); }
+   ShadowType getShadowType() const override { return ShadowType_CubeMap; }
+   void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ) override;
+   void setShaderParameters( GFXShaderConstBuffer* params, LightingShaderConstants* lsc ) override;
+   void releaseTextures() override;
+   bool setTextureStage( U32 currTexFlag, LightingShaderConstants* lsc ) override;
 
 protected:   
 
diff --git a/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h b/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h
index 0564c6451..343649c14 100644
--- a/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h
+++ b/Engine/source/lighting/shadowMap/dualParaboloidLightShadowMap.h
@@ -34,7 +34,7 @@ class DualParaboloidLightShadowMap : public ParaboloidLightShadowMap
 public:
    DualParaboloidLightShadowMap( LightInfo *light );
 
-   virtual void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState );
+   void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ) override;
 };
 
 #endif // _DUALPARABOLOIDLIGHTSHADOWMAP_H_
\ No newline at end of file
diff --git a/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h b/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h
index 917ab99bc..8b65b9f6d 100644
--- a/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h
+++ b/Engine/source/lighting/shadowMap/paraboloidLightShadowMap.h
@@ -36,9 +36,9 @@ public:
    ~ParaboloidLightShadowMap();
 
    // LightShadowMap
-   virtual ShadowType getShadowType() const;
-   virtual void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState );
-   virtual void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc);
+   ShadowType getShadowType() const override;
+   void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ) override;
+   void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc) override;
 
 protected:
    Point2F mShadowMapScale;
diff --git a/Engine/source/lighting/shadowMap/pssmLightShadowMap.h b/Engine/source/lighting/shadowMap/pssmLightShadowMap.h
index 8ee883018..986e25370 100644
--- a/Engine/source/lighting/shadowMap/pssmLightShadowMap.h
+++ b/Engine/source/lighting/shadowMap/pssmLightShadowMap.h
@@ -37,9 +37,9 @@ public:
    PSSMLightShadowMap( LightInfo *light );
 
    // LightShadowMap
-   virtual ShadowType getShadowType() const { return ShadowType_PSSM; }
-   virtual void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState );
-   virtual void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc);
+   ShadowType getShadowType() const override { return ShadowType_PSSM; }
+   void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ) override;
+   void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc) override;
 
    /// Used to scale TSShapeInstance::smDetailAdjust to have
    /// objects lod quicker when in the PSSM shadow.
diff --git a/Engine/source/lighting/shadowMap/shadowMapManager.h b/Engine/source/lighting/shadowMap/shadowMapManager.h
index df9eb9024..7e3167aeb 100644
--- a/Engine/source/lighting/shadowMap/shadowMapManager.h
+++ b/Engine/source/lighting/shadowMap/shadowMapManager.h
@@ -70,8 +70,8 @@ public:
    ShadowMapPass* getShadowMapPass() const { return mShadowMapPass; }
 
    // Shadow manager
-   virtual void activate();
-   virtual void deactivate();
+   void activate() override;
+   void deactivate() override;
 
    GFXTextureObject* getTapRotationTex();
 
diff --git a/Engine/source/lighting/shadowMap/shadowMapPass.h b/Engine/source/lighting/shadowMap/shadowMapPass.h
index 8e1fa0ef5..d16ec622f 100644
--- a/Engine/source/lighting/shadowMap/shadowMapPass.h
+++ b/Engine/source/lighting/shadowMap/shadowMapPass.h
@@ -122,7 +122,7 @@ public:
    ShadowRenderPassManager() : Parent() {}
 
    /// Add a RenderInstance to the list
-   virtual void addInst( RenderInst *inst );
+   void addInst( RenderInst *inst ) override;
 };
 
 #endif // _SHADOWMAPPASS_H_
diff --git a/Engine/source/lighting/shadowMap/shadowMatHook.h b/Engine/source/lighting/shadowMap/shadowMatHook.h
index 4763d2f71..e62789eaf 100644
--- a/Engine/source/lighting/shadowMap/shadowMatHook.h
+++ b/Engine/source/lighting/shadowMap/shadowMatHook.h
@@ -45,7 +45,7 @@ public:
    ShadowMatInstance( Material *mat );
    virtual ~ShadowMatInstance() {}
 
-   virtual bool setupPass( SceneRenderState *state, const SceneData &sgData );
+   bool setupPass( SceneRenderState *state, const SceneData &sgData ) override;
 };
 
 class ShadowMaterialHook : public MatInstanceHook
@@ -56,7 +56,7 @@ public:
 
    // MatInstanceHook
    virtual ~ShadowMaterialHook();
-   virtual const MatInstanceHookType& getType() const { return Type; }
+   const MatInstanceHookType& getType() const override { return Type; }
 
    /// The material hook type.
    static const MatInstanceHookType Type;
diff --git a/Engine/source/lighting/shadowMap/singleLightShadowMap.h b/Engine/source/lighting/shadowMap/singleLightShadowMap.h
index bfe5ad627..2f26457c8 100644
--- a/Engine/source/lighting/shadowMap/singleLightShadowMap.h
+++ b/Engine/source/lighting/shadowMap/singleLightShadowMap.h
@@ -37,9 +37,9 @@ public:
    ~SingleLightShadowMap();
 
    // LightShadowMap
-   virtual ShadowType getShadowType() const { return ShadowType_Spot; }
-   virtual void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState );
-   virtual void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc);
+   ShadowType getShadowType() const override { return ShadowType_Spot; }
+   void _render( RenderPassManager* renderPass, const SceneRenderState *diffuseState ) override;
+   void setShaderParameters(GFXShaderConstBuffer* params, LightingShaderConstants* lsc) override;
 };
 
 
diff --git a/Engine/source/materials/matInstance.cpp b/Engine/source/materials/matInstance.cpp
index ab41a3892..f7c6918fd 100644
--- a/Engine/source/materials/matInstance.cpp
+++ b/Engine/source/materials/matInstance.cpp
@@ -49,9 +49,9 @@ public:
    void loadHandle(ProcessedMaterial* pmat);
    
    // MaterialParameterHandle interface
-   const String& getName() const { return mName; }
-   virtual bool isValid() const; 
-   virtual S32 getSamplerRegister( U32 pass ) const;
+   const String& getName() const override { return mName; }
+   bool isValid() const override; 
+   S32 getSamplerRegister( U32 pass ) const override;
 private:   
    friend class MatInstParameters;
    String mName;
diff --git a/Engine/source/materials/processedCustomMaterial.h b/Engine/source/materials/processedCustomMaterial.h
index bcdbf239b..2294553bd 100644
--- a/Engine/source/materials/processedCustomMaterial.h
+++ b/Engine/source/materials/processedCustomMaterial.h
@@ -39,16 +39,16 @@ public:
    ProcessedCustomMaterial(Material &mat);
    ~ProcessedCustomMaterial();
 
-   virtual bool setupPass(SceneRenderState *, const SceneData& sgData, U32 pass);
-   virtual bool init( const FeatureSet &features, const GFXVertexFormat *vertexFormat, const MatFeaturesDelegate &featuresDelegate );   
-   virtual void setTextureStages(SceneRenderState *, const SceneData &sgData, U32 pass );
-   virtual MaterialParameters* allocMaterialParameters();
+   bool setupPass(SceneRenderState *, const SceneData& sgData, U32 pass) override;
+   bool init( const FeatureSet &features, const GFXVertexFormat *vertexFormat, const MatFeaturesDelegate &featuresDelegate ) override;   
+   void setTextureStages(SceneRenderState *, const SceneData &sgData, U32 pass ) override;
+   MaterialParameters* allocMaterialParameters() override;
 
 protected:
 
-   virtual void _setStageData();
-   virtual bool _hasCubemap(U32 pass);
-   void _initPassStateBlock( RenderPassData *rpd, GFXStateBlockDesc &result );
+   void _setStageData() override;
+   bool _hasCubemap(U32 pass) override;
+   void _initPassStateBlock( RenderPassData *rpd, GFXStateBlockDesc &result ) override;
    virtual void _initPassStateBlocks();
 
 private:
diff --git a/Engine/source/materials/shaderMaterialParameters.h b/Engine/source/materials/shaderMaterialParameters.h
index 4a26251db..83f068c0d 100644
--- a/Engine/source/materials/shaderMaterialParameters.h
+++ b/Engine/source/materials/shaderMaterialParameters.h
@@ -40,13 +40,13 @@ public:
    ShaderMaterialParameterHandle(const String& name);
    ShaderMaterialParameterHandle(const String& name, Vector<GFXShader*>& shaders);
 
-   virtual const String& getName() const { return mName; } 
-   virtual S32 getSamplerRegister( U32 pass ) const;
+   const String& getName() const override { return mName; } 
+   S32 getSamplerRegister( U32 pass ) const override;
 
    // NOTE: We always return true here instead of querying the
    // children... often there is only one element, so lets just
    // hit the loop once on the set.
-   virtual bool isValid() const { return true; };      
+   bool isValid() const override { return true; };      
 
 protected:
    Vector< GFXShaderConstHandle* > mHandles;   
@@ -68,28 +68,28 @@ public:
    ///
 
    /// Returns the material parameter handle for name.
-   virtual void set(MaterialParameterHandle* handle, const F32 f);
-   virtual void set(MaterialParameterHandle* handle, const Point2F& fv);
-   virtual void set(MaterialParameterHandle* handle, const Point3F& fv);
-   virtual void set(MaterialParameterHandle* handle, const Point4F& fv);
+   void set(MaterialParameterHandle* handle, const F32 f) override;
+   void set(MaterialParameterHandle* handle, const Point2F& fv) override;
+   void set(MaterialParameterHandle* handle, const Point3F& fv) override;
+   void set(MaterialParameterHandle* handle, const Point4F& fv) override;
    virtual void set(MaterialParameterHandle* handle, const PlaneF& fv);
-   virtual void set(MaterialParameterHandle* handle, const LinearColorF& fv);
-   virtual void set(MaterialParameterHandle* handle, const S32 f);
-   virtual void set(MaterialParameterHandle* handle, const Point2I& fv);
-   virtual void set(MaterialParameterHandle* handle, const Point3I& fv);
-   virtual void set(MaterialParameterHandle* handle, const Point4I& fv);
-   virtual void set(MaterialParameterHandle* handle, const AlignedArray<F32>& fv);
-   virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point2F>& fv);
-   virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point3F>& fv);
-   virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point4F>& fv);
-   virtual void set(MaterialParameterHandle* handle, const AlignedArray<S32>& fv);
-   virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point2I>& fv);
-   virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point3I>& fv);
-   virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point4I>& fv);
-   virtual void set(MaterialParameterHandle* handle, const MatrixF& mat, const GFXShaderConstType matrixType = GFXSCT_Float4x4);
-   virtual void set(MaterialParameterHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4);
+   void set(MaterialParameterHandle* handle, const LinearColorF& fv) override;
+   void set(MaterialParameterHandle* handle, const S32 f) override;
+   void set(MaterialParameterHandle* handle, const Point2I& fv) override;
+   void set(MaterialParameterHandle* handle, const Point3I& fv) override;
+   void set(MaterialParameterHandle* handle, const Point4I& fv) override;
+   void set(MaterialParameterHandle* handle, const AlignedArray<F32>& fv) override;
+   void set(MaterialParameterHandle* handle, const AlignedArray<Point2F>& fv) override;
+   void set(MaterialParameterHandle* handle, const AlignedArray<Point3F>& fv) override;
+   void set(MaterialParameterHandle* handle, const AlignedArray<Point4F>& fv) override;
+   void set(MaterialParameterHandle* handle, const AlignedArray<S32>& fv) override;
+   void set(MaterialParameterHandle* handle, const AlignedArray<Point2I>& fv) override;
+   void set(MaterialParameterHandle* handle, const AlignedArray<Point3I>& fv) override;
+   void set(MaterialParameterHandle* handle, const AlignedArray<Point4I>& fv) override;
+   void set(MaterialParameterHandle* handle, const MatrixF& mat, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override;
+   void set(MaterialParameterHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override;
 
-   virtual U32 getAlignmentValue(const GFXShaderConstType constType);
+   U32 getAlignmentValue(const GFXShaderConstType constType) override;
 
 private:
    Vector<GFXShaderConstBufferRef> mBuffers;   
diff --git a/Engine/source/math/mQuadPatch.h b/Engine/source/math/mQuadPatch.h
index d579ca367..4aa648fb3 100644
--- a/Engine/source/math/mQuadPatch.h
+++ b/Engine/source/math/mQuadPatch.h
@@ -49,10 +49,10 @@ public:
 
    QuadPatch();
 
-   virtual void   calc( F32 t, Point3F &result );
-   virtual void   calc( Point3F *points, F32 t, Point3F &result );
-   virtual void   setControlPoint( Point3F &point, S32 index );
-   virtual void   submitControlPoints( SplCtrlPts &points );
+   void   calc( F32 t, Point3F &result ) override;
+   void   calc( Point3F *points, F32 t, Point3F &result ) override;
+   void   setControlPoint( Point3F &point, S32 index ) override;
+   void   submitControlPoints( SplCtrlPts &points ) override;
 
 
 };
diff --git a/Engine/source/module/tamlModuleIdUpdateVisitor.h b/Engine/source/module/tamlModuleIdUpdateVisitor.h
index 36c4c2d04..276b4548d 100644
--- a/Engine/source/module/tamlModuleIdUpdateVisitor.h
+++ b/Engine/source/module/tamlModuleIdUpdateVisitor.h
@@ -56,10 +56,10 @@ public:
         {}
     virtual ~TamlModuleIdUpdateVisitor() {}
 
-    virtual bool wantsPropertyChanges( void ) { return true; }
-    virtual bool wantsRootOnly( void ) { return true; }
+    bool wantsPropertyChanges( void ) override { return true; }
+    bool wantsRootOnly( void ) override { return true; }
 
-    virtual bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState )
+    bool visit( const TamlParser& parser, TamlVisitor::PropertyState& propertyState ) override
     {
         // Debug Profiling.
         PROFILE_SCOPE(TamlModuleIdUpdateVisitor_Visit);
diff --git a/Engine/source/navigation/guiNavEditorCtrl.h b/Engine/source/navigation/guiNavEditorCtrl.h
index 4d795f459..6e0b34f5e 100644
--- a/Engine/source/navigation/guiNavEditorCtrl.h
+++ b/Engine/source/navigation/guiNavEditorCtrl.h
@@ -62,7 +62,7 @@ public:
    /// @name SimObject
    /// @{
 
-   bool onAdd();
+   bool onAdd() override;
    static void initPersistFields();
 
    /// @}
@@ -70,24 +70,24 @@ public:
    /// @name GuiControl
    /// @{
 
-   virtual void onSleep();
-   virtual void onRender(Point2I offset, const RectI &updateRect);
+   void onSleep() override;
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
    /// @}
 
    /// @name EditTSCtrl
    /// @{
 
-   void get3DCursor(GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_);
+   void get3DCursor(GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_) override;
    bool get3DCentre(Point3F &pos);
-   void on3DMouseDown(const Gui3DMouseEvent & event);
-   void on3DMouseUp(const Gui3DMouseEvent & event);
-   void on3DMouseMove(const Gui3DMouseEvent & event);
-   void on3DMouseDragged(const Gui3DMouseEvent & event);
-   void on3DMouseEnter(const Gui3DMouseEvent & event);
-   void on3DMouseLeave(const Gui3DMouseEvent & event);
-   void updateGuiInfo();      
-   void renderScene(const RectI & updateRect);
+   void on3DMouseDown(const Gui3DMouseEvent & event) override;
+   void on3DMouseUp(const Gui3DMouseEvent & event) override;
+   void on3DMouseMove(const Gui3DMouseEvent & event) override;
+   void on3DMouseDragged(const Gui3DMouseEvent & event) override;
+   void on3DMouseEnter(const Gui3DMouseEvent & event) override;
+   void on3DMouseLeave(const Gui3DMouseEvent & event) override;
+   void updateGuiInfo() override;      
+   void renderScene(const RectI & updateRect) override;
 
    /// @}
 
@@ -177,8 +177,8 @@ public:
 
    SimObjectId mObjId;
 
-   virtual void undo();
-   virtual void redo() { undo(); }
+   void undo() override;
+   void redo() override { undo(); }
 };
 #endif
 #endif
diff --git a/Engine/source/navigation/navContext.h b/Engine/source/navigation/navContext.h
index 1033465c6..6a507a8e7 100644
--- a/Engine/source/navigation/navContext.h
+++ b/Engine/source/navigation/navContext.h
@@ -36,29 +36,29 @@ public:
 
 protected:
    /// Clears all log entries.
-   virtual void doResetLog();
+   void doResetLog() override;
 
    /// Logs a message.
    /// @param[in] category The category of the message.
    /// @param[in] msg      The formatted message.
    /// @param[in] len      The length of the formatted message.
-   virtual void doLog(const rcLogCategory category, const char* msg, const int len);
+   void doLog(const rcLogCategory category, const char* msg, const int len) override;
 
    /// Clears all timers. (Resets all to unused.)
-   virtual void doResetTimers();
+   void doResetTimers() override;
 
    /// Starts the specified performance timer.
    /// @param[in] label The category of timer.
-   virtual void doStartTimer(const rcTimerLabel label);
+   void doStartTimer(const rcTimerLabel label) override;
 
    /// Stops the specified performance timer.
    /// @param[in] label The category of the timer.
-   virtual void doStopTimer(const rcTimerLabel label);
+   void doStopTimer(const rcTimerLabel label) override;
 
    /// Returns the total accumulated time of the specified performance timer.
    /// @param[in] label The category of the timer.
    /// @return The accumulated time of the timer, or -1 if timers are disabled or the timer has never been started.
-   virtual int doGetAccumulatedTime(const rcTimerLabel label) const;
+   int doGetAccumulatedTime(const rcTimerLabel label) const override;
 
 private:
    /// Store start time and final time for each timer.
diff --git a/Engine/source/persistence/taml/fsTinyXml.h b/Engine/source/persistence/taml/fsTinyXml.h
index c4a0d55c2..f8b6936c2 100644
--- a/Engine/source/persistence/taml/fsTinyXml.h
+++ b/Engine/source/persistence/taml/fsTinyXml.h
@@ -165,47 +165,47 @@ public:
    PrettyXMLPrinter(VfsXMLPrinter& innerPrinter, int depth = 0);
 
    /// Visit a document.
-   virtual bool VisitEnter(const tinyxml2::XMLDocument& doc)
+   bool VisitEnter(const tinyxml2::XMLDocument& doc) override
    {
       mProcessEntities = doc.ProcessEntities();
       return mInnerPrinter.VisitEnter(doc);
    }
 
    /// Visit a document.
-   virtual bool VisitExit(const tinyxml2::XMLDocument& doc)
+   bool VisitExit(const tinyxml2::XMLDocument& doc) override
    {
       return mInnerPrinter.VisitExit(doc);
    }
 
    /// Visit an element.
-   virtual bool VisitEnter(const tinyxml2::XMLElement& element, const tinyxml2::XMLAttribute* firstAttribute);
+   bool VisitEnter(const tinyxml2::XMLElement& element, const tinyxml2::XMLAttribute* firstAttribute) override;
    /// Visit an element.
-   virtual bool VisitExit(const tinyxml2::XMLElement& element)
+   bool VisitExit(const tinyxml2::XMLElement& element) override
    {
       mDepth--;
       return mInnerPrinter.VisitExit(element);
    }
 
    /// Visit a declaration.
-   virtual bool Visit(const tinyxml2::XMLDeclaration& declaration)
+   bool Visit(const tinyxml2::XMLDeclaration& declaration) override
    {
       return mInnerPrinter.Visit(declaration);
    }
 
    /// Visit a text node.
-   virtual bool Visit(const tinyxml2::XMLText& text)
+   bool Visit(const tinyxml2::XMLText& text) override
    {
       return mInnerPrinter.Visit(text);
    }
 
    /// Visit a comment node.
-   virtual bool Visit(const tinyxml2::XMLComment& comment)
+   bool Visit(const tinyxml2::XMLComment& comment) override
    {
       return mInnerPrinter.Visit(comment);
    }
 
    /// Visit an unknown node.
-   virtual bool Visit(const tinyxml2::XMLUnknown& unknown)
+   bool Visit(const tinyxml2::XMLUnknown& unknown) override
    {
       return mInnerPrinter.Visit(unknown);
    }
diff --git a/Engine/source/persistence/taml/xml/tamlXmlParser.h b/Engine/source/persistence/taml/xml/tamlXmlParser.h
index 41c97dae4..62e637276 100644
--- a/Engine/source/persistence/taml/xml/tamlXmlParser.h
+++ b/Engine/source/persistence/taml/xml/tamlXmlParser.h
@@ -43,10 +43,10 @@ public:
     virtual ~TamlXmlParser() {}
 
     /// Whether the parser can change a property or not.
-    virtual bool canChangeProperty( void ) { return true; }
+    bool canChangeProperty( void ) override { return true; }
 
     /// Accept visitor.
-    virtual bool accept( const char* pFilename, TamlVisitor& visitor );
+    bool accept( const char* pFilename, TamlVisitor& visitor ) override;
 
 private:
     inline bool parseElement( tinyxml2::XMLElement* pXmlElement, TamlVisitor& visitor );
diff --git a/Engine/source/platform/async/asyncBufferedStream.h b/Engine/source/platform/async/asyncBufferedStream.h
index 206de59c6..8c421c5c9 100644
--- a/Engine/source/platform/async/asyncBufferedStream.h
+++ b/Engine/source/platform/async/asyncBufferedStream.h
@@ -151,7 +151,7 @@ class AsyncBufferedInputStream : public IInputStreamFilter< T, Stream >,
       void stop() { mIsStopped = true; }
 
       // IInputStream.
-      virtual U32 read( ElementType* buffer, U32 num );
+      U32 read( ElementType* buffer, U32 num ) override;
 };
 
 //-----------------------------------------------------------------------------
@@ -299,7 +299,7 @@ class AsyncBufferedReadItem : public ThreadWorkItem
       T mElement;
 
       // WorkItem
-      virtual void execute()
+      void execute() override
       {
          if( Deref( mSourceStream ).read( &mElement, 1 ) )
          {                  
@@ -309,7 +309,7 @@ class AsyncBufferedReadItem : public ThreadWorkItem
             mAsyncStream->_onArrival( mElement );
          }
       }
-      virtual void onCancelled()
+      void onCancelled() override
       {
          Parent::onCancelled();
          destructSingle( mElement );
@@ -354,7 +354,7 @@ class AsyncSingleBufferedInputStream : public AsyncBufferedInputStream< T, Strea
    protected:
          
       // AsyncBufferedInputStream.
-      virtual void _requestNext();
+      void _requestNext() override;
 
       /// Create a new work item that reads the next element.
       virtual void _newReadItem( ThreadSafeRef< ThreadWorkItem >& outRef )
diff --git a/Engine/source/platform/async/asyncPacketStream.h b/Engine/source/platform/async/asyncPacketStream.h
index 00f798946..374118784 100644
--- a/Engine/source/platform/async/asyncPacketStream.h
+++ b/Engine/source/platform/async/asyncPacketStream.h
@@ -129,7 +129,7 @@ class AsyncPacketBufferedInputStream : public AsyncBufferedInputStream< Packet*,
             PacketType* mPacket;
 
             // WorkItem
-            virtual void execute()
+            void execute() override
             {
                Parent::execute();
                mPacket->mSizeActual += this->mNumElementsRead;
@@ -174,7 +174,7 @@ class AsyncPacketBufferedInputStream : public AsyncBufferedInputStream< Packet*,
                if( this->cancellationPoint() ) return;
                mAsyncStream->_onArrival( mPacket );
             }
-            virtual void onCancelled()
+            void onCancelled() override
             {
                Parent::onCancelled();
                destructSingle< PacketType* >( mPacket );
@@ -197,7 +197,7 @@ class AsyncPacketBufferedInputStream : public AsyncBufferedInputStream< Packet*,
       virtual PacketType* _newPacket( U32 packetSize ) { return constructSingle< PacketType* >( packetSize ); }
 
       /// Request the next packet from the underlying stream.
-      virtual void _requestNext();
+      void _requestNext() override;
 
       /// Create a new work item that reads "numElements" into "packet".
       virtual void _newReadItem( PacketReadItemRef& outRef,
diff --git a/Engine/source/platform/async/asyncUpdate.h b/Engine/source/platform/async/asyncUpdate.h
index 1bb416774..e158ddaed 100644
--- a/Engine/source/platform/async/asyncUpdate.h
+++ b/Engine/source/platform/async/asyncUpdate.h
@@ -114,7 +114,7 @@ class AsyncUpdateThread : public Thread, public ThreadSafeRefCount< AsyncUpdateT
 
       virtual ~AsyncUpdateThread();
 
-      virtual void run( void* );
+      void run( void* ) override;
 
       /// Trigger the update event to notify the thread about
       /// pending updates.
@@ -141,7 +141,7 @@ class AsyncPeriodicUpdateThread : public AsyncUpdateThread
       /// Time between periodic updates in milliseconds.
       U32 mIntervalMS;
 
-      virtual void _waitForEventAndReset();
+      void _waitForEventAndReset() override;
 
    public:
 
diff --git a/Engine/source/platform/platformNetAsync.cpp b/Engine/source/platform/platformNetAsync.cpp
index 5b91df2b1..1a2a33df2 100644
--- a/Engine/source/platform/platformNetAsync.cpp
+++ b/Engine/source/platform/platformNetAsync.cpp
@@ -76,7 +76,7 @@ struct NetAsync::NameLookupWorkItem : public ThreadPool::WorkItem
    }
 
 protected:
-   virtual void execute()
+   void execute() override
    {
 	  NetAddress address;
 	  Net::Error error = Net::stringToAddress(mRequest.remoteAddr, &address, true);
diff --git a/Engine/source/platform/threads/threadPool.cpp b/Engine/source/platform/threads/threadPool.cpp
index 1cad50dda..42f262726 100644
--- a/Engine/source/platform/threads/threadPool.cpp
+++ b/Engine/source/platform/threads/threadPool.cpp
@@ -206,7 +206,7 @@ struct ThreadPool::WorkerThread : public Thread
    WorkerThread( ThreadPool* pool, U32 index );
 
    WorkerThread*     getNext();
-   virtual void      run( void* arg = 0 );
+   void      run( void* arg = 0 ) override;
 
 private:
    U32               mIndex;
diff --git a/Engine/source/platform/threads/threadPoolAsyncIO.h b/Engine/source/platform/threads/threadPoolAsyncIO.h
index 7f37534da..35738d091 100644
--- a/Engine/source/platform/threads/threadPoolAsyncIO.h
+++ b/Engine/source/platform/threads/threadPoolAsyncIO.h
@@ -223,7 +223,7 @@ class AsyncReadItem : public AsyncIOItem< T, Stream >
       /// elements actually read from the stream.
       U32 mNumElementsRead;
 
-      virtual void execute();
+      void execute() override;
       
       void _allocBuffer()
       {
diff --git a/Engine/source/platformSDL/sdlInputManager.h b/Engine/source/platformSDL/sdlInputManager.h
index b9c9f057d..5bea81a9e 100644
--- a/Engine/source/platformSDL/sdlInputManager.h
+++ b/Engine/source/platformSDL/sdlInputManager.h
@@ -95,9 +95,9 @@ public:
 public:
    SDLInputManager();
 
-   bool enable();
-   void disable();
-   void process();
+   bool enable() override;
+   void disable() override;
+   void process() override;
 
    void processEvent(SDL_Event &evt);
 
diff --git a/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h b/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h
index 2c0e93537..72d1c6400 100644
--- a/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h
+++ b/Engine/source/platformWin32/videoInfo/wmiVideoInfo.h
@@ -52,8 +52,8 @@ private:
 
 protected:
    static const WCHAR *smPVIQueryTypeToWMIString [];
-   bool _queryProperty( const PVIQueryType queryType, const U32 adapterId, String *outValue );
-   bool _initialize();
+   bool _queryProperty( const PVIQueryType queryType, const U32 adapterId, String *outValue ) override;
+   bool _initialize() override;
    String _lookUpVendorId(U32 vendorId);
 
 public:
diff --git a/Engine/source/platformWin32/winDInputDevice.h b/Engine/source/platformWin32/winDInputDevice.h
index b242df789..3f92dfea9 100644
--- a/Engine/source/platformWin32/winDInputDevice.h
+++ b/Engine/source/platformWin32/winDInputDevice.h
@@ -124,7 +124,7 @@ class DInputDevice : public InputDevice
       static bool joystickDetected();
       //
 
-      bool process();
+      bool process() override;
 };
 
 //------------------------------------------------------------------------------
diff --git a/Engine/source/platformWin32/winDirectInput.h b/Engine/source/platformWin32/winDirectInput.h
index d7ebd1b70..9f5d86ac0 100644
--- a/Engine/source/platformWin32/winDirectInput.h
+++ b/Engine/source/platformWin32/winDirectInput.h
@@ -94,14 +94,14 @@ class DInputManager : public InputManager
    public:
       DInputManager();
 
-      bool enable();
-      void disable();
+      bool enable() override;
+      void disable() override;
 
-      void onDeleteNotify( SimObject* object );
-      bool onAdd();
-      void onRemove();
+      void onDeleteNotify( SimObject* object ) override;
+      bool onAdd() override;
+      void onRemove() override;
 
-      void process();
+      void process() override;
 
       // DirectInput functions:
       static void init();
diff --git a/Engine/source/platformWin32/winDlibrary.cpp b/Engine/source/platformWin32/winDlibrary.cpp
index eae7b07c9..5b937bd2f 100644
--- a/Engine/source/platformWin32/winDlibrary.cpp
+++ b/Engine/source/platformWin32/winDlibrary.cpp
@@ -35,7 +35,7 @@ public:
    ~Win32DLibrary();
    bool open(const char* file);
    void close();
-   void *bind(const char *name);
+   void *bind(const char *name) override;
 };
 
 Win32DLibrary::Win32DLibrary()
diff --git a/Engine/source/platformWin32/winExec.cpp b/Engine/source/platformWin32/winExec.cpp
index 3b9ad52b9..a4c08c88d 100644
--- a/Engine/source/platformWin32/winExec.cpp
+++ b/Engine/source/platformWin32/winExec.cpp
@@ -43,7 +43,7 @@ class ExecuteThread : public Thread
 public:
    ExecuteThread(const char *executable, const char *args = NULL, const char *directory = NULL);
 
-   virtual void run(void *arg = 0);
+   void run(void *arg = 0) override;
 };
 
 //-----------------------------------------------------------------------------
@@ -62,7 +62,7 @@ public:
       mOK = ok;
    }
 
-   virtual void process(SimObject *object)
+   void process(SimObject *object) override
    {
       if( Con::isFunction( "onExecuteDone" ) )
          Con::executef( "onExecuteDone", Con::getIntArg( mOK ) );
diff --git a/Engine/source/platformWin32/winFont.h b/Engine/source/platformWin32/winFont.h
index eac8b1bac..b5a980705 100644
--- a/Engine/source/platformWin32/winFont.h
+++ b/Engine/source/platformWin32/winFont.h
@@ -38,23 +38,23 @@ public:
     virtual ~WinFont();
     
     // PlatformFont virtual methods
-    virtual bool isValidChar(const UTF16 ch) const;
-    virtual bool isValidChar(const UTF8 *str) const;
+    bool isValidChar(const UTF16 ch) const override;
+    bool isValidChar(const UTF8 *str) const override;
 
-    inline virtual U32 getFontHeight() const
+    inline U32 getFontHeight() const override
     {
         return mTextMetric.tmHeight;
     }
 
-    inline virtual U32 getFontBaseLine() const
+    inline U32 getFontBaseLine() const override
     {
         return mTextMetric.tmAscent;
     }
 
-    virtual PlatformFont::CharInfo &getCharInfo(const UTF16 ch) const;
-    virtual PlatformFont::CharInfo &getCharInfo(const UTF8 *str) const;
+    PlatformFont::CharInfo &getCharInfo(const UTF16 ch) const override;
+    PlatformFont::CharInfo &getCharInfo(const UTF8 *str) const override;
 
-    virtual bool create(const char *name, dsize_t size, U32 charset = TGE_ANSI_CHARSET);
+    bool create(const char *name, dsize_t size, U32 charset = TGE_ANSI_CHARSET) override;
 };
 
 #endif // _WINFONT_H_
diff --git a/Engine/source/platformWin32/winRedbook.cpp b/Engine/source/platformWin32/winRedbook.cpp
index beef38dd0..c363d69a7 100644
--- a/Engine/source/platformWin32/winRedbook.cpp
+++ b/Engine/source/platformWin32/winRedbook.cpp
@@ -57,13 +57,13 @@ class Win32RedBookDevice : public RedBookDevice
 
       U32 getDeviceId();
 
-      bool open();
-      bool close();
-      bool play(U32);
-      bool stop();
-      bool getTrackCount(U32 *);
-      bool getVolume(F32 *);
-      bool setVolume(F32);
+      bool open() override;
+      bool close() override;
+      bool play(U32) override;
+      bool stop() override;
+      bool getTrackCount(U32 *) override;
+      bool getVolume(F32 *) override;
+      bool setVolume(F32) override;
 };
 
 //------------------------------------------------------------------------------
diff --git a/Engine/source/platformWin32/winTimer.cpp b/Engine/source/platformWin32/winTimer.cpp
index e5c8639a1..74bd4b0e3 100644
--- a/Engine/source/platformWin32/winTimer.cpp
+++ b/Engine/source/platformWin32/winTimer.cpp
@@ -47,7 +47,7 @@ public:
       mPerfCountNext = 0.0;
    }
 
-   const S32 getElapsedMs()
+   const S32 getElapsedMs() override
    {
       // Use QPC, update remainders so we don't leak time, and return the elapsed time.
       QueryPerformanceCounter( (LARGE_INTEGER *) &mPerfCountNext);
@@ -59,7 +59,7 @@ public:
       return elapsed;
    }
 
-   void reset()
+   void reset() override
    {
       // Do some simple copying to reset the timer to 0.
       mPerfCountCurrent = mPerfCountNext;
diff --git a/Engine/source/platformWin32/winVolume.cpp b/Engine/source/platformWin32/winVolume.cpp
index b9e8e01ee..68cc8a421 100644
--- a/Engine/source/platformWin32/winVolume.cpp
+++ b/Engine/source/platformWin32/winVolume.cpp
@@ -72,10 +72,10 @@ namespace Win32
       HANDLE   *getHANDLES() { return mHandleList.address(); }
 
    private:
-      virtual void   internalProcessOnce();
+      void   internalProcessOnce() override;
 
-      virtual bool   internalAddNotification( const Path &dir );
-      virtual bool   internalRemoveNotification( const Path &dir );
+      bool   internalAddNotification( const Path &dir ) override;
+      bool   internalRemoveNotification( const Path &dir ) override;
 
       Vector<Path>   mDirs;
       Vector<HANDLE> mHandleList;
diff --git a/Engine/source/platformWin32/winVolume.h b/Engine/source/platformWin32/winVolume.h
index 4b3160a25..feda42281 100644
--- a/Engine/source/platformWin32/winVolume.h
+++ b/Engine/source/platformWin32/winVolume.h
@@ -42,15 +42,15 @@ public:
    Win32FileSystem(String volume);
    ~Win32FileSystem();
 
-   String   getTypeStr() const { return "Win32"; }
+   String   getTypeStr() const override { return "Win32"; }
 
-   FileNodeRef resolve(const Path& path);
+   FileNodeRef resolve(const Path& path) override;
    void verifyCompatibility(const Path& _path, WIN32_FIND_DATAW _info);
-   FileNodeRef create(const Path& path,FileNode::Mode);
-   bool remove(const Path& path);
-   bool rename(const Path& from,const Path& to);
-   Path mapTo(const Path& path);
-   Path mapFrom(const Path& path);
+   FileNodeRef create(const Path& path,FileNode::Mode) override;
+   bool remove(const Path& path) override;
+   bool rename(const Path& from,const Path& to) override;
+   Path mapTo(const Path& path) override;
+   Path mapFrom(const Path& path) override;
 
 private:
    String mVolume;
@@ -65,24 +65,24 @@ class Win32File: public File
 public:
    ~Win32File();
 
-   Path getName() const;
-   NodeStatus getStatus() const;
-   bool getAttributes(Attributes*);
-   U64 getSize();
+   Path getName() const override;
+   NodeStatus getStatus() const override;
+   bool getAttributes(Attributes*) override;
+   U64 getSize() override;
 
-   U32 getPosition();
-   U32 setPosition(U32,SeekMode);
+   U32 getPosition() override;
+   U32 setPosition(U32,SeekMode) override;
 
-   bool open(AccessMode);
-   bool close();
+   bool open(AccessMode) override;
+   bool close() override;
 
-   U32 read(void* dst, U32 size);
-   U32 write(const void* src, U32 size);
+   U32 read(void* dst, U32 size) override;
+   U32 write(const void* src, U32 size) override;
 
 private:
    friend class Win32FileSystem;
 
-   U32 calculateChecksum();
+   U32 calculateChecksum() override;
 
    Path     mPath;
    String   mName;
@@ -103,18 +103,18 @@ class Win32Directory: public Directory
 public:
    ~Win32Directory();
 
-   Path getName() const;
-   NodeStatus getStatus() const;
-   bool getAttributes(Attributes*);
+   Path getName() const override;
+   NodeStatus getStatus() const override;
+   bool getAttributes(Attributes*) override;
 
-   bool open();
-   bool close();
-   bool read(Attributes*);
+   bool open() override;
+   bool close() override;
+   bool read(Attributes*) override;
 
 private:
    friend class Win32FileSystem;
 
-   U32 calculateChecksum();
+   U32 calculateChecksum() override;
 
    Path     mPath;
    String   mName;
diff --git a/Engine/source/renderInstance/forcedMaterialMeshMgr.h b/Engine/source/renderInstance/forcedMaterialMeshMgr.h
index 78e5ff1fb..637de4b68 100644
--- a/Engine/source/renderInstance/forcedMaterialMeshMgr.h
+++ b/Engine/source/renderInstance/forcedMaterialMeshMgr.h
@@ -40,7 +40,7 @@ public:
    void setOverrideMaterial(BaseMatInstance* overrideMaterial);
 
    // RenderBinManager interface
-   virtual void render(SceneRenderState * state);
+   void render(SceneRenderState * state) override;
 
    DECLARE_CONOBJECT(ForcedMaterialMeshMgr);
    static void initPersistFields();
diff --git a/Engine/source/renderInstance/renderFormatChanger.h b/Engine/source/renderInstance/renderFormatChanger.h
index f57463051..09bc6c384 100644
--- a/Engine/source/renderInstance/renderFormatChanger.h
+++ b/Engine/source/renderInstance/renderFormatChanger.h
@@ -84,16 +84,16 @@ public:
 
    DECLARE_CONOBJECT(RenderFormatToken);
    static void initPersistFields();
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    RenderFormatToken();
    virtual ~RenderFormatToken();
 
-   virtual void process(SceneRenderState *state, RenderPassStateBin *callingBin);
-   virtual void reset();
-   virtual void enable(bool enabled = true);
-   virtual bool isEnabled() const;
+   void process(SceneRenderState *state, RenderPassStateBin *callingBin) override;
+   void reset() override;
+   void enable(bool enabled = true) override;
+   bool isEnabled() const override;
 };
 
 #endif // _RENDERFORMATCHANGER_H_
diff --git a/Engine/source/renderInstance/renderGlowMgr.h b/Engine/source/renderInstance/renderGlowMgr.h
index 6b7d2289f..27ff7a03f 100644
--- a/Engine/source/renderInstance/renderGlowMgr.h
+++ b/Engine/source/renderInstance/renderGlowMgr.h
@@ -50,8 +50,8 @@ public:
    bool isGlowEnabled();
 
    // RenderBinManager
-   virtual void addElement( RenderInst *inst );
-   virtual void render( SceneRenderState *state );
+   void addElement( RenderInst *inst ) override;
+   void render( SceneRenderState *state ) override;
 
    // ConsoleObject
    DECLARE_CONOBJECT( RenderGlowMgr );
@@ -67,7 +67,7 @@ protected:
 
       virtual BaseMatInstance *getMatInstance() { return mGlowMatInst; }
 
-      virtual const MatInstanceHookType& getType() const { return Type; }
+      const MatInstanceHookType& getType() const override { return Type; }
 
       /// Our material hook type.
       static const MatInstanceHookType Type;
diff --git a/Engine/source/renderInstance/renderImposterMgr.h b/Engine/source/renderInstance/renderImposterMgr.h
index caf6f83d4..f870c6e77 100644
--- a/Engine/source/renderInstance/renderImposterMgr.h
+++ b/Engine/source/renderInstance/renderImposterMgr.h
@@ -93,7 +93,7 @@ public:
    static void initPersistFields();
 
    // RenderBinManager
-   virtual void render( SceneRenderState *state );
+   void render( SceneRenderState *state ) override;
 };
 
 
diff --git a/Engine/source/renderInstance/renderMeshMgr.h b/Engine/source/renderInstance/renderMeshMgr.h
index fa0d3cb2a..20a3f38f4 100644
--- a/Engine/source/renderInstance/renderMeshMgr.h
+++ b/Engine/source/renderInstance/renderMeshMgr.h
@@ -38,8 +38,8 @@ public:
 
    // RenderBinManager interface
    virtual void init();
-   virtual void render(SceneRenderState * state);
-   virtual void addElement( RenderInst *inst );
+   void render(SceneRenderState * state) override;
+   void addElement( RenderInst *inst ) override;
 
    // ConsoleObject interface
    static void initPersistFields();
diff --git a/Engine/source/renderInstance/renderObjectMgr.h b/Engine/source/renderInstance/renderObjectMgr.h
index 3686fe93e..c8ef9c575 100644
--- a/Engine/source/renderInstance/renderObjectMgr.h
+++ b/Engine/source/renderInstance/renderObjectMgr.h
@@ -39,7 +39,7 @@ public:
    virtual void setOverrideMaterial(BaseMatInstance* overrideMat); 
 
    // RenderBinMgr
-   virtual void render(SceneRenderState * state);
+   void render(SceneRenderState * state) override;
 
    // ConsoleObject
    static void initPersistFields();
diff --git a/Engine/source/renderInstance/renderParticleMgr.h b/Engine/source/renderInstance/renderParticleMgr.h
index 77b3d6a82..6d606acad 100644
--- a/Engine/source/renderInstance/renderParticleMgr.h
+++ b/Engine/source/renderInstance/renderParticleMgr.h
@@ -50,10 +50,10 @@ public:
    virtual ~RenderParticleMgr();
 
    // RenderBinManager
-   void render(SceneRenderState * state);
-   void sort();
-   void clear();
-   void addElement( RenderInst *inst );
+   void render(SceneRenderState * state) override;
+   void sort() override;
+   void clear() override;
+   void addElement( RenderInst *inst ) override;
 
    // ConsoleObject
    DECLARE_CONOBJECT(RenderParticleMgr);
@@ -62,12 +62,12 @@ public:
    const static U8 ParticleSystemStencilMask = 0x80; // We are using the top bit
    const static U32 OffscreenPoolSize = 5;
 
-   virtual void setTargetChainLength(const U32 chainLength);
+   void setTargetChainLength(const U32 chainLength) override;
 
 protected:
 
    // Override
-   virtual bool _handleGFXEvent(GFXDevice::GFXDeviceEventType event);
+   bool _handleGFXEvent(GFXDevice::GFXDeviceEventType event) override;
 
    bool _initShader();
    void _initGFXResources();
diff --git a/Engine/source/renderInstance/renderPassStateToken.h b/Engine/source/renderInstance/renderPassStateToken.h
index f472c72c7..2786cd43b 100644
--- a/Engine/source/renderInstance/renderPassStateToken.h
+++ b/Engine/source/renderInstance/renderPassStateToken.h
@@ -79,9 +79,9 @@ public:
    RenderPassStateBin();
    virtual ~RenderPassStateBin();
 
-   void render(SceneRenderState *state);
-   void clear();
-   void sort();
+   void render(SceneRenderState *state) override;
+   void clear() override;
+   void sort() override;
 };
 
 #endif // _RENDERPASSSTATETOKEN_H_
diff --git a/Engine/source/renderInstance/renderTerrainMgr.h b/Engine/source/renderInstance/renderTerrainMgr.h
index c235588db..0e819da8e 100644
--- a/Engine/source/renderInstance/renderTerrainMgr.h
+++ b/Engine/source/renderInstance/renderTerrainMgr.h
@@ -83,7 +83,7 @@ protected:
    static bool _clearStats( GFXDevice::GFXDeviceEventType type );
 
    // RenderBinManager
-   virtual void internalAddElement( RenderInst *inst );
+   void internalAddElement( RenderInst *inst ) override;
 
 public:
 
@@ -96,9 +96,9 @@ public:
    DECLARE_CONOBJECT(RenderTerrainMgr);
 
    // RenderBinManager
-   virtual void sort();
-   virtual void render( SceneRenderState *state );
-   virtual void clear();
+   void sort() override;
+   void render( SceneRenderState *state ) override;
+   void clear() override;
 
 };
 
diff --git a/Engine/source/renderInstance/renderTranslucentMgr.h b/Engine/source/renderInstance/renderTranslucentMgr.h
index e6464f7d9..8c01402b2 100644
--- a/Engine/source/renderInstance/renderTranslucentMgr.h
+++ b/Engine/source/renderInstance/renderTranslucentMgr.h
@@ -43,9 +43,9 @@ public:
    virtual ~RenderTranslucentMgr();
 
    // RenderBinManager
-   void render(SceneRenderState * state);
-   void addElement( RenderInst *inst );
-   void setupSGData( MeshRenderInst *ri, SceneData &data );
+   void render(SceneRenderState * state) override;
+   void addElement( RenderInst *inst ) override;
+   void setupSGData( MeshRenderInst *ri, SceneData &data ) override;
 
    // ConsoleObject
    DECLARE_CONOBJECT(RenderTranslucentMgr);
diff --git a/Engine/source/scene/pathManager.cpp b/Engine/source/scene/pathManager.cpp
index e5d5c72fb..cfa84a91a 100644
--- a/Engine/source/scene/pathManager.cpp
+++ b/Engine/source/scene/pathManager.cpp
@@ -88,10 +88,10 @@ class PathManagerEvent : public NetEvent
    typedef NetEvent Parent;
    PathManagerEvent() : modifiedPath(0), clearPaths(false) { }
 
-   void pack(NetConnection*, BitStream*);
-   void write(NetConnection*, BitStream*);
-   void unpack(NetConnection*, BitStream*);
-   void process(NetConnection*);
+   void pack(NetConnection*, BitStream*) override;
+   void write(NetConnection*, BitStream*) override;
+   void unpack(NetConnection*, BitStream*) override;
+   void process(NetConnection*) override;
 
    DECLARE_CONOBJECT(PathManagerEvent);
 };
diff --git a/Engine/source/scene/reflectionMatHook.h b/Engine/source/scene/reflectionMatHook.h
index dab5e2b8c..c90444a38 100644
--- a/Engine/source/scene/reflectionMatHook.h
+++ b/Engine/source/scene/reflectionMatHook.h
@@ -38,7 +38,7 @@ public:
    ReflectionMatInstance( Material *mat );
    virtual ~ReflectionMatInstance() {}
 
-   virtual bool setupPass( SceneRenderState *state, const SceneData &sgData );
+   bool setupPass( SceneRenderState *state, const SceneData &sgData ) override;
 };
 
 class ReflectionMaterialHook : public MatInstanceHook
@@ -49,7 +49,7 @@ public:
 
    // MatInstanceHook
    virtual ~ReflectionMaterialHook();
-   virtual const MatInstanceHookType& getType() const { return Type; }
+   const MatInstanceHookType& getType() const override { return Type; }
 
    /// The material hook type.
    static const MatInstanceHookType Type;
diff --git a/Engine/source/sfx/media/sfxVorbisStream.h b/Engine/source/sfx/media/sfxVorbisStream.h
index 74b9d0964..f5b13b32a 100644
--- a/Engine/source/sfx/media/sfxVorbisStream.h
+++ b/Engine/source/sfx/media/sfxVorbisStream.h
@@ -60,8 +60,8 @@ class SFXVorbisStream : public SFXFileStream,
       static long _tell_func( void *datasource );
 
       // SFXStream
-      virtual bool _readHeader();
-      virtual void _close();
+      bool _readHeader() override;
+      void _close() override;
 
    public:
 
@@ -92,10 +92,10 @@ class SFXVorbisStream : public SFXFileStream,
                   S32 *bitstream );
 
       // SFXStream
-      virtual void reset();
-      virtual U32 read( U8 *buffer, U32 length );
-      virtual bool isEOS() const;
-      virtual SFXStream* clone() const
+      void reset() override;
+      U32 read( U8 *buffer, U32 length ) override;
+      bool isEOS() const override;
+      SFXStream* clone() const override
       {
          SFXVorbisStream* stream = new SFXVorbisStream( *this );
          if( !stream->mVF )
@@ -104,8 +104,8 @@ class SFXVorbisStream : public SFXFileStream,
       }
 
       // IPositionable
-      virtual U32 getPosition() const;
-      virtual void setPosition( U32 offset );
+      U32 getPosition() const override;
+      void setPosition( U32 offset ) override;
 };
 
 #endif // TORQUE_OGGVORBIS
diff --git a/Engine/source/sfx/media/sfxWavStream.h b/Engine/source/sfx/media/sfxWavStream.h
index 7b6d182a7..243fc078a 100644
--- a/Engine/source/sfx/media/sfxWavStream.h
+++ b/Engine/source/sfx/media/sfxWavStream.h
@@ -44,8 +44,8 @@ class SFXWavStream : public SFXFileStream,
       U32 mDataStart;
 
       // SFXFileStream
-      virtual bool _readHeader();
-      virtual void _close();
+      bool _readHeader() override;
+      void _close() override;
 
    public:
 
@@ -62,9 +62,9 @@ class SFXWavStream : public SFXFileStream,
       virtual ~SFXWavStream();
 
       // SFXStream
-      virtual void reset();
-      virtual U32 read( U8 *buffer, U32 length );
-      virtual SFXStream* clone() const
+      void reset() override;
+      U32 read( U8 *buffer, U32 length ) override;
+      SFXStream* clone() const override
       {
          SFXWavStream* stream = new SFXWavStream( *this );
          if( !stream->mStream )
@@ -73,8 +73,8 @@ class SFXWavStream : public SFXFileStream,
       }
 
       // IPositionable
-      virtual U32 getPosition() const;
-      virtual void setPosition( U32 offset );
+      U32 getPosition() const override;
+      void setPosition( U32 offset ) override;
 };
 
 #endif  // _SFXWAVSTREAM_H_
diff --git a/Engine/source/sfx/null/sfxNullBuffer.h b/Engine/source/sfx/null/sfxNullBuffer.h
index 8ad77c714..ce90aad14 100644
--- a/Engine/source/sfx/null/sfxNullBuffer.h
+++ b/Engine/source/sfx/null/sfxNullBuffer.h
@@ -38,8 +38,8 @@ class SFXNullBuffer : public SFXBuffer
       SFXNullBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description );
 
       // SFXBuffer.
-      virtual void write( SFXInternal::SFXStreamPacket* const* packets, U32 num );
-      virtual void _flush() {}
+      void write( SFXInternal::SFXStreamPacket* const* packets, U32 num ) override;
+      void _flush() override {}
 
    public:
 
diff --git a/Engine/source/sfx/null/sfxNullDevice.h b/Engine/source/sfx/null/sfxNullDevice.h
index d3b36ae7f..299b53cd8 100644
--- a/Engine/source/sfx/null/sfxNullDevice.h
+++ b/Engine/source/sfx/null/sfxNullDevice.h
@@ -55,9 +55,9 @@ class SFXNullDevice : public SFXDevice
    public:
 
       // SFXDevice.
-      virtual  SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description );
-      virtual SFXVoice* createVoice( bool is3D, SFXBuffer *buffer );
-      virtual void update();
+       SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ) override;
+      SFXVoice* createVoice( bool is3D, SFXBuffer *buffer ) override;
+      void update() override;
 };
 
 #endif // _SFXNULLDEVICE_H_
\ No newline at end of file
diff --git a/Engine/source/sfx/null/sfxNullProvider.cpp b/Engine/source/sfx/null/sfxNullProvider.cpp
index da85b5588..a41dda4c8 100644
--- a/Engine/source/sfx/null/sfxNullProvider.cpp
+++ b/Engine/source/sfx/null/sfxNullProvider.cpp
@@ -36,11 +36,11 @@ public:
 
 protected:
    void addDeviceDesc( const String& name, const String& desc );
-   void init();
+   void init() override;
 
 public:
 
-   SFXDevice* createDevice( const String& deviceName, bool useHardware, S32 maxBuffers );
+   SFXDevice* createDevice( const String& deviceName, bool useHardware, S32 maxBuffers ) override;
 
 };
 
diff --git a/Engine/source/sfx/null/sfxNullVoice.h b/Engine/source/sfx/null/sfxNullVoice.h
index 02582542d..b28cb6629 100644
--- a/Engine/source/sfx/null/sfxNullVoice.h
+++ b/Engine/source/sfx/null/sfxNullVoice.h
@@ -54,12 +54,12 @@ class SFXNullVoice : public SFXVoice
       bool mIsLooping;
 
       // SFXVoice.
-      virtual SFXStatus _status() const;
-      virtual void _play();
-      virtual void _pause();
-      virtual void _stop();
-      virtual void _seek( U32 sample );
-      virtual U32 _tell() const;
+      SFXStatus _status() const override;
+      void _play() override;
+      void _pause() override;
+      void _stop() override;
+      void _seek( U32 sample ) override;
+      U32 _tell() const override;
 
       ///
       U32 _getPlayTime() const
@@ -72,15 +72,15 @@ class SFXNullVoice : public SFXVoice
       virtual ~SFXNullVoice();
 
       /// SFXVoice
-      SFXStatus getStatus() const;
-      void setPosition( U32 sample );
-      void play( bool looping );
-      void setMinMaxDistance( F32 min, F32 max );
-      void setVelocity( const VectorF& velocity );
-      void setTransform( const MatrixF& transform );
-      void setVolume( F32 volume );
-      void setPitch( F32 pitch );
-      void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume );
+      SFXStatus getStatus() const override;
+      void setPosition( U32 sample ) override;
+      void play( bool looping ) override;
+      void setMinMaxDistance( F32 min, F32 max ) override;
+      void setVelocity( const VectorF& velocity ) override;
+      void setTransform( const MatrixF& transform ) override;
+      void setVolume( F32 volume ) override;
+      void setPitch( F32 pitch ) override;
+      void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ) override;
 };
 
 #endif // _SFXNULLVOICE_H_
\ No newline at end of file
diff --git a/Engine/source/sfx/openal/sfxALBuffer.h b/Engine/source/sfx/openal/sfxALBuffer.h
index 4ed44e133..26864a3d0 100644
--- a/Engine/source/sfx/openal/sfxALBuffer.h
+++ b/Engine/source/sfx/openal/sfxALBuffer.h
@@ -103,8 +103,8 @@ class SFXALBuffer : public SFXBuffer
       }
 
       // SFXBuffer.
-      virtual void write( SFXInternal::SFXStreamPacket* const* packets, U32 num );
-      void _flush();
+      void write( SFXInternal::SFXStreamPacket* const* packets, U32 num ) override;
+      void _flush() override;
 
    public:
 
diff --git a/Engine/source/sfx/openal/sfxALDevice.h b/Engine/source/sfx/openal/sfxALDevice.h
index 654dca6d2..3d2bf5e78 100644
--- a/Engine/source/sfx/openal/sfxALDevice.h
+++ b/Engine/source/sfx/openal/sfxALDevice.h
@@ -87,12 +87,12 @@ class SFXALDevice : public SFXDevice
    public:
 
       // SFXDevice.
-      virtual SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description );
-      virtual SFXVoice* createVoice( bool is3D, SFXBuffer *buffer );
-      virtual void setListener( U32 index, const SFXListenerProperties& listener );
-      virtual void setDistanceModel( SFXDistanceModel model );
-      virtual void setDopplerFactor( F32 factor );
-      virtual void setRolloffFactor( F32 factor );
+      SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ) override;
+      SFXVoice* createVoice( bool is3D, SFXBuffer *buffer ) override;
+      void setListener( U32 index, const SFXListenerProperties& listener ) override;
+      void setDistanceModel( SFXDistanceModel model ) override;
+      void setDopplerFactor( F32 factor ) override;
+      void setRolloffFactor( F32 factor ) override;
 #if defined(AL_ALEXT_PROTOTYPES)
       //function for openAL to open slots
       virtual void openSlots();
@@ -103,7 +103,7 @@ class SFXALDevice : public SFXDevice
       //get values from sfxreverbproperties and pass it to openal device
       virtual void setReverb(const SFXReverbProperties& reverb);
 #endif
-      virtual void resetReverb() {}
+      void resetReverb() override {}
 };
 
 #endif // _SFXALDEVICE_H_
diff --git a/Engine/source/sfx/openal/sfxALProvider.cpp b/Engine/source/sfx/openal/sfxALProvider.cpp
index e6742f515..28a28b9e4 100644
--- a/Engine/source/sfx/openal/sfxALProvider.cpp
+++ b/Engine/source/sfx/openal/sfxALProvider.cpp
@@ -48,10 +48,10 @@ protected:
       
    };
 
-   void init();
+   void init() override;
 
 public:
-   SFXDevice *createDevice( const String& deviceName, bool useHardware, S32 maxBuffers );
+   SFXDevice *createDevice( const String& deviceName, bool useHardware, S32 maxBuffers ) override;
 
 };
 
diff --git a/Engine/source/sfx/openal/sfxALVoice.h b/Engine/source/sfx/openal/sfxALVoice.h
index 6360da843..2f3dd8eca 100644
--- a/Engine/source/sfx/openal/sfxALVoice.h
+++ b/Engine/source/sfx/openal/sfxALVoice.h
@@ -79,12 +79,12 @@ class SFXALVoice : public SFXVoice
       void _lateBindStaticBufferIfNecessary();
 
       // SFXVoice.
-      virtual SFXStatus _status() const;
-      virtual void _play();
-      virtual void _pause();
-      virtual void _stop();
-      virtual void _seek( U32 sample );
-      virtual U32 _tell() const;
+      SFXStatus _status() const override;
+      void _play() override;
+      void _pause() override;
+      void _stop() override;
+      void _seek( U32 sample ) override;
+      U32 _tell() const override;
 
    public:
 
@@ -94,14 +94,14 @@ class SFXALVoice : public SFXVoice
       virtual ~SFXALVoice();
 
       /// SFXVoice
-      void setMinMaxDistance( F32 min, F32 max );
-      void play( bool looping );
-      void setVelocity( const VectorF& velocity );
-      void setTransform( const MatrixF& transform );
-      void setVolume( F32 volume );
-      void setPitch( F32 pitch );
-      void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume );
-      void setRolloffFactor( F32 factor );
+      void setMinMaxDistance( F32 min, F32 max ) override;
+      void play( bool looping ) override;
+      void setVelocity( const VectorF& velocity ) override;
+      void setTransform( const MatrixF& transform ) override;
+      void setVolume( F32 volume ) override;
+      void setPitch( F32 pitch ) override;
+      void setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ) override;
+      void setRolloffFactor( F32 factor ) override;
 };
 
 #endif // _SFXALVOICE_H_
\ No newline at end of file
diff --git a/Engine/source/sfx/sfxController.h b/Engine/source/sfx/sfxController.h
index 7d2ee4980..0d3b26f3d 100644
--- a/Engine/source/sfx/sfxController.h
+++ b/Engine/source/sfx/sfxController.h
@@ -185,14 +185,14 @@ class SFXController : public SFXSource
       static SFXController* _create( SFXPlayList* playList );
       
       // SFXSource.
-      virtual void _play();
-      virtual void _pause();
-      virtual void _stop();
-      virtual void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event );
-      virtual void _updateVolume( const MatrixF& listener );
-      virtual void _updatePitch();
-      virtual void _updatePriority();
-      virtual void _update();
+      void _play() override;
+      void _pause() override;
+      void _stop() override;
+      void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event ) override;
+      void _updateVolume( const MatrixF& listener ) override;
+      void _updatePitch() override;
+      void _updatePriority() override;
+      void _update() override;
       
    public:
    
diff --git a/Engine/source/sfx/sfxEnvironment.h b/Engine/source/sfx/sfxEnvironment.h
index 372d4138b..5afad1acc 100644
--- a/Engine/source/sfx/sfxEnvironment.h
+++ b/Engine/source/sfx/sfxEnvironment.h
@@ -59,11 +59,11 @@ class SFXEnvironment : public SimDataBlock
       
       static void initPersistFields();
 
-      virtual bool onAdd();
-      virtual bool preload( bool server, String& errorStr );
-      virtual void packData( BitStream* stream );
-      virtual void unpackData( BitStream* stream );
-      virtual void inspectPostApply();
+      bool onAdd() override;
+      bool preload( bool server, String& errorStr ) override;
+      void packData( BitStream* stream ) override;
+      void unpackData( BitStream* stream ) override;
+      void inspectPostApply() override;
 
       /// @return The reverb properties of the sound environment.
       const SFXReverbProperties& getReverb() const { return mReverb; }
diff --git a/Engine/source/sfx/sfxFileStream.h b/Engine/source/sfx/sfxFileStream.h
index 54c578081..b22ba57a2 100644
--- a/Engine/source/sfx/sfxFileStream.h
+++ b/Engine/source/sfx/sfxFileStream.h
@@ -105,11 +105,11 @@ class SFXFileStream : public SFXStream
       void close();
 
       // SFXStream.
-      const SFXFormat& getFormat() const { return mFormat; }
-      U32 getSampleCount() const { return mSamples; }
-      U32 getDataLength() const { return mSamples * mFormat.getBytesPerSample(); }
-      U32 getDuration() const { return mFormat.getDuration( mSamples ); }
-      bool isEOS() const;
+      const SFXFormat& getFormat() const override { return mFormat; }
+      U32 getSampleCount() const override { return mSamples; }
+      U32 getDataLength() const override { return mSamples * mFormat.getBytesPerSample(); }
+      U32 getDuration() const override { return mFormat.getDuration( mSamples ); }
+      bool isEOS() const override;
 };
 
 #endif // _SFXFILESTREAM_H_
diff --git a/Engine/source/sfx/sfxInternal.h b/Engine/source/sfx/sfxInternal.h
index 212133859..7d2c49df2 100644
--- a/Engine/source/sfx/sfxInternal.h
+++ b/Engine/source/sfx/sfxInternal.h
@@ -120,15 +120,15 @@ class SFXAsyncStream : public AsyncPacketBufferedInputStream< SFXStreamRef, SFXS
       bool mReadSilenceAtEnd;
 
       // AsyncPacketStream.
-      virtual SFXStreamPacket* _newPacket( U32 packetSize )
+      SFXStreamPacket* _newPacket( U32 packetSize ) override
       {
          SFXStreamPacket* packet = Parent::_newPacket( packetSize );
          packet->mFormat = getSourceStream()->getFormat();
          return packet;
       }
-      virtual void _requestNext();
-      virtual void _onArrival( SFXStreamPacket* const& packet );
-      virtual void _newReadItem( PacketReadItemRef& outRef, SFXStreamPacket* packet, U32 numElements )
+      void _requestNext() override;
+      void _onArrival( SFXStreamPacket* const& packet ) override;
+      void _newReadItem( PacketReadItemRef& outRef, SFXStreamPacket* packet, U32 numElements ) override
       {
          if( !this->mNumRemainingSourceElements && mReadSilenceAtEnd )
             packet->mIsLast = false;
@@ -285,7 +285,7 @@ class SFXWrapAroundBuffer : public SFXBuffer
       U32 mBufferSize;
 
       // SFXBuffer.
-      virtual void _flush()
+      void _flush() override
       {
          mWriteOffset = 0;
       }
@@ -294,7 +294,7 @@ class SFXWrapAroundBuffer : public SFXBuffer
       virtual bool _copyData( U32 offset, const U8* data, U32 length ) = 0;
 
       // SFXBuffer.
-      virtual void write( SFXStreamPacket* const* packets, U32 num );
+      void write( SFXStreamPacket* const* packets, U32 num ) override;
 
       /// @return the sample position in the sound stream as determined from the
       ///   given buffer offset.
@@ -326,7 +326,7 @@ class SFXWrapAroundBuffer : public SFXBuffer
       SFXWrapAroundBuffer( SFXDescription* description )
          : Parent( description ), mBufferSize( 0 ), mWriteOffset(0) {}
          
-      virtual U32 getMemoryUsed() const { return mBufferSize; }
+      U32 getMemoryUsed() const override { return mBufferSize; }
 };
 
 //--------------------------------------------------------------------------
diff --git a/Engine/source/sfx/sfxMemoryStream.h b/Engine/source/sfx/sfxMemoryStream.h
index dddfcaf01..2421add45 100644
--- a/Engine/source/sfx/sfxMemoryStream.h
+++ b/Engine/source/sfx/sfxMemoryStream.h
@@ -72,13 +72,13 @@ class SFXMemoryStream : public SFXStream,
       SFXMemoryStream( const SFXFormat& format, SourceStreamType* stream, U32 numSamples = U32_MAX );
       
       // SFXStream.
-      const SFXFormat& getFormat() const { return mFormat; }
-      U32 getSampleCount() const { return mNumSamplesTotal; }
-      U32 getDataLength() const { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDataLength( getDuration() ) ); }
-      U32 getDuration() const { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDuration( mNumSamplesTotal ) ); }
-      bool isEOS() const { return ( mNumSamplesLeft != 0 ); }
-      void reset();
-      U32 read( U8 *buffer, U32 length );      
+      const SFXFormat& getFormat() const override { return mFormat; }
+      U32 getSampleCount() const override { return mNumSamplesTotal; }
+      U32 getDataLength() const override { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDataLength( getDuration() ) ); }
+      U32 getDuration() const override { return ( mNumSamplesTotal == U32_MAX ? U32_MAX : mFormat.getDuration( mNumSamplesTotal ) ); }
+      bool isEOS() const override { return ( mNumSamplesLeft != 0 ); }
+      void reset() override;
+      U32 read( U8 *buffer, U32 length ) override;      
 };
 
 #endif // !_SFXMEMORYSTREAM_H_
diff --git a/Engine/source/sfx/sfxModifier.h b/Engine/source/sfx/sfxModifier.h
index 39f2a7316..07fce959d 100644
--- a/Engine/source/sfx/sfxModifier.h
+++ b/Engine/source/sfx/sfxModifier.h
@@ -73,7 +73,7 @@ class SFXOneShotModifier : public SFXModifier
       SFXOneShotModifier( SFXSource* source, F32 triggerPos, bool removeWhenDone = false );
    
       // IPolled.
-      virtual bool update();
+      bool update() override;
 };
 
 /// An SFXModifier that is spans a certain range of playback time.
@@ -117,7 +117,7 @@ class SFXRangeModifier : public SFXModifier
       bool isActive() const { return mIsActive; }
       
       // IPolled.
-      virtual bool update();
+      bool update() override;
 };
 
 /// A volume fade effect (fade-in or fade-out).
@@ -149,9 +149,9 @@ class SFXFadeModifier : public SFXRangeModifier
       EOnEnd mOnEnd;
       
       // SFXModifier.
-      virtual void _onStart();
-      virtual void _onUpdate();
-      virtual void _onEnd();
+      void _onStart() override;
+      void _onUpdate() override;
+      void _onEnd() override;
       
    public:
    
@@ -181,7 +181,7 @@ class SFXMarkerModifier : public SFXOneShotModifier
       String mMarkerName;
       
       // SFXOneShotModifier
-      virtual void _onTrigger();
+      void _onTrigger() override;
    
    public:
    
diff --git a/Engine/source/sfx/sfxSound.h b/Engine/source/sfx/sfxSound.h
index 7494e3846..c3c5dd8c5 100644
--- a/Engine/source/sfx/sfxSound.h
+++ b/Engine/source/sfx/sfxSound.h
@@ -104,16 +104,16 @@ class SFXSound : public SFXSource,
       }
       
       // SFXSource.
-      virtual void _play();
-      virtual void _pause();
-      virtual void _stop();
-      virtual void _updateStatus();
-      virtual void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event );
-      virtual void _updateVolume( const MatrixF& listener );
-      virtual void _updatePitch();
-      virtual void _updatePriority();
-      virtual void _setMinMaxDistance( F32 min, F32 max );
-      virtual void _setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume );
+      void _play() override;
+      void _pause() override;
+      void _stop() override;
+      void _updateStatus() override;
+      void _onParameterEvent( SFXParameter* parameter, SFXParameterEvent event ) override;
+      void _updateVolume( const MatrixF& listener ) override;
+      void _updatePitch() override;
+      void _updatePriority() override;
+      void _setMinMaxDistance( F32 min, F32 max ) override;
+      void _setCone( F32 innerAngle, F32 outerAngle, F32 outerVolume ) override;
 
    public:
 
@@ -131,10 +131,10 @@ class SFXSound : public SFXSource,
 
       /// Return the current playback position in milliseconds.
       /// @note For looping sources, this returns the position in the current cycle.
-      U32 getPosition() const;
+      U32 getPosition() const override;
 
       /// Set the current playback position in milliseconds.
-      void setPosition( U32 ms );
+      void setPosition( U32 ms ) override;
 
       /// Returns the source's total playback time in milliseconds.
       U32 getDuration() const { return mDuration; }
@@ -155,15 +155,15 @@ class SFXSound : public SFXSource,
       static S32 QSORT_CALLBACK qsortCompare( const void* item1, const void* item2 );
 
       // SFXSource.
-      virtual void setTransform( const MatrixF& transform );
-      virtual void setVelocity( const VectorF& velocity );
-      virtual bool isVirtualized() const;
-      virtual F32 getElapsedPlayTimeCurrentCycle() const;
-      virtual F32 getTotalPlayTime() const;
+      void setTransform( const MatrixF& transform ) override;
+      void setVelocity( const VectorF& velocity ) override;
+      bool isVirtualized() const override;
+      F32 getElapsedPlayTimeCurrentCycle() const override;
+      F32 getTotalPlayTime() const override;
 
       // SimObject.
-      virtual void onRemove();
-      virtual void onDeleteNotify( SimObject* object );
+      void onRemove() override;
+      void onDeleteNotify( SimObject* object ) override;
 };
 
 #endif // !_SFXSOUND_H_
diff --git a/Engine/source/sfx/sfxState.h b/Engine/source/sfx/sfxState.h
index 320586e51..85f9b7b86 100644
--- a/Engine/source/sfx/sfxState.h
+++ b/Engine/source/sfx/sfxState.h
@@ -105,10 +105,10 @@ class SFXState : public SimDataBlock
       void disable();
       
       // SimDataBlock.
-      virtual bool onAdd();
-      virtual bool preload( bool server, String& errorStr );
-      virtual void packData( BitStream* stream );
-      virtual void unpackData( BitStream* stream );
+      bool onAdd() override;
+      bool preload( bool server, String& errorStr ) override;
+      void packData( BitStream* stream ) override;
+      void unpackData( BitStream* stream ) override;
       
       static void initPersistFields();
    
diff --git a/Engine/source/sfx/sfxStream.h b/Engine/source/sfx/sfxStream.h
index 6d52db3d6..7f965e678 100644
--- a/Engine/source/sfx/sfxStream.h
+++ b/Engine/source/sfx/sfxStream.h
@@ -73,12 +73,12 @@ class SFXStream : public ThreadSafeRefCount< SFXStream >,
       virtual bool isEOS() const = 0;
 
       /// Resets the stream to restart reading data from the begining.
-      virtual void reset() = 0;
+      void reset() override = 0;
 
       /// Reads data from the stream and decompresses it into PCM samples.
       ///
       /// @param length Number of bytes to read.
-      virtual U32 read( U8 *buffer, U32 length ) = 0;
+      U32 read( U8 *buffer, U32 length ) override = 0;
 };
 
 typedef ThreadSafeRef< SFXStream > SFXStreamRef;
diff --git a/Engine/source/sfx/sfxVoice.h b/Engine/source/sfx/sfxVoice.h
index f199a633f..74e40293e 100644
--- a/Engine/source/sfx/sfxVoice.h
+++ b/Engine/source/sfx/sfxVoice.h
@@ -156,14 +156,14 @@ class SFXVoice :  public StrongRefBase,
       ///
       /// @note For looping sounds, this will return the position in the
       ///   current cycle and not the total number of samples played so far.
-      virtual U32 getPosition() const;
+      U32 getPosition() const override;
 
       /// Sets the playback position to the given sample count.
       ///
       /// @param sample Offset in number of samples.  This is allowed to use an offset
       ///   accumulated from multiple cycles.  Each cycle will wrap around back to the
       ///   beginning of the buffer.
-      virtual void setPosition( U32 sample );
+      void setPosition( U32 sample ) override;
 
       /// @return the current playback status.
       /// @note For streaming voices, the reaction to for the voice to update its status
diff --git a/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h b/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h
index 046f065c9..d27269c64 100644
--- a/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h
+++ b/Engine/source/shaderGen/GLSL/accuFeatureGLSL.h
@@ -50,19 +50,19 @@ public:
    //****************************************************************************
    // Accu Texture
    //****************************************************************************
-   virtual void processVert(  Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
    void getAccuVec( MultiLine *meta, LangElement *accuVec );
 
    Var* addOutAccuVec( Vector<ShaderComponent*> &componentList, MultiLine *meta );
 
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd )
+   Resources getResources( const MaterialFeatureData &fd ) override
    {
       Resources res; 
       res.numTex = 1;
@@ -70,12 +70,12 @@ public:
       return res;
    }
 
-   virtual void setTexData(   Material::StageData &stageDat,
+   void setTexData(   Material::StageData &stageDat,
                               const MaterialFeatureData &fd,
                               RenderPassData &passData,
-                              U32 &texIndex );
+                              U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Accu Texture";
    }
@@ -84,7 +84,7 @@ public:
 class AccuScaleFeature : public ShaderFeatureGLSL
 {
 public:
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override
    {
       // Find the constant value
       Var *accuScale = (Var *)( LangElement::find("accuScale") );
@@ -98,13 +98,13 @@ public:
       }
    }
 
-   virtual String getName() { return "Accu Scale"; }
+   String getName() override { return "Accu Scale"; }
 };
 
 class AccuDirectionFeature : public ShaderFeatureGLSL
 {
 public:
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override
    {
       // Find the constant value
       Var *accuDirection = (Var *)( LangElement::find("accuDirection") );
@@ -118,13 +118,13 @@ public:
       }
    }
 
-   virtual String getName() { return "Accu Direction"; }
+   String getName() override { return "Accu Direction"; }
 };
 
 class AccuStrengthFeature : public ShaderFeatureGLSL
 {
 public:
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override
    {
       // Find the constant value
       Var *accuStrength = (Var *)( LangElement::find("accuStrength") );
@@ -138,13 +138,13 @@ public:
       }
    }
 
-   virtual String getName() { return "Accu Strength"; }
+   String getName() override { return "Accu Strength"; }
 };
 
 class AccuCoverageFeature : public ShaderFeatureGLSL
 {
 public:
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override
    {
       // Find the constant value
       Var *accuCoverage = (Var *)( LangElement::find("accuCoverage") );
@@ -158,14 +158,14 @@ public:
       }
    }
 
-   virtual String getName() { return "Accu Coverage"; }
+   String getName() override { return "Accu Coverage"; }
 };
 
 
 class AccuSpecularFeature : public ShaderFeatureGLSL
 {
 public:
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override
    {
       // Find the constant value
       Var *accuSpecular = (Var *)( LangElement::find("accuSpecular") );
@@ -179,7 +179,7 @@ public:
       }
    }
 
-   virtual String getName() { return "Accu Specular"; }
+   String getName() override { return "Accu Specular"; }
 };
 
 #endif
\ No newline at end of file
diff --git a/Engine/source/shaderGen/GLSL/bumpGLSL.h b/Engine/source/shaderGen/GLSL/bumpGLSL.h
index b37bb9099..2dc934eed 100644
--- a/Engine/source/shaderGen/GLSL/bumpGLSL.h
+++ b/Engine/source/shaderGen/GLSL/bumpGLSL.h
@@ -43,17 +43,17 @@ class BumpFeatGLSL : public ShaderFeatureGLSL
 public:
 
    // ShaderFeatureGLSL
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }  
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual void setTexData( Material::StageData &stageDat,
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }  
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
-   virtual String getName() { return "Bumpmap"; }
+                            U32 &texIndex ) override;
+   String getName() override { return "Bumpmap"; }
 };
 
 
@@ -75,16 +75,16 @@ public:
    ParallaxFeatGLSL();
 
    // ShaderFeatureGLSL
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual void setTexData(   Material::StageData &stageDat,
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   void setTexData(   Material::StageData &stageDat,
                               const MaterialFeatureData &fd,
                               RenderPassData &passData,
-                              U32 &texIndex );
-   virtual String getName() { return "Parallax"; }
+                              U32 &texIndex ) override;
+   String getName() override { return "Parallax"; }
 };
 
 
@@ -95,12 +95,12 @@ class NormalsOutFeatGLSL : public ShaderFeatureGLSL
 public:
 	
    // ShaderFeatureGLSL
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-									 const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-									const MaterialFeatureData &fd );
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }  
-   virtual String getName() { return "NormalsOut"; }
+   void processVert(  Vector<ShaderComponent*> &componentList,
+									 const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, 
+									const MaterialFeatureData &fd ) override;
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }  
+   String getName() override { return "NormalsOut"; }
 };
 
 #endif // _BUMP_GLSL_H_
\ No newline at end of file
diff --git a/Engine/source/shaderGen/GLSL/customFeatureGLSL.h b/Engine/source/shaderGen/GLSL/customFeatureGLSL.h
index b8358a835..df304ef10 100644
--- a/Engine/source/shaderGen/GLSL/customFeatureGLSL.h
+++ b/Engine/source/shaderGen/GLSL/customFeatureGLSL.h
@@ -94,15 +94,15 @@ public:
    //****************************************************************************
    // Accu Texture
    //****************************************************************************
-   virtual void processVert(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processVert(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual void processPix(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processPix(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override { return Material::LerpAlpha; }
 
-   virtual Resources getResources(const MaterialFeatureData& fd)
+   Resources getResources(const MaterialFeatureData& fd) override
    {
       Resources res;
       res.numTex = 1;
@@ -110,12 +110,12 @@ public:
       return res;
    }
 
-   virtual void setTexData(Material::StageData& stageDat,
+   void setTexData(Material::StageData& stageDat,
       const MaterialFeatureData& fd,
       RenderPassData& passData,
-      U32& texIndex);
+      U32& texIndex) override;
 
-   virtual String getName()
+   String getName() override
    {
       return mOwner->getName();
    }
diff --git a/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h b/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h
index 7994f115a..cf7039f29 100644
--- a/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h
+++ b/Engine/source/shaderGen/GLSL/debugVizFeatureGLSL.h
@@ -34,8 +34,8 @@ public:
 
    DebugVizGLSL();
 
-   virtual void processPix(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processPix(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual String getName() { return "Debug Viz"; }
+   String getName() override { return "Debug Viz"; }
 };
diff --git a/Engine/source/shaderGen/GLSL/depthGLSL.h b/Engine/source/shaderGen/GLSL/depthGLSL.h
index c92326415..3c7d6fdb0 100644
--- a/Engine/source/shaderGen/GLSL/depthGLSL.h
+++ b/Engine/source/shaderGen/GLSL/depthGLSL.h
@@ -35,12 +35,12 @@ class EyeSpaceDepthOutGLSL : public ShaderFeatureGLSL
 public:
 
    // ShaderFeature
-   virtual void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual String getName() { return "Eye Space Depth (Out)"; }
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
-   virtual const char* getOutputVarName() const { return "eyeSpaceDepth"; }
+   void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   String getName() override { return "Eye Space Depth (Out)"; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
+   const char* getOutputVarName() const override { return "eyeSpaceDepth"; }
 };
 
 
@@ -49,12 +49,12 @@ class DepthOutGLSL : public ShaderFeatureGLSL
 public:
 
    // ShaderFeature
-   virtual void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual String getName() { return "Depth (Out)"; }
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
-   virtual const char* getOutputVarName() const { return "IN_depth"; }
+   void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   String getName() override { return "Depth (Out)"; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
+   const char* getOutputVarName() const override { return "IN_depth"; }
 };
 
 #endif // _DEPTH_GLSL_H_
\ No newline at end of file
diff --git a/Engine/source/shaderGen/GLSL/paraboloidGLSL.h b/Engine/source/shaderGen/GLSL/paraboloidGLSL.h
index 811b19324..1a0feaf1f 100644
--- a/Engine/source/shaderGen/GLSL/paraboloidGLSL.h
+++ b/Engine/source/shaderGen/GLSL/paraboloidGLSL.h
@@ -37,11 +37,11 @@ class ParaboloidVertTransformGLSL : public ShaderFeatureGLSL
 public:
 
    // ShaderFeature
-   virtual void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual String getName() { return "Paraboloid Vert Transform"; }
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   String getName() override { return "Paraboloid Vert Transform"; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
 };
 
diff --git a/Engine/source/shaderGen/GLSL/shaderCompGLSL.h b/Engine/source/shaderGen/GLSL/shaderCompGLSL.h
index 1ba5d66db..46d2e2496 100644
--- a/Engine/source/shaderGen/GLSL/shaderCompGLSL.h
+++ b/Engine/source/shaderGen/GLSL/shaderCompGLSL.h
@@ -33,46 +33,46 @@ class VertPixelConnectorGLSL : public ShaderConnector
 public:
 
    // ShaderConnector
-   virtual Var* getElement(   RegisterType type, 
+   Var* getElement(   RegisterType type, 
                               U32 numElements = 1, 
-                              U32 numRegisters = -1 );
-   virtual void setName( const char *newName );
-   virtual void reset();
-   virtual void sortVars();
+                              U32 numRegisters = -1 ) override;
+   void setName( const char *newName ) override;
+   void reset() override;
+   void sortVars() override;
 
    virtual void print( Stream &stream) {} // TODO OPENGL temporal fix for dedicated build on Linux
-   virtual void print( Stream &stream, bool isVerterShader );
+   void print( Stream &stream, bool isVerterShader ) override;
    void printStructDefines( Stream &stream, bool in );
-   virtual void printOnMain( Stream &stream, bool isVerterShader );
+   void printOnMain( Stream &stream, bool isVerterShader ) override;
 };
 
 class AppVertConnectorGLSL : public ShaderConnector
 {
 public:
-   virtual Var* getElement(   RegisterType type, 
+   Var* getElement(   RegisterType type, 
                               U32 numElements = 1, 
-                              U32 numRegisters = -1 );
-   virtual void setName( const char *newName );
-   virtual void reset();
-   virtual void sortVars();
+                              U32 numRegisters = -1 ) override;
+   void setName( const char *newName ) override;
+   void reset() override;
+   void sortVars() override;
    
    virtual void print( Stream &stream) {} // TODO OPENGL temporal fix for dedicated build on Linux
-   virtual void print( Stream &stream, bool isVerterShader );   
-   virtual void printOnMain( Stream &stream, bool isVerterShader );
+   void print( Stream &stream, bool isVerterShader ) override;   
+   void printOnMain( Stream &stream, bool isVerterShader ) override;
 };
 
 
 class VertexParamsDefGLSL : public ParamsDef
 {
 public:
-   virtual void print( Stream &stream, bool isVerterShader );   
+   void print( Stream &stream, bool isVerterShader ) override;   
 };
 
 
 class PixelParamsDefGLSL : public ParamsDef
 {
 public:
-   virtual void print( Stream &stream, bool isVerterShader );
+   void print( Stream &stream, bool isVerterShader ) override;
 };
 
 #endif // _SHADERCOMP_GLSL_H_
diff --git a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h
index d4dbb1886..5db741ded 100644
--- a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h
+++ b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h
@@ -140,10 +140,10 @@ public:
    Var* getInWorldNormal(Vector<ShaderComponent*>& componentList);
 		
    // ShaderFeature
-   Var* getVertTexCoord( const String &name );
-   LangElement* setupTexSpaceMat(  Vector<ShaderComponent*> &componentList, Var **texSpaceMat );
-   LangElement* assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget );
-   LangElement* expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd );
+   Var* getVertTexCoord( const String &name ) override;
+   LangElement* setupTexSpaceMat(  Vector<ShaderComponent*> &componentList, Var **texSpaceMat ) override;
+   LangElement* assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ) override;
+   LangElement* expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd ) override;
 };
 
 
@@ -157,7 +157,7 @@ public:
       : mName( name )
    {}
 
-   virtual String getName() { return mName; }
+   String getName() override { return mName; }
 };
 
 class RenderTargetZeroGLSL : public ShaderFeatureGLSL
@@ -175,12 +175,12 @@ public:
       mFeatureName = buffer;
    }
 	
-   virtual String getName() { return mFeatureName; }
+   String getName() override { return mFeatureName; }
 	
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-									const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+									const MaterialFeatureData &fd ) override;
    
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const { return mOutputTargetMask; }
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override { return mOutputTargetMask; }
 };
 
 
@@ -188,20 +188,20 @@ public:
 class VertPositionGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
                              
-   virtual String getName()
+   String getName() override
    {
       return "Vert Position";
    }
 
-   virtual void determineFeature(   Material *material,
+   void determineFeature(   Material *material,
                                     const GFXVertexFormat *vertexFormat,
                                     U32 stageNum,
                                     const FeatureType &type,
                                     const FeatureSet &features,
-                                    MaterialFeatureData *outFeatureData );
+                                    MaterialFeatureData *outFeatureData ) override;
 
 };
 
@@ -218,17 +218,17 @@ public:
 
    RTLightingFeatGLSL();
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::None; }
+   Material::BlendOp getBlendOp() override{ return Material::None; }
    
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "RT Lighting";
    }
@@ -244,25 +244,25 @@ protected:
 	ShaderIncludeDependency mTorqueDep;
 public:
 	DiffuseMapFeatGLSL();
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual U32 getOutputTargets(const MaterialFeatureData &fd) const;
+   U32 getOutputTargets(const MaterialFeatureData &fd) const override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
                             
-   virtual String getName()
+   String getName() override
    {
       return "Base Texture";
    }
@@ -273,23 +273,23 @@ public:
 class OverlayTexFeatGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Overlay Texture";
    }
@@ -300,14 +300,14 @@ public:
 class DiffuseFeatureGLSL : public ShaderFeatureGLSL
 {
 public:   
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::None; }
+   Material::BlendOp getBlendOp() override{ return Material::None; }
 
-   virtual U32 getOutputTargets(const MaterialFeatureData &fd) const;
+   U32 getOutputTargets(const MaterialFeatureData &fd) const override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Diffuse Color";
    }
@@ -318,14 +318,14 @@ class DiffuseVertColorFeatureGLSL : public ShaderFeatureGLSL
 {
 public:   
 
-   virtual void processVert(  Vector< ShaderComponent* >& componentList,
-                              const MaterialFeatureData& fd );
-   virtual void processPix(   Vector< ShaderComponent* >&componentList, 
-                              const MaterialFeatureData& fd );
+   void processVert(  Vector< ShaderComponent* >& componentList,
+                              const MaterialFeatureData& fd ) override;
+   void processPix(   Vector< ShaderComponent* >&componentList, 
+                              const MaterialFeatureData& fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::None; }
+   Material::BlendOp getBlendOp() override{ return Material::None; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Diffuse Vertex Color";
    }
@@ -335,28 +335,28 @@ public:
 class LightmapFeatGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
                             
-   virtual String getName()
+   String getName() override
    {
       return "Lightmap";
    }
    
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -364,28 +364,28 @@ public:
 class TonemapFeatGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
                             
-   virtual String getName()
+   String getName() override
    {
       return "Tonemap";
    }
    
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -393,20 +393,20 @@ public:
 class VertLitGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::None; }
+   Material::BlendOp getBlendOp() override{ return Material::None; }
    
-   virtual String getName()
+   String getName() override
    {
       return "Vert Lit";
    }
    
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -414,23 +414,23 @@ public:
 class DetailFeatGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::Mul; }
+   Material::BlendOp getBlendOp() override{ return Material::Mul; }
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Detail";
    }
@@ -441,21 +441,21 @@ public:
 class ReflectCubeFeatGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Reflect Cube";
    }
@@ -472,17 +472,17 @@ protected:
 public:
    FogFeatGLSL();
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override { return Material::LerpAlpha; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Fog";
    }
@@ -493,9 +493,9 @@ public:
 class TexAnimGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Texture Animation";
    }
@@ -513,17 +513,17 @@ public:
 
    VisibilityFeatGLSL();
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Visibility";
    }
@@ -534,12 +534,12 @@ public:
 class AlphaTestGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Alpha Test";
    }
@@ -552,12 +552,12 @@ public:
 class GlowMaskGLSL : public ShaderFeatureGLSL
 {
 public:
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Glow Mask";
    }
@@ -578,12 +578,12 @@ public:
 	
    HDROutGLSL();
 	
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-									const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+									const MaterialFeatureData &fd ) override;
 	
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 	
-   virtual String getName() { return "HDR Output"; }
+   String getName() override { return "HDR Output"; }
 };
 
 ///
@@ -597,35 +597,35 @@ public:
 	
    FoliageFeatureGLSL();
 	
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-									 const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+									 const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList,
-                           const MaterialFeatureData &fd );   
+   void processPix( Vector<ShaderComponent*> &componentList,
+                           const MaterialFeatureData &fd ) override;   
 	
-   virtual String getName()
+   String getName() override
    {
       return "Foliage Feature";
    }
 	
-   virtual void determineFeature( Material *material, 
+   void determineFeature( Material *material, 
 											const GFXVertexFormat *vertexFormat,
 											U32 stageNum,
 											const FeatureType &type,
 											const FeatureSet &features,
-											MaterialFeatureData *outFeatureData );
+											MaterialFeatureData *outFeatureData ) override;
 
-   virtual ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject );   
+   ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ) override;   
 };
 
 class ParticleNormalFeatureGLSL : public ShaderFeatureGLSL
 {
 public:
 	
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-									 const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+									 const MaterialFeatureData &fd ) override;
 	
-   virtual String getName()
+   String getName() override
    {
       return "Particle Normal Generation Feature";
    }
@@ -645,20 +645,20 @@ public:
 
    ImposterVertFeatureGLSL();
 
-	virtual void processVert(  Vector<ShaderComponent*> &componentList,
-									 const MaterialFeatureData &fd );
+	void processVert(  Vector<ShaderComponent*> &componentList,
+									 const MaterialFeatureData &fd ) override;
 
-	virtual void processPix(  Vector<ShaderComponent*> &componentList,
-									const MaterialFeatureData &fd );
+	void processPix(  Vector<ShaderComponent*> &componentList,
+									const MaterialFeatureData &fd ) override;
 	
-   virtual String getName() { return "Imposter Vert"; }
+   String getName() override { return "Imposter Vert"; }
 	
-   virtual void determineFeature( Material *material, 
+   void determineFeature( Material *material, 
 											const GFXVertexFormat *vertexFormat,
 											U32 stageNum,
 											const FeatureType &type,
 											const FeatureSet &features,
-											MaterialFeatureData *outFeatureData );
+											MaterialFeatureData *outFeatureData ) override;
 };
 
 /// Hardware Skinning
@@ -668,10 +668,10 @@ protected:
 
 public:
 
-   virtual void processVert(Vector<ShaderComponent*> &componentList,
-      const MaterialFeatureData &fd);
+   void processVert(Vector<ShaderComponent*> &componentList,
+      const MaterialFeatureData &fd) override;
 
-   virtual String getName() { return "Hardware Skinning"; }
+   String getName() override { return "Hardware Skinning"; }
 };
 
 /// Reflection Probes
@@ -683,21 +683,21 @@ protected:
 public:
    ReflectionProbeFeatGLSL();
 
-   virtual void processVert(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processVert(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
    
-   virtual void processPix(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processPix(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual Resources getResources(const MaterialFeatureData& fd);
+   Resources getResources(const MaterialFeatureData& fd) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData(Material::StageData& stageDat,
+   void setTexData(Material::StageData& stageDat,
       const MaterialFeatureData& fd,
       RenderPassData& passData,
-      U32& texIndex);
+      U32& texIndex) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Reflection Probes";
    }
diff --git a/Engine/source/shaderGen/GLSL/shaderGenGLSL.h b/Engine/source/shaderGen/GLSL/shaderGenGLSL.h
index 77305b8e7..51c84aa50 100644
--- a/Engine/source/shaderGen/GLSL/shaderGenGLSL.h
+++ b/Engine/source/shaderGen/GLSL/shaderGenGLSL.h
@@ -36,12 +36,12 @@ public:
         ShaderGenPrinterGLSL() { for (int i = 0; i < 3; i++) extraRTs[i] = false; }
  
    // ShaderGenPrinter
-   virtual void printShaderHeader(Stream& stream);
-   virtual void printMainComment(Stream& stream);
-   virtual void printVertexShaderCloser(Stream& stream);
-   virtual void printPixelShaderOutputStruct(Stream& stream, const MaterialFeatureData &featureData);
-   virtual void printPixelShaderCloser(Stream& stream);
-   virtual void printLine(Stream& stream, const String& line);
+   void printShaderHeader(Stream& stream) override;
+   void printMainComment(Stream& stream) override;
+   void printVertexShaderCloser(Stream& stream) override;
+   void printPixelShaderOutputStruct(Stream& stream, const MaterialFeatureData &featureData) override;
+   void printPixelShaderCloser(Stream& stream) override;
+   void printLine(Stream& stream, const String& line) override;
 };
 
 class ShaderGenComponentFactoryGLSL : public ShaderGenComponentFactory
@@ -53,10 +53,10 @@ public:
    static const char* typeToString( GFXDeclType type );
 
    // ShaderGenComponentFactory
-   virtual ShaderComponent* createVertexInputConnector( const GFXVertexFormat &vertexFormat );
-   virtual ShaderComponent* createVertexPixelConnector();
-   virtual ShaderComponent* createVertexParamsDef();
-   virtual ShaderComponent* createPixelParamsDef();
+   ShaderComponent* createVertexInputConnector( const GFXVertexFormat &vertexFormat ) override;
+   ShaderComponent* createVertexPixelConnector() override;
+   ShaderComponent* createVertexParamsDef() override;
+   ShaderComponent* createPixelParamsDef() override;
 };
 
 #endif
\ No newline at end of file
diff --git a/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h b/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h
index 76ca93ae6..5f4682178 100644
--- a/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h
+++ b/Engine/source/shaderGen/HLSL/accuFeatureHLSL.h
@@ -50,19 +50,19 @@ public:
    //****************************************************************************
    // Accu Texture
    //****************************************************************************
-   virtual void processVert(  Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
    void getAccuVec( MultiLine *meta, LangElement *accuVec );
 
    Var* addOutAccuVec( Vector<ShaderComponent*> &componentList, MultiLine *meta );
 
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd )
+   Resources getResources( const MaterialFeatureData &fd ) override
    {
       Resources res; 
       res.numTex = 1;
@@ -70,12 +70,12 @@ public:
       return res;
    }
 
-   virtual void setTexData(   Material::StageData &stageDat,
+   void setTexData(   Material::StageData &stageDat,
                               const MaterialFeatureData &fd,
                               RenderPassData &passData,
-                              U32 &texIndex );
+                              U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Accu Texture";
    }
@@ -84,7 +84,7 @@ public:
 class AccuScaleFeature : public ShaderFeatureHLSL
 {
 public:
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override
    {
       // Find the constant value
       Var *accuScale = (Var *)( LangElement::find("accuScale") );
@@ -98,13 +98,13 @@ public:
       }
    }
 
-   virtual String getName() { return "Accu Scale"; }
+   String getName() override { return "Accu Scale"; }
 };
 
 class AccuDirectionFeature : public ShaderFeatureHLSL
 {
 public:
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override
    {
       // Find the constant value
       Var *accuDirection = (Var *)( LangElement::find("accuDirection") );
@@ -118,13 +118,13 @@ public:
       }
    }
 
-   virtual String getName() { return "Accu Direction"; }
+   String getName() override { return "Accu Direction"; }
 };
 
 class AccuStrengthFeature : public ShaderFeatureHLSL
 {
 public:
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override
    {
       // Find the constant value
       Var *accuStrength = (Var *)( LangElement::find("accuStrength") );
@@ -138,13 +138,13 @@ public:
       }
    }
 
-   virtual String getName() { return "Accu Strength"; }
+   String getName() override { return "Accu Strength"; }
 };
 
 class AccuCoverageFeature : public ShaderFeatureHLSL
 {
 public:
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override
    {
       // Find the constant value
       Var *accuCoverage = (Var *)( LangElement::find("accuCoverage") );
@@ -158,14 +158,14 @@ public:
       }
    }
 
-   virtual String getName() { return "Accu Coverage"; }
+   String getName() override { return "Accu Coverage"; }
 };
 
 
 class AccuSpecularFeature : public ShaderFeatureHLSL
 {
 public:
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override
    {
       // Find the constant value
       Var *accuSpecular = (Var *)( LangElement::find("accuSpecular") );
@@ -179,7 +179,7 @@ public:
       }
    }
 
-   virtual String getName() { return "Accu Specular"; }
+   String getName() override { return "Accu Specular"; }
 };
 
 #endif
\ No newline at end of file
diff --git a/Engine/source/shaderGen/HLSL/bumpHLSL.h b/Engine/source/shaderGen/HLSL/bumpHLSL.h
index 79e5af370..23be5778c 100644
--- a/Engine/source/shaderGen/HLSL/bumpHLSL.h
+++ b/Engine/source/shaderGen/HLSL/bumpHLSL.h
@@ -43,17 +43,17 @@ class BumpFeatHLSL : public ShaderFeatureHLSL
 public:
 
    // ShaderFeatureHLSL
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }  
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual void setTexData( Material::StageData &stageDat,
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }  
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
-   virtual String getName() { return "Bumpmap"; }
+                            U32 &texIndex ) override;
+   String getName() override { return "Bumpmap"; }
 };
 
 
@@ -75,16 +75,16 @@ public:
    ParallaxFeatHLSL();
 
    // ShaderFeatureHLSL
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual void setTexData(   Material::StageData &stageDat,
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   void setTexData(   Material::StageData &stageDat,
                               const MaterialFeatureData &fd,
                               RenderPassData &passData,
-                              U32 &texIndex );
-   virtual String getName() { return "Parallax"; }
+                              U32 &texIndex ) override;
+   String getName() override { return "Parallax"; }
 };
 
 
@@ -95,12 +95,12 @@ class NormalsOutFeatHLSL : public ShaderFeatureHLSL
 public:
 
    // ShaderFeatureHLSL
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }  
-   virtual String getName() { return "NormalsOut"; }
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }  
+   String getName() override { return "NormalsOut"; }
 };
 
 #endif // _BUMP_HLSL_H_
\ No newline at end of file
diff --git a/Engine/source/shaderGen/HLSL/customFeatureHLSL.h b/Engine/source/shaderGen/HLSL/customFeatureHLSL.h
index be89aeb50..f1d92a724 100644
--- a/Engine/source/shaderGen/HLSL/customFeatureHLSL.h
+++ b/Engine/source/shaderGen/HLSL/customFeatureHLSL.h
@@ -94,15 +94,15 @@ public:
    //****************************************************************************
    // Accu Texture
    //****************************************************************************
-   virtual void processVert(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processVert(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual void processPix(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processPix(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override { return Material::LerpAlpha; }
 
-   virtual Resources getResources(const MaterialFeatureData& fd)
+   Resources getResources(const MaterialFeatureData& fd) override
    {
       Resources res;
       res.numTex = 1;
@@ -110,12 +110,12 @@ public:
       return res;
    }
 
-   virtual void setTexData(Material::StageData& stageDat,
+   void setTexData(Material::StageData& stageDat,
       const MaterialFeatureData& fd,
       RenderPassData& passData,
-      U32& texIndex);
+      U32& texIndex) override;
 
-   virtual String getName()
+   String getName() override
    {
       return mOwner->getName();
    }
diff --git a/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h b/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h
index 69d5b0940..53c0151e9 100644
--- a/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h
+++ b/Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.h
@@ -34,8 +34,8 @@ public:
 
    DebugVizHLSL();
 
-   virtual void processPix(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processPix(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual String getName() { return "Debug Viz"; }
+   String getName() override { return "Debug Viz"; }
 };
diff --git a/Engine/source/shaderGen/HLSL/depthHLSL.h b/Engine/source/shaderGen/HLSL/depthHLSL.h
index c174ee1c8..e0607f2bb 100644
--- a/Engine/source/shaderGen/HLSL/depthHLSL.h
+++ b/Engine/source/shaderGen/HLSL/depthHLSL.h
@@ -35,12 +35,12 @@ class EyeSpaceDepthOutHLSL : public ShaderFeatureHLSL
 public:
 
    // ShaderFeature
-   virtual void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual String getName() { return "Eye Space Depth (Out)"; }
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
-   virtual const char* getOutputVarName() const { return "eyeSpaceDepth"; }
+   void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   String getName() override { return "Eye Space Depth (Out)"; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
+   const char* getOutputVarName() const override { return "eyeSpaceDepth"; }
 };
 
 
@@ -49,12 +49,12 @@ class DepthOutHLSL : public ShaderFeatureHLSL
 public:
 
    // ShaderFeature
-   virtual void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual String getName() { return "Depth (Out)"; }
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
-   virtual const char* getOutputVarName() const { return "IN.depth"; }
+   void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   String getName() override { return "Depth (Out)"; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
+   const char* getOutputVarName() const override { return "IN.depth"; }
 };
 
 #endif // _DEPTH_HLSL_H_
\ No newline at end of file
diff --git a/Engine/source/shaderGen/HLSL/paraboloidHLSL.h b/Engine/source/shaderGen/HLSL/paraboloidHLSL.h
index 43ee84239..63e379b3c 100644
--- a/Engine/source/shaderGen/HLSL/paraboloidHLSL.h
+++ b/Engine/source/shaderGen/HLSL/paraboloidHLSL.h
@@ -37,11 +37,11 @@ class ParaboloidVertTransformHLSL : public ShaderFeatureHLSL
 public:
 
    // ShaderFeature
-   virtual void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd );
-   virtual Resources getResources( const MaterialFeatureData &fd );
-   virtual String getName() { return "Paraboloid Vert Transform"; }
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   void processVert( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   void processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) override;
+   Resources getResources( const MaterialFeatureData &fd ) override;
+   String getName() override { return "Paraboloid Vert Transform"; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
 };
 
diff --git a/Engine/source/shaderGen/HLSL/shaderCompHLSL.h b/Engine/source/shaderGen/HLSL/shaderCompHLSL.h
index a89c54ea1..e11e234c7 100644
--- a/Engine/source/shaderGen/HLSL/shaderCompHLSL.h
+++ b/Engine/source/shaderGen/HLSL/shaderCompHLSL.h
@@ -35,40 +35,40 @@ private:
 public:
 
    // ShaderConnector
-   virtual Var* getElement(   RegisterType type, 
+   Var* getElement(   RegisterType type, 
                               U32 numElements = 1, 
-                              U32 numRegisters = -1 );
+                              U32 numRegisters = -1 ) override;
    virtual Var* getIndexedElement(  U32 index,
                                     RegisterType type, 
                                     U32 numElements = 1, 
                                     U32 numRegisters = -1 );
        
-   virtual void setName( const char *newName );
-   virtual void reset();
-   virtual void sortVars();
+   void setName( const char *newName ) override;
+   void reset() override;
+   void sortVars() override;
 
-   virtual void print( Stream &stream, bool isVertexShader );
+   void print( Stream &stream, bool isVertexShader ) override;
 };
 
 
 class ParamsDefHLSL : public ParamsDef
 {
 protected:
-   virtual void assignConstantNumbers();
+   void assignConstantNumbers() override;
 };
 
 
 class VertexParamsDefHLSL : public ParamsDefHLSL
 {
 public:
-   virtual void print( Stream &stream, bool isVerterShader );
+   void print( Stream &stream, bool isVerterShader ) override;
 };
 
 
 class PixelParamsDefHLSL : public ParamsDefHLSL
 {
 public:
-   virtual void print( Stream &stream, bool isVerterShader );
+   void print( Stream &stream, bool isVerterShader ) override;
 };
 
 #endif // _SHADERCOMP_HLSL_H_
diff --git a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h
index e01b97853..49c32e66e 100644
--- a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h
+++ b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h
@@ -141,10 +141,10 @@ public:
    Var* getInWorldNormal(Vector<ShaderComponent*>& componentList);
 
    // ShaderFeature
-   Var* getVertTexCoord( const String &name );
-   LangElement* setupTexSpaceMat(  Vector<ShaderComponent*> &componentList, Var **texSpaceMat );
-   LangElement* assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget );
-   LangElement* expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd );
+   Var* getVertTexCoord( const String &name ) override;
+   LangElement* setupTexSpaceMat(  Vector<ShaderComponent*> &componentList, Var **texSpaceMat ) override;
+   LangElement* assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ) override;
+   LangElement* expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd ) override;
 };
 
 
@@ -158,7 +158,7 @@ public:
       : mName( name )
    {}
 
-   virtual String getName() { return mName; }
+   String getName() override { return mName; }
 };
 
 class RenderTargetZeroHLSL : public ShaderFeatureHLSL
@@ -176,12 +176,12 @@ public:
       mFeatureName = buffer;
    }
 
-   virtual String getName() { return mFeatureName; }
+   String getName() override { return mFeatureName; }
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-      const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+      const MaterialFeatureData &fd ) override;
    
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const { return mOutputTargetMask; }
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override { return mOutputTargetMask; }
 };
 
 
@@ -189,23 +189,23 @@ public:
 class VertPositionHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList,
-                            const MaterialFeatureData &fd);
+   void processPix( Vector<ShaderComponent*> &componentList,
+                            const MaterialFeatureData &fd) override;
                              
-   virtual String getName()
+   String getName() override
    {
       return "Vert Position";
    }
 
-   virtual void determineFeature(   Material *material,
+   void determineFeature(   Material *material,
                                     const GFXVertexFormat *vertexFormat,
                                     U32 stageNum,
                                     const FeatureType &type,
                                     const FeatureSet &features,
-                                    MaterialFeatureData *outFeatureData );
+                                    MaterialFeatureData *outFeatureData ) override;
 
 };
 
@@ -222,17 +222,17 @@ public:
 
    RTLightingFeatHLSL();
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::None; }
+   Material::BlendOp getBlendOp() override{ return Material::None; }
    
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "RT Lighting";
    }
@@ -248,25 +248,25 @@ protected:
 
 public:
    DiffuseMapFeatHLSL();
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual U32 getOutputTargets(const MaterialFeatureData &fd) const;
+   U32 getOutputTargets(const MaterialFeatureData &fd) const override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
                             
-   virtual String getName()
+   String getName() override
    {
       return "Base Texture";
    }
@@ -277,23 +277,23 @@ public:
 class OverlayTexFeatHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Overlay Texture";
    }
@@ -304,13 +304,13 @@ public:
 class DiffuseFeatureHLSL : public ShaderFeatureHLSL
 {
 public:   
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::None; }
+   Material::BlendOp getBlendOp() override{ return Material::None; }
 
-   virtual U32 getOutputTargets(const MaterialFeatureData &fd) const;
-   virtual String getName()
+   U32 getOutputTargets(const MaterialFeatureData &fd) const override;
+   String getName() override
    {
       return "Diffuse Color";
    }
@@ -321,14 +321,14 @@ class DiffuseVertColorFeatureHLSL : public ShaderFeatureHLSL
 {
 public:   
 
-   virtual void processVert(  Vector< ShaderComponent* >& componentList,
-                              const MaterialFeatureData& fd );
-   virtual void processPix(   Vector< ShaderComponent* >&componentList, 
-                              const MaterialFeatureData& fd );
+   void processVert(  Vector< ShaderComponent* >& componentList,
+                              const MaterialFeatureData& fd ) override;
+   void processPix(   Vector< ShaderComponent* >&componentList, 
+                              const MaterialFeatureData& fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::None; }
+   Material::BlendOp getBlendOp() override{ return Material::None; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Diffuse Vertex Color";
    }
@@ -338,28 +338,28 @@ public:
 class LightmapFeatHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
                             
-   virtual String getName()
+   String getName() override
    {
       return "Lightmap";
    }
 
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -367,28 +367,28 @@ public:
 class TonemapFeatHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override{ return Material::LerpAlpha; }
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
                             
-   virtual String getName()
+   String getName() override
    {
       return "Tonemap";
    }
 
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -396,20 +396,20 @@ public:
 class VertLitHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::None; }
+   Material::BlendOp getBlendOp() override{ return Material::None; }
    
-   virtual String getName()
+   String getName() override
    {
       return "Vert Lit";
    }
 
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -417,23 +417,23 @@ public:
 class DetailFeatHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp(){ return Material::Mul; }
+   Material::BlendOp getBlendOp() override{ return Material::Mul; }
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Detail";
    }
@@ -444,21 +444,21 @@ public:
 class ReflectCubeFeatHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData( Material::StageData &stageDat,
+   void setTexData( Material::StageData &stageDat,
                             const MaterialFeatureData &fd,
                             RenderPassData &passData,
-                            U32 &texIndex );
+                            U32 &texIndex ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Reflect Cube";
    }
@@ -475,17 +475,17 @@ protected:
 public:
    FogFeatHLSL();
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::LerpAlpha; }
+   Material::BlendOp getBlendOp() override { return Material::LerpAlpha; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Fog";
    }
@@ -496,9 +496,9 @@ public:
 class TexAnimHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Texture Animation";
    }
@@ -516,17 +516,17 @@ public:
 
    VisibilityFeatHLSL();
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Visibility";
    }
@@ -537,12 +537,12 @@ public:
 class AlphaTestHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Alpha Test";
    }
@@ -555,12 +555,12 @@ public:
 class GlowMaskHLSL : public ShaderFeatureHLSL
 {
 public:
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
-   virtual String getName()
+   String getName() override
    {
       return "Glow Mask";
    }
@@ -581,12 +581,12 @@ public:
 
    HDROutHLSL();
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Material::BlendOp getBlendOp() { return Material::None; }
+   Material::BlendOp getBlendOp() override { return Material::None; }
 
-   virtual String getName() { return "HDR Output"; }
+   String getName() override { return "HDR Output"; }
 };
 
 ///
@@ -600,35 +600,35 @@ public:
 
    FoliageFeatureHLSL();
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList,
-                           const MaterialFeatureData &fd );   
+   void processPix( Vector<ShaderComponent*> &componentList,
+                           const MaterialFeatureData &fd ) override;   
 
-   virtual String getName()
+   String getName() override
    {
       return "Foliage Feature";
    }
 
-   virtual void determineFeature( Material *material, 
+   void determineFeature( Material *material, 
                                   const GFXVertexFormat *vertexFormat,
                                   U32 stageNum,
                                   const FeatureType &type,
                                   const FeatureSet &features,
-                                  MaterialFeatureData *outFeatureData );
+                                  MaterialFeatureData *outFeatureData ) override;
 
-   virtual ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject );   
+   ShaderFeatureConstHandles* createConstHandles( GFXShader *shader, SimObject *userObject ) override;   
 };
 
 class ParticleNormalFeatureHLSL : public ShaderFeatureHLSL
 {
 public:
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-      const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+      const MaterialFeatureData &fd ) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Particle Normal Generation Feature";
    }
@@ -648,20 +648,20 @@ public:
 
    ImposterVertFeatureHLSL();
 
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(  Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processPix(  Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Imposter Vert"; }
+   String getName() override { return "Imposter Vert"; }
 
-   virtual void determineFeature( Material *material, 
+   void determineFeature( Material *material, 
                                   const GFXVertexFormat *vertexFormat,
                                   U32 stageNum,
                                   const FeatureType &type,
                                   const FeatureSet &features,
-                                  MaterialFeatureData *outFeatureData );
+                                  MaterialFeatureData *outFeatureData ) override;
 };
 
 /// Hardware Skinning
@@ -671,10 +671,10 @@ protected:
 
 public:
 
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Hardware Skinning"; }
+   String getName() override { return "Hardware Skinning"; }
 };
 
 /// Reflection Probes
@@ -686,21 +686,21 @@ protected:
 public:
    ReflectionProbeFeatHLSL();
 
-   virtual void processVert(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processVert(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual void processPix(Vector<ShaderComponent*> &componentList,
-      const MaterialFeatureData &fd);
+   void processPix(Vector<ShaderComponent*> &componentList,
+      const MaterialFeatureData &fd) override;
 
-   virtual Resources getResources(const MaterialFeatureData &fd);
+   Resources getResources(const MaterialFeatureData &fd) override;
 
    // Sets textures and texture flags for current pass
-   virtual void setTexData(Material::StageData &stageDat,
+   void setTexData(Material::StageData &stageDat,
       const MaterialFeatureData &fd,
       RenderPassData &passData,
-      U32 &texIndex);
+      U32 &texIndex) override;
 
-   virtual String getName()
+   String getName() override
    {
       return "Reflection Probes";
    }
diff --git a/Engine/source/shaderGen/HLSL/shaderGenHLSL.h b/Engine/source/shaderGen/HLSL/shaderGenHLSL.h
index c14354f39..74be5684a 100644
--- a/Engine/source/shaderGen/HLSL/shaderGenHLSL.h
+++ b/Engine/source/shaderGen/HLSL/shaderGenHLSL.h
@@ -33,12 +33,12 @@ class ShaderGenPrinterHLSL : public ShaderGenPrinter
 public:
 
    // ShaderGenPrinter
-   virtual void printShaderHeader(Stream& stream);
-   virtual void printMainComment(Stream& stream);
-   virtual void printVertexShaderCloser(Stream& stream);
-   virtual void printPixelShaderOutputStruct(Stream& stream, const MaterialFeatureData &featureData);
-   virtual void printPixelShaderCloser(Stream& stream);
-   virtual void printLine(Stream& stream, const String& line);
+   void printShaderHeader(Stream& stream) override;
+   void printMainComment(Stream& stream) override;
+   void printVertexShaderCloser(Stream& stream) override;
+   void printPixelShaderOutputStruct(Stream& stream, const MaterialFeatureData &featureData) override;
+   void printPixelShaderCloser(Stream& stream) override;
+   void printLine(Stream& stream, const String& line) override;
 };
 
 class ShaderGenComponentFactoryHLSL : public ShaderGenComponentFactory
@@ -50,10 +50,10 @@ public:
    static const char* typeToString( GFXDeclType type );
 
    // ShaderGenComponentFactory
-   virtual ShaderComponent* createVertexInputConnector( const GFXVertexFormat &vertexFormat );
-   virtual ShaderComponent* createVertexPixelConnector();
-   virtual ShaderComponent* createVertexParamsDef();
-   virtual ShaderComponent* createPixelParamsDef();
+   ShaderComponent* createVertexInputConnector( const GFXVertexFormat &vertexFormat ) override;
+   ShaderComponent* createVertexPixelConnector() override;
+   ShaderComponent* createVertexParamsDef() override;
+   ShaderComponent* createPixelParamsDef() override;
 };
 
 
diff --git a/Engine/source/shaderGen/customShaderFeature.h b/Engine/source/shaderGen/customShaderFeature.h
index fd76380c4..6a452779c 100644
--- a/Engine/source/shaderGen/customShaderFeature.h
+++ b/Engine/source/shaderGen/customShaderFeature.h
@@ -65,8 +65,8 @@ public:
 	static void initPersistFields();
 
 	// Handle when we are added to the scene and removed from the scene
-	bool onAdd();
-	void onRemove();
+	bool onAdd() override;
+	void onRemove() override;
 
 	//shadergen setup
 	void addVariable(String name, String type, String defaultValue);
diff --git a/Engine/source/shaderGen/langElement.h b/Engine/source/shaderGen/langElement.h
index 34af7c3f9..6608173e5 100644
--- a/Engine/source/shaderGen/langElement.h
+++ b/Engine/source/shaderGen/langElement.h
@@ -136,7 +136,7 @@ struct Var : public LangElement
    void setConnectName(const char *newName );
    void setType(const char *newType );
   
-   virtual void print( Stream &stream );
+   void print( Stream &stream ) override;
 
    // Construct a uniform / shader const var
    void setUniform(const String& constType, const String& constName, ConstantSortPosition sortPos);
@@ -176,7 +176,7 @@ public:
    }
 
    void addStatement( LangElement *elem );
-   virtual void print( Stream &stream );
+   void print( Stream &stream ) override;
 };
 
 
diff --git a/Engine/source/shaderGen/shaderOp.h b/Engine/source/shaderGen/shaderOp.h
index 2f2cbc4bf..63faad2ad 100644
--- a/Engine/source/shaderGen/shaderOp.h
+++ b/Engine/source/shaderGen/shaderOp.h
@@ -89,7 +89,7 @@ class DecOp : public ShaderOp
 
 public:
    DecOp( Var *in1 );
-   virtual void print( Stream &stream );
+   void print( Stream &stream ) override;
 };
 
 
@@ -107,7 +107,7 @@ class EchoOp : public ShaderOp
 public:
    EchoOp( const char * statement );
    ~EchoOp();
-   virtual void print( Stream &stream );
+   void print( Stream &stream ) override;
 };
 
 //----------------------------------------------------------------------------
@@ -122,7 +122,7 @@ class IndexOp : public ShaderOp
 
 public:
    IndexOp( Var* var, U32 index );
-   virtual void print( Stream &stream );
+   void print( Stream &stream ) override;
 };
 
 
@@ -159,7 +159,7 @@ class GenOp : public ShaderOp
 
 public:
    GenOp( const char * statement, ... );
-   virtual void print( Stream &stream );
+   void print( Stream &stream ) override;
 
 };
 
diff --git a/Engine/source/sim/actionMap.h b/Engine/source/sim/actionMap.h
index 840dd70f9..3a8ff392e 100644
--- a/Engine/source/sim/actionMap.h
+++ b/Engine/source/sim/actionMap.h
@@ -55,7 +55,7 @@ class ActionMap : public SimObject
    friend class ContextAction;
 
   protected:
-   bool onAdd();
+   bool onAdd() override;
 
    struct Node {
       U32 modifiers;
@@ -214,8 +214,8 @@ public:
    bool mReturnHoldTime;                ///< Do we return back our time held?  
 
    ContextAction(StringTableEntry func, F32 minHoldTime, ActionMap::Node* button, bool holdOnly);
-   virtual void processTick();
-   virtual void interpolateTick(F32 delta) {}   
-   virtual void advanceTime(F32 timeDelta) {}
+   void processTick() override;
+   void interpolateTick(F32 delta) override {}   
+   void advanceTime(F32 timeDelta) override {}
 };
 #endif // _ACTIONMAP_H_
diff --git a/Engine/source/sim/connectionStringTable.cpp b/Engine/source/sim/connectionStringTable.cpp
index 50ecd54a6..e7342ed17 100644
--- a/Engine/source/sim/connectionStringTable.cpp
+++ b/Engine/source/sim/connectionStringTable.cpp
@@ -38,29 +38,29 @@ public:
       mIndex = index;
       mString = string;
    }
-   virtual void pack(NetConnection* /*ps*/, BitStream *bstream)
+   void pack(NetConnection* /*ps*/, BitStream *bstream) override
    {
       bstream->writeInt(mIndex, ConnectionStringTable::EntryBitSize);
       bstream->writeString(mString.getString());
    }
-   virtual void write(NetConnection* /*ps*/, BitStream *bstream)
+   void write(NetConnection* /*ps*/, BitStream *bstream) override
    {
       bstream->writeInt(mIndex, ConnectionStringTable::EntryBitSize);
       bstream->writeString(mString.getString());
    }
-   virtual void unpack(NetConnection* /*con*/, BitStream *bstream)
+   void unpack(NetConnection* /*con*/, BitStream *bstream) override
    {
       char buf[256];
       mIndex = bstream->readInt(ConnectionStringTable::EntryBitSize);
       bstream->readString(buf);
       mString = NetStringHandle(buf);
    }
-   virtual void notifyDelivered(NetConnection *ps, bool madeit)
+   void notifyDelivered(NetConnection *ps, bool madeit) override
    {
       if(madeit)
          ps->confirmStringReceived(mString, mIndex);
    }
-   virtual void process(NetConnection *connection)
+   void process(NetConnection *connection) override
    {
 #ifdef TORQUE_DEBUG_NET
       Con::printf("Mapping string: %s to index: %d", mString.getString(), mIndex);
diff --git a/Engine/source/sim/netConnection.cpp b/Engine/source/sim/netConnection.cpp
index ac3a2c325..0ce12bb68 100644
--- a/Engine/source/sim/netConnection.cpp
+++ b/Engine/source/sim/netConnection.cpp
@@ -69,25 +69,25 @@ public:
    typedef NetEvent Parent;
    ConnectionMessageEvent(U32 msg=0, U32 seq=0, U32 gc=0)
       { message = msg; sequence = seq; ghostCount = gc;}
-   void pack(NetConnection *, BitStream *bstream)
+   void pack(NetConnection *, BitStream *bstream) override
    {
       bstream->write(sequence);
       bstream->writeInt(message, 3);
       bstream->writeInt(ghostCount, NetConnection::GhostIdBitSize + 1);
    }
-   void write(NetConnection *, BitStream *bstream)
+   void write(NetConnection *, BitStream *bstream) override
    {
       bstream->write(sequence);
       bstream->writeInt(message, 3);
       bstream->writeInt(ghostCount, NetConnection::GhostIdBitSize + 1);
    }
-   void unpack(NetConnection *, BitStream *bstream)
+   void unpack(NetConnection *, BitStream *bstream) override
    {
       bstream->read(&sequence);
       message = bstream->readInt(3);
       ghostCount = bstream->readInt(NetConnection::GhostIdBitSize + 1);
    }
-   void process(NetConnection *ps)
+   void process(NetConnection *ps) override
    {
       ps->handleConnectionMessage(message, sequence, ghostCount);
    }
@@ -790,7 +790,7 @@ public:
       stream.setBuffer(buffer, inStream->getPosition());
       stream.setPosition(inStream->getPosition());
    }
-   void process(SimObject *object)
+   void process(SimObject *object) override
    {
       ((NetConnection *) object)->sendPacket(&stream);
    }
diff --git a/Engine/source/sim/netDownload.cpp b/Engine/source/sim/netDownload.cpp
index b523ef0ad..ba6176b76 100644
--- a/Engine/source/sim/netDownload.cpp
+++ b/Engine/source/sim/netDownload.cpp
@@ -59,28 +59,28 @@ public:
       }
    }
 
-   virtual void pack(NetConnection *, BitStream *bstream)
+   void pack(NetConnection *, BitStream *bstream) override
    {
       bstream->writeRangedU32(nameCount, 0, MaxFileNames);
       for(U32 i = 0; i < nameCount; i++)
          bstream->writeString(mFileNames[i]);
    }
 
-   virtual void write(NetConnection *, BitStream *bstream)
+   void write(NetConnection *, BitStream *bstream) override
    {
       bstream->writeRangedU32(nameCount, 0, MaxFileNames);
       for(U32 i = 0; i < nameCount; i++)
          bstream->writeString(mFileNames[i]);
    }
 
-   virtual void unpack(NetConnection *, BitStream *bstream)
+   void unpack(NetConnection *, BitStream *bstream) override
    {
       nameCount = bstream->readRangedU32(0, MaxFileNames);
       for(U32 i = 0; i < nameCount; i++)
          bstream->readString(mFileNames[i]);
    }
 
-   virtual void process(NetConnection *connection)
+   void process(NetConnection *connection) override
    {
       U32 i;
       for(i = 0; i < nameCount; i++)
@@ -120,30 +120,30 @@ public:
       chunkLen = len;
    }
    
-   virtual void pack(NetConnection *, BitStream *bstream)
+   void pack(NetConnection *, BitStream *bstream) override
    {
       bstream->writeRangedU32(chunkLen, 0, ChunkSize);
       bstream->write(chunkLen, chunkData);
    }
    
-   virtual void write(NetConnection *, BitStream *bstream)
+   void write(NetConnection *, BitStream *bstream) override
    {
       bstream->writeRangedU32(chunkLen, 0, ChunkSize);
       bstream->write(chunkLen, chunkData);
    }
    
-   virtual void unpack(NetConnection *, BitStream *bstream)
+   void unpack(NetConnection *, BitStream *bstream) override
    {
       chunkLen = bstream->readRangedU32(0, ChunkSize);
       bstream->read(chunkLen, chunkData);
    }
    
-   virtual void process(NetConnection *connection)
+   void process(NetConnection *connection) override
    {
       connection->chunkReceived(chunkData, chunkLen);
    }
    
-   virtual void notifyDelivered(NetConnection *nc, bool madeIt)
+   void notifyDelivered(NetConnection *nc, bool madeIt) override
    {
       if(!nc->isRemoved())
         nc->sendFileChunk();
diff --git a/Engine/source/sim/netGhost.cpp b/Engine/source/sim/netGhost.cpp
index d903d7473..89d8c7143 100644
--- a/Engine/source/sim/netGhost.cpp
+++ b/Engine/source/sim/netGhost.cpp
@@ -63,7 +63,7 @@ public:
    ~GhostAlwaysObjectEvent()
       { delete object; }
 
-   void pack(NetConnection *ps, BitStream *bstream)
+   void pack(NetConnection *ps, BitStream *bstream) override
    {
       bstream->writeInt(ghostIndex, NetConnection::GhostIdBitSize);
 
@@ -83,7 +83,7 @@ public:
 #endif
       }
    }
-   void write(NetConnection *ps, BitStream *bstream)
+   void write(NetConnection *ps, BitStream *bstream) override
    {
       bstream->writeInt(ghostIndex, NetConnection::GhostIdBitSize);
       if(bstream->writeFlag(validObject))
@@ -100,7 +100,7 @@ public:
 #endif
       }
    }
-   void unpack(NetConnection *ps, BitStream *bstream)
+   void unpack(NetConnection *ps, BitStream *bstream) override
    {
       ghostIndex = bstream->readInt(NetConnection::GhostIdBitSize);
 
@@ -136,7 +136,7 @@ public:
          validObject = false;
       }
    }
-   void process(NetConnection *ps)
+   void process(NetConnection *ps) override
    {
       Con::executef("onGhostAlwaysObjectReceived");
 
diff --git a/Engine/source/terrain/glsl/terrFeatureGLSL.h b/Engine/source/terrain/glsl/terrFeatureGLSL.h
index 135d54b8a..7c80773ec 100644
--- a/Engine/source/terrain/glsl/terrFeatureGLSL.h
+++ b/Engine/source/terrain/glsl/terrFeatureGLSL.h
@@ -61,17 +61,17 @@ class TerrainBaseMapFeatGLSL : public TerrainFeatGLSL
 {
 public:
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
           
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Terrain Base Texture"; }
+   String getName() override { return "Terrain Base Texture"; }
 
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -86,17 +86,17 @@ public:
 
    TerrainDetailMapFeatGLSL();
 
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Terrain Detail Texture"; }
+   String getName() override { return "Terrain Detail Texture"; }
 
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -111,17 +111,17 @@ public:
 
    TerrainMacroMapFeatGLSL();
 
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Terrain Macro Texture"; }
+   String getName() override { return "Terrain Macro Texture"; }
 
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -129,66 +129,66 @@ class TerrainNormalMapFeatGLSL : public TerrainFeatGLSL
 {
 public:
 
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                            const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                            const MaterialFeatureData &fd ) override;
    
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                           const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                           const MaterialFeatureData &fd ) override;
    
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
    
-   virtual String getName() { return "Terrain Normal Texture"; }
+   String getName() override { return "Terrain Normal Texture"; }
 };
 
 class TerrainLightMapFeatGLSL : public TerrainFeatGLSL
 {
 public:
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
           
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Terrain Lightmap Texture"; }
+   String getName() override { return "Terrain Lightmap Texture"; }
 };
 
 class TerrainORMMapFeatGLSL : public TerrainFeatGLSL
 {
 public:
 
-	virtual void processVert(Vector<ShaderComponent*> &componentList,
-		const MaterialFeatureData &fd);
+	void processVert(Vector<ShaderComponent*> &componentList,
+		const MaterialFeatureData &fd) override;
 
-	virtual void processPix(Vector<ShaderComponent*> &componentList,
-		const MaterialFeatureData &fd);
+	void processPix(Vector<ShaderComponent*> &componentList,
+		const MaterialFeatureData &fd) override;
 
-	virtual Resources getResources(const MaterialFeatureData &fd);
+	Resources getResources(const MaterialFeatureData &fd) override;
 
-	virtual U32 getOutputTargets(const MaterialFeatureData &fd) const;
-	virtual String getName() { return "Composite Matinfo map"; }
+	U32 getOutputTargets(const MaterialFeatureData &fd) const override;
+	String getName() override { return "Composite Matinfo map"; }
 };
 
 class TerrainBlankInfoMapFeatGLSL : public ShaderFeatureGLSL
 {
 public:
 
-   virtual void processPix(Vector<ShaderComponent*> &componentList,
-      const MaterialFeatureData &fd);
+   void processPix(Vector<ShaderComponent*> &componentList,
+      const MaterialFeatureData &fd) override;
 
-   virtual String getName() { return "Blank Matinfo map"; }
+   String getName() override { return "Blank Matinfo map"; }
 };
 
 class TerrainHeightMapBlendGLSL : public TerrainFeatGLSL
 {
 public:
 
-   virtual void processVert(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processVert(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual void processPix(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processPix(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual String getName() { return "Terrain Heightmap Blend"; }
+   String getName() override { return "Terrain Heightmap Blend"; }
 };
 
 #endif // _TERRFEATUREGLSL_H_
diff --git a/Engine/source/terrain/hlsl/terrFeatureHLSL.h b/Engine/source/terrain/hlsl/terrFeatureHLSL.h
index 407b8e267..b65b1335b 100644
--- a/Engine/source/terrain/hlsl/terrFeatureHLSL.h
+++ b/Engine/source/terrain/hlsl/terrFeatureHLSL.h
@@ -68,17 +68,17 @@ class TerrainBaseMapFeatHLSL : public TerrainFeatHLSL
 {
 public:
 
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
+   void processVert( Vector<ShaderComponent*> &componentList,
+                             const MaterialFeatureData &fd ) override;
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
           
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Terrain Base Texture"; }
+   String getName() override { return "Terrain Base Texture"; }
 
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -93,17 +93,17 @@ public:
 
    TerrainDetailMapFeatHLSL();
 
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Terrain Detail Texture"; }
+   String getName() override { return "Terrain Detail Texture"; }
 
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -118,17 +118,17 @@ public:
 
    TerrainMacroMapFeatHLSL();
 
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Terrain Macro Texture"; }
+   String getName() override { return "Terrain Macro Texture"; }
 
-   virtual U32 getOutputTargets( const MaterialFeatureData &fd ) const;
+   U32 getOutputTargets( const MaterialFeatureData &fd ) const override;
 };
 
 
@@ -136,65 +136,65 @@ class TerrainNormalMapFeatHLSL : public TerrainFeatHLSL
 {
 public:
 
-   virtual void processVert(  Vector<ShaderComponent*> &componentList,
-                              const MaterialFeatureData &fd );
+   void processVert(  Vector<ShaderComponent*> &componentList,
+                              const MaterialFeatureData &fd ) override;
 
-   virtual void processPix(   Vector<ShaderComponent*> &componentList, 
-                              const MaterialFeatureData &fd );
+   void processPix(   Vector<ShaderComponent*> &componentList, 
+                              const MaterialFeatureData &fd ) override;
 
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Terrain Normal Texture"; }
+   String getName() override { return "Terrain Normal Texture"; }
 };
 
 class TerrainLightMapFeatHLSL : public TerrainFeatHLSL
 {
 public:
 
-   virtual void processPix( Vector<ShaderComponent*> &componentList, 
-                            const MaterialFeatureData &fd );
+   void processPix( Vector<ShaderComponent*> &componentList, 
+                            const MaterialFeatureData &fd ) override;
           
-   virtual Resources getResources( const MaterialFeatureData &fd );
+   Resources getResources( const MaterialFeatureData &fd ) override;
 
-   virtual String getName() { return "Terrain Lightmap Texture"; }
+   String getName() override { return "Terrain Lightmap Texture"; }
 };
 
 class TerrainORMMapFeatHLSL : public TerrainFeatHLSL
 {
 public:
 
-   virtual void processVert(Vector<ShaderComponent*> &componentList,
-      const MaterialFeatureData &fd);
+   void processVert(Vector<ShaderComponent*> &componentList,
+      const MaterialFeatureData &fd) override;
 
-   virtual void processPix(Vector<ShaderComponent*> &componentList,
-      const MaterialFeatureData &fd);
+   void processPix(Vector<ShaderComponent*> &componentList,
+      const MaterialFeatureData &fd) override;
 
-   virtual Resources getResources(const MaterialFeatureData &fd);
+   Resources getResources(const MaterialFeatureData &fd) override;
 
-   virtual U32 getOutputTargets(const MaterialFeatureData &fd) const;
-   virtual String getName() { return "Composite Matinfo map"; }
+   U32 getOutputTargets(const MaterialFeatureData &fd) const override;
+   String getName() override { return "Composite Matinfo map"; }
 };
 
 class TerrainBlankInfoMapFeatHLSL : public TerrainFeatHLSL
 {
 public:
 
-   virtual void processPix(Vector<ShaderComponent*> &componentList,
-      const MaterialFeatureData &fd);
-   virtual String getName() { return "Blank Matinfo map"; }
+   void processPix(Vector<ShaderComponent*> &componentList,
+      const MaterialFeatureData &fd) override;
+   String getName() override { return "Blank Matinfo map"; }
 };
 
 class TerrainHeightMapBlendHLSL : public TerrainFeatHLSL
 {
 public:
 
-   virtual void processVert(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processVert(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual void processPix(Vector<ShaderComponent*>& componentList,
-      const MaterialFeatureData& fd);
+   void processPix(Vector<ShaderComponent*>& componentList,
+      const MaterialFeatureData& fd) override;
 
-   virtual String getName() { return "Terrain Heightmap Blend"; }
+   String getName() override { return "Terrain Heightmap Blend"; }
 };
 
 #endif // _TERRFEATUREHLSL_H_
diff --git a/Engine/source/terrain/terrCollision.h b/Engine/source/terrain/terrCollision.h
index 7313b9054..6434a3a91 100644
--- a/Engine/source/terrain/terrCollision.h
+++ b/Engine/source/terrain/terrCollision.h
@@ -47,11 +47,11 @@ class TerrainConvex : public Convex
    TerrainConvex( const TerrainConvex& cv );
 
    // Convex
-   Box3F getBoundingBox() const;
-   Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const;
-   Point3F support(const VectorF& v) const;
-   void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf);
-   void getPolyList(AbstractPolyList* list);
+   Box3F getBoundingBox() const override;
+   Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const override;
+   Point3F support(const VectorF& v) const override;
+   void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf) override;
+   void getPolyList(AbstractPolyList* list) override;
 };
 
 #endif // _TERRCOLL_H_
diff --git a/Engine/source/ts/assimp/assimpAppMaterial.h b/Engine/source/ts/assimp/assimpAppMaterial.h
index 3c1482fa9..0e973aaeb 100644
--- a/Engine/source/ts/assimp/assimpAppMaterial.h
+++ b/Engine/source/ts/assimp/assimpAppMaterial.h
@@ -47,7 +47,7 @@ public:
    AssimpAppMaterial(aiMaterial* mtl);
    ~AssimpAppMaterial() { }
 
-   String getName() const { return name; }
+   String getName() const override { return name; }
    Material* createMaterial(const Torque::Path& path) const;
    void initMaterial(const Torque::Path& path, Material* mat) const;
 
diff --git a/Engine/source/ts/assimp/assimpAppMesh.h b/Engine/source/ts/assimp/assimpAppMesh.h
index 871ef86fe..9e5919276 100644
--- a/Engine/source/ts/assimp/assimpAppMesh.h
+++ b/Engine/source/ts/assimp/assimpAppMesh.h
@@ -53,7 +53,7 @@ public:
       //delete geomExt;
    }
 
-   void lookupSkinData();
+   void lookupSkinData() override;
 
    static void fixDetailSize(bool fixed, S32 size=2)
    {
@@ -64,7 +64,7 @@ public:
    /// Get the name of this mesh
    ///
    /// @return A string containing the name of this mesh
-   const char *getName(bool allowFixed=true);
+   const char *getName(bool allowFixed=true) override;
 
    //-----------------------------------------------------------------------
 
@@ -74,7 +74,7 @@ public:
    /// @param defaultVal   Reference to variable to hold return value
    ///
    /// @return True if a value was set, false if not
-   bool getFloat(const char *propName, F32 &defaultVal)
+   bool getFloat(const char *propName, F32 &defaultVal) override
    {
       return appNode->getFloat(propName,defaultVal);
    }
@@ -85,7 +85,7 @@ public:
    /// @param defaultVal   Reference to variable to hold return value
    ///
    /// @return True if a value was set, false if not
-   bool getInt(const char *propName, S32 &defaultVal)
+   bool getInt(const char *propName, S32 &defaultVal) override
    {
       return appNode->getInt(propName,defaultVal);
    }
@@ -96,13 +96,13 @@ public:
    /// @param defaultVal   Reference to variable to hold return value
    ///
    /// @return True if a value was set, false if not
-   bool getBool(const char *propName, bool &defaultVal)
+   bool getBool(const char *propName, bool &defaultVal) override
    {
       return appNode->getBool(propName,defaultVal);
    }
 
    /// Return true if this mesh is a skin
-   bool isSkin()
+   bool isSkin() override
    {
       return mIsSkinMesh;
    }
@@ -111,15 +111,15 @@ public:
    ///
    /// @param time           Time at which to generate the mesh data
    /// @param objectOffset   Transform to apply to the generated data (bounds transform)
-   void lockMesh(F32 time, const MatrixF& objOffset);
+   void lockMesh(F32 time, const MatrixF& objOffset) override;
 
    /// Get the transform of this mesh at a certain time
    ///
    /// @param time   Time at which to get the transform
    ///
    /// @return The mesh transform at the specified time
-   MatrixF getMeshTransform(F32 time);
-   F32 getVisValue(F32 t);
+   MatrixF getMeshTransform(F32 time) override;
+   F32 getVisValue(F32 t) override;
 };
 
 #endif // _COLLADA_APPMESH_H_
diff --git a/Engine/source/ts/assimp/assimpAppNode.h b/Engine/source/ts/assimp/assimpAppNode.h
index 947cb894b..41b90cd3a 100644
--- a/Engine/source/ts/assimp/assimpAppNode.h
+++ b/Engine/source/ts/assimp/assimpAppNode.h
@@ -45,8 +45,8 @@ class AssimpAppNode : public AppNode
 
    MatrixF getTransform(F32 time);
    void getAnimatedTransform(MatrixF& mat, F32 t, aiAnimation* animSeq);
-   void buildMeshList();
-   void buildChildList();
+   void buildMeshList() override;
+   void buildChildList() override;
 
 protected:
 
@@ -73,10 +73,10 @@ public:
    static F32 sTimeMultiplier;
 
    //-----------------------------------------------------------------------
-   const char *getName() { return mName; }
-   const char *getParentName() { return mParentName; }
+   const char *getName() override { return mName; }
+   const char *getParentName() override { return mParentName; }
 
-   bool isEqual(AppNode* node)
+   bool isEqual(AppNode* node) override
    {
       const AssimpAppNode* appNode = dynamic_cast<const AssimpAppNode*>(node);
       return (appNode && (appNode->mNode == mNode));
@@ -84,21 +84,21 @@ public:
 
    // Property look-ups: only float properties are stored, the rest are
    // converted from floats as needed
-   bool getFloat(const char* propName, F32& defaultVal)
+   bool getFloat(const char* propName, F32& defaultVal) override
    {
       //Map<StringTableEntry,F32>::Iterator itr = mProps.find(propName);
       //if (itr != mProps.end())
        //  defaultVal = itr->value;
       return false;
    }
-   bool getInt(const char* propName, S32& defaultVal)
+   bool getInt(const char* propName, S32& defaultVal) override
    {
       F32 value = defaultVal;
       bool ret = getFloat(propName, value);
       defaultVal = (S32)value;
       return ret;
    }
-   bool getBool(const char* propName, bool& defaultVal)
+   bool getBool(const char* propName, bool& defaultVal) override
    {
       F32 value = defaultVal;
       bool ret = getFloat(propName, value);
@@ -106,9 +106,9 @@ public:
       return ret;
    }
 
-   MatrixF getNodeTransform(F32 time);
-   bool animatesTransform(const AppSequence* appSeq);
-   bool isParentRoot() { return (appParent == NULL); }
+   MatrixF getNodeTransform(F32 time) override;
+   bool animatesTransform(const AppSequence* appSeq) override;
+   bool isParentRoot() override { return (appParent == NULL); }
 
    static void assimpToTorqueMat(const aiMatrix4x4& inAssimpMat, MatrixF& outMat);
    static void convertMat(MatrixF& outMat);
diff --git a/Engine/source/ts/assimp/assimpAppSequence.h b/Engine/source/ts/assimp/assimpAppSequence.h
index 467aeb4a2..abd20aa8d 100644
--- a/Engine/source/ts/assimp/assimpAppSequence.h
+++ b/Engine/source/ts/assimp/assimpAppSequence.h
@@ -34,18 +34,18 @@ public:
 
    aiAnimation *mAnim;
 
-   virtual void setActive(bool active);
+   void setActive(bool active) override;
 
-   virtual S32 getNumTriggers() const { return 0; }
-   virtual void getTrigger(S32 index, TSShape::Trigger& trigger) const { trigger.state = 0; }
+   S32 getNumTriggers() const override { return 0; }
+   void getTrigger(S32 index, TSShape::Trigger& trigger) const override { trigger.state = 0; }
 
-   virtual const char* getName() const { return mSequenceName.c_str(); }
+   const char* getName() const override { return mSequenceName.c_str(); }
 
-   F32 getStart() const { return seqStart; }
-   F32 getEnd() const { return seqEnd; }
+   F32 getStart() const override { return seqStart; }
+   F32 getEnd() const override { return seqEnd; }
    void setEnd(F32 end) { seqEnd = end; }
 
-   virtual U32 getFlags() const;
-   virtual F32 getPriority() const;
-   virtual F32 getBlendRefTime() const;
+   U32 getFlags() const override;
+   F32 getPriority() const override;
+   F32 getBlendRefTime() const override;
 };
diff --git a/Engine/source/ts/collada/colladaAppMaterial.h b/Engine/source/ts/collada/colladaAppMaterial.h
index 429a07e50..76fc6f434 100644
--- a/Engine/source/ts/collada/colladaAppMaterial.h
+++ b/Engine/source/ts/collada/colladaAppMaterial.h
@@ -53,7 +53,7 @@ public:
    ColladaAppMaterial(const domMaterial* pMat);
    ~ColladaAppMaterial() { delete effectExt; }
 
-   String getName() const { return name; }
+   String getName() const override { return name; }
 
    void resolveFloat(const domCommon_float_or_param_type* value, F32* dst);
    void resolveColor(const domCommon_color_or_texture_type* value, LinearColorF* dst);
diff --git a/Engine/source/ts/collada/colladaAppMesh.h b/Engine/source/ts/collada/colladaAppMesh.h
index 72c16e56d..6b737a9b9 100644
--- a/Engine/source/ts/collada/colladaAppMesh.h
+++ b/Engine/source/ts/collada/colladaAppMesh.h
@@ -135,7 +135,7 @@ public:
    /// Get the name of this mesh
    ///
    /// @return A string containing the name of this mesh
-   const char *getName(bool allowFixed=true);
+   const char *getName(bool allowFixed=true) override;
 
    //-----------------------------------------------------------------------
 
@@ -145,7 +145,7 @@ public:
    /// @param defaultVal   Reference to variable to hold return value
    ///
    /// @return True if a value was set, false if not
-   bool getFloat(const char *propName, F32 &defaultVal)
+   bool getFloat(const char *propName, F32 &defaultVal) override
    {
       return appNode->getFloat(propName,defaultVal);
    }
@@ -156,7 +156,7 @@ public:
    /// @param defaultVal   Reference to variable to hold return value
    ///
    /// @return True if a value was set, false if not
-   bool getInt(const char *propName, S32 &defaultVal)
+   bool getInt(const char *propName, S32 &defaultVal) override
    {
       return appNode->getInt(propName,defaultVal);
    }
@@ -167,13 +167,13 @@ public:
    /// @param defaultVal   Reference to variable to hold return value
    ///
    /// @return True if a value was set, false if not
-   bool getBool(const char *propName, bool &defaultVal)
+   bool getBool(const char *propName, bool &defaultVal) override
    {
       return appNode->getBool(propName,defaultVal);
    }
 
    /// Return true if this mesh is a skin
-   bool isSkin()
+   bool isSkin() override
    {
       if (instanceCtrl) {
          const domController* ctrl = daeSafeCast<domController>(instanceCtrl->getUrl().getElement());
@@ -185,48 +185,48 @@ public:
    }
 
    /// Get the skin data: bones, vertex weights etc
-   void lookupSkinData();
+   void lookupSkinData() override;
 
    /// Check if the mesh visibility is animated
    ///
    /// @param appSeq   Start/end time to check
    ///
    /// @return True if the mesh visibility is animated, false if not
-   bool animatesVis(const AppSequence* appSeq);
+   bool animatesVis(const AppSequence* appSeq) override;
 
    /// Check if the material used by this mesh is animated
    ///
    /// @param appSeq   Start/end time to check
    ///
    /// @return True if the material is animated, false if not
-   bool animatesMatFrame(const AppSequence* appSeq);
+   bool animatesMatFrame(const AppSequence* appSeq) override;
 
    /// Check if the mesh is animated
    ///
    /// @param appSeq   Start/end time to check
    ///
    /// @return True if the mesh is animated, false if not
-   bool animatesFrame(const AppSequence* appSeq);
+   bool animatesFrame(const AppSequence* appSeq) override;
 
    /// Generate the vertex, normal and triangle data for the mesh.
    ///
    /// @param time           Time at which to generate the mesh data
    /// @param objOffset      Transform to apply to the generated data (bounds transform)
-   void lockMesh(F32 time, const MatrixF& objOffset);
+   void lockMesh(F32 time, const MatrixF& objOffset) override;
 
    /// Get the transform of this mesh at a certain time
    ///
    /// @param time   Time at which to get the transform
    ///
    /// @return The mesh transform at the specified time
-   MatrixF getMeshTransform(F32 time);
+   MatrixF getMeshTransform(F32 time) override;
 
    /// Get the visibility of this mesh at a certain time
    ///
    /// @param time   Time at which to get visibility info
    ///
    /// @return Visibility from 0 (invisible) to 1 (opaque)
-   F32 getVisValue(F32 time);
+   F32 getVisValue(F32 time) override;
 };
 
 #endif // _COLLADA_APPMESH_H_
diff --git a/Engine/source/ts/collada/colladaAppSequence.h b/Engine/source/ts/collada/colladaAppSequence.h
index 83be18be4..fcb9d4e84 100644
--- a/Engine/source/ts/collada/colladaAppSequence.h
+++ b/Engine/source/ts/collada/colladaAppSequence.h
@@ -44,20 +44,20 @@ public:
    ColladaAppSequence(const domAnimation_clip* clip);
    ~ColladaAppSequence();
 
-   void setActive(bool active);
+   void setActive(bool active) override;
 
    const domAnimation_clip* getClip() const { return pClip; }
 
    S32 getNumTriggers();
    void getTrigger(S32 index, TSShape::Trigger& trigger);
 
-   const char* getName() const;
+   const char* getName() const override;
 
-   F32 getStart() const { return seqStart; }
-   F32 getEnd() const { return seqEnd; }
+   F32 getStart() const override { return seqStart; }
+   F32 getEnd() const override { return seqEnd; }
    void setEnd(F32 end) { seqEnd = end; }
 
-   U32 getFlags() const;
+   U32 getFlags() const override;
    F32 getPriority();
    F32 getBlendRefTime();
 };
diff --git a/Engine/source/ts/collada/colladaShapeLoader.cpp b/Engine/source/ts/collada/colladaShapeLoader.cpp
index 8f96c9cab..817ca3a6e 100644
--- a/Engine/source/ts/collada/colladaShapeLoader.cpp
+++ b/Engine/source/ts/collada/colladaShapeLoader.cpp
@@ -68,12 +68,12 @@ static FileTime sLastModTime;    // Modification time of the last loaded Collada
 // Custom warning/error message handler
 class myErrorHandler : public daeErrorHandler
 {
-	void handleError( daeString msg )
+	void handleError( daeString msg ) override
    {
       Con::errorf("Error: %s", msg);
    }
 
-	void handleWarning( daeString msg )
+	void handleWarning( daeString msg ) override
    {
       Con::errorf("Warning: %s", msg);
    }
diff --git a/Engine/source/ts/instancingMatHook.h b/Engine/source/ts/instancingMatHook.h
index fe1c72659..0c3c3a952 100644
--- a/Engine/source/ts/instancingMatHook.h
+++ b/Engine/source/ts/instancingMatHook.h
@@ -41,7 +41,7 @@ public:
    virtual ~InstancingMaterialHook();
 
    // MatInstanceHook
-   virtual const MatInstanceHookType& getType() const { return Type; }
+   const MatInstanceHookType& getType() const override { return Type; }
 
    /// Returns the instancing material instance or the input material 
    /// instance if one could not be created.
diff --git a/Engine/source/ts/tsSortedMesh.h b/Engine/source/ts/tsSortedMesh.h
index df0e58ddd..26dc18621 100644
--- a/Engine/source/ts/tsSortedMesh.h
+++ b/Engine/source/ts/tsSortedMesh.h
@@ -60,15 +60,15 @@ public:
    // render methods..
    void render(S32 frame, S32 matFrame, TSMaterialList *);
 
-   bool buildPolyList( S32 frame, AbstractPolyList *polyList, U32 &surfaceKey, TSMaterialList *materials );
-   bool castRay( S32 frame, const Point3F &start, const Point3F &end, RayInfo *rayInfo, TSMaterialList *materials );
-   bool buildConvexHull(); ///< does nothing, skins don't use this
+   bool buildPolyList( S32 frame, AbstractPolyList *polyList, U32 &surfaceKey, TSMaterialList *materials ) override;
+   bool castRay( S32 frame, const Point3F &start, const Point3F &end, RayInfo *rayInfo, TSMaterialList *materials ) override;
+   bool buildConvexHull() override; ///< does nothing, skins don't use this
                            ///
                            ///  @returns false ALWAYS
    S32 getNumPolys();
 
-   void assemble(bool skip);
-   void disassemble();
+   void assemble(bool skip) override;
+   void disassemble() override;
 
    TSSortedMesh() {
       alwaysWriteDepth = false;
diff --git a/Engine/source/util/catmullRom.h b/Engine/source/util/catmullRom.h
index 84bb272aa..40d7d2eaa 100644
--- a/Engine/source/util/catmullRom.h
+++ b/Engine/source/util/catmullRom.h
@@ -101,8 +101,8 @@ public:
    TYPE getPosition( U32 idx );
 
    // CatmullRomBase
-   void clear();
-   F32 segmentArcLength( U32 i, F32 u1, F32 u2 );
+   void clear() override;
+   F32 segmentArcLength( U32 i, F32 u1, F32 u2 ) override;
 
 protected:
 
diff --git a/Engine/source/util/imposterCapture.cpp b/Engine/source/util/imposterCapture.cpp
index 426f3b0bb..2c78120d7 100644
--- a/Engine/source/util/imposterCapture.cpp
+++ b/Engine/source/util/imposterCapture.cpp
@@ -49,7 +49,7 @@ public:
 
    // MatInstanceHook
    virtual ~ImposterCaptureMaterialHook();
-   virtual const MatInstanceHookType& getType() const { return Type; }
+   const MatInstanceHookType& getType() const override { return Type; }
 
    /// The material hook type.
    static const MatInstanceHookType Type;
diff --git a/Engine/source/util/messaging/messageForwarder.h b/Engine/source/util/messaging/messageForwarder.h
index 3fc668ccb..3ac8d7ab1 100644
--- a/Engine/source/util/messaging/messageForwarder.h
+++ b/Engine/source/util/messaging/messageForwarder.h
@@ -65,8 +65,8 @@ public:
 
    static void initPersistFields();
 
-   virtual bool onMessageReceived(StringTableEntry queue, const char *event, const char *data);
-   virtual bool onMessageObjectReceived(StringTableEntry queue, Message *msg);
+   bool onMessageReceived(StringTableEntry queue, const char *event, const char *data) override;
+   bool onMessageObjectReceived(StringTableEntry queue, Message *msg) override;
 };
 
 // @}
diff --git a/Engine/source/util/messaging/scriptMsgListener.h b/Engine/source/util/messaging/scriptMsgListener.h
index ab26dd171..7cd2a5c23 100644
--- a/Engine/source/util/messaging/scriptMsgListener.h
+++ b/Engine/source/util/messaging/scriptMsgListener.h
@@ -66,16 +66,16 @@ public:
 
    ///////////////////////////////////////////////////////////////////////
 
-   virtual bool onAdd();
-   virtual void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    ///////////////////////////////////////////////////////////////////////
 
-   virtual bool onMessageReceived(StringTableEntry queue, const char* event, const char* data);
-   virtual bool onMessageObjectReceived(StringTableEntry queue, Message *msg);
+   bool onMessageReceived(StringTableEntry queue, const char* event, const char* data) override;
+   bool onMessageObjectReceived(StringTableEntry queue, Message *msg) override;
 
-   virtual void onAddToQueue(StringTableEntry queue);
-   virtual void onRemoveFromQueue(StringTableEntry queue);
+   void onAddToQueue(StringTableEntry queue) override;
+   void onRemoveFromQueue(StringTableEntry queue) override;
 };
 
 // @}
diff --git a/Engine/source/util/sampler.cpp b/Engine/source/util/sampler.cpp
index 405a81800..775dc3360 100644
--- a/Engine/source/util/sampler.cpp
+++ b/Engine/source/util/sampler.cpp
@@ -164,7 +164,7 @@ class CSVSamplerBackend : public ISamplerBackend
    }
 
    /// Open the file and emit a row with the names of all enabled keys.
-   virtual bool init( const char* fileName )
+   bool init( const char* fileName ) override
    {
       if( !mStream.open( fileName, Torque::FS::File::Write ) )
       {
@@ -193,11 +193,11 @@ class CSVSamplerBackend : public ISamplerBackend
       return true;
    }
 
-   virtual void beginFrame()
+   void beginFrame() override
    {
    }
 
-   virtual void endFrame()
+   void endFrame() override
    {
       char buffer[ 256 ];
 
@@ -260,19 +260,19 @@ class CSVSamplerBackend : public ISamplerBackend
       return NULL; // silence compiler
    }
 
-   virtual void sample( U32 key, bool value )
+   void sample( U32 key, bool value ) override
    {
       lookup( key )->set( value );
    }
-   virtual void sample( U32 key, S32 value )
+   void sample( U32 key, S32 value ) override
    {
       lookup( key )->set( value );
    }
-   virtual void sample( U32 key, F32 value )
+   void sample( U32 key, F32 value ) override
    {
       lookup( key )->set( value );
    }
-   virtual void sample( U32 key, const char* value )
+   void sample( U32 key, const char* value ) override
    {
       lookup( key )->set( value );
    }
diff --git a/Engine/source/windowManager/sdl/sdlCursorController.h b/Engine/source/windowManager/sdl/sdlCursorController.h
index 423be28b5..66be2f8c3 100644
--- a/Engine/source/windowManager/sdl/sdlCursorController.h
+++ b/Engine/source/windowManager/sdl/sdlCursorController.h
@@ -34,17 +34,17 @@ public:
       pushCursor( PlatformCursorController::curArrow );
    };
 
-   virtual void setCursorPosition( S32 x, S32 y );
-   virtual void getCursorPosition( Point2I &point );
-   virtual void setCursorVisible( bool visible );
-   virtual bool isCursorVisible();
+   void setCursorPosition( S32 x, S32 y ) override;
+   void getCursorPosition( Point2I &point ) override;
+   void setCursorVisible( bool visible ) override;
+   bool isCursorVisible() override;
 
-   void setCursorShape( U32 cursorID );
-   void setCursorShape( const UTF8 *fileName, bool reload );
+   void setCursorShape( U32 cursorID ) override;
+   void setCursorShape( const UTF8 *fileName, bool reload ) override;
 
-   U32 getDoubleClickTime();
-   S32 getDoubleClickWidth();
-   S32 getDoubleClickHeight();
+   U32 getDoubleClickTime() override;
+   S32 getDoubleClickWidth() override;
+   S32 getDoubleClickHeight() override;
 };
 
 
diff --git a/Engine/source/windowManager/sdl/sdlWindow.h b/Engine/source/windowManager/sdl/sdlWindow.h
index 205945963..7fb852809 100644
--- a/Engine/source/windowManager/sdl/sdlWindow.h
+++ b/Engine/source/windowManager/sdl/sdlWindow.h
@@ -104,7 +104,7 @@ public:
    PlatformWindowSDL();
    ~PlatformWindowSDL();
 
-   virtual void* getSystemWindow(const WindowSystem system);
+   void* getSystemWindow(const WindowSystem system) override;
 
    void* &getMenuHandle()
    {
@@ -116,62 +116,62 @@ public:
       mMenuHandle = menuHandle;
    }   
 
-   virtual GFXDevice *getGFXDevice();
-   virtual GFXWindowTarget *getGFXTarget();
+   GFXDevice *getGFXDevice() override;
+   GFXWindowTarget *getGFXTarget() override;
    
-   virtual void _setVideoMode(const GFXVideoMode &mode);
-   virtual const GFXVideoMode &getVideoMode();
-   virtual bool clearFullscreen();
-   virtual bool isFullscreen();
-   virtual void _setFullscreen(const bool fullscreen);
+   void _setVideoMode(const GFXVideoMode &mode) override;
+   const GFXVideoMode &getVideoMode() override;
+   bool clearFullscreen() override;
+   bool isFullscreen() override;
+   void _setFullscreen(const bool fullscreen) override;
    
-   virtual bool setCaption(const char *cap);
-   virtual const char *getCaption();
+   bool setCaption(const char *cap) override;
+   const char *getCaption() override;
    
    // Window Client Area Extent
-   virtual void setClientExtent( const Point2I newExtent );
-   virtual const Point2I getClientExtent();
+   void setClientExtent( const Point2I newExtent ) override;
+   const Point2I getClientExtent() override;
   
    // Window Bounds
-   virtual void setBounds(const RectI &newBounds);
-   virtual const RectI getBounds() const;
+   void setBounds(const RectI &newBounds) override;
+   const RectI getBounds() const override;
 
    // Window Position
-   virtual void setPosition( const Point2I newPosition );
-   virtual const Point2I getPosition();
-   virtual void centerWindow();
-   virtual bool setSize(const Point2I &newSize);
+   void setPosition( const Point2I newPosition ) override;
+   const Point2I getPosition() override;
+   void centerWindow() override;
+   bool setSize(const Point2I &newSize) override;
    
    // Coordinate space conversion.
-   virtual Point2I clientToScreen( const Point2I& pos );
-   virtual Point2I screenToClient( const Point2I& pos );
+   Point2I clientToScreen( const Point2I& pos ) override;
+   Point2I screenToClient( const Point2I& pos ) override;
 
-   virtual bool isOpen();
-   virtual bool isVisible();
-   virtual bool isFocused();
-   virtual bool isMinimized();
-   virtual bool isMaximized();
+   bool isOpen() override;
+   bool isVisible() override;
+   bool isFocused() override;
+   bool isMinimized() override;
+   bool isMaximized() override;
 
-   virtual void minimize();
-   virtual void maximize();
-   virtual void hide();
-   virtual void show();
-   virtual void close();
-   virtual void restore();
-   virtual void setFocus();
+   void minimize() override;
+   void maximize() override;
+   void hide() override;
+   void show() override;
+   void close() override;
+   void restore() override;
+   void setFocus() override;
 
-   virtual void setMouseLocked(bool enable);
-   virtual bool isMouseLocked() const { return mMouseLocked; };
-   virtual bool shouldLockMouse() const { return mShouldLockMouse; };
+   void setMouseLocked(bool enable) override;
+   bool isMouseLocked() const override { return mMouseLocked; };
+   bool shouldLockMouse() const override { return mShouldLockMouse; };
 
    /// Set if relevant keypress events should be translated into character input events.
-   virtual void setKeyboardTranslation(const bool enabled);
+   void setKeyboardTranslation(const bool enabled) override;
 
-   virtual WindowId getWindowId();
+   WindowId getWindowId() override;
 
    SDL_Window* getSDLWindow() const { return mWindowHandle; }
 
-   virtual PlatformWindow * getNextWindow() const
+   PlatformWindow * getNextWindow() const override
    {
       return mNextWindow;
    }
@@ -187,6 +187,6 @@ public:
 
    /// Return the platform specific object needed to create or attach an
    /// accelerated graohics drawing context on or to the window
-   virtual void* getPlatformDrawable() const { return mWindowHandle; }
+   void* getPlatformDrawable() const override { return mWindowHandle; }
 };
 #endif
diff --git a/Engine/source/windowManager/sdl/sdlWindowMgr.h b/Engine/source/windowManager/sdl/sdlWindowMgr.h
index 45cd3bfe3..d4c49095d 100644
--- a/Engine/source/windowManager/sdl/sdlWindowMgr.h
+++ b/Engine/source/windowManager/sdl/sdlWindowMgr.h
@@ -61,7 +61,7 @@ protected:
    friend class PlatformWindowSDL;
    friend class FileDialog; // TODO SDL REMOVE
 
-   virtual void _processCmdLineArgs(const S32 argc, const char **argv);
+   void _processCmdLineArgs(const S32 argc, const char **argv) override;
 
    /// Link the specified window into the window list.
    void linkWindow(PlatformWindowSDL *w);
@@ -101,34 +101,34 @@ public:
    PlatformWindowManagerSDL();
    ~PlatformWindowManagerSDL();
 
-   virtual RectI getPrimaryDesktopArea();
-   virtual S32       getDesktopBitDepth();
-   virtual Point2I   getDesktopResolution();
+   RectI getPrimaryDesktopArea() override;
+   S32       getDesktopBitDepth() override;
+   Point2I   getDesktopResolution() override;
 
-   virtual S32 findFirstMatchingMonitor(const char* name);
-   virtual U32 getMonitorCount();
-   virtual const char* getMonitorName(U32 index);
-   virtual RectI getMonitorRect(U32 index);
-   virtual RectI getMonitorUsableRect(U32 index);
-   virtual U32 getMonitorModeCount(U32 monitorIndex);
-   virtual const String getMonitorMode(U32 monitorIndex, U32 modeIndex);
-   virtual const String getMonitorDesktopMode(U32 monitorIndex);
+   S32 findFirstMatchingMonitor(const char* name) override;
+   U32 getMonitorCount() override;
+   const char* getMonitorName(U32 index) override;
+   RectI getMonitorRect(U32 index) override;
+   RectI getMonitorUsableRect(U32 index) override;
+   U32 getMonitorModeCount(U32 monitorIndex) override;
+   const String getMonitorMode(U32 monitorIndex, U32 modeIndex) override;
+   const String getMonitorDesktopMode(U32 monitorIndex) override;
 
-   virtual void getMonitorRegions(Vector<RectI> &regions);
-   virtual PlatformWindow *createWindow(GFXDevice *device, const GFXVideoMode &mode);
-   virtual void getWindows(VectorPtr<PlatformWindow*> &windows);
+   void getMonitorRegions(Vector<RectI> &regions) override;
+   PlatformWindow *createWindow(GFXDevice *device, const GFXVideoMode &mode) override;
+   void getWindows(VectorPtr<PlatformWindow*> &windows) override;
 
-   virtual void setParentWindow(void* newParent);
-   virtual void* getParentWindow();
+   void setParentWindow(void* newParent) override;
+   void* getParentWindow() override;
 
-   virtual PlatformWindow *getWindowById(WindowId id);
-   virtual PlatformWindow *getFirstWindow();
-   virtual PlatformWindow* getFocusedWindow();
+   PlatformWindow *getWindowById(WindowId id) override;
+   PlatformWindow *getFirstWindow() override;
+   PlatformWindow* getFocusedWindow() override;
 
-   virtual void lowerCurtain();
-   virtual void raiseCurtain();
+   void lowerCurtain() override;
+   void raiseCurtain() override;
 
-   virtual void setDisplayWindow(bool set) { mDisplayWindow = set; }
+   void setDisplayWindow(bool set) override { mDisplayWindow = set; }
 
    /// Stores the input state so that the event loop will fire a check if we need
    /// to change how keyboard input is being handled.
diff --git a/Engine/source/windowManager/win32/win32Window.h b/Engine/source/windowManager/win32/win32Window.h
index 638cc3b19..2445c08d1 100644
--- a/Engine/source/windowManager/win32/win32Window.h
+++ b/Engine/source/windowManager/win32/win32Window.h
@@ -136,7 +136,7 @@ public:
       return mWindowHandle;
    }
 
-   virtual void* getSystemWindow(const WindowSystem system);
+   void* getSystemWindow(const WindowSystem system) override;
 
    HMENU &getMenuHandle()
    {
@@ -161,57 +161,57 @@ public:
    /// Allow windows to translate messages. Used for accelerators.
    bool translateMessage(MSG &msg);
 
-   virtual GFXDevice *getGFXDevice();
-   virtual GFXWindowTarget *getGFXTarget();
+   GFXDevice *getGFXDevice() override;
+   GFXWindowTarget *getGFXTarget() override;
    
-   virtual void _setVideoMode(const GFXVideoMode &mode);
-   virtual const GFXVideoMode &getVideoMode();
-   virtual bool clearFullscreen();
-   virtual bool isFullscreen();
-   virtual void _setFullscreen(const bool fullscreen);
+   void _setVideoMode(const GFXVideoMode &mode) override;
+   const GFXVideoMode &getVideoMode() override;
+   bool clearFullscreen() override;
+   bool isFullscreen() override;
+   void _setFullscreen(const bool fullscreen) override;
    
-   virtual bool setCaption(const char *cap);
-   virtual const char *getCaption();
+   bool setCaption(const char *cap) override;
+   const char *getCaption() override;
    
    // Window Client Area Extent
-   virtual void setClientExtent( const Point2I newExtent );
-   virtual const Point2I getClientExtent();
+   void setClientExtent( const Point2I newExtent ) override;
+   const Point2I getClientExtent() override;
   
    // Window Bounds
-   virtual void setBounds(const RectI &newBounds);
-   virtual const RectI getBounds() const;
+   void setBounds(const RectI &newBounds) override;
+   const RectI getBounds() const override;
 
    // Window Position
-   virtual void setPosition( const Point2I newPosition );
-   virtual const Point2I getPosition();
-   virtual void centerWindow();
-   virtual bool setSize(const Point2I &newSize);
+   void setPosition( const Point2I newPosition ) override;
+   const Point2I getPosition() override;
+   void centerWindow() override;
+   bool setSize(const Point2I &newSize) override;
    
    // Coordinate space conversion.
-   virtual Point2I clientToScreen( const Point2I& pos );
-   virtual Point2I screenToClient( const Point2I& pos );
+   Point2I clientToScreen( const Point2I& pos ) override;
+   Point2I screenToClient( const Point2I& pos ) override;
 
-   virtual bool isOpen();
-   virtual bool isVisible();
-   virtual bool isFocused();
-   virtual bool isMinimized();
-   virtual bool isMaximized();
+   bool isOpen() override;
+   bool isVisible() override;
+   bool isFocused() override;
+   bool isMinimized() override;
+   bool isMaximized() override;
 
-   virtual void minimize();
-   virtual void maximize();
-   virtual void hide();
-   virtual void show();
-   virtual void close();
-   virtual void restore();
-   virtual void setFocus();
+   void minimize() override;
+   void maximize() override;
+   void hide() override;
+   void show() override;
+   void close() override;
+   void restore() override;
+   void setFocus() override;
 
-   virtual void setMouseLocked(bool enable);
-   virtual bool isMouseLocked() const { return mMouseLocked; };
-   virtual bool shouldLockMouse() const { return mShouldLockMouse; };
+   void setMouseLocked(bool enable) override;
+   bool isMouseLocked() const override { return mMouseLocked; };
+   bool shouldLockMouse() const override { return mShouldLockMouse; };
 
-   virtual WindowId getWindowId();
+   WindowId getWindowId() override;
 
-   virtual PlatformWindow * getNextWindow() const
+   PlatformWindow * getNextWindow() const override
    {
       return mNextWindow;
    }
@@ -227,6 +227,6 @@ public:
 
    /// Return the platform specific object needed to create or attach an
    /// accelerated graohics drawing context on or to the window
-   virtual void* getPlatformDrawable() const { return mWindowHandle; }
+   void* getPlatformDrawable() const override { return mWindowHandle; }
 };
 #endif