birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,873 Commits 3 Branches 3 Tags
625fca71ab6cf36674b5262bf32e60b216fb7ff2
Commit Graph

417 Commits

Author SHA1 Message Date
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
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
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
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
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
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
lsemp3d 99a706c2a5 Merge branch 'development' into scripting/text_updates_pass5 2021-11-22 12:24:00 -08:00
lsemp3d 5d09e8d42e Fixed generated property names, pull argument names from BC when available, auto-reload on asset change 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-22 12:22:38 -08:00
lsemp3d 20a2a79003 Updated more node names, no longer return data type string to control tooltip display in SC 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-22 10:58:09 -08:00
moraaar 5145fceedc Fix some compilation errors due to warnings of potentially returning unitialized variables. (#5796) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-11-22 09:57:42 +00:00
puvvadar 6eec6c8f8e Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de 
Merge stabilization/2110
 2021-11-19 15:46:16 -08:00
Luis Sempé 59819d1677 Merge pull request #5804 from aws-lumberyard-dev/scripting/text_updates_pass4 
Improved text generation to split up CamelCase names + updated more node names
 2021-11-19 13:23:41 -08:00
lsemp3d d9aa1ee5b4 Merge branch 'scripting/text_updates_pass4' into scripting/text_updates_pass5 2021-11-19 11:17:52 -08:00
lsemp3d 99d2605a81 Improved generation by splitting up CamelCase text for names, updated more node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-19 11:06:53 -08:00
lsemp3d efd4862b34 More node name updates 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-18 17:15:04 -08:00
lsemp3d 0ecfb1b557 Fixed file saving path for BehaviorClass generation + more node updates 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-18 16:23:55 -08:00
lsemp3d a0ca98238f Updated more node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-18 15:46:30 -08:00
lsemp3d c097c5755c Updated more node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-18 14:54:49 -08:00
lsemp3d bc388762af Updated more node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-18 14:37:40 -08:00
puvvadar f44a9e196c Merge commit '33abae100880cf835fd6feb53e3fc03af68d0961' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:50 -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
Chris Galvan 21c3aba7da Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-17 11:13:38 -06:00
lsemp3d 416b44333e Removed string copy per PR feedback 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-17 07:56:09 -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
lsemp3d ce86aa59d7 Updated animation node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-17 07:45:40 -08:00
lsemp3d 2e733b4950 Merge branch 'development' into scripting/text_updates_pass3 2021-11-16 17:19:31 -08:00
lsemp3d de544bf34a Updated the AWS node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-16 17:00:36 -08:00
lsemp3d fabf61688d Improved generation and look up for BehaviorProperty and updates AWS node names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-16 16:24:48 -08:00
lsemp3d f02d92e5d9 Updated node names & categories 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-16 14:00:32 -08:00
lsemp3d 3a7105fd4c Updated remaining math nodes' text 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-16 13:49:19 -08:00
Tommy Walton 8fe4e7f08f Merge commit '82c83b2c5a47514956576cd336888f4354ace6a6' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:54:50 -08:00
lsemp3d 5ed6d2f2f5 Updated more math related names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-16 12:00:46 -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
Luis Sempé 9cf49845a4 Merge pull request #5621 from aws-lumberyard-dev/scripting/expand_context_menu 
Added user option to define the size of the Script Canvas node palette context menu
 2021-11-16 09:19:41 -08:00