214700a73e
Finish repair for scanning for upgrade tool
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-24 17:38:34 -07:00
4545e2fb33
Improved layout and behavior of the SlotTypeSelector widget
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-24 16:27:55 -07:00
26f6a714c8
initial fix for version scan
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-24 15:14:20 -07:00
5e04c3737f
Add preliminary budget tracking system and remove driller integration
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-24 15:07:29 -06:00
d91dbe3d92
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-24 11:49:35 -07:00
5361cf3b26
Merge branch 'development' into cmake/win_fix_wnew
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-24 11:49:07 -07:00
4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development
...
JSON serialization of SC Editor Assets
2021-08-24 11:45:18 -07:00
5ca84cb07e
Merge branch 'development' into cmake/win_fix_wnew
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Legacy/CryCommon/Cry_Camera.h
# Code/Legacy/CryCommon/IShader.h
2021-08-24 10:46:18 -07:00
9c7b55a31d
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
# Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
# Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
# Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
2021-08-24 10:43:48 -07:00
a901a41b3a
Merge branch 'development' into cmake/remove_align_macros
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-24 08:27:07 -07:00
794c22c02e
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-23 16:02:58 -07:00
13188f8958
Simplify codegen of baseclass
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-23 15:56:45 -07:00
6ab776a3a6
Merge pull request #3354 from aws-lumberyard-dev/scripting/autogenfixes
...
Fixed categories not being properly applied for Nodeables & removed old code generator tags
> LG, I guess old NodeableCodegen definitions have all been migrated to new xml format file?
correct
2021-08-23 15:09:57 -07:00
95a812b238
fixup codegen, remove android errors
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-23 15:07:42 -07:00
31addc43dc
Windows and Linux compiling
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 14:02:45 -07:00
23f99aeb94
more gems changes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 13:03:37 -07:00
53dfb1a39e
remove unnecessary ALIGN macros
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 20:36:11 -07:00
d7d2e84fee
Added all the missing serializer support, fixed up serialization notification
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-20 19:35:38 -07:00
2e228d94f0
push/pop mismatch
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 18:39:40 -07:00
323d642e65
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 18:01:54 -07:00
b96b99363c
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:35 -07:00
ea2f74dc0f
more fixes for Gems
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:12 -07:00
fd97a7688c
Added missing reflection tag
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-19 17:02:39 -07:00
15af7e692e
Removed old codegen tags and documented the only required Nodeable preprocessor definition
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-19 16:38:19 -07:00
62a0041245
enable warning 4296: 'operator': expression is always false
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-19 16:16:28 -07:00
ec7b76c1e9
Fixed typo in previous commit
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-19 15:14:52 -07:00
f8e99cd7dd
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
# Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-19 08:53:41 -07:00
cf44a4ad67
Address additional PR feedback
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 19:16:05 -06:00
98f9f9ecbb
Fixed category attribute application on NodeableNodes
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-18 17:37:03 -07:00
a5f072f7a9
Remove statistics profiler
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:10 -06:00
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:09 -06:00
7814d7679c
Merge pull request #3127 from aws-lumberyard-dev/scriptcanvas/codegenfix_namespace
...
Completed namespace support for the ScriptCanvasGrammar template
2021-08-18 14:40:37 -07:00
c701522adc
update error messaging, remove unnecessary comments
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-18 13:28:01 -07:00
ca8a148b63
fix Linux compile error
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-18 12:16:39 -07:00
b813f2fbf4
add compiler flag for object stream support of SC editor assets
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-18 10:56:02 -07:00
1ad182105b
fix memory leak and possible nullptr read
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-17 16:40:48 -07:00
de9e991ccc
merge development
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-17 15:37:30 -07:00
778ebc39a2
add listener to cmake files
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-17 14:07:13 -07:00
88121f3bb4
move JsonUtils to AzCore
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-17 14:06:24 -07:00
0270fb7fbe
Initial saving/loading of JSON serialization of sc editor assets
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-17 13:47:20 -07:00
f22d2d736b
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:42:46 -07:00
14e7754334
More fixes for warnings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:42:09 -07:00
67a5bc98ce
ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:40:53 -07:00
e9b4f48f71
more fixes, will merge fixes for w4245 and w4389
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:06:22 -07:00
3522f622f3
more castings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:06:20 -07:00
f914f7680a
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:05:37 -07:00
b52516cdec
ScripCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:05:21 -07:00
88bef1074b
Replaced some Lumberyard references with O3DE.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-16 15:43:01 -05:00
9ecb746563
Completed namespace support for the ScriptCanvasGrammar template
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-14 16:50:57 -07:00
5044204839
Move JsonUtils.h for support of SC serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-13 21:53:20 -07:00
chcurran
lsemp3d
Jeremy Ong
Esteban Papp
pappeste
Chris Galvan