birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,122 Commits 3 Branches 3 Tags
development
Commit Graph

623 Commits

Author SHA1 Message Date
carlitosan 850d36130e update error window message and add AP launch request 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-11-30 15:02:06 -08:00
carlitosan a5a42e3268 Add dialog window for messaging when SC assets fail to save 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-11-30 14:05:31 -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 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
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
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
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
chcurran 1c9c268231 Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux 2021-11-22 11:03:49 -08:00
chcurran 04fe1d5243 File state change include external delete detection 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-22 11:03:37 -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
Chris Galvan 1937e1ea51 Fixed asset completer model for source handle picker. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-19 16:20:54 -06: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
Chris Galvan 9ec4b408fd Merge pull request #281 from aws-lumberyard-dev/cgalvan/SCSourceFilePicker 
Added property handler for SourceHandle type
 2021-11-19 15:23:41 -06:00
Chris Galvan 6af6a9d70a Fixed issue when clearing out source handle property. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-19 15:03:49 -06:00
Chris Galvan 68344f5a80 Updated Script Canvas component to use source handle property. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-19 14:58:01 -06:00
Chris Galvan 6e14713ea6 Added property handler for SourceHandle type. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-19 14:52:45 -06:00
chcurran 7aec710cff fix graph tab selection: 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-19 12:22:12 -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
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>
 2021-11-19 10:03:16 -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
chcurran 487e2fb5bb remove typo 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-18 13:31:00 -08:00
chcurran 62878489a3 more aggressively release graph memory in version explorer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-18 10:41:46 -08:00
puvvadar f44a9e196c Merge commit '33abae100880cf835fd6feb53e3fc03af68d0961' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:50 -08:00
chcurran 5b9896d2c4 fixed unit test running system 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-17 13:47:51 -08:00
chcurran 0367a3297f fixed version explorer issue 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-11-17 12:17:45 -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 2e733b4950 Merge branch 'development' into scripting/text_updates_pass3 2021-11-16 17:19:31 -08:00