706233f72c
Merge branch 'development' into cmake/SPEC-7179
2021-07-19 15:48:29 -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
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
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
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
6a0257b509
Reverting changes to AtomTools windows
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-15 16:23:56 -05:00
9c63968833
Style fixing
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:40 -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
c86535f892
Styling fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:25 -05:00
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
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
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
df18e53ab4
WriteStartupLog() not implemented
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:17 -05:00
f930185077
WriteStartupLog() implemented in base class (unresolved external)
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:14 -05:00
ecede42501
Fixing logging and cleaning up AzQtApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:12 -05:00
81c3414cd1
Adding back OnOutput to MaterialEditor for override
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:10 -05:00
e45028c9d8
Fixing MaterialEditorApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:03 -05:00
31a2ccb041
Addressing change requests for pull request
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:29:01 -05:00
1cadf34dc3
Removing commenting and unnecessary header files
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:28:58 -05:00
5872138671
AzQtApplication 2
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:28:53 -05:00
d3d9b600f9
AzQtApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:28:51 -05:00
975be6a480
MaterialEditor inheriting from ToolsApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com >
2021-07-13 19:28:49 -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
149863c527
Removed Amazon as Company for QSettings ( #1649 )
...
* Removed Amazon as Company for QSettings
Signed-off-by: Terry Michaels <miterenc@amazon.com >
2021-06-29 14:00:11 -05:00
104e24519c
ATOM-15861 fixed material editor screen capture and test scripts
2021-06-25 11:57:29 -05:00
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
2021-06-23 16:23:40 -07:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
5a276b11b0
Fixing includes
2021-06-21 16:56:06 -07:00
4de1d90994
[ATOM-15292] Camera no longer resets when typing something
2021-06-21 16:52:05 -07:00
7e231c8e36
LYN-4547 prepending O3DE to the material editor application name
2021-06-16 23:37:43 -05:00
1339d453fc
Adding PAL implementation for Linux
2021-06-09 13:21:59 -05:00
af42705bc9
Fixing linux build
2021-06-09 12:49:35 -05:00
6675d06b67
Fixing linux build
2021-06-09 12:32:55 -05:00
0fbeec7f17
Enabling linux compilation
2021-06-09 11:57:21 -05:00
e85b5a8c48
Fixing material editor startup and critical asset issues
...
Added builder and tool aliases
Added dependency to Atom Bridge
2021-06-09 00:35:31 -05:00
d67628d88c
ATOM-15701 changed material inspector highlight color
2021-06-07 18:23:40 -05:00
de4e6957e8
Made a bunch of display name and description updates to core material types.
...
- Renamed "Details" group to "Overview".
- Renamed "UV Names" group to "UV Sets".
- Renamed "General" group to "General Settings".
- Renamed "Parallax" group to "Displacement".
- Renamed "Texture Map" properties to just "Texture". In cases where a specific type of texture is mentioned like "roughness texture map" I called this "roughness map" (which is more common according to google).
- Renamed "Heightmap" to "Height map" (which is more common according to google).
ATOM-14002 [Material Editor] Revisit user facing organization and layout of material types
2021-05-28 13:38:56 -07:00
c2822a4063
ATOM-15649 sorting material types in create material dialog
2021-05-27 13:17:51 -05:00
d8b74110ff
Merge branch 'main' into transform-float-scale
2021-05-25 16:28:28 +01:00
5788c379bb
Merge pull request #890 from aws-lumberyard-dev/Atom/mnaumov/Atom-15538
...
[ATOM-15538] Material Editor camera zoom speed adjusts to model size
2021-05-24 21:51:33 -07:00
78451c5898
PR feedback
2021-05-24 17:34:04 -07:00
42c5801c52
Merge branch 'main' into transform-float-scale
2021-05-24 23:01:29 +01:00
26a1b96380
Merge pull request #888 from aws-lumberyard-dev/Atom/mnaumov/Atom-15463
...
[ATOM-15463] Adjusting combo box width
2021-05-24 12:03:37 -07:00
a05b131cc8
ATOM-15612 fix material editor crash when group doesn't exist
2021-05-24 10:39:55 -05:00
945f55378e
merge from main
2021-05-24 11:27:43 +01:00
6ee8c6daa5
[ATOM-15538] Material Editor camera zoom speed adjusts to model size
2021-05-21 20:34:42 -07:00
5c18c6ee47
Adjusting combo box width
2021-05-21 19:54:13 -07:00
Esteban Papp
Guthrie Adams
Dayo Lawal
Steve Pham
Dayo Lawal
Terry Michaels
guthadam
Qing Tao
mnaumov
Chris Santora
greerdv
AMZN-mnaumov