birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
f22ecc783028fcce46670d3684aecb9ac975fc40
o3de/Code/Legacy/CryCommon
T
History
Esteban Papp 5ca84cb07e Merge branch 'development' into cmake/win_fix_wnew 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/Cry_Camera.h
#	Code/Legacy/CryCommon/IShader.h
2021-08-24 10:46:18 -07:00
..
LyShine
Merge branch 'development' into cmake/SPEC-7484
2021-08-11 07:55:26 -07:00
Maestro
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
Mocks
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 09:23:34 -07:00
AndroidSpecific.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
AnimKey.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AppleSpecific.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
BaseTypes.h
removing more unused stuff
2021-08-06 16:42:38 -07:00
BitFiddling.h
removing more unused stuff
2021-08-06 16:42:38 -07:00
CMakeLists.txt
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Common_TypeInfo.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_Camera.h
clang is more specific where the modifier should be
2021-08-23 16:17:10 -07:00
Cry_Color.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_Geo.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_GeoDistance.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_GeoIntersect.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_GeoOverlap.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_HWMatrix.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_HWVector3.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_Math.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_Matrix33.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
Cry_Matrix34.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
Cry_Matrix44.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
Cry_MatrixDiag.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_Quat.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
Cry_ValidNumber.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_Vector2.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_Vector3.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_Vector4.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Cry_XOptimise.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryArray.h
Merge branch 'development' into cmake/SPEC-7182
2021-08-11 11:16:24 -07:00
CryAssert_Android.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryAssert_impl.h
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
CryAssert_iOS.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryAssert_Linux.h
[redcode/crythread-2nd-pass] replaced instances of AZStd::lock_guard<> with AZStd::scoped_lock as per feedback
2021-08-12 12:40:03 -07:00
CryAssert_Mac.h
[redcode/crythread-2nd-pass] removed or replaced remaining CryMutex/CryLock usage with equivalent AZStd version
2021-08-10 20:35:55 -07:00
CryAssert.h
platform.h cleanup
2021-08-06 15:10:21 -07:00
crycommon_files.cmake
Non-terrain-gem changes in support of upcoming terrain work. (#3345)
2021-08-20 11:31:19 -05:00
crycommon_testing_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryCommon.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryCrc32.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryCustomTypes.h
Merge branch 'development' into cmake/SPEC-7182
2021-08-11 11:16:24 -07:00
CryEndian.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryFile.h
linux fixes
2021-08-03 17:59:35 -07:00
CryHalf_info.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryHalf.inl
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryHeaders_info.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryHeaders.h
CryEngine
2021-08-16 16:39:13 -07:00
CryLegacyAllocator.h
CryLegacyAllocator cleanup
2021-07-27 19:28:50 -07:00
CryLibrary.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryLibrary.h
Several build fixes
2021-08-12 16:42:18 -07:00
CryListenerSet.h
linux fixes
2021-08-03 17:59:35 -07:00
CryName.h
Merge branch 'development' into cmake/SPEC-7484
2021-08-05 20:05:25 -07:00
CryPath.h
linux fixes
2021-08-03 17:59:35 -07:00
CryPodArray.h
CryEngine compiles
2021-07-27 19:28:56 -07:00
CryRandomInternal.h
removing more unused stuff
2021-08-06 16:42:38 -07:00
CrySizer.h
fixes after merge
2021-08-11 13:56:03 -07:00
CrySystemBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CryTypeInfo.cpp
addressing PR comments/suggestions
2021-08-05 19:30:09 -07:00
CryTypeInfo.h
removing files that got added by rebase
2021-07-28 09:54:42 -07:00
CryVersion.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
FrameProfiler.h
Deprecate profiler categories based on global enum
2021-08-18 17:33:09 -06:00
FunctorBaseFunction.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
FunctorBaseMember.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
HeapAllocator.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
HMDBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IAudioInterfacesCommonData.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IAudioSystem.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ICmdLine.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IConsole.h
runtime fixes (Editor running)
2021-08-05 19:31:12 -07:00
IEntityRenderState_info.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IEntityRenderState.h
removing files that got added by rebase
2021-07-28 09:54:42 -07:00
IFont.h
removing files that got added by rebase
2021-07-28 09:54:42 -07:00
IFunctorBase.h
[redcode/crythread-2nd-pass] post merge include fixes
2021-08-11 21:04:19 -07:00
IGem.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IIndexedMesh_info.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IIndexedMesh.h
CryEngine compiles
2021-07-27 19:28:56 -07:00
ILevelSystem.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ILocalizationManager.h
more fixes, AtomFont still requires more work
2021-07-28 11:06:14 -07:00
ILog.h
[redcode/crythread-2nd-pass] removed platform.h include hack linked to CryThread.h for apple platforms in ILog.h and ISystem.h
2021-08-12 11:02:44 -07:00
IMaterial.h
[redcode/crythread-2nd-pass] post merge include fixes
2021-08-11 21:04:19 -07:00
IMiniLog.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IMNM.h
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
IMovieSystem.h
More string fixes
2021-07-29 15:53:32 -07:00
INavigationSystem.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
iOSSpecific.h
removing more unused stuff
2021-08-06 16:42:38 -07:00
IPathfinder.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IPhysics.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IPostEffectGroup.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IProcess.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IReadWriteXMLSink.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IRenderAuxGeom.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IRenderer.h
removing files that got added by rebase
2021-07-28 09:54:42 -07:00
IRenderMesh.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ISerialize.h
CryEngine
2021-08-16 16:39:13 -07:00
IShader.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
ISplines.h
fixes for Code/CryEngine
2021-08-16 16:03:28 -07:00
IStatObj.h
Gems/Atom builds
2021-07-30 18:53:50 -07:00
IStereoRenderer.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ISurfaceType.h
Gems/Maestro
2021-08-02 11:44:34 -07:00
ISystem.h
Remove RAD (pending future interface for external profiler registration)
2021-08-18 17:33:15 -06:00
ITexture.h
removing more unused stuff
2021-08-06 16:42:38 -07:00
ITimer.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IValidator.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
IViewSystem.h
Audio legacy cleanup - Move global functions to be handled by AudioSystemComponent (#3283)
2021-08-17 17:59:09 -05:00
IWindowMessageHandler.h
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
IXml.h
enable warning 4296: 'operator': expression is always false
2021-08-19 16:16:28 -07:00
LCGRandom.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LegacyAllocator.cpp
Merge branch 'development' into cmake/AddressSanitizer
2021-08-19 11:44:28 -07:00
LegacyAllocator.h
Deprecate profiler categories based on global enum
2021-08-18 17:33:09 -06:00
Linux32Specific.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
Linux64Specific.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
Linux_Win32Wrapper.h
[redcode/crythread-2nd-pass] removed re-implemented stubs of Windows synchapi.h functions and CrySimpleThread define in platform.h
2021-08-11 21:32:02 -07:00
LinuxSpecific.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
LoadScreenBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LocalizationManagerBus.h
auto-search/replace
2021-08-02 16:07:23 -07:00
LocalizationManagerBus.inl
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MacSpecific.h
Several build fixes
2021-08-12 16:42:18 -07:00
MainThreadRenderRequestBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MathConversion.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MemoryAccess.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MetaUtils.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MicrophoneBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MiniQueue.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
MTPseudoRandom.cpp
platform.h cleanup
2021-08-06 15:10:21 -07:00
MTPseudoRandom.h
SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634)
2021-06-29 13:51:24 -07:00
MultiThread_Containers.h
[redcode/crythread-2nd-pass] removed or replaced remaining CryMutex/CryLock usage with equivalent AZStd version
2021-08-10 20:35:55 -07:00
NullAudioSystem.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Options.h
removing more unused stuff
2021-08-06 16:42:38 -07:00
physinterface.h
[redcode/crythread-2nd-pass] replaced remaining CrySpinLock/CryWriteLock usage with equivalent AZStd version
2021-08-11 15:54:59 -07:00
platform_impl.cpp
more fixes
2021-08-23 17:21:59 -07:00
platform.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
PNoise3.h
fixes for Code/CryEngine
2021-08-16 16:03:28 -07:00
PoolAllocator.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
primitives.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ProjectDefines.h
Address additional PR feedback
2021-08-18 19:16:05 -06:00
Random.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Range.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
RenderBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ScopedVariableSetter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SerializationTypes.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SerializeFwd.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SFunctor.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SimpleSerialize.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
smartptr.h
[redcode/crythread-2nd-pass] post merge include fixes
2021-08-11 21:04:19 -07:00
StaticInstance.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
StatObjBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
StereoRendererBus.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
StlUtils.h
removing files that got added by rebase
2021-07-28 09:54:42 -07:00
stridedptr.h
removing more unused stuff
2021-08-06 16:42:38 -07:00
Synchronization.h
[redcode/crythread-2nd-pass] replaced remaining CrySpinLock/CryWriteLock usage with equivalent AZStd version
2021-08-11 15:54:59 -07:00
Tarray.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Timer.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TimeValue_info.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TimeValue.h
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
TypeInfo_decl.h
removing files that got added by rebase
2021-07-28 09:54:42 -07:00
TypeInfo_impl.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
VectorMap.h
[redcode/crythread-2nd-pass] fixed missing includes
2021-08-11 12:59:32 -07:00
VectorSet.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Vertex.h
fixes for Code/CryEngine
2021-08-16 16:03:28 -07:00
VertexFormats.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
VRCommon.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Win32specific.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
Win64specific.h
remove unnecessary ALIGN macros
2021-08-20 20:36:11 -07:00
WinBase.cpp
[redcode/crythread-2nd-pass] removed re-implemented stubs of Windows synchapi.h functions and CrySimpleThread define in platform.h
2021-08-11 21:32:02 -07:00
XMLBinaryHeaders.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00