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
|
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 |
Michael Pollind
|
4f746fddac
|
chore: Rename Graph to EditorGraph
Signed-off-by: Michael Pollind <mpollind@gmail.com>
|
4 years ago |
carlitosan
|
9c7a558ccb
|
basic refactor of assets (#6467)
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 |
carlitosan
|
5d9a95577f
|
Merge pull request #6294 from aws-lumberyard-dev/carlitosan-sc-save-crash-dialog
Fix dependency static initialization and error message
|
4 years ago |
carlitosan
|
48ca34eb9f
|
Merge pull request #6267 from aws-lumberyard-dev/sc-editor-asset-redux
Make version explorer wait on AP for dependent assets
|
4 years ago |
carlitosan
|
7087565149
|
fix interpreted statics
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
carlitosan
|
5e60ef743a
|
merge latest
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
carlitosan
|
766de68199
|
small fixes for SC play in editor and warnings
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
carlitosan
|
1d0e2e6379
|
clean up debug output settings
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
carlitosan
|
64d21c9448
|
Make version explorer wait on AP for dependent assets
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
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
|
4 years ago |
Esteban Papp
|
cd5306febf
|
Merging from development
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
Esteban Papp
|
7817ed76bf
|
Removes FileIOEventBus
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
carlitosan
|
6bd0308339
|
Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
Esteban Papp
|
59ef6f983f
|
Removes Driller from ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
chcurran
|
ca771f3adc
|
version upgrader in a presumed working story
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
Chris Galvan
|
356e267fe5
|
Merge pull request #6035 from aws-lumberyard-dev/cgalvan/gitflow_211130_o3de
Merged `stabilization/2110` to `development`
|
4 years ago |
Chris Galvan
|
554f67f899
|
Resolved conflict in Gems/LmbrCentral/Code/lmbrcentral_files.cmake
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
|
4 years ago |
lsemp3d
|
8e472a030b
|
Added support for translating variables types in the variable manager
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
|
4 years ago |
carlitosan
|
5794fa6c9d
|
non-handler static initialization for runtime assets is made recursive on dependencies
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
chcurran
|
132d06b6da
|
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
|
30bcddc694
|
fixed unit testing code
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
chcurran
|
cdb858e8af
|
Editor Script Component simplified and working
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
chcurran
|
24b3167d48
|
EditorCOmponent build pipeline WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
chcurran
|
205b2c27ee
|
SC Editor serialization update in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
chcurran
|
1c9c268231
|
Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux
|
4 years ago |
chcurran
|
04fe1d5243
|
File state change include external delete detection
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
Chris Galvan
|
68344f5a80
|
Updated Script Canvas component to use source handle property.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
|
4 years ago |
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>
|
4 years ago |
chcurran
|
487e2fb5bb
|
remove typo
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
chcurran
|
62878489a3
|
more aggressively release graph memory in version explorer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
chcurran
|
0367a3297f
|
fixed version explorer issue
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
Tommy Walton
|
f5537b4b47
|
Merge pull request #5675 from aws-lumberyard-dev/amzn-tommy/gitflow_211116_o3de2
Merge stabilization/2110 as of c3dacb1 to development
|
4 years ago |
lsemp3d
|
a623f04f46
|
Applied feedback from PR
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
|
4 years ago |
Tommy Walton
|
8fe4e7f08f
|
Merge commit '82c83b2c5a47514956576cd336888f4354ace6a6' into amzn-tommy/gitflow_211116_o3de2
|
4 years ago |
lsemp3d
|
7a279019b7
|
Improved generation for node generics, updated text for many math nodes
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
|
4 years ago |
chcurran
|
0e7d732c61
|
fix upgrade scanner
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
lsemp3d
|
5072c2667f
|
Fixed the application of translation overrides to free standing BehaviorProperty constants
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
|
4 years ago |
carlitosan
|
d0cf18e778
|
remove test code artifact
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
carlitosan
|
c140b882d2
|
Fix mis-spelled comment
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
carlitosan
|
9898b6ee45
|
Move SC runtime asset static initialization out of data loading threads
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
lsemp3d
|
abafd435ed
|
Added C++ tooltip for custom nodes, updated text for AnimAudioComponentRequestBus
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
|
4 years ago |
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>
|
4 years ago |