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
4ae74c913f
Gems/PhysX
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 17:59:49 -07:00
ea2f74dc0f
more fixes for Gems
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:12 -07:00
f8e99cd7dd
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
# Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-19 08:53:41 -07:00
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:09 -06:00
036114a5a7
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
2021-08-17 12:10:46 -07:00
d9ea329cbd
Fixes #2796 Collider retains phys mesh asset reference after changing to shape ( #3162 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-08-17 13:48:51 +01:00
0b70cf2308
Gems/PhysX
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:42:42 -07:00
82b359e80d
PhysX
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:40:48 -07:00
2943f16d11
PhysX
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:05:18 -07:00
e630e3324d
fixed joint crash when no lead entity is selected ( #2867 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-08-16 15:46:46 +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
7ec3283a3e
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-08-06 11:06:32 +01:00
0f58d7394e
fixes #2544 , fixes all doc links for physx, cloth, blast and white box
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-08-06 11:05:31 +01:00
19d79f1559
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-05 14:57:24 -07:00
34afed6792
fixed Ragdoll component can crash on deactivate ( #2834 )
...
fixes #2650
The root of the crash was connecting/disconnecting to the AZ::Event SceneSimulationStart when not on the main thread, as that is not thread safe.
The connection/disconnection was originally handled from Enable/EnableQueued and Disable/DisabledQueued which can be called from other threads within EmotionFX. I've moved the connection/disconnection to the Constructor / destructor, as the handler is responsible for executing the queued enable/disable actions and it makes sense to have that connection happen external to the Enable/disable path.
Signed-off-by: amzn-sean 75276488+amzn-sean@users.noreply.github.com
2021-08-05 14:27:31 +01:00
6d2765ef42
moved default location of surfacetypemateriallibrary.physmaterial ( #2786 )
...
from 'project root' to 'project root/Assets/Physics'
The functionality of creating / using the default physmaterial file has only change in related to the file location, other functionality is unchanged.
The following situations can occur:
This will not affect have any project that uses a custom physmaterial file.
This will not affect have any project that uses the default from the old location, as the configuration will still point there.
New projects created will get the default physmaterial file at the new location.
A Project that fails to load (or deletes) the selected physmaterial file, will get the default physmaterial file at the new location (this happens only on startup of the editor).
Issue: #2765
Signed-off-by: amzn-sean 75276488+amzn-sean@users.noreply.github.com
2021-08-04 13:10:17 +01:00
45ebf57d3f
Fixed bug in hash_table that made rehash() function run forever ( #2745 )
...
* Fixed bug in hash_table that made rehash() function to run infinitely on specific conditions when inserting an already existing element
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
* Replaced erasing to happen in the source list instead
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
* minor comment improvement
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
* Small commment improvement
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
* Small comment fix
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
* Added assert and fixed code with incorrect hashing
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
* .
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
* Addressed PR comments, reverted to void* as it size_t hash is different
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
* Fixed build on linux
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
* Addressed PR comments
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk >
Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk >
2021-08-03 20:38:18 -05:00
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00
461743ef2d
Enabled PhysX system component in asset builders since it's required … ( #2652 )
...
* Enabled PhysX system component in asset builders since it's required for cooking collision meshes
Signed-off-by: pereslav <pereslav@amazon.com >
* Added AssetCatalogService to the list of dependent
Signed-off-by: pereslav <pereslav@amazon.com >
2021-07-30 16:14:49 -05:00
a7e414fafe
Fix Linux compilation error in test code
...
Signed-off-by: Ibtehaj Nadeem <81370835+ibtehajn@users.noreply.github.com >
2021-07-28 17:58:31 +01:00
0824bb462a
Improve tooltip text
...
Signed-off-by: Ibtehaj Nadeem <81370835+ibtehajn@users.noreply.github.com >
2021-07-28 17:31:45 +01:00
fd07f907bc
Implement axis locking options for rigid bodies
...
Linear and angular motion of rigid bodies can now be restricted along
specific world-space axes.
Signed-off-by: Ibtehaj Nadeem <81370835+ibtehajn@users.noreply.github.com >
2021-07-28 13:39:32 +01:00
074e33081f
more fixes for w4267
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-27 19:32:11 -07:00
f53d1f955a
PhysX
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-27 19:31:07 -07:00
5e863f810d
some physx fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-27 19:29:08 -07:00
9639003a7d
LYN-4774 Fix missing box icons inside the main Viewport ( #2297 )
...
* LYN-4774 Fix missing box icons inside the main Viewport
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* V2 icons
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* Bug fixes
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-07-21 16:33:04 -07:00
e76b65fce9
Reduce inclusion overhead a little bit
...
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-07-20 02:31:38 +02:00
706233f72c
Merge branch 'development' into cmake/SPEC-7179
2021-07-19 15:48:29 -07:00
b01cd0c788
UI tweaks of the physics doc link widget ( #2259 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-07-19 17:25:23 +01: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
074518454c
Merge branch 'development' into cmake/SPEC-7179
2021-07-15 16:58:58 -07:00
0d726d5d91
Gems/PhysX
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-13 19:11:36 -07:00
1220ea6539
Merge pull request #2093 from aws-lumberyard-dev/Renaming_Urls_Names
...
Changed all amazon reverse urls to o3de reverse urls
2021-07-13 10:13:08 +01:00
c4a50b961e
Merge pull request #2102 from aws-lumberyard-dev/MultiplayerRigidBodiesLerp
...
Added an option to character component not use auto-apply velocities on a physics tick
2021-07-12 19:49:50 +01:00
39daa9f361
Added an option to not use auto-apply velocities on a physics tick
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-07-12 18:29:02 +01:00
36a8c0a8cc
changed all amazon to o3de
...
Signed-off-by: aaguilea <aaguilea@amazon.com >
2021-07-12 16:34:01 +01:00
08c3bb6bd7
some tidying up
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-09 19:39:07 +01:00
c7b3a06c6b
expose scene queries to lua
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-09 19:24:09 +01: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
7d5f8d5125
Updating linux version of NvCloth, poly2tri and v-hacd.
...
Signed-off-by: moraaar <moraaar@amazon.com >
2021-07-08 11:55:59 +01: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
2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-06 17:34:04 +01:00
636ff587c3
Shape casts correctly report positions of colliders that intersect or in contact of the initial pose ( #1848 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-07-05 18:06:20 +01:00
40f9761f86
Fixed more copyright header issues caused by script replacement
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:21:26 -05:00
b9e06e70d9
Fixed copyright header issues per new validator
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 15:34:04 -05:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
73522e90c9
FBX -> Scene, part 2. Code changes, file renames ( #1704 )
...
* First pass FBX -> Scene File conversion.
This is the simple pass, minimizing code changes and focused on comments.
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Step 1 of part 2 of the FBX -> Scene rename
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Renaming FbxSceneBuilder folder to SceneBuilder
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Renamed files
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* More FBX -> Scene
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-07-01 15:46:55 -07:00
4c4be73bd5
First pass FBX -> Scene File conversion. ( #1699 )
...
This is the simple pass, minimizing code changes and focused on comments.
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-07-01 08:53:47 -07:00
amzn-sean
Esteban Papp
Jeremy Ong
pappeste
greerdv
AMZN-AlexOteiza
SergeyAMZN
Ibtehaj Nadeem
sphrose
nemerle
Steve Pham
hultonha
pereslav
aaguilea
Chris Galvan
moraaar
hultonha
AMZN-stankowi