birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,956 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ba43efd3d2'
${ noResults }
Commit Graph

619 Commits (ba43efd3d2fc3099750192b916d7aa98b51d5f63)

Author SHA1 Message Date
Steve Pham 59e43813f0
GCC Support for Linux 
Updates and fixes to support GCC for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 4 years ago
Luis Sempé 891a13631e
Merge branch 'development' into chore/rename-Graph-EditorGraph-Match 4 years ago
carlitosan 56475f529c
Merge pull request #6911 from aws-lumberyard-dev/carlitosan-sc-bug-bash-4 
Make SC User data slots proper, immutable variable references
 4 years ago
carlitosan 295c836ed8 clean up comments, add set type action in disabled form 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 02ce4659c4 remove comment 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 1431afb51a remove a ability to change type on user added slots 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 22cee244c1 remove a ability to reset reference, do not display reference box on user added data slots 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 13d6451b6a update parser and unit tests to respect the new way slots are added to user function nodes 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 4e755cc258 Add variable, datum sanity for user added slots 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Alex Peterson 07e6b54ca5
Fix names display index and scripting dev gem (#6822) 
* Fix input/output params not being zero-based
* Expose missing Dump Database developer command
* Fix issue where developer gem name is not the same as the target
* Let the user specify folder to write to

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
nemerle 90ccae7243 Merge remote-tracking branch 'upstream/development' into compiletime_filerequest_code2 4 years ago
moraaar 57e4fb9b39
Fixed script canvas component asset not being found (#6727) 
Script canvas component has the member m_sourceData (that points to the script canvas asset) that internally has data, id and path. Path is serialized as the absolute path of the pc that is saving the level.

So when another pc loads the same level it cannot find the script canvas asset.

The function CompleteDescription takes a look at the id and takes the path from the asset catalog, but at the moment it's doing an early return because id and path are not empty (but path is the value serialized from other user saving the level).

By removing the early return condition then it it will resolve by using id, looking into the catalog and getting the real path.

This fix makes several physics automated tests that relied on script canvas to work.

Signed-off-by: moraaar moraaar@amazon.com
 4 years ago
nemerle f1f81c3789 Merge remote-tracking branch 'upstream/development' into compiletime_filerequest_code2 4 years ago
carlitosan 7f4fe67f77
Fix issues caused by SC editor component holding onto a live graph (#6734) 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan da0a10bb4c
fix for edit SC action in entity context menu (#6686) 
* on demand reflect az events when they are the return value of ebuses

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* fix crash and functionality for edit sc editor context menu action

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan c83bf11a3d
on demand reflect az events when they are the return value of ebuses (#6625) 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 6c986657b4
Fix for file-save-as-new and open asset (#6490) 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Michael Pollind 4f746fddac chore: Rename Graph to EditorGraph 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 4 years ago
Mike Balfour 92b0514b48 Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into mbalfour/gitflow_211220_stabilization_2111RTE 
# Conflicts:
#	Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp

Also fixed bad merge on ScripCanvas MainWindow.cpp

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 4 years ago
Mike Balfour 2c8a93fb9c Merge commit 'a2bb968371194a92bdd6e2841f73c85a79ce2a20' into mbalfour/gitflow_211220_stabilization_2111RTE 
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

# Conflicts:
#	Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
#	Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
#	Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp
#	Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.h
#	Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
#	Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerBus.h
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h
#	Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
#	Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
#	Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp
#	Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetHandler.h
#	Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.cpp
#	Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h
#	Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasFileHandling.h
#	Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h
#	Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
#	Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h
#	Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
#	Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Modifier.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Scanner.cpp
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
#	Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
 4 years ago
carlitosan c6eead4efa
remove uber build exceptions (#6466) 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 9c7a558ccb
basic refactor of assets (#6467) 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Nemerle d8e06d9d95 Apply reviewer suggestions 
Signed-off-by: Nemerle <nemerle5+git@gmail.com>
 4 years ago
carlitosan ae8f724124
Merge pull request #6394 from aws-lumberyard-dev/carlitosan-sc-redcode-asset 
redcoding asset handler, holder, tracker, memory asset
 4 years ago
carlitosan 73e0bdbe6e fix version deletion error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 1fdee48b6d fix Linux build error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 024c53ece3 untested fix for object stream version bug 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan e1c1adf2dc fix linux build error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 671479c095 remove dev comment 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 686f82666b disable test manager until the asset browsing is fixed 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan f2bbf41881 fix color background in editor 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 81bb7aab80 the bloodbath compiles 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 2271fa3dc6 redcode sc asset files bloodbath 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan e078eac379 redcode the asset itself WIP 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Luis Sempé 3ee7cef09e
Merge pull request #6306 from aws-lumberyard-dev/scripting/fix_slot_names 
Fixed incorrect condition that led to badly named slots
 4 years ago
carlitosan c5d370723e redcoding asset handler, holder, tracker, memory asset 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 0a1dc3c4bd Fix missing asset handler error on EditorSCComponent load from pre SourceHandle files 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 837e532ad7 fail safe for EditorScriptCanvasComponents saved before AZ::IO::Path got json support 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan a5b30ffc5a fix interpreted statics 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 9830925309 small fixes for SC play in editor and warnings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 0963bc0cc5 removed commented out include 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan dc538d94e5 update error window message and add AP launch request 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan cbc70b4b88 Add dialog window for messaging when SC assets fail to save 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan aeabf21bba clean up debug output settings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 0f07de7454 fix verbose setting 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan ac6c90cd2c pre-PR cleanup 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 169416c2f9 remove testing code 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan d284d908b9 Make version explorer wait on AP for dependent assets 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan d8e5315199 Use weak reference for undo state, as it is an entirely internal class 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan b9bbe233be Restore undo/redo 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 3e728d1183 fixed another string_view printf error caught by linux compiler 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan b10c679c33 fixed string_view printf error caught by linux compiler 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 4f00718a38 fix linux build error, change translation system errors to warnings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 07bf8fc755 fix linux build error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 0cc4c06213 remove uneeded files/comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran d31c6a2774 remove uneeded files/comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
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…
 4 years ago
nemerle 5ff65be314 This reduces non-unity build time by ~2% and build size by ~0.5%. 
This PR is a 'clean' version of #6199 updated to latest development

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 4 years ago
chcurran 87023cae47 finish last of pre-PR clean up, including saving over previsouly opened tabs 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 6421463df2 clean up WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 2c107c364f fix mismatched file name on modification 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran d8add36212 restore file save 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 499cdaae5e version upgrader in a presumed working story 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 55fa33cff4 Clean up modifier asset handling. Fix file handling string error. 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran c4ea3075cc fixed unit tests bugs, removed commented out code, removed loading spam 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 8357fa34e9 fixed unit testing code 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 27cc659ab9 Editor Script Component simplified and working 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 66e744785f EditorCOmponent build pipeline WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 23267fd862 SC Editor serialization update in JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 5db535d1dd Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux 4 years ago
chcurran d9f849b03e File state change include external delete detection 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Chris Galvan ca5424dd7b Fixed asset completer model for source handle picker. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
Chris Galvan b44541c440 Merge pull request #281 from aws-lumberyard-dev/cgalvan/SCSourceFilePicker 
Added property handler for SourceHandle type
 4 years ago
chcurran 805bd8ef56 fix graph tab selection: 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Chris Galvan 31304ee9b1 Fixed issue when clearing out source handle property. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
Chris Galvan c36d827fc5 Updated Script Canvas component to use source handle property. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
Chris Galvan befd84cf0b Added property handler for SourceHandle type. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
chcurran ad8cfa5f99 editor sc component switched over to source handle, not yet connected to file notifications 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran b772db5e73 remove typo 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 727d1b3815 more aggressively release graph memory in version explorer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 4342501804 fixed unit test running system 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran f8fdf4b306 fixed version explorer issue 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 4484b69036 isolate the loading problem during version explorer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 015185f9d6 fix upgrade scanner 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran e34c6e55df fix scoped compile error 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran b7d8c1a644 make default names NOT the default name of a previously existing file 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 921f675df2 restore source file deleted behavior 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran d8e8cdba60 multi tab close fixed 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 5558be2aeb new source file close button works, but not on multiple tabs 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 6c1d1dc2e2 new source file button works 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 65814e65cc source file save-as 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 5cd8eb648c source save in place first pass 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 1ea245e46c source save asset-free WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran d40b9fc809 add file state for graphs 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 20147ddafb it renders! 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran cbbd6df0c5 clean up open pipeline to render graph 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran bc342df6b4 initial compile of detailed path of change to regular sc files 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran c5cd854172 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>
 4 years ago
chcurran 31c627defc initial scriptcanvas source handle 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
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
 4 years ago