Jeremy Ong
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:09 -06:00
Mikhail Naumov
db91bdbf51
Improvements to Entity Outliner context menu
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-17 18:30:46 -07:00
amzn-phist
d6b268e84e
Remove ResourceSelectorHost and clean up/refactor related bits ( #3050 )
...
* Sever dependency on legacy resource selector host
Audio resource selectors (browse dialogs) no longer need to be
registered with the legacy IResourceSelectorHost system. Set up a new
EBus specifically to handle browse button presses and directly invokes
the dialog.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Hook up legacy audio control selector to new EBus
Remaining use of legacy audio selectors (trackview) need to be able to
bypass ResourceSelectorHost now.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Removes ResourceSelectorHost and legacy selectors
This removes various Variable types that were tied to resource
selectors, such as GeomCache, Model, Animation, File. Removes the
ResourceSelectorHost completely. The two things that still appeared to
have selectors in TrackView are Audio Controls and Texture. Fixed the
audio control selector to work via EBus and the Texture selector didn't
seem to work at all, but left it in as it was.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Make the default audio selector return old value
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Fix some signed/unsigned comparison warnings
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Remove deleted function from Editor Mock
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Change audio selector api to use string_view
Per feedback.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
2021-08-16 12:41:24 -05:00
Chris Galvan
11d5009f46
Fixed creating entities in the viewport logic to use hit test detection.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-12 16:31:39 -05:00
Chris Galvan
c9df7c69a4
Updated slice entity outliner to use new consolidated StyledTreeView as well.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-12 13:20:55 -05:00
AMZN-Alexandre Corcia Aguilera
83e56b6ab5
Remove new camera flag functions and legacy code paths ( #3071 )
...
Signed-off-by: aaguilea <aaguilea@amazon.com >
2021-08-12 15:06:16 +01:00
hultonha
30c277bc56
Editor code: tidy up BOOLs,NULLs and overrides pt2.
...
Merge pull request #2873 from nemerle/tidy_up_editor_code_a_bit_split2
2021-08-09 15:29:54 +01:00
Yuriy Toporovskyy
fd616fdcfb
Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com >
2021-08-06 10:32:38 -04:00
Yuriy Toporovskyy
56dee47c6b
Address more PR feedback
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com >
2021-08-05 11:56:09 -04:00
Nemerle
0d0d94f575
Editor code: tidy up BOOLs,NULLs and overrides pt2.
...
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 2 of a split #2847
Signed-off-by: Nemerle <nemerle5+git@gmail.com >
2021-08-05 16:46:38 +02:00
Esteban Papp
074e33081f
more fixes for w4267
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-27 19:32:11 -07:00
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
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
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
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
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
e214f26392
Editor/Plugins/ComponentEntityEditorPlugin
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-14 09:34:05 -07:00
Alex Montgomery
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
jjjoness
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
Esteban Papp
d7c8c0192f
SPEC-7503 Mac nightly run asset profile failed to process "Translation/scriptcanvas_en_us.ts" ( #1742 )
...
* copy frameworks to output for loose file case
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* patching lrelease
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Fix for python in loose files and bundles
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* found what the problem is, setting a version just in case
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* fixup_bundle working with Python.framework and codesigning on AssetProcessor.app
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Trying to ignore other files to solve Jenkins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Fix some qt stuff for mac
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* removal of cstemp files to prevent signature failures
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Updating Qt with fixes to solve some qt framework issues with include paths
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-08 17:20:20 -07:00
Danilo Aimini
02f340abbd
Fix resource registration for the EntityOutlinerWidget class in AzToolsFramework. Also moves icons to a more appropriate location. ( #1731 )
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-07-01 18:37:44 -07:00
alexmontAmazon
9ef25cb5c4
rewrite of the filter code to fix [LYN-4156][LYN-4545] ( #1640 ) ( #1726 )
...
* rewrite of the filter code to fix [LYN-4156][LYN-4545]
Signed-off-by: Alex Montgomery <alexmont@amazon.com >
* improved onRowCountChanged() per comments
Signed-off-by: Alex Montgomery <alexmont@amazon.com >
2021-07-01 13:59:10 -07:00
Steve Pham
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com >
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com >
2021-06-30 19:51:55 -07:00
Esteban Papp
4d6f3aefd2
fix wrong path ( #1697 )
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-06-30 17:02:54 -07:00
Danilo Aimini
7030f663f5
LYN-4890 | Change all instances of teal blue to correct O3DE branding palette colors ( #1672 )
...
* Replace old teal color with correct palette colors from the O3DE branding.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix hyperlink color in O3DE About Us dialog to improve visibility.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-06-30 15:20:42 -07:00
Esteban Papp
d6caff7842
Some sandbox references I was missing
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-06-29 16:54:30 -07:00
Esteban Papp
1696680240
git mv Code\Sandbox\Plugins Code/Editor/Plugins
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-06-29 13:55:31 -07:00