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

597 Commits

Author SHA1 Message Date
sphrose 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
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
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
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
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 706233f72c Merge branch 'development' into cmake/SPEC-7179 2021-07-19 15:48:29 -07: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
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
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 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
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
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
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 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
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
Esteban Papp 4a5ac0e204 Fix for ArchiveTest where the assets alias was not being set 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-14 16:45:36 -07:00
Esteban Papp 24831b1970 Code review changes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-14 14:54:57 -07:00
Esteban Papp d8ac5654d2 Merge branch 'development' into cleanup/SPEC-1670 2021-07-14 14:53:59 -07:00
jackalbe 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
hultonha 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
Nicholas Van Sickle 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
Dayo Lawal 92ead794fa Removal of AzQtAppWindow 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:35 -05:00
Dayo Lawal d36d1defab Styling fixes and AzQtAppWindow changes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:32 -05:00
Dayo Lawal c86535f892 Styling fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:25 -05:00
Dayo Lawal 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
Dayo Lawal 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
srikappa da11424119 Merge branch 'development' into Prefab/BestEffortPatching 
Signed-off-by: srikappa <srikappa@amazon.com>
 2021-07-13 11:52:07 -07:00
Esteban Papp 2f2bbc7d43 no message 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-13 11:02:16 -07:00
hultonha 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
hultonha 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
Esteban Papp 4e84738ff2 Ordering file alphabetically 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-12 20:32:08 -07:00
Esteban Papp 1dec9d4a9a Fix tests in AzToolsFramework now that the Trace bus is hooked 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-12 18:08:35 -07:00