b740329c1e
Merge pull request #2326 from aws-lumberyard-dev/ImGuiNoEntityProblem
...
Im gui no entity problem
2021-07-21 11:11:47 -05:00
8e79ed8667
Merge pull request #2313 from aws-lumberyard-dev/AssetBrowserScanFolderFullPathFix
...
Fixed RootAssetBrowserEntry setting of child AssetBrowserEntries
2021-07-21 09:58:52 -05:00
f24ce2a5bb
Merge branch 'development' into ImGuiNoEntityProblem
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-07-21 15:02:46 +01:00
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
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
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
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
36f2207558
Remove unneeded fields from Entity and EditorTransform JsonSerializers
...
Signed-off-by: sconel <sconel@amazon.com >
2021-07-20 16:11:49 -07:00
b8a80aa914
fix for viewport ui focus issue
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-20 20:32:41 +01:00
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
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
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
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
706233f72c
Merge branch 'development' into cmake/SPEC-7179
2021-07-19 15:48:29 -07:00
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
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
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
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
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
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
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
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
032a35e495
fix Windows unity build
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-15 18:44:38 -07:00
074518454c
Merge branch 'development' into cmake/SPEC-7179
2021-07-15 16:58:58 -07:00
f215011de4
Copyright header and whitespace fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-15 12:44:26 -05:00
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
ffcfa44b49
{LYN-4514} Engine updates to enable PAB for the Blast Gem ( #2140 )
...
* {LYN-4514} Engine updates to enable PAB for the Blast Gem
* Engine updates to enable Python Asset Building for the Blast Gem
* added API to detect IsPythonActive()
* ExportProductList behavior
* scene manifest usage of generated assetinfo
* updated ScriptProcessorRuleBehavior to handle OnPrepareForExport
Tests: new tests for scene behavior via ExportProduct
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com >
* updated base on PR feedback
added more comments for IsPythonActive()
added a serializeContext for export product list
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com >
2021-07-14 14:54:22 -05:00
5c177ef48a
Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-14 09:23:26 +01:00
867ae23664
Make Viewport input events fully Qt based ( #2142 )
...
* Make Viewport input events fully Qt based.
This should fix an issue with Qt touch event -> mouse event translation in the Editor, and may also fix issues with the Mac Editor and remote desktop (though, lacking the requisite hardware, I can test precisely none of these things personally).
See https://github.com/o3de/o3de/issues/1889
- Adapted LegacyViewportCameraController to use Movement::X & Y (mostly for testing purposes, it's on the slate for being removed soon)
- Moved cursor capture logic from RenderViewportWidget into QtEventToAzInputManager so that it can make sure it generates correct movement deltas
- Removed ViewportMouseCursorRequests::PreviousViewportCursorScreenPosition to have our viewport controllers use our dedicated Movement::X and Y channels instead, which will work in the launcher
Signed-off-by: nvsickle <nvsickle@amazon.com >
* Address review feedback
Signed-off-by: nvsickle <nvsickle@amazon.com >
* Fix Linux build
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-13 20:58:48 -07:00
92ead794fa
Removal of AzQtAppWindow
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:35 -05:00
d36d1defab
Styling fixes and AzQtAppWindow changes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:32 -05:00
c86535f892
Styling fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:25 -05:00
c63c42c7f4
Adding comments and changing QApplication org/app names
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:23 -05:00
6f44393f3a
Moved logging to AzToolsFramework, working with MatEditor and SMC
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:21 -05:00
da11424119
Merge branch 'development' into Prefab/BestEffortPatching
...
Signed-off-by: srikappa <srikappa@amazon.com >
2021-07-13 11:52:07 -07:00
2f2bbc7d43
no message
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-13 11:02:16 -07:00
b0707d3295
ensure the final vertex in a spline cannot be deleted using a manipulator
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-13 17:51:06 +01: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
c494adba88
Use a utility function to compare json document and expected string
...
Signed-off-by: srikappa <srikappa@amazon.com >
2021-07-12 14:21:04 -07:00
b7e3db9d82
Make prefab patch application use a best effort mechanism
...
Signed-off-by: srikappa <srikappa@amazon.com >
2021-07-12 11:58:14 -07:00
e924ed0b86
Merged stabilization/2106 to development; Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-12 10:45:23 -05:00
36a8c0a8cc
changed all amazon to o3de
...
Signed-off-by: aaguilea <aaguilea@amazon.com >
2021-07-12 16:34:01 +01:00
372ac2707f
fix outliner sorting using incorrect types for comparisons ( #2052 )
...
* fix outliner sorting using incorrect types for comparisons, fixes for [LY-122258] and [LYN-3666]
Signed-off-by: Alex Montgomery <alexmont@amazon.com >
* fix annoying but necessary Qt type cast
Signed-off-by: Alex Montgomery <alexmont@amazon.com >
2021-07-09 19:37:57 -07:00
1d022907dc
Prefabs | Introduce sanitation of prefab doms on loading ( #1929 )
...
* Update PrefabLoader to sanitize ingested prefabs and have core systems operate with default values
Signed-off-by: sconel <sconel@amazon.com >
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Remove IsExplicitDefault implementation to avoid confusion (since the function isn't virtual).
Avoid copying PrefabDoms over in SanitizeLoadTemplate.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Address naming and commenting concerns from PR reviews.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix to error detection code
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Add support for all uuid formats for zero check.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
Co-authored-by: sconel <sconel@amazon.com >
2021-07-09 16:22:38 -07:00
22a52bc7b2
Fix issue where game and editor entities could exist simultaneously while exiting game mode ( #2015 )
...
Signed-off-by: sconel <sconel@amazon.com >
2021-07-09 15:39:17 -05:00
1b530195fc
Clarify ImGui activation in Editor viewport ( #1765 )
...
* Clarify ImGui activation in Editor viewport
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* All working following changes from comments in PR
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* One more change
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* fixes from comments in PR.
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Fixed git merge error
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Added header to ImGuiBus.h
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Fix for Jenkins error
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Minor typo fix
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-07-09 12:03:20 -05: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
83d1bc0fbf
Merge branch 'stabilization/2106' into LYN-3718
2021-07-08 10:19:11 +01:00
c8fb453760
Fix copyright header copy/paste issue.
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 14:40:59 -07:00
Terry Michaels
lumberyard-employee-dm
John Jones-Steele
hultonha
hultonha
sconel
Esteban Papp
sharmajs-amzn
nemerle
Guthrie Adams
srikappa-amzn
Steve Pham
sconel
amzn-mike
Dayo Lawal
jackalbe
Nicholas Van Sickle
Dayo Lawal
Chris Galvan
aaguilea
Alex Montgomery
Danilo Aimini
jjjoness
sphrose