49d35e0788
Final fixes for MSVC
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
ec1a08d487
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Editor/ConfigGroup.cpp
# Code/Editor/ControlMRU.cpp
# Code/Editor/CryEdit.cpp
# Code/Editor/CryEdit.h
# Code/Editor/IEditorImpl.cpp
# Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
4 years ago
6bf6ae9485
Editor code: tidy up BOOLs,NULLs and overrides pt5. ( #2876 )
...
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 5 of a split #2847
Signed-off-by: Nemerle <nemerle5+git@gmail.com>
Co-authored-by: Nemerle <nemerle5+git@gmail.com>
4 years ago
e28d04aea6
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Editor/CryEditDoc.h
# Code/Legacy/CryCommon/CryArray.h
# Code/Legacy/CryCommon/CryString.h
# Code/Legacy/CryCommon/UnicodeBinding.h
# Code/Legacy/CrySystem/LocalizedStringManager.cpp
# Gems/LyShine/Code/Source/StringUtfUtils.h
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
4 years ago
c9e16c1c42
Erased some legacy function that are no longer necessary
...
Signed-off-by: aaguilea <aaguilea@amazon.com>
4 years ago
a14b4e478e
Code/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
38261d0800
Shorten copyright headers by splitting into 2 lines ( #2213 )
...
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
2fc1062802
Removed deprecated graphics settings/performance menu options. Updated automated test accordingly.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com>
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com>
5 years ago
d14229c67e
some replacements and fixes that were referring Sandbox/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
e34e36cb35
git mv Code\Sandbox\Editor Code/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp
Artur K
aaguilea
Steve Pham
Chris Galvan