59e43813f0
GCC Support for Linux
...
Updates and fixes to support GCC for Linux
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2022-01-20 13:00:02 -08:00
c778606c89
Templates restricted ( #6498 )
...
* Templates/Restricted upgrade/fixes:
Fixed template storage format: templates now only store true relative paths and no longer save "origin" paths and "optional" has been removed, it was never used.
Upgraded all templates to new standard
Template system now correctly handles child objects: Child objects no longer have to specify restricted they inherit from parent
Restricted now operates at the object level and makes no assumptions about parent
Restricted templates can now be combined and seperated on creation
ly_get_list_relative_filename has been deprecated for o3de_pal_dir
All Gems/Projects/Templates updated to use new code
Signed-off-by: byrcolin <byrcolin@amazon.com >
2022-01-14 10:27:20 -08:00
8c7e3c090c
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-11-23 21:26:52 +00:00
23750b8c81
fix direction of manipulator scaling for asset collider when axes are flipped
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-11-23 11:34:31 +00:00
e52557ee76
restoring physx joint typed tests on all platforms ( #5836 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-11-23 10:54:00 +00:00
43563060bc
Making trait variable consistent and fixing warning ( #5118 )
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-11-01 08:44:22 -07:00
35467b63d9
Unit tests for Heightfield collider ( #5042 )
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-10-27 19:31:30 +01:00
4d49a604af
Moving run Physx Benchmarks behind a cmake flag ( #4411 )
...
The benchmark code is still built, as it is part of the PhysX.Tests project.
Currently jenkins has a 1500sec(25min) timeout, the benchmarks can sometimes take over 1500sec and cause a build failure for timeout.
Jenkins currently doesn't upload the results of the benchmarks, so this is ok.
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-10-04 12:34:51 +01:00
b4279ab3d8
Remove touchbending references in PhysX Gem ( #3320 )
...
* minor comments update
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-08-23 14:54:56 +01:00
181998f810
Fixes a nightly build and a CMake warning ( #2941 )
...
* Addressing CMake warning and removing timeouts that are the same as the default
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* missed this one
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Making it an error so developers stops putting timeouts longer than the allowed one since it causes AR issues
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* fixing warning from the nightly build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* disabling test that is triggering a timeout
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-10 14:05:14 -07:00
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
2021-07-16 15:42:37 -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
0d726d5d91
Gems/PhysX
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-13 19:11:36 -07:00
3b1873b045
Merged stabilization/2106 -> development (resolved merge conflicts).
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-08 13:56:47 -05:00
15e0aa7984
Use latest version of nvcloth, poly2tri and v-hacd 3rdParty libraries for windows, android, mac and ios.
...
Signed-off-by: moraaar <moraaar@amazon.com >
2021-07-08 11:55:59 +01:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05: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
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
9f62d631fb
Physics joints updated to the new API ( #1361 )
...
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com >
2021-06-17 15:52:27 +01:00
370f28f69c
Missing PHYSX_ENABLE_MULTI_THREADING for PhysX.Editor
2021-06-01 09:28:13 +01:00
0dd8fce2b0
Pass on fixing LmbrCentral.Static dependencies
2021-05-27 10:30:11 -07:00
4652d47fb3
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
db0db5c1c0
Proper dependencies to LmbrCentral/LmbrCentral.Editor, mixing those two can cause Editor modules to load non-Editor modules
2021-05-24 18:57:48 -07:00
c9d5d7fb77
The new gem registration and usage system
...
Merge from mainline (Rebase)
2021-05-20 10:47:03 -07:00
3d84902b24
Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used). ( #741 )
...
Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used).
2021-05-13 11:10:44 -06:00
1d4c483e73
Red code legacy renderer ( #383 )
...
- Remove some references to gEnv->pRenderer/GetIEditor()->GetRenderer() that is now always null.
- Restore the debug console to existence.
- Stop building the following in preparation for their removal:
Code/CryEngine/Cry3DEngine/*
Code/CryEngine/RenderDll/*
Code/Tools/CryFXC/*
Code/Tools/HLSLCrossCompiler/*
Code/Tools/HLSLCrossCompilerMETAL/*
Code/Tools/RC/*
Code/Tools/ShaderCacheGen/*
Tools/CrySCompileServer/*
2021-04-30 07:31:42 -06:00
dcb253e08c
Merge pull request #321 from aws-lumberyard-dev/modify_test_timeout
...
Modify test timeouts
2021-04-29 18:03:45 -07:00
771a7a25aa
Adding OUTPUT_NAME to physics gems shared libraries to avoid conflicting with their 3rdParty libraries
2021-04-29 18:00:06 +01:00
d8afec36cd
Change test module default timeouts to 25 minutes to unblock Periodic and Sandbox CI builds, without incurring the costs involved with increased log verbosity.
2021-04-26 12:38:00 -07:00
92c77dca11
LYN-3069 Revert some 3rdparty changes and address issue ( #185 )
...
* renaming and organizing files
* removed unused files
* Removing unnecessary file
* moved file
* reverting movement of 3rdparty associations from gems to global
* removing unnecessary calls to ly_add_external_target_path
* fixing install prefix of ci_build
* Fixes to get 3rdparties declared in gems to be installed
* Allowing to install just one configuration
* Adding empty line at the end
* removing commented code
* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed
2021-04-21 11:16:27 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
Steve Pham
AMZN-byrcolin
greerdv
amzn-sean
Esteban Papp
John Jones-Steele
Chris Galvan
moraaar
Gene Walters
pappeste
lumberyard-employee-dm
Nicholas Lawson
bosnichd
Sean Sweeney
alexpete