into afx_plus_3.8 Conflicts: Engine/source/T3D/aiPlayer.cpp Engine/source/T3D/aiPlayer.h Engine/source/T3D/gameBase/gameConnection.cpp Engine/source/T3D/player.cpp Engine/source/T3D/tsStatic.cpp Engine/source/console/consoleObject.cpp Engine/source/console/sim.h Engine/source/gui/core/guiCanvas.cpp Engine/source/gui/core/guiCanvas.h Engine/source/scene/sceneObject.cpp Engine/source/scene/sceneObject.h Engine/source/sim/netEvent.cpp Engine/source/terrain/terrData.cpp Engine/source/ts/tsShapeInstance.h README.md