Commit Graph

105 Commits (0c6a838c6f994614db2e03aedbb153d775fac3b0)

Author SHA1 Message Date
Esteban Papp 0c6a838c6f fix warnigns after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@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 c95f491635
Merge pull request #3126 from aws-lumberyard-dev/Atom/guthadam/atomtools_restore_source_control_spam_filter
AtomTools: restoring log message filter to ignore source control spam
4 years ago
Esteban Papp 1d4c53a777 More fixes for Gems
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Guthrie Adams 5169e98826 Merge branch 'development' into Atom/guthadam/atomtools_refactor_document_system 4 years ago
Esteban Papp e9b4f48f71 more fixes, will merge fixes for w4245 and w4389
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Guthrie Adams 885357a6b5 AtomTools: restoring log message filter to ignore source control spam
Added message filter support to TraceLogger

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams 2fa9a831b3 AtomTools: prepend asterisk to denote modified document tabs
Appending is standard and preferred but the tabs elide from the end (instead of middle) and cut it off

Signed-off-by: Guthrie Adams <guthadam@amazon.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 7172c3231e Merge branch 'development' into Atom/guthadam/atomtools_refactor_main 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
moudgils c2b8542bbd
Support for refresh rate and sync interval (#2989)
* Add support for querying the refresh rate and sync interval
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 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 1c181af94e fixing problems with document tab management
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Dayo Lawal e507236257 Addressing requests
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
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
hultonha 1169c82b98
Make camera controller priority customizable (#2826)
* make 'should handle' logic customizable

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates to get priority function

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* minor comment tweak

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Dayo Lawal 259bc3f85e ATWindowNotificationBus and ATFactoryRequestBus
Signed-off-by: Dayo Lawal <lawalfua@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
hultonha 7393c86416 some formatting and naming changes after PR feedback
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
hultonha 71a299d739 minor comment grammar fix
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
hultonha 86758fda35 documentation pass for modular viewport camera controller
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Dayo Lawal 2ed07c2a6a delete MEWindowsRequestBus
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
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 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
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 485f6338ac CreateReflectionManager()
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 4baea40a75 Reflect() fix
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
hultonha 4268376587
Ensure camera system correctly consumes events when it is active (#2346)
* add typename for struct initializer

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix for ensuring while the camera is 'active', events are consumed and not propagated

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* refactor how we decide which priority to repsond to events to

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* also -> only

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Dayo Lawal ecc26a24a5 //! Comment added
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
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