birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,095 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 '999fb76163'
${ noResults }
Commit Graph

286 Commits (999fb761630d0f43d4b35525234631c74b5805df)

Author SHA1 Message Date
lsemp3d b12d696522 Fixed ambiguous translation key when a property and a method share the same name 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 1a8fdd9c84 Script Canvas: Added take screenshot button to toolbar 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
Esteban Papp 6fad254b59 Merge branch 'development' into optimization/unused_files 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/IEditorImpl.cpp
#	Code/Editor/IEditorImpl.h
#	Gems/LmbrCentral/Code/Tests/lmbrcentral_editor_tests_files.cmake
 4 years ago
Chris Galvan 8d0dce2613
Merge pull request #7101 from siretty/fix_build_linux_clang_13 
Fix Build on Linux with Clang 13 with Debug, Profile and Release Configuration
 4 years ago
Chris Galvan 71640c1c82
Merge pull request #6376 from nemerle/compiletime_filerequest_code2 
Compile time reduction - FileRequest & related changes
 4 years ago
Daniel Edwards 0a5f472f43 Clang 13: Fix build errors ... 
... due to local variables only being written to (but never read).

Signed-off-by: Daniel Edwards <dev@danieledwards.de>
 4 years ago
lsemp3d d5f7bc7c9b Consolidated navigation to file code 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d be2241bda9 Navigate to file after generating translation (only 1) 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
Esteban Papp 2174f522cb Removes MainWindowBus.h from Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 9d95ad4a2a Removes CreateNodeContextMenu.cpp/h from Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 5c557f56a3 Removes LoggingAssetDataAggregator/LoggingAssetWindowSession from Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp d858c16831 Removes LoggingTypes.cpp from Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 4015ffd073 Removes WidgetBus.h from Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 3db71950e8 Removes NewGraphDialog from Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Luis Sempé 891a13631e
Merge branch 'development' into chore/rename-Graph-EditorGraph-Match 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 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 4e755cc258 Add variable, datum sanity for user added slots 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 4 years ago
nemerle f1f81c3789 Merge remote-tracking branch 'upstream/development' into compiletime_filerequest_code2 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 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 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 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
carlitosan c5d370723e redcoding asset handler, holder, tracker, memory asset 
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 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 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 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 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