birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,122 Commits 3 Branches 3 Tags
development
Commit Graph

300 Commits

Author SHA1 Message Date
Guthrie Adams 44a007547c minor reformatting and removed unused headers from ME/SMCApplication.* 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-05 19:55:56 -05:00
Dayo Lawal cb5e2c71ff Typo fix2 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-05 19:08:45 -05:00
Dayo Lawal 32ba658e5e Typo fix 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-05 18:35:54 -05:00
Dayo Lawal e507236257 Addressing requests 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-05 17:59:00 -05:00
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-05 14:57:24 -07:00
Dayo Lawal e8d685211b CreateMenu/CreateTabBar 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-05 16:24:49 -05:00
Dayo Lawal 602da53ebe Merging upstream 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-05 14:20:25 -05:00
Dayo Lawal bf7512ebf4 Merge fix 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-05 14:07:48 -05:00
Dayo Lawal f8c8181b0c Bug fix (updating WindowComponent) 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-03 19:47:50 -05:00
Dayo Lawal 259bc3f85e ATWindowNotificationBus and ATFactoryRequestBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-03 19:24:46 -05:00
Guthrie Adams b594132a47 using command line parameter instead of member 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-03 17:19:30 -05:00
Guthrie Adams f269d222b7 Fixing issues with shader management console startup 
Updating test scripts

Synchronizing SMC and ME application classes

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-03 17:07:03 -05:00
Dayo Lawal 4eacd076da Fixing ME and ATWindowNotificationBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-03 15:53:20 -05:00
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-02 18:03:04 -07:00
Dayo Lawal 63ed78d267 status_bar 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-02 17:27:26 -05:00
Dayo Lawal 58ff2d8cab AtomToolsMainWindowRequestBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-02 14:59:45 -05:00
Dayo Lawal 8eb9205711 AtomToolsMainWindow 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-02 00:34:43 -05:00
Guthrie Adams b357cd0000 Merge pull request #2605 from aws-lumberyard-dev/Atom/guthadam/updating_atomtoolsappication_comments_and_formatting 
AtomToolsApplication minor comments/formatting
 2021-07-29 15:23:53 -05:00
Guthrie Adams 2237439a0e Material Editor: changing preset errors to warnings 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-07-29 09:29:00 -05:00
Guthrie Adams 4465b52de5 AtomToolsApplication minor comments/formatting 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-07-29 09:13:49 -05:00
Dayo Lawal 3cd40b151e Merge remote-tracking branch 'upstream/development' into atomToolsApplication 2021-07-28 11:47:47 -05:00
pappeste 97f9ac870d Atom 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-27 19:29:20 -07:00
Dayo Lawal 4b0527c07f Moving comments 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 13:42:48 -05:00
Dayo Lawal 5cb001dffd More fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 12:51:38 -05:00
Dayo Lawal 06b3f7d964 Undoing adding reflect and adding target names to functions 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 12:18:12 -05:00
Dayo Lawal e3083c7310 Reflect() fix 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 02:11:58 -05:00
Dayo Lawal 61038ccd03 Reflect() 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 02:09:45 -05:00
Dayo Lawal 4b97a416a3 GetCriticalAssetFilters() 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 02:06:33 -05:00
Dayo Lawal 7122f1b761 More refractoring 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-26 17:41:10 -05:00
Dayo Lawal 50f6ea8385 Using GetBuildTargetName() and other fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-26 16:22:34 -05:00
Dayo Lawal 4306b57230 More replacement with target name 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-26 13:08:59 -05:00
Dayo Lawal 78b07a0869 Fixing errors and streamlining more to base class 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-26 12:51:37 -05:00
Dayo Lawal c1998d8d3c AtomToolsApplication working with SMC 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-22 11:27:57 -05:00
Dayo Lawal 002a4a4a21 AtomToolsApplication working with MatEditor 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-22 11:27:55 -05:00
Esteban Papp 706233f72c Merge branch 'development' into cmake/SPEC-7179 2021-07-19 15:48:29 -07: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
Dayo Lawal 0ffd151da6 Removing name setting in main.cpp for Atom tools 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-19 12:42:38 -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
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
Dayo Lawal 6a0257b509 Reverting changes to AtomTools windows 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-15 16:23:56 -05:00
Dayo Lawal 9c63968833 Style fixing 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:40 -05: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 27466154be AzQtApplication Window 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:30 -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
Dayo Lawal b365f8bddf Fixing problem with FileIO (exception in Environment.h) 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:19 -05:00
Dayo Lawal df18e53ab4 WriteStartupLog() not implemented 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:17 -05:00