birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,111 Commits 3 Branches 3 Tags
cf2effc58cd2aabf9f1e9ac3c5d4ff90ae2737cd
Commit Graph

1194 Commits

Author SHA1 Message Date
srikappa-amzn d8c9c5178e Reset the prefab root instance before removing the corresponding template (#2287) 
* Remove dirty entities correctly when prefab entities get destroyed

Signed-off-by: srikappa-amzn <srikappa@amazon.com>

* Remove call to clear dirty entity for single entity delete

Signed-off-by: srikappa-amzn <srikappa@amazon.com>

* Removed couple of asserts because order of operations is not fixed

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-07-21 15:42:46 -05:00
Terry Michaels b740329c1e Merge pull request #2326 from aws-lumberyard-dev/ImGuiNoEntityProblem 
Im gui no entity problem
 2021-07-21 11:11:47 -05:00
lumberyard-employee-dm 8e79ed8667 Merge pull request #2313 from aws-lumberyard-dev/AssetBrowserScanFolderFullPathFix 
Fixed RootAssetBrowserEntry setting of child AssetBrowserEntries
 2021-07-21 09:58:52 -05:00
John Jones-Steele f24ce2a5bb Merge branch 'development' into ImGuiNoEntityProblem 
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
 2021-07-21 15:02:46 +01:00
John Jones-Steele 7cb6ef4f47 Checked for no Entity selected and fixed UI 
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
 2021-07-21 15:00:46 +01:00
hultonha 1ac59388a3 Merge pull request #2319 from aws-lumberyard-dev/hultonha_LYN-1866_viewport-ui-focus-fix 
Viewport UI focus/shortcut fix
 2021-07-21 13:43:20 +01:00
hultonha 67e7a75d50 ensure uiMainWindow and uiOverlay have valid object names 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-21 11:11:22 +01:00
greerdv c0f27bd7bc merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-21 10:05:32 +01:00
lumberyard-employee-dm 92a4c76797 Fixed RootAssetBrowserEntry setting of child AssetBrowserEntries 
The issue is due to RootAssetBrowserEntry::UpdateChildPaths not taking
the RootAssetBrowserEntry fullpath into account when appending the child
path entry

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-07-20 20:40:04 -05:00
sconel 36f2207558 Remove unneeded fields from Entity and EditorTransform JsonSerializers 
Signed-off-by: sconel <sconel@amazon.com>
 2021-07-20 16:11:49 -07:00
Jeremy Ong e5983dd2af Terminate AssetProcessor when spawned by the parent project process (#2272) 
* Terminate AssetProcessor when spawned by the parent project process

Signed-off-by: Jeremy Ong <jcong@amazon.com>

* Maintain default behavior (leaving AP running on quit)

To enable the autotermination feature, the ap_tether_lifetime CVAR is
provided.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-07-20 12:38:12 -07:00
hultonha b8a80aa914 fix for viewport ui focus issue 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-20 20:32:41 +01:00
Esteban Papp a08f850766 Merge pull request #2284 from nemerle/header_inclution_reductions_pt1 
Reduce inclusion overhead a little bit
 2021-07-20 10:51:25 -07:00
sharmajs-amzn d5431e1c57 {LYN-4996} Asset Processor is not reprocessing STL files after settings are edited/updated (#2095) 
* add asset importer file extension

Signed-off-by: sharmajs <sharmajs@amazon.com>

* add new test setreg file

Signed-off-by: sharmajs <sharmajs@amazon.com>

* removed an unnecessary namespace

Signed-off-by: sharmajs <sharmajs@amazon.com>

* addressed feedback

Signed-off-by: sharmajs <sharmajs@amazon.com>

* addressed feedback

Signed-off-by: sharmajs <sharmajs@amazon.com>

* remove unnecessay method

Signed-off-by: sharmajs <sharmajs@amazon.com>

* add file

Signed-off-by: sharmajs <sharmajs@amazon.com>

* reduce waiting time in block until idle

Signed-off-by: sharmajs <sharmajs@amazon.com>
 2021-07-20 09:26:11 -07:00
greerdv 4438192d04 merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-20 16:12:45 +01:00
nemerle 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
lumberyard-employee-dm d22a473936 Merge pull request #2241 from aws-lumberyard-dev/CherryPickIssue2227Fix 
Cherry Pick: External Gem and Projects now appear in Editor AssetBrowser (#2227)
 2021-07-19 18:57:32 -05:00
Esteban Papp 4a4e6eb376 SPEC-7179 Removal of precompiled header files 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-19 16:37:33 -07:00
Scott Romero 3c378b348c [development] Fixed runaway memory in editor (#2220) 
There was a change in bahaviour to how files/directories were collected in the AZ::IO::FindData::Scan* functions which allowed the addition of duplicate entries. This created a problem when attempting a recursively greedy search with zips included because of the level system pak files. Their mount points would be the root "levels" folder, so for N-levels there would be N identical entries to the "levels" folder being added perpetually each time ScanZips was called on the "levels" folder or above folders with "*" filtering.

Letting the editor sit idle no longer sees the reported memory in the bottom status bar climb. Also, running the tests which prompted the initial change shows a negligible change in perf.

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-07-19 16:14:41 -07:00
Esteban Papp 706233f72c Merge branch 'development' into cmake/SPEC-7179 2021-07-19 15:48:29 -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 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
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
greerdv 01aa765de2 merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-17 16:58:18 +01: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
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
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 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
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
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
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
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
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
hultonha 2c9922d4b5 Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash 2021-07-15 09:28:47 +01:00
lsemp3d 104e0f73bf Fixed Lua class enumeration, there was a crash when traversing into methods 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-07-14 23:39:48 -05:00
Esteban Papp ae46eea1e8 Fix tests in Linux and discover path comparison problem in Windows (fixed) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-14 20:24:15 -07:00