birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,377 Commits 3 Branches 3 Tags
f94043dc83fb832b7e20fd4c8db69e2ea04ef993
Commit Graph

223 Commits

Author SHA1 Message Date
carlitosan 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
Esteban Papp 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
chcurran 794c22c02e merge latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-23 16:02:58 -07:00
chcurran 13188f8958 Simplify codegen of baseclass 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-23 15:56:45 -07:00
Luis Sempé 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
chcurran 95a812b238 fixup codegen, remove android errors 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-23 15:07:42 -07:00
Esteban Papp 53dfb1a39e remove unnecessary ALIGN macros 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 20:36:11 -07:00
chcurran 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
lsemp3d fd97a7688c Added missing reflection tag 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-08-19 17:02:39 -07:00
lsemp3d 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
Esteban Papp 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
lsemp3d ec7b76c1e9 Fixed typo in previous commit 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-08-19 15:14:52 -07:00
Esteban Papp 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
Jeremy Ong cf44a4ad67 Address additional PR feedback 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-18 19:16:05 -06:00
lsemp3d 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
Jeremy Ong a5f072f7a9 Remove statistics profiler 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-18 17:33:10 -06:00
Jeremy Ong 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
Luis Sempé 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
chcurran 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
chcurran ca8a148b63 fix Linux compile error 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-18 12:16:39 -07:00
chcurran 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
chcurran 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
chcurran de9e991ccc merge development 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-17 15:37:30 -07:00
chcurran 778ebc39a2 add listener to cmake files 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-17 14:07:13 -07:00
chcurran 88121f3bb4 move JsonUtils to AzCore 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-17 14:06:24 -07:00
chcurran 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
Esteban Papp f22d2d736b Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:46 -07:00
Esteban Papp 14e7754334 More fixes for warnings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:09 -07:00
pappeste 67a5bc98ce ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:40:53 -07:00
Esteban Papp 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
Esteban Papp 3522f622f3 more castings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:06:20 -07:00
Esteban Papp f914f7680a Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:37 -07:00
pappeste b52516cdec ScripCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:21 -07:00
Chris Galvan 88bef1074b Replaced some Lumberyard references with O3DE. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-16 15:43:01 -05:00
lsemp3d 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
chcurran 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 a56be14677 JSON saving of SC editor assets 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-13 17:25:01 -07:00
carlitosan 8c21c85972 Merge pull request #3028 from aws-lumberyard-dev/carlitosan/development 
Addes JSON serialization support for properties stored in the EditorScriptCanvasComponent. Add tool tips to explain repeater node behavior, remove empty "User Functions" and "Script Event" headings from Editor.
 2021-08-12 12:38:40 -07:00
chcurran fe21b89d8e working support for editor property json serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-12 10:24:16 -07:00
chcurran d2c87fd21f initial json serialization for editor sc properties 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-11 17:30:16 -07:00
lsemp3d 2b4bd10028 Updated path to icon that was emitting a warning 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-08-11 17:08:09 -07:00
chcurran 584c125fbc rename serializer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-11 15:11:20 -07:00
chcurran 3374b82360 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-08-11 14:48:24 -07:00
chcurran aaa847a569 Remove empty User Functions and Script Event sections 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-11 14:40:34 -07:00
Artur K 4cee263033 Minimal TypeInfo header/reduce std interdependencies. (#2688) 
* Minimal TypeInfo header/reduce std interdependencies.

TypeInfoSimple.h is a small header that can replace the use of
TypeInfo.h in some cases.

Signed-off-by: Nemerle <nemerle5+git@gmail.com>

* Windows build fixed

Removed algorithm.h from string_view.h

smoke-test passed

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Resotore dynamic_pointer_cast in intrusive_ptr

Requested by reviewer.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix CI build

string.h - missed alogorithm.h, since it was removed from string_view
NodeWrapper.h - missing smart_ptr.h

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: Nemerle <nemerle5+git@gmail.com>
 2021-08-10 19:07:01 -05:00
chcurran c0ed0a7925 Added more tool tip data to repeater. 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-10 16:59:21 -07:00
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-05 14:57:24 -07:00
lsemp3d 2c96556576 Removed unnecessary argument in node generic macro 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-08-04 08:47:37 -07:00
lsemp3d 1f0fcf2aa2 Updates GetDirectionVector nodes to also return the distance between the points 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-08-04 08:42:26 -07:00
lsemp3d 20515c46be Updated DirectionTo node's tooltips to match the translation file 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-08-04 08:20:41 -07:00