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

477 Commits

Author SHA1 Message Date
carlitosan d4206270a6 Use weak reference for undo state, as it is an entirely internal class 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 13:37:29 -08:00
carlitosan 15e26b7515 merge development 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 12:21:45 -08:00
carlitosan a76e9bba69 Restore undo/redo 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 12:12:46 -08:00
Luis Sempé 9db83814f2 Merge pull request #6045 from aws-lumberyard-dev/scripting/fix_translation_reload 
If the asset catalog gets reloaded, clear the translation to avoid du…
 2021-12-03 07:36:54 -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
lsemp3d 88b6e52248 Fixed support for AZEvent name generation 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-12-02 16:43:21 -08:00
carlitosan 37ae47dda1 fix linux build error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 16:02:29 -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 1005ec9700 remove uneeded files/comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 13:18:16 -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 a9b1b02b92 fix mismatched file name on modification 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-01 23:55:11 -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
lsemp3d eedbf77e3d Updated node format to account for duplicated slot names + regenerated node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-12-01 11:24:17 -08:00
lsemp3d 8ebfe4004e Disambiguate setters and getters with the same name + updates to fix duplicates 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-30 17:37:56 -08:00
lsemp3d 3ee528042f Removed duplicated file #2 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-30 16:24:15 -08:00
lsemp3d a133dff451 Removed duplicated file 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-30 16:02:40 -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 aab6e33d30 Non unity build fix 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-30 08:41:27 -08:00
lsemp3d 066178d7b9 PR feedback 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-30 06:35:44 -08:00
lsemp3d 8ce3dc846c Missing include 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-30 06:34:41 -08: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
lsemp3d 612ca4f66a PR feedback 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-29 14:18:37 -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
amzn-sj ba732480d0 Remove LyShineExample Gem's dependency on LmbrCentral and address feedback from previous PR with similar fix for ScriptCanvas 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-11-29 12:41:33 -08:00
lsemp3d 13361b220e Updated GameLift names, improved Getter/Setter generation 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-29 10:40:07 -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
amzn-sj 34542337b9 Remove dependency of ScriptCanvasPhysics on ScriptCanvas gem to fix runtime dependency conflict 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-11-24 22:34:04 -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
lsemp3d 67d38a5bea A few more updtes and a fallback category for items in the Other field 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-24 09:18:03 -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
lsemp3d 02e4950fde Few category fixes 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-23 13:32:34 -08:00
lsemp3d 57a6930842 Categorized most nodes and improved names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-23 13:30:14 -08:00
lsemp3d a05fb749c4 Updated input node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-23 13:04:01 -08:00
lsemp3d 3b9d5a7250 More updates and a fix for parameter and result name generation 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-23 12:56:29 -08:00
lsemp3d d30ac7cfa6 Updated all names files to use 'base' instead of 'key' to avoid validation issues 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-23 10:36:34 -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
lsemp3d 2da3ab42fd Renamed 'key' to 'base' to avoid future problems with secrets patterns, cleanup and improvements 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-23 08:50:41 -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
lsemp3d 9e6e83ff7f First pass at rendering node name generation 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-22 17:21:19 -08:00
lsemp3d 42c9395554 Updated more categories and names for constants 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-22 17:16:28 -08:00
lsemp3d eb402ee361 Improved categories and names for constants 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-22 17:01:18 -08:00
lsemp3d b6ce643a74 Categorized all constants 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-22 16:30:09 -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
lsemp3d 99a706c2a5 Merge branch 'development' into scripting/text_updates_pass5 2021-11-22 12:24:00 -08:00