birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,227 Commits 3 Branches 3 Tags
bf42e3f02a935fca3fb63ebd65b68cfeb123b593
Commit Graph

175 Commits

Author SHA1 Message Date
Guthrie Adams 5900b9a55f Merge pull request #3314 from aws-lumberyard-dev/Atom/guthadam/atomtools_fix_multiple_app_instances 
AtomTools: fix multiple material editor processes launching
 2021-08-19 16:27:31 -05:00
Guthrie Adams dc6bfd8500 Merge pull request #3278 from aws-lumberyard-dev/Atom/guthadam/atomtools_wrapping_status_message_functions 
AtomTools: added status message helper functions
 2021-08-19 16:24:17 -05:00
Guthrie Adams 4b3ce6738f AtomTools: fix multiple material editor processes launching 
Atom tools launch or check for the existence of a local server in order to prevent multiple application processes from running. These checks were being done far too late, after initialization and asset processing, leaving time for multiple processes to start before the server or checks. Zombie processes could start and run indefinitely without user interaction because the event loop was being entered despite the request to exit the application early.

These changes launch the server and checks immediately after the application object is constructed and exit before any other work is done if the application will not be run.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-18 17:41:15 -05:00
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
 2021-08-17 12:10:46 -07:00
Guthrie Adams 8ebaf10840 AtomTools: added status message helper functions 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-17 14:04:26 -05:00
Esteban Papp e6b5342c07 Gems/Atom 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:28 -07:00
pappeste 58f8b563d0 fix them all 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:38:33 -07:00
Guthrie Adams ae4ad7dcac fixed formatting 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-16 18:29:16 -05:00
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>
 2021-08-13 00:19:43 -05:00
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>
 2021-08-12 22:11:18 -05:00
Guthrie Adams 5fd2d8e7ee updating comments 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-12 10:48:09 -05:00
Guthrie Adams 98ba833c78 Merge branch 'development' into Atom/guthadam/atomtools_refactor_main 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-12 09:46:11 -05:00
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
 2021-08-12 09:33:58 -05:00
Guthrie Adams fb1ee0f037 updated undo/redo messages 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-11 16:45:51 -05:00
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>
 2021-08-11 16:38:13 -05:00
Guthrie Adams 3142367fa8 move main window bus reflection to atom tools 
update python scripts

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-11 15:21:54 -05:00
Guthrie Adams f1e8d37b86 holding pen for refactor 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-11 14:55:28 -05:00
Guthrie Adams c772529b05 Merge branch 'development' into lawalfua/atomToolsMainWindow 2021-08-06 01:27:36 -05:00
Guthrie Adams 1c181af94e fixing problems with document tab management 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-05 22:36:43 -05:00
Guthrie Adams d6f08151cc removed unused headers and forwards 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-05 20:56:46 -05:00
Guthrie Adams 782e8465a4 removed StatusBarWidget class references 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-05 20:05:01 -05:00
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
Dayo Lawal 2ed07c2a6a delete MEWindowsRequestBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-02 23:09:28 -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