birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,820 Commits 3 Branches 3 Tags
72f338a6897ff952ae0bfc564fc19fae072fbb1c
Commit Graph

382 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 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 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 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 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
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 2e733b4950 Merge branch 'development' into scripting/text_updates_pass3 2021-11-16 17:19:31 -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
Tommy Walton 8fe4e7f08f Merge commit '82c83b2c5a47514956576cd336888f4354ace6a6' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:54:50 -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
lsemp3d 34adac8dd9 Crash guards 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 15:21:18 -08:00
lsemp3d ca66c609aa Added user setting to change the Script Canvas node palette context menu 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 11:43:16 -08:00
lsemp3d ed05318059 Fixed fallback name for EBus methods, improved more names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 10:29:45 -08:00
lsemp3d 9adb968e7a Fixed EBus generation to pull the BC metadata, and a few text updates 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 10:05:59 -08:00
lsemp3d 56834361bc Fixed some missing node palette entries since display name was not populated yet 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 16:01:02 -08:00
lsemp3d 5072c2667f Fixed the application of translation overrides to free standing BehaviorProperty constants 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 15:45:55 -08:00
carlitosan d0cf18e778 remove test code artifact 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-11-12 14:56:27 -08:00
carlitosan c140b882d2 Fix mis-spelled comment 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-11-12 14:19:22 -08:00
lsemp3d 4fac65b600 Added missing forward declaration 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 14:02:43 -08:00
carlitosan 9898b6ee45 Move SC runtime asset static initialization out of data loading threads 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-11-12 13:47:30 -08:00
lsemp3d a0667f7ae8 Improved BehaviorProperty method text generation and updated some translations in the process 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 13:07:11 -08:00
lsemp3d abafd435ed Added C++ tooltip for custom nodes, updated text for AnimAudioComponentRequestBus 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 09:08:09 -08:00
lsemp3d 1463e72016 Updated Actor Animation nodes, fixed subtitles and improved tooltip information 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-11 18:31:02 -08:00
Luis Sempé b0e9313df0 Script Canvas added text generation for BehaviorContext properties (#5568) 
Added generation and navigation options for BehaviorProperty items
 2021-11-11 15:26:41 -08:00
Nicholas Van Sickle 2c2c1d8137 Merge pull request #5562 from aws-lumberyard-dev/nvsickle/StabToDevNov21 
Merge `stabilization/2110` as of `fac3d0b1bf` into `development`
 2021-11-11 15:04:18 -08:00
Luis Sempé 9e2a3226fd Script Canvas, replace the text replacement system to a JSON file based one (#5228) 
It is now possible to right click on nodes on the node palette to navigate to the file that holds the text data for any given node, this way it is easy to update and improve the naming of titles, subtitles, categories, tool tips and slots.
 2021-11-11 11:53:51 -08:00
lumberyard-employee-dm 5fc4551ac0 [LYN-8041] Enable relocation of the Project Game Release Layout (#5380) 
* Enable relocation of the Project Game Release Layout

Relocating the Project Game Release Layout to another directory on the file system failed due to the querying of the engine root failing due to the ComponentApplication::m_engineRoot not using the project path stored in the SettingsRegisry if the engine root cannot be detected

Removed the ApplicationRequestBus GetEngineRoot function.
The ComponentApplicationRequestBus has a function of the same name that returns the same path.

Removed the deprecated GetAppRoot function.
The path it returns has no defined value. It was not the engine root or the project root.
Removed unused CFileUtil and CFileUtil_impl functions that were invoking the ApplicationREquestBus GetEngineRoot function.
On the way to update the functions it was discovered that they aren't called

Added a CalculateBranchToken overload that can populate a fixed_string to avoid heap allocations

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Protect against an empty list of artifacts to remove when generating the
engine.pak

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-09 12:03:52 -06:00