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

200 Commits

Author SHA1 Message Date
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
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
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
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
lsemp3d 6188df4b49 Added Get Direction Vector node for Vector2,3 and 4 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-08-03 15:36:56 -07:00
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-02 18:03:04 -07:00
chcurran 893a80a54e Fix variables names in the property window 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-30 11:37:40 -07:00
chcurran 3633bf2ed0 remove accidental submission of commented out event handling 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-30 10:07:23 -07:00
chcurran 0313b16a85 display unused variables in the editor; bump builder version for recent change to EntityId nodes 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-30 09:50:54 -07:00
carlitosan 41421d82fc Merge pull request #2589 from aws-lumberyard-dev/carlitosan/development 
fix dangling component variables on cleared script, fix EntityIDNode …
 2021-07-29 10:46:52 -07:00
chcurran 43dfffa3fd fix dangling component variables on cleared script, fix EntityIDNode reflection 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-28 20:58:49 -07:00
carlitosan 9475d1612b Merge branch 'development' into carlitosan_fix_for 2021-07-28 19:10:59 -07:00
chcurran d7a4b0d930 fix for double asset registration and multiple outs from loop nodes 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-28 16:51:25 -07:00
pappeste e3344bdf8d ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-27 19:31:25 -07:00
chcurran 055915ec4f merge from latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-27 15:51:35 -07:00
carlitosan 1e3c55246a Merge pull request #2490 from aws-lumberyard-dev/carlitosan/fix_null_check 
remove null data check from connected slots
 2021-07-27 12:49:15 -07:00
chcurran 76a3195487 remove null data check from connected slots 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-27 10:52:22 -07:00
chcurran 223654c41b Add fix and unit tests for pure on graph start functions and direct entity id input 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-26 17:51:10 -07:00
chcurran b8300c6248 fix entity reference removal when not in a variable 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-26 16:02:17 -07:00
chcurran 3ad8f0dbf9 adjust location of disabling SC unit tests on Linux 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-26 13:20:08 -07:00
chcurran 6f07a0b136 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-07-26 11:32:12 -07:00
chcurran a87318c52a temporarily disable SC unit tests on Linux until a file case issue is solved 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-26 11:31:34 -07:00
lsemp3d 9a4a7bc156 Script Canvas: Fixed Scope and Initial Value selection boxes 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-07-22 17:19:29 -07:00
sphrose 9639003a7d LYN-4774 Fix missing box icons inside the main Viewport (#2297) 
* LYN-4774 Fix missing box icons inside the main Viewport

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* V2 icons

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Bug fixes

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-07-21 16:33:04 -07:00
Luis Sempé eb24edbce7 Merge pull request #2304 from aws-lumberyard-dev/scripting/contract_crash_fix 
Crash guard when the data has a list with an empty contract
 2021-07-21 14:48:24 -07:00
lsemp3d 6c4fdd3af5 Missing early out if no contract exists 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-07-20 13:13:43 -07:00
lsemp3d 8d56a031ef crash guard when the data has a list with an empty contract 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-07-20 13:13:41 -07:00