Commit Graph

132 Commits (fc2053fad9dbfdff14607fbc98aaa6baea5686ec)

Author SHA1 Message Date
Dayo Lawal 3cd40b151e Merge remote-tracking branch 'upstream/development' into atomToolsApplication 5 years ago
Dayo Lawal 4b0527c07f Moving comments
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 5cb001dffd More fixes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 06b3f7d964 Undoing adding reflect and adding target names to functions
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal e3083c7310 Reflect() fix
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 61038ccd03 Reflect()
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 4b97a416a3 GetCriticalAssetFilters()
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 7122f1b761 More refractoring
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 50f6ea8385 Using GetBuildTargetName() and other fixes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 4306b57230 More replacement with target name
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 78b07a0869 Fixing errors and streamlining more to base class
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal c1998d8d3c AtomToolsApplication working with SMC
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 002a4a4a21 AtomToolsApplication working with MatEditor
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Esteban Papp 706233f72c Merge branch 'development' into cmake/SPEC-7179 5 years ago
Guthrie Adams 7cb2f62d4b
Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication
Addition of a base AzQtToolsApplication class
5 years ago
Dayo Lawal 0ffd151da6 Removing name setting in main.cpp for Atom tools
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
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
5 years ago
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>
5 years ago
Esteban Papp 7c9653087d Builds Windows nounity and unity
Builds Linux nounity and unity

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Dayo Lawal 6a0257b509 Reverting changes to AtomTools windows
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 9c63968833 Style fixing
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 92ead794fa Removal of AzQtAppWindow
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal d36d1defab Styling fixes and AzQtAppWindow changes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 27466154be AzQtApplication Window
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal c86535f892 Styling fixes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal c63c42c7f4 Adding comments and changing QApplication org/app names
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 6f44393f3a Moved logging to AzToolsFramework, working with MatEditor and SMC
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal b365f8bddf Fixing problem with FileIO (exception in Environment.h)
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal df18e53ab4 WriteStartupLog() not implemented
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal f930185077 WriteStartupLog() implemented in base class (unresolved external)
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal ecede42501 Fixing logging and cleaning up AzQtApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 81c3414cd1 Adding back OnOutput to MaterialEditor for override
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal e45028c9d8 Fixing MaterialEditorApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 31a2ccb041 Addressing change requests for pull request
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 1cadf34dc3 Removing commenting and unnecessary header files
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 5872138671 AzQtApplication 2
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal d3d9b600f9 AzQtApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 975be6a480 MaterialEditor inheriting from ToolsApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
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>
5 years ago
Terry Michaels 149863c527
Removed Amazon as Company for QSettings (#1649)
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
guthadam 104e24519c ATOM-15861 fixed material editor screen capture and test scripts 5 years ago
Qing Tao c29cfaafa4
ATOM-15287 Materials Disappear When Hot Reloading Parent Materials (#1532)
The issue was because the material wasn't compiled when creating the draw packet
5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
mnaumov 5a276b11b0 Fixing includes 5 years ago
mnaumov 4de1d90994 [ATOM-15292] Camera no longer resets when typing something 5 years ago
guthadam 7e231c8e36 LYN-4547 prepending O3DE to the material editor application name 5 years ago
guthadam 1339d453fc Adding PAL implementation for Linux 5 years ago
guthadam af42705bc9 Fixing linux build 5 years ago
guthadam 6675d06b67 Fixing linux build 5 years ago
guthadam 0fbeec7f17 Enabling linux compilation 5 years ago