birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,244 Commits 3 Branches 3 Tags
5d9a95577f9fe66074281dfd15a354dbc64ed8bf
Commit Graph

263 Commits

Author SHA1 Message Date
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 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 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
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 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
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 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
Chris Galvan 356e267fe5 Merge pull request #6035 from aws-lumberyard-dev/cgalvan/gitflow_211130_o3de 
Merged `stabilization/2110` to `development`
 2021-11-30 13:02:50 -06:00
Chris Galvan 554f67f899 Resolved conflict in Gems/LmbrCentral/Code/lmbrcentral_files.cmake 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-30 10:44:43 -06:00
lsemp3d 8e472a030b Added support for translating variables types in the variable manager 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-29 18:22:53 -08:00
carlitosan 5794fa6c9d non-handler static initialization for runtime assets is made recursive on dependencies 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-11-26 10:17:14 -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 30bcddc694 fixed unit testing code 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-23 23:57:03 -08:00
chcurran cdb858e8af Editor Script Component simplified and working 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-23 10:31:26 -08:00
chcurran 24b3167d48 EditorCOmponent build pipeline WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-22 20:34: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 1c9c268231 Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux 2021-11-22 11:03: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
Chris Galvan 68344f5a80 Updated Script Canvas component to use source handle property. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-19 14:58:01 -06: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 487e2fb5bb remove typo 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-18 13:31:00 -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
chcurran 0367a3297f fixed version explorer issue 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-17 12:17:45 -08:00
Tommy Walton f5537b4b47 Merge pull request #5675 from aws-lumberyard-dev/amzn-tommy/gitflow_211116_o3de2 
Merge stabilization/2110 as of c3dacb1 to development
 2021-11-17 11:26:41 -08:00
lsemp3d a623f04f46 Applied feedback from PR 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-17 07:52:46 -08:00
Tommy Walton 8fe4e7f08f Merge commit '82c83b2c5a47514956576cd336888f4354ace6a6' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:54:50 -08:00
lsemp3d 7a279019b7 Improved generation for node generics, updated text for many math nodes 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-16 11:07: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 5072c2667f Fixed the application of translation overrides to free standing BehaviorProperty constants 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 15:45:55 -08:00
carlitosan d0cf18e778 remove test code artifact 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-11-12 14:56:27 -08:00
carlitosan c140b882d2 Fix mis-spelled comment 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-11-12 14:19:22 -08:00
carlitosan 9898b6ee45 Move SC runtime asset static initialization out of data loading threads 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-11-12 13:47:30 -08:00
lsemp3d abafd435ed Added C++ tooltip for custom nodes, updated text for AnimAudioComponentRequestBus 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 09:08:09 -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
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 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 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 ea5eba6e3f add file state for graphs 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-04 15:58:19 -07:00
chcurran b635e112fc clean up open pipeline to render graph 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-03 19:15:44 -07:00
chcurran ad6dc8a3bd initial compile of detailed path of change to regular sc files 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-10-29 16:23:20 -07:00
chcurran 658da08495 Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 2021-10-18 12:55:21 -07:00
chcurran b7f6ebb708 Git MainWindow.cpp to point where it compiles, and reveals the radius of changes for everything to work without assets 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-10-18 11:56:14 -07:00