Commit Graph

471 Commits

Author SHA1 Message Date
Luis Sempé 3ee7cef09e Merge pull request #6306 from aws-lumberyard-dev/scripting/fix_slot_names
Fixed incorrect condition that led to badly named slots
2021-12-14 11:27:15 -08:00
Luis Sempé 713cd4337c Merge pull request #6263 from aws-lumberyard-dev/scripting/enable_minimap
Enabled the Script Canvas Minimap. It will be tested and any performa…
2021-12-13 07:49:45 -08:00
carlitosan 63f8be12d5 Merge pull request #6322 from aws-lumberyard-dev/carlitosan-sc-bug-fix
Fix missing asset handler error in AP when loading old SC files
2021-12-10 09:46:42 -08:00
Artur K 53b88d4752 Preapre codebase for FileRequest compiletime improvements (#6192)
* Preapre codebase for FileRequest compiletime improvements

This is preparing grounds for the next PR that will contain the 'meat'
of the changes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove spurious newline.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-12-10 13:08:24 +00:00
carlitosan 21e7d1db67 Fix missing asset handler error on EditorSCComponent load from pre SourceHandle files
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-09 18:58:47 -08:00
carlitosan 3f128c5baa Merge branch 'development' of https://github.com/o3de/o3de into carlitosan-sc-bug-fix 2021-12-09 13:18:45 -08:00
lsemp3d c563b54277 Fixed incorrect condition that led to badly named slots
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-12-09 13:04:15 -08:00
carlitosan 5d9a95577f Merge pull request #6294 from aws-lumberyard-dev/carlitosan-sc-save-crash-dialog
Fix dependency static initialization and error message
2021-12-09 11:44:42 -08:00
carlitosan 72d00dd94c fail safe for EditorScriptCanvasComponents saved before AZ::IO::Path got json support
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-09 11:43:36 -08:00
carlitosan 48ca34eb9f Merge pull request #6267 from aws-lumberyard-dev/sc-editor-asset-redux
Make version explorer wait on AP for dependent assets
2021-12-09 09:49:58 -08:00
carlitosan 7087565149 fix interpreted statics
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-08 23:23:03 -08:00
carlitosan 5e60ef743a merge latest
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-08 23:01:23 -08:00
carlitosan 766de68199 small fixes for SC play in editor and warnings
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-08 22:54:21 -08:00
carlitosan 1d0e2e6379 clean up debug output settings
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-08 18:52:24 -08:00
carlitosan f551cb2345 fix verbose setting
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-08 17:44:01 -08:00
carlitosan c3bd48b10e pre-PR cleanup
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-08 17:32:57 -08:00
carlitosan edd1fe9a05 remove testing code
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-08 16:31:08 -08:00
carlitosan 64d21c9448 Make version explorer wait on AP for dependent assets
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-08 16:11:38 -08:00
lsemp3d a6b2e2cabd Enabled the Script Canvas Minimap. It will be tested and any performance concerns will be addressed
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-12-08 13:59:57 -08:00
amzn-sj 47bd6fc4d4 [Mac] Format string specifier for size_t should be %zu (#6237)
Fixes this build error: error: format specifies type 'int' but the argument has type 'size_t' (aka 'unsigned long') [-Werror,-Wformat]

Signed-off-by: amzn-sj srikkant@amazon.com
2021-12-08 08:34:34 -08:00
Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/azcore_files.cmake
#	Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif
2021-12-07 13:31:55 -08:00
Esteban Papp cd5306febf Merging from development
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-07 12:35:41 -08:00
carlitosan d4206270a6 Use weak reference for undo state, as it is an entirely internal class
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-06 13:37:29 -08:00
carlitosan 15e26b7515 merge development
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-06 12:21:45 -08:00
carlitosan a76e9bba69 Restore undo/redo
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-06 12:12:46 -08:00
Esteban Papp 03adf700fe Merge branch 'development' into redcode/driller_removal
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-03 13:35:16 -08:00
Esteban Papp 799cc68de2 no message
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-03 11:38:49 -08:00
Luis Sempé 9db83814f2 Merge pull request #6045 from aws-lumberyard-dev/scripting/fix_translation_reload
If the asset catalog gets reloaded, clear the translation to avoid du…
2021-12-03 07:36:54 -08:00
carlitosan c218fd9b77 fixed another string_view printf error caught by linux compiler
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-02 20:17:36 -08:00
carlitosan f7547a4cbd fixed string_view printf error caught by linux compiler
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-02 19:55:27 -08:00
carlitosan db798bdbc7 fix linux build error, change translation system errors to warnings
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-02 18:18:06 -08:00
Esteban Papp 7817ed76bf Removes FileIOEventBus
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-02 18:08:45 -08:00
lsemp3d 88b6e52248 Fixed support for AZEvent name generation
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-12-02 16:43:21 -08:00
carlitosan b70545ad94 ScriptCanvas --> Script Canvas in comments
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-02 16:07:50 -08:00
carlitosan 37ae47dda1 fix linux build error
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-02 16:02:29 -08:00
carlitosan 6bd0308339 Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-02 14:17:35 -08:00
Esteban Papp 59ef6f983f Removes Driller from ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-02 13:55:00 -08:00
chcurran 1005ec9700 remove uneeded files/comments
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-02 13:18:16 -08:00
chcurran 7dc03485b6 remove uneeded files/comments
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-02 13:18:14 -08:00
chcurran 5a0ab6814d finish last of pre-PR clean up, including saving over previsouly opened tabs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-02 09:17:05 -08:00
chcurran 5da820a8c2 clean up WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-02 00:25:50 -08:00
chcurran a9b1b02b92 fix mismatched file name on modification
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-01 23:55:11 -08:00
chcurran 6fb284ff0a restore file save
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-01 23:04:07 -08:00
chcurran ca771f3adc version upgrader in a presumed working story
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-12-01 22:18:32 -08:00
lsemp3d eedbf77e3d Updated node format to account for duplicated slot names + regenerated node names
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-12-01 11:24:17 -08:00
lsemp3d 8ebfe4004e Disambiguate setters and getters with the same name + updates to fix duplicates
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-11-30 17:37:56 -08:00
carlitosan a359244c51 add pane close to system tick bus
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-11-30 17:18:27 -08:00
carlitosan 9e725da597 removed commented out include
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-11-30 15:30:42 -08:00
carlitosan 850d36130e update error window message and add AP launch request
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-11-30 15:02:06 -08:00
carlitosan a5a42e3268 Add dialog window for messaging when SC assets fail to save
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-11-30 14:05:31 -08:00