birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,451 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'c0acbe7bd4'
${ noResults }
Commit Graph

219 Commits (c0acbe7bd4cc17f1519efa9dee5a117c091d6be1)

Author SHA1 Message Date
chcurran 88121f3bb4 move JsonUtils to AzCore 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
 4 years ago
Guthrie Adams 8ebaf10840 AtomTools: added status message helper functions 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Esteban Papp e6b5342c07 Gems/Atom 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
pappeste 58f8b563d0 fix them all 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Guthrie Adams ae4ad7dcac fixed formatting 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
chcurran 5044204839 Move JsonUtils.h for support of SC serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Guthrie Adams 364ac51502 Removed errors from unimplemented status functions 
Updated shader management console trace messages
Renamed document rebuild function to reopen

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams 30fee96c43 Moved material editor document system buses and system components to atom tools framework 
Renamed document related buses and components to have generic names
Added a base document class with default implementation from which other application specific documents can be derived to work with the document system
Added document factory function registration to the document system request bus so that each application can specify the type of document it creates
Updated all comments and messaging to only refer to documents, not materials or material documents
Updated material editor and shader management console to conform to the new buses
This will provide a first pass of a common interface for a document management system that can be shared by multiple applications
Corrected status bar message copy and paste errors
Updated all test scripts to use the new buses

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams 98ba833c78 Merge branch 'development' into Atom/guthadam/atomtools_refactor_main 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams 2afd3b0959
Merge pull request #3052 from aws-lumberyard-dev/Atom/guthadam/atomtools_refactor_move_mainwindow_bus 
AtomTools: move main window bus reflection to atom tools
 4 years ago
Guthrie Adams fb1ee0f037 updated undo/redo messages 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams e0410385d5 AtomTools: fixing status bar messages 
fixed problems with status bar messages not appearing
added status bar messages to shader management console
got rid of central widget variable and moved layout to atom tools window base class

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams 3142367fa8 move main window bus reflection to atom tools 
update python scripts

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams f1e8d37b86 holding pen for refactor 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams c772529b05 Merge branch 'development' into lawalfua/atomToolsMainWindow 4 years ago
Guthrie Adams 1c181af94e fixing problems with document tab management 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams d6f08151cc removed unused headers and forwards 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams 782e8465a4 removed StatusBarWidget class references 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams 44a007547c minor reformatting and removed unused headers from ME/SMCApplication.* 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Dayo Lawal cb5e2c71ff Typo fix2 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 32ba658e5e Typo fix 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal e507236257 Addressing requests 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago
Dayo Lawal e8d685211b CreateMenu/CreateTabBar 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 602da53ebe Merging upstream 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal bf7512ebf4 Merge fix 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal f8c8181b0c Bug fix (updating WindowComponent) 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 259bc3f85e ATWindowNotificationBus and ATFactoryRequestBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Guthrie Adams b594132a47 using command line parameter instead of member 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
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>
 4 years ago
Dayo Lawal 4eacd076da Fixing ME and ATWindowNotificationBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago
Dayo Lawal 63ed78d267 status_bar 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 58ff2d8cab AtomToolsMainWindowRequestBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 8eb9205711 AtomToolsMainWindow 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Guthrie Adams b357cd0000
Merge pull request #2605 from aws-lumberyard-dev/Atom/guthadam/updating_atomtoolsappication_comments_and_formatting 
AtomToolsApplication minor comments/formatting
 4 years ago
Guthrie Adams 2237439a0e Material Editor: changing preset errors to warnings 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Guthrie Adams 4465b52de5 AtomToolsApplication minor comments/formatting 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
Dayo Lawal 3cd40b151e Merge remote-tracking branch 'upstream/development' into atomToolsApplication 4 years ago
pappeste 97f9ac870d Atom 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Dayo Lawal 4b0527c07f Moving comments 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 5cb001dffd More fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 06b3f7d964 Undoing adding reflect and adding target names to functions 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal e3083c7310 Reflect() fix 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 61038ccd03 Reflect() 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 4b97a416a3 GetCriticalAssetFilters() 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 7122f1b761 More refractoring 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 50f6ea8385 Using GetBuildTargetName() and other fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 4306b57230 More replacement with target name 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 78b07a0869 Fixing errors and streamlining more to base class 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal c1998d8d3c AtomToolsApplication working with SMC 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Dayo Lawal 002a4a4a21 AtomToolsApplication working with MatEditor 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 years ago
Esteban Papp 706233f72c Merge branch 'development' into cmake/SPEC-7179 4 years ago
Guthrie Adams 7cb2f62d4b
Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication 
Addition of a base AzQtToolsApplication class
 4 years ago
Dayo Lawal 0ffd151da6 Removing name setting in main.cpp for Atom tools 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 4 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
 4 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>
 4 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>
 4 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
guthadam d67628d88c ATOM-15701 changed material inspector highlight color 5 years ago
Chris Santora 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
 5 years ago
guthadam c2822a4063 ATOM-15649 sorting material types in create material dialog 5 years ago
greerdv d8b74110ff Merge branch 'main' into transform-float-scale 5 years ago
AMZN-mnaumov 5788c379bb
Merge pull request #890 from aws-lumberyard-dev/Atom/mnaumov/Atom-15538 
[ATOM-15538] Material Editor camera zoom speed adjusts to model size
 5 years ago
mnaumov 78451c5898 PR feedback 5 years ago
greerdv 42c5801c52 Merge branch 'main' into transform-float-scale 5 years ago
AMZN-mnaumov 26a1b96380
Merge pull request #888 from aws-lumberyard-dev/Atom/mnaumov/Atom-15463 
[ATOM-15463] Adjusting combo box width
 5 years ago
guthadam a05b131cc8 ATOM-15612 fix material editor crash when group doesn't exist 5 years ago
greerdv 945f55378e merge from main 5 years ago