c805d443d2
Merge branch 'development' into cmake/warn_virtual
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Legacy/CryCommon/IConsole.h
# Code/Legacy/CrySystem/LocalizedStringManager.h
# Code/Legacy/CrySystem/XConsole.h
# Code/Legacy/CrySystem/XConsoleVariable.h
# Code/Legacy/CrySystem/XML/XmlUtils.cpp
# cmake/Platform/Common/Clang/Configurations_clang.cmake
2021-09-07 18:42:40 -07:00
7d34004b6d
some Code/Legacy fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-07 18:38:05 -07:00
2a2847b15d
Legacy code cleanup - part 3 ( #3903 )
...
* Legacy cleanup - part 3
Not much is left that can be easily removed,
so I think this will be last cleanup before the legacy functionality is replaced.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* fix windows build, remove a few more things, re-add one file
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Remove legacy RenderBus + more cleanups
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Remove MaterialOwnerBus.h
Clean-up in Cry_Matrix34/33
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-09-07 12:14:16 -06:00
96a5f06ca3
Legacy cleanup, part 2 ( #3659 )
...
* Legacy cleanup, part 2
There are still things that can be removed, those will be likely done in part three:
`The Return of the Cleanup` :)
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix windows build
Somehow there were some unfixed errors from enabled warnings?
I'm unsure if I've pulled repo in unstable state, or those were somehow
missed.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-08-30 14:40:02 -06:00
f55ffae994
Merge branch 'development' into redcode/crythread-2nd-pass
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-08-11 20:31:58 -07:00
f99f1f00f4
[redcode/crythread-2nd-pass] removed or replaced remaining CryMutex/CryLock usage with equivalent AZStd version
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-08-10 20:35:55 -07:00
99bf5e54c4
More string fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-29 15:53:32 -07:00
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 >
2021-07-16 15:25:48 -07:00
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 >
2021-06-30 19:51:55 -07:00
9f0bbf3b74
SPEC-7531 Change Code/CryEngine to Code/Legacy ( #1634 )
...
* git mv Code\CryEngine Code\Legacy
* redirecting CMakeLists.txt
* fixing uic warning
* Some more CryEngine mentions
* validation scripts
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-06-29 13:51:24 -07:00
Esteban Papp
Artur K
AMZN-ScottR
Steve Pham