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
07a1af99ba
Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons
2021-07-19 12:04:46 -07:00
23a4835e48
Desync debug work
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-07-19 12:03:57 -07: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
01aa765de2
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-17 16:58:18 +01:00
82f89d596e
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 18:27:30 -07: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
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
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
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
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
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
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
d40bfd21a9
Merge branch 'o3de:development' into rapidjson-natvis
2021-07-16 11:44:56 -05:00
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
1e2cf9c8d2
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-16 14:47:11 +01:00
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
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
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
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
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
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
f215011de4
Copyright header and whitespace fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-15 12:44:26 -05:00
4aebea61af
Fixes for Jenkins
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-15 09:42:02 -07: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
9c1d66f61f
improve translations for physics types in Script Canvas
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-15 13:07:34 +01:00
2c9922d4b5
Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash
2021-07-15 09:28:47 +01:00
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
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
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
72ea2ca1b4
Change the InputDeviceImplementationRequest to be addressable by an InputDevcieId to account for the situation where someone may want to swap out the implementation for a single instance of a devcie type rather than all instances of that device type (the latter can still be achieved using Broadcast instead of Event when calling the EBus method). ( #2180 )
...
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-07-14 17:44:44 -06:00
24831b1970
Code review changes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-14 14:54:57 -07:00
d8ac5654d2
Merge branch 'development' into cleanup/SPEC-1670
2021-07-14 14:53:59 -07: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
272b9ba9c7
Code/Legacy/CryCommon
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-14 09:37:01 -07:00
d69897fd86
add [[maybe_unused]] attribute to prevent innocuous warning
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-14 10:33:39 +01: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
11327b59ea
Expose vsync interval with new cvar rpi_vsync_interval and support Vulkan vsync ( #2061 )
...
* Expose vsync interval with new cvar rpi_vsync_interval
On change, the rpi_vsync_interval is broadcasted to a new event on
the WindowNotificationBus and all swapchains are recreated with the
new vsync value.
Signed-off-by: Jeremy Ong <jeremycong@gmail.com >
* Add vsync interval support to the Vulkan RHI
Vsync intervals are not intrinsically supported using the Vulkan
swapchain extension. Instead, extra presents are enqueued for each
extra vblank requested past 1. Swapchain recreation is triggered
when transitioning to and from the FIFO presentation mode (when
rpi_vsync_interval transitions from and to 0 respectively).
Signed-off-by: Jeremy Ong <jeremycong@gmail.com >
* Rollback vsync > 1 implementation on Vulkan and leverage *Internal pattern
Signed-off-by: Jeremy Ong <jeremycong@gmail.com >
2021-07-13 20:54:06 -07:00
54947791d2
Fixing copyright header
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:51:58 -05:00
9c63968833
Style fixing
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:40 -05:00
986ee5aa9b
Changing cmake
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:37 -05: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
27466154be
AzQtApplication Window
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:30 -05:00
656a4bb097
o3de.com to o3de.org
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:28 -05:00
lumberyard-employee-dm
kberg-amzn
Guthrie Adams
greerdv
Esteban Papp
srikappa-amzn
Terry Michaels
Steve Pham
sconel
Danilo Aimini
amzn-mike
jjjoness
hultonha
Dayo Lawal
lsemp3d
bosnichd
jackalbe
Nicholas Van Sickle
Jeremy Ong
Dayo Lawal