birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,375 Commits 3 Branches 3 Tags
9c7a558ccb0597e6ffe014266b3ded0f9aa708d3
Commit Graph

131 Commits

Author SHA1 Message Date
carlitosan ae8f724124 Merge pull request #6394 from aws-lumberyard-dev/carlitosan-sc-redcode-asset 
redcoding asset handler, holder, tracker, memory asset
 2021-12-16 16:29:58 -08:00
carlitosan 671479c095 remove dev comment 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-14 19:05:43 -08:00
carlitosan 686f82666b disable test manager until the asset browsing is fixed 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-14 18:52:50 -08:00
carlitosan 81bb7aab80 the bloodbath compiles 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-14 17:32:22 -08:00
carlitosan 2271fa3dc6 redcode sc asset files bloodbath 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-14 15:09:46 -08:00
carlitosan e078eac379 redcode the asset itself WIP 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-14 14:17:06 -08:00
carlitosan c5d370723e redcoding asset handler, holder, tracker, memory asset 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 14:14:31 -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 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 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 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
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
Esteban Papp 799cc68de2 no message 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-03 11:38:49 -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
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
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 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
chcurran 8c308fc3da Clean up modifier asset handling. Fix file handling string error. 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-29 13:43:39 -08:00
chcurran 132d06b6da fixed unit tests bugs, removed commented out code, removed loading spam 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-24 18:55:11 -08:00
chcurran 205b2c27ee SC Editor serialization update in JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-22 16:04:49 -08:00
chcurran 04fe1d5243 File state change include external delete detection 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-22 11:03:37 -08:00
chcurran f1632b099c editor sc component switched over to source handle, not yet connected to file notifications 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-19 10:03:16 -08:00
chcurran 62878489a3 more aggressively release graph memory in version explorer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-18 10:41:46 -08:00
puvvadar f44a9e196c Merge commit '33abae100880cf835fd6feb53e3fc03af68d0961' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:50 -08:00
chcurran 0367a3297f fixed version explorer issue 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-17 12:17:45 -08:00
Chris Galvan 21c3aba7da Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-17 11:13:38 -06:00
chcurran 63f98e7dd9 isolate the loading problem during version explorer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-16 09:12:36 -08:00
chcurran 0e7d732c61 fix upgrade scanner 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-15 17:15:05 -08:00
lsemp3d ca66c609aa Added user setting to change the Script Canvas node palette context menu 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 11:43:16 -08:00
chcurran facfdf4e7a Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-11 16:07:18 -08:00
chcurran d9622e74ab make default names NOT the default name of a previously existing file 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-11 12:18:50 -08:00
Luis Sempé 9e2a3226fd Script Canvas, replace the text replacement system to a JSON file based one (#5228) 
It is now possible to right click on nodes on the node palette to navigate to the file that holds the text data for any given node, this way it is easy to update and improve the naming of titles, subtitles, categories, tool tips and slots.
 2021-11-11 11:53:51 -08:00
chcurran 737ed1b032 restore source file deleted behavior 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-11 10:36:55 -08:00
chcurran 47e9d5a117 multi tab close fixed 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-10 17:15:42 -08:00
chcurran eefc3f9a91 new source file close button works, but not on multiple tabs 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-10 16:40:33 -08:00
chcurran 0fa56ba5f8 new source file button works 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-10 15:39:17 -08:00
chcurran 98ecef2fd2 source file save-as 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-08 14:39:20 -08:00
chcurran a334ce09b4 source save in place first pass 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-08 13:58:48 -08:00
chcurran 837e9f6105 source save asset-free WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-08 10:00:45 -08:00