041aa42307
fixes after merge
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
37ffe90353
Merge branch 'development' into cmake/SPEC-7182
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Editor/QtUtil.h
# Code/Legacy/CryCommon/Linux_Win32Wrapper.h
# Code/Legacy/CryCommon/ProjectDefines.h
# Code/Legacy/CryCommon/StringUtils.h
# Code/Legacy/CryCommon/UnicodeBinding.h
# Code/Legacy/CryCommon/UnicodeEncoding.h
# Code/Legacy/CryCommon/UnicodeFunctions.h
# Code/Legacy/CryCommon/UnicodeIterator.h
# Code/Legacy/CryCommon/WinBase.cpp
# Code/Legacy/CryCommon/platform.h
# Code/Legacy/CryCommon/platform_impl.cpp
# Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
# Gems/Maestro/Code/Source/Cinematics/Movie.cpp
5 years ago
9f7d280a1e
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Editor/ResourceSelectorHost.cpp
5 years ago
2361490c8b
Fixes for Android
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
fa2032d21d
Linux fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
fe635d5ab4
Merge branch 'development' into cmake/SPEC-7182
5 years ago
4cee263033
Minimal TypeInfo header/reduce std interdependencies. ( #2688 )
...
* Minimal TypeInfo header/reduce std interdependencies.
TypeInfoSimple.h is a small header that can replace the use of
TypeInfo.h in some cases.
Signed-off-by: Nemerle <nemerle5+git@gmail.com>
* Windows build fixed
Removed algorithm.h from string_view.h
smoke-test passed
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Resotore dynamic_pointer_cast in intrusive_ptr
Requested by reviewer.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix CI build
string.h - missed alogorithm.h, since it was removed from string_view
NodeWrapper.h - missing smart_ptr.h
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
Co-authored-by: Nemerle <nemerle5+git@gmail.com>
5 years ago
d71674579a
fixing startup on game launcher
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
2147b1d128
Merge branch 'development' into cmake/SPEC-7484
5 years ago
a9cd126026
Adding PLATFORM_H_SECTION_15 back since it is used in restricted
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
2d1ed48fea
Merge branch 'development' into cmake/SPEC-2513_w4018
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
5 years ago
e3b22f51b2
@lumberyard-employee-dm suggestion to use (w)string_view as the src to simplify functions in conversions.h
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 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
5 years ago
f03df3e546
Fix issues with audio localization bank switching ( #2945 )
...
* Fix issues with locating and loading loc banks
The code that initially checked the g_languageAudio cvar wasn't properly
detecting when the cvar wasn't set. Fixed an issue discovering
localized banks wasn't properly recursing into subdirectories.
Simplified handling of audio language switching for Wwise.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Address feedback on PR
Change .size() == 0 to .empty()
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
5 years ago
3d15382fb6
Camera Component, Editor Viewport Widget refactoring.
...
Merge pull request #2840 from yuriy0/camera_and_editor_viewport_widget_improvements
5 years ago
360d0bdd0b
removing more unused stuff
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
d6744690ee
platform.h cleanup
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
9a8a411a0b
[development] removal of unused and low stakes code related to Cry-threading ( #2896 )
...
Removal highlights include:
- File indexer (used CryThread<>) linked to long gone asset browser
- Producer/consumer queues from CryMT
- set/vector/CLocklessPointerQueue containers also from CryMT
- Cry interlocked linked list and _InterlockedCompareExchange128
- CryThread type
- SAtomicVar types
- CryAutoSet type
- Various unused lock types
-- AutoLockModify
-- AutoLockRead
-- CryOptionalAutoLock
-- CryReadModifyLock
-- CryRWLock
-- ReadLock
-- ReadLockCond
-- WriteAfterReadLock
- Misc. unused functions
-- CryInterLockedAdd (not to be confused with CryInterlockedAdd, using a lower case "locked")
-- CryInterlockedExchange64 (which was only defined for unix platforms)
-- SpinLock
-- JobSpinLock
-- AtomicAdd
-- JobAtomicAdd
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
fd616fdcfb
Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
5 years ago
c85e5a6886
Some more build fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 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
5 years ago
10f950b726
fix w4018
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
4358b6eb27
runtime fixes (Editor running)
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
895dc09176
addressing PR comments/suggestions
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
0dc829891a
fixing build
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
aa12434728
removing some dead code, commented code referring old types, static AZStd::strings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
bb36a4d40c
Style
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
5 years ago
83099a7f5b
Update mocks for ISystem changes
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
5 years ago
590de17343
Delete code which was only commented out
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
5 years ago
73fee0c57e
Camera Component, Editor Viewport Widget refactoring.
...
- Handle changing of active camera entirely inside CameraComponentController
- Remove a LOT of legacy Cry things related to cameras
- Add a CameraSystemComponent to handle ActiveCameraRequestBus and CameraSystemRequestBus
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
5 years ago
eeed7df429
fixing no unity builds
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
82c5f80fbd
More windows/linux fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
e28602dbbb
linux fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
a14b4e478e
Code/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
061cb98f74
auto-search/replace
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
29a2ad79a4
Gems/Gestures
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
db7536acda
Gems/Maestro
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
f665f572f3
Gems/Atom builds
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
41ad6d7b7a
Code/Legacy cleanup
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
99bf5e54c4
More string fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
95c6fd83ea
remove !defined(RESOURCE_COMPILER) since is not defined anywhere (resource compiler was removed)
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
f21fc79dc4
remove of unicode files from Cry
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
56eda61828
remove of UNICODE/_UNICODE
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
63d2f34ad6
more fixes, AtomFont still requires more work
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
9c72510a4f
removing files that got added by rebase
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> (+1 squashed commits)
Squashed commits:
[a19269426] fixing more strings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> (+1 squashed commits)
Squashed commits:
[d2a049324] fixing more strings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> (+1 squashed commits)
Squashed commits:
[a1ff4c101] trying to build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
20a4ec9b7d
Sandbox
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
ceab4a794c
CryEngine compiles
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
8eef0e219a
CryLegacyAllocator cleanup
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
1f9b284de2
Merge branch 'development' into cmake/SPEC-7179
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
# Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
# Code/Editor/Plugins/EditorCommon/stdafx.cpp
# Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
# Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
# Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
# Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
# Code/Tools/AssetProcessor/native/precompiled.h
# Code/Tools/Standalone/StandaloneTools_precompiled.h
# Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
# Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
# Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
# Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
# Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
# Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
# Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
# Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
# Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
# Gems/Blast/Code/Source/StdAfx.cpp
# Gems/Camera/Code/Source/Camera_precompiled.h
# Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
# Gems/FastNoise/Code/Source/FastNoise_precompiled.h
# Gems/Gestures/Code/Source/Gestures_precompiled.h
# Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
# Gems/GraphCanvas/Code/precompiled.h
# Gems/ImGui/Code/Source/ImGui_precompiled.h
# Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
# Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
# Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
# Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
# Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
# Gems/LyShine/Code/Source/LyShine_precompiled.h
# Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
# Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
# Gems/Maestro/Code/Source/Maestro_precompiled.h
# Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
# Gems/Metastream/Code/Source/Metastream_precompiled.h
# Gems/Microphone/Code/Source/Microphone_precompiled.h
# Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
# Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
# Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
# Gems/PhysX/Code/Source/PhysX_precompiled.h
# Gems/PhysX/Code/physx_unsupported_files.cmake
# Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
# Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
# Gems/ScriptCanvas/Code/Editor/precompiled.h
# Gems/ScriptCanvas/Code/Source/precompiled.h
# Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
# Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
# Gems/ScriptEvents/Code/Source/precompiled.h
# Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
# Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
# Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
# Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
# Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
# Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
# Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
# Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
# Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
# Gems/Twitch/Code/Source/Twitch_precompiled.h
# Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
5 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>
5 years ago
Esteban Papp
Artur K
amzn-phist
hultonha
Scott Romero
Yuriy Toporovskyy
pappeste
Steve Pham