Chris Burel
8702f0cd2e
Add test for the mesh optimizer's ability to weld nearby vertices
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-07-19 14:37:53 -07:00
Mike Balfour
6d563e2e19
[GHI 2178] Vegetation Debugger info was sometimes getting culled ( #2209 )
...
* [GHI 2178] Fixed missing vegetation info
The entity debug drawing culling system was removing it due to the level entity not having an AABB. Since this component can draw infinitely far, it just needed a max AABB.
With the culling fixed, it made another culling problem evident - a bug in the font code where it wasn't culling 3D text rendered behind the camera. Now it is.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Fix problem with debug rendering not immediately showing up.
When using FloatMax for the AABB, it causes math overflows with the initial camera frustrum. Changing to max/2.0f is sufficient to avoid the overflows.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Fixed normals on mesh raycasts.
The normals needed to be normalized after transformation, and didn't need the non-uniform scale applied to them, since they're normals.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Fixed the bug that prevented max-size AABBs from working with ShapeIntersection::Overlap.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
2021-07-19 15:43:56 -05:00
lumberyard-employee-dm
ce6514de6d
Added clarifying comments as to why the Gem's SourcePaths directory is
...
temporarily copied over to the SettingsRegistryBuilder local Settings Registry instance
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-19 14:58:19 -05:00
lumberyard-employee-dm
4d927cb26e
Merge pull request #2247 from aws-lumberyard-dev/Prefab/ClearEntityMapsTogether
...
Remove container entity from all maps when entities are cleared from a prefab instance
2021-07-19 14:12:51 -05:00
kberg-amzn
07a1af99ba
Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons
2021-07-19 12:04:46 -07:00
kberg-amzn
23a4835e48
Desync debug work
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-07-19 12:03:57 -07:00
Guthrie Adams
7cb2f62d4b
Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication
...
Addition of a base AzQtToolsApplication class
2021-07-19 13:32:09 -05:00
srikappa-amzn
ef68a07a40
Merge branch 'development' into Prefab/ClearEntityMapsTogether
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-07-19 10:52:15 -07:00
hultonha
080d10ede9
continue to show cursor while using RMB until context menu pop-up is fixed
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-19 11:55:38 +01:00
greerdv
01aa765de2
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-17 16:58:18 +01:00
lumberyard-employee-dm
0c339d2e2d
Fixed the SettingsRegistryBuilder not merging the Registry directories within Gems
...
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-16 21:55:26 -05:00
Esteban Papp
82f89d596e
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 18:27:30 -07:00
srikappa-amzn
ebf0ea6a69
Remove container entity from all maps when entities are cleared from a prefab instance
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-07-16 17:03:03 -07:00
lumberyard-employee-dm
2091e58cd9
External Gem and Projects now appear in Editor AssetBrowser ( #2227 )
...
* External Gem and Projects now appear in Editor AssetBrowser
Optimized logic populating the FolderAssetBrowserEntries in the Editor AssetBrowser.
Added an "[External]" tag to scan folders which reside outside of the Engine Root
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Fixed conversion of fixed_string to string when normalizing an added AssetBrowser file path.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* RootAssetBrowserEntry.cpp Linux conditional expression fix
Because an AZ::IO::PathView is convertible to an AZ::IO::FixedMaxPath and vice-versa, the conversion of the second part of the ternary expression absolutePathView needs to explicitly convert to an AZ::IO::FixedMaxPath
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-16 18:00:13 -05:00
Terry Michaels
d9ec159f0e
Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
...
Gitflow 7/16/21 - O3DE
2021-07-16 17:50:44 -05:00
Esteban Papp
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
Steve Pham
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
sconel
b05984d4ca
Prevent cached world transform and parent data from being serialized in prefab ( #2219 )
...
Porting over @AMZN-daimini 's work to clean up unneeded data from prefabs by removing cached transform data from json serialization. This is done by writing an explicit json serializer for the Editor Transform component and opting not to store or load the cached Transform fields.
Tested by creating new prefabs, loading and as well as resaving old prefabs which included patches aimed at cached transform data.
Signed-off-by: sconel <sconel@amazon.com >
2021-07-16 15:20:52 -07:00
Esteban Papp
83c5028af6
Fix windows release and a warning issued in Jenkins
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-16 14:24:55 -07:00
Esteban Papp
47f43c2e35
Fixing casing typo and type coming from CryCommon
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-16 14:05:26 -07:00
Danilo Aimini
e9270e491a
Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
# Conflicts:
# scripts/build/bootstrap/incremental_build_util.py
2021-07-16 13:21:55 -07:00
Esteban Papp
7c9653087d
Builds Windows nounity and unity
...
Builds Linux nounity and unity
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-16 13:13:59 -07:00
lumberyard-employee-dm
448469025b
Updated the AZ Path Code to perform case-insensitive hashing of path ( #2226 )
...
segments when using the Windows Path Separator
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-16 15:13:47 -05:00
amzn-mike
8116e239f4
Restore fix lost in merge: [LY-121929] Asset Processor Error : Sqlite - Failed to prepare statement. ( #2202 )
...
Fixed unresolved product dependency query to be able to handle much larger queries (tested with 100,000 products) by storing queried products in a temp table first
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-07-16 10:50:39 -07:00
amzn-phist
4407891740
Update audio cvars from legacy to AZ_CVARs ( #2182 )
...
* Upgrade s_AudioLoggingOptions to AZ_CVAR
Removes this legacy CVar and reimplements it as an AZ_CVAR with similar
functionality of setting flags using alpha characters.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Upgrade s_DrawAudioDebug to AZ_CVAR
Removes the legacy CVar and reimplements it as an AZ_CVAR with similar
functionality and options.
Additional updates to the logging options CVar to fix up flag enums.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Upgrade s_FileCacheManagerDebugFilter to AZ_CVAR
Removes the legacy CVar and reimplements it as an AZ_CVAR with similar
functionality.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Removal of legacy IConsole dependencies from Audio
Moves a g_languageAudio cvar from CrySystem to AudioSystem.
Convert all cvar commands to AZ_CONSOLEFREEFUNC's.
Remove IConsole.h includes from source files.
Removes the CSoundCVars class.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Minor update to cvar comments etc.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
2021-07-16 12:25:32 -05:00
lumberyard-employee-dm
d40bfd21a9
Merge branch 'o3de:development' into rapidjson-natvis
2021-07-16 11:44:56 -05:00
jjjoness
facd1e18b5
One hamburger menu to rule them all ( #2232 )
...
* Icon changes
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Icon changes to svg files
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-07-16 10:17:11 -05:00
greerdv
1e2cf9c8d2
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-16 14:47:11 +01:00
hultonha
6839ef1512
Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-16 12:58:39 +01:00
hultonha
d55f1b748d
Merge pull request #2136 from aws-lumberyard-dev/hultonha_LY-69118_lambda_crash
...
Update MSVC to use new lambda processing
2021-07-16 12:55:29 +01:00
hultonha
5a0c1fab9f
Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-16 10:30:37 +01:00
lumberyard-employee-dm
e28ff0beea
Adding rapidjson.natvis file to the AzCore project to Visualizers to VS
...
By adding the natvis to a vcxproj Visual Studio automatically loads it
when using the source engine
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-16 03:52:11 -05:00
John Jones-Steele
2170e1f0a5
Merge branch 'development' into MuteAudioButtonMightBeBroken
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-07-16 09:15:13 +01:00
Esteban Papp
032a35e495
fix Windows unity build
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-15 18:44:38 -07:00
Luis Sempé
8827e3a2f2
Merge pull request #2170 from aws-lumberyard-dev/scripting/fix_gridhub
...
Removed editor specialization from GridHub, it does not need the gems…
2021-07-15 17:53:14 -07:00
AMZN-nggieber
69312a5e56
Clear Build and Cache Directory After Project Move or Copy ( #2184 )
...
* Clear build and Cache directories when copying or moving projects
Signed-off-by: nggieber <nggieber@amazon.com >
* Updated tests for moving projects and Added tests for copying projects and skipping build files
Signed-off-by: nggieber <nggieber@amazon.com >
* Address PR feedback and fix a few minor UX issues, and request project be rebuild after copying or moving
Signed-off-by: nggieber <nggieber@amazon.com >
* Include ProjectInfo.h in ProjectUtils.h so linux will compile
Signed-off-by: nggieber <nggieber@amazon.com >
2021-07-15 17:48:04 -07:00
Esteban Papp
074518454c
Merge branch 'development' into cmake/SPEC-7179
2021-07-15 16:58:58 -07:00
Esteban Papp
3771ba80a4
Combine Framework.Tests and AzToolsFramework.Tests targets into one target
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-15 16:57:15 -07:00
lsemp3d
8262a5f8e5
Merge remote-tracking branch 'upstream/development' into scripting/fix_gridhub
2021-07-15 16:01:35 -07:00
chcurran
5885be5711
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
2021-07-15 11:56:28 -07:00
Esteban Papp
087c9f6edb
more fixes for Jenkins vs local behavior
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-15 11:40:34 -07:00
Dayo Lawal
f215011de4
Copyright header and whitespace fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-15 12:44:26 -05:00
John Jones-Steele
45f85bb384
Merge branch 'development' into MuteAudioButtonMightBeBroken
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-07-15 18:22:02 +01:00
Dayo Lawal
8f22bff1fb
QEditorApplication inheriting from AzQtApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-15 12:16:18 -05:00
chcurran
e2c1477629
fix for dependency job key on ScriptEvents from SC builder
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-15 09:46:51 -07:00
Esteban Papp
4aebea61af
Fixes for Jenkins
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-15 09:42:02 -07:00
John Jones-Steele
3b419c02e6
CHange the way the Mute Audio button works depending on the Gem availability
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-07-15 13:42:02 +01:00
hultonha
a365ae1da1
Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-15 13:27:51 +01:00
greerdv
9c1d66f61f
improve translations for physics types in Script Canvas
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-15 13:07:34 +01:00
Benjamin Jillich
0863a24490
Revert "[MeshOptimizer] Determine the original vertex index based on the position ( #2008 )" ( #2188 )
...
This reverts commit a077a88d3f due to assets failing on Jenkins.
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-07-15 12:18:10 +02:00