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
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
2f2bbc7d43
no message
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-13 11:02:16 -07: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
64697350bc
LYN-4806: Switch Asset Browser Mode Button (Fix) ( #1852 )
...
* Adding dropdown for view
Signed-off-by: igarri <igarri@amazon.com >
* Adding Asset Browser Mode selector button
Signed-off-by: igarri <igarri@amazon.com >
* Added display State Enum
Signed-off-by: igarri <igarri@amazon.com >
* changed over to AZStd::unique_ptr
Signed-off-by: igarri <igarri@amazon.com >
* added pointers
Signed-off-by: igarri <igarri@amazon.com >
* Fixing pointers
Signed-off-by: igarri <igarri@amazon.com >
* Fixing parenting
Signed-off-by: igarri <igarri@amazon.com >
* Changes from Code Review Feedback
Signed-off-by: igarri <igarri@amazon.com >
* Fixed wrong condition
Signed-off-by: igarri <igarri@amazon.com >
* Added Button Icon
Signed-off-by: igarri <igarri@amazon.com >
* Fixing Copyright Header
Signed-off-by: igarri <igarri@amazon.com >
2021-07-07 10:53:21 +01:00
40f9761f86
Fixed more copyright header issues caused by script replacement
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:21:26 -05:00
b9e06e70d9
Fixed copyright header issues per new validator
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 15:34:04 -05:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
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
7bb4e0562b
Update AssetBrowserTreeView.cpp
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-06-30 09:06:16 +01:00
6fb2558e44
Merge branch 'upstream/development' into genewalt/gitflow_210628
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 15:40:46 -07:00
f905b71844
Adding missing o3de copyright headers
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 13:48:45 -07:00
db5d03b588
LYN-4863: Item data not copied on drag-n-drop if column is hidden in Asset Browser Tree View. ( #1616 )
...
* Fixed: Item returning null in drag and drop when column is hidden
* Added explanation about why this approach is needed
2021-06-29 12:41:35 +02:00
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
2dd8d03654
Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest
2021-06-25 17:24:32 -07:00
ad2ee47ea3
Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest
2021-06-25 09:49:13 -04:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
e4e22879b8
LYN-1767: Search View Crash Fix ( #1430 )
...
* Fixed crash in tableView when the filter goes empty and there is a selected entry.
* fixed consts
* Code Review Changes
* more minor fixes
2021-06-21 10:49:01 +02:00
5a53c074c2
Fixing Header Data in AssetBrowserTableModel
2021-06-10 15:14:35 +01:00
66bbcb08e5
Fixing Thumbnails preview from TableView
2021-06-09 11:02:09 +01:00
3d1abdc4e3
Pull request corrections, namespaces, style, etc
2021-06-04 12:16:32 +01:00
eb67b6b452
Adding namespace aliases and API comments
2021-06-03 13:36:47 +01:00
485a45d3c2
Made some corrections
2021-06-02 15:32:03 +01:00
e7752e3ad4
Merge branch 'main' into LYN-1767-AB
2021-06-02 12:03:22 +01:00
6ca37bbf84
Checking variable constness
2021-05-27 14:04:02 +01:00
ad3625c2a2
Added ability to specify a default directory for the asset picker in the asset property control ( #903 )
...
* Framework for setting default directory in asset picker
* Asset Picker will default to a passed in default directory in the selection model
* Added comment to the property to help define what is expected.
* Fixed string assignment
* Removed commented out #pragma
* Addressed review feedback
* Addressed review feedback
2021-05-25 11:57:49 -05:00
6a0cf97456
Fixed Selection in AssetBrowserTreeView
2021-05-24 13:19:35 +01:00
dfb0d7f9f5
Fixed numeric_cast, style, const variables
2021-05-21 12:33:55 +01:00
0b50b6cc63
Fixed code Style and minor issues from feedback
2021-05-19 12:04:40 +01:00
ec784b005f
More Corrections
2021-05-18 15:49:35 +01:00
f49e4b3333
modified code from feedback
2021-05-18 15:26:05 +01:00
1c2b8f9111
Adding AZ_CVAR for the new feature
2021-05-18 13:33:21 +01:00
b9c9811d35
Fixing qobject_cast to the StringFilter
2021-05-17 14:06:01 +01:00
d5591e52ff
Merge branch 'main' into LYN-1767-AB
2021-05-14 13:12:29 +01:00
cff9fea535
Switching views with filters
2021-05-14 13:09:14 +01:00
33240c9f90
Selecting assets from tableview
2021-05-13 16:08:14 +01:00
d7ca3f273b
croll to top on view when the filter updates
2021-05-13 13:25:03 +01:00
d6868df735
Expanding TableView Columns
2021-05-13 12:29:16 +01:00
7cec2d8b07
Remove more unused things from CryCommon and CrySystem. ( #709 )
...
Lots of unrelated removals, I basically tried to remove everything exposed via gEnv that isn't used anymore, and following the threads found a few other things to remove also.
2021-05-12 08:30:15 -06:00
c1e21185b4
Selecting correct indexes from Asset Browser Model
2021-05-12 12:20:23 +01:00
80684b383b
Code cleanup
2021-05-12 11:42:39 +01:00
1c990b2ef6
Filter Sorting Working
2021-05-12 11:03:02 +01:00
6e15e87e41
Asset Browser Table view filtering
2021-05-10 15:52:35 +01:00
662951eb98
Merge branch 'main' into LYN-1767-AB
2021-05-10 10:41:54 +01:00
65550d3f1c
Entries updating on the table view
2021-05-10 10:39:01 +01:00
e7600cef94
PR feedback
2021-04-30 14:24:34 -07:00
01bba93f28
PR feedback
2021-04-30 12:52:03 -07:00
lumberyard-employee-dm
Esteban Papp
Steve Pham
Chris Galvan
sphrose
AMZN-Igarri
Gene Walters
IgnacioMartinezGarrido
Yuriy Toporovskyy
igarri
Terry Michaels
bosnichd
mnaumov