birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,226 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'cef82f0313'
${ noResults }
Commit Graph

200 Commits (cef82f0313868e930c8eda17ee38153af82f8b51)

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
 4 years ago
Jeremy Ong cf44a4ad67 Address additional PR feedback 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 4 years ago
Jeremy Ong a5f072f7a9 Remove statistics profiler 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 4 years ago
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>
 4 years ago
Luis Sempé 7814d7679c
Merge pull request #3127 from aws-lumberyard-dev/scriptcanvas/codegenfix_namespace 
Completed namespace support for the ScriptCanvasGrammar template
 4 years ago
Esteban Papp f22d2d736b Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 14e7754334 More fixes for warnings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
pappeste 67a5bc98ce ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp e9b4f48f71 more fixes, will merge fixes for w4245 and w4389 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 3522f622f3 more castings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp f914f7680a Gems/ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
pappeste b52516cdec ScripCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Chris Galvan 88bef1074b Replaced some Lumberyard references with O3DE. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
lsemp3d 9ecb746563 Completed namespace support for the ScriptCanvasGrammar template 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
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.
 4 years ago
chcurran fe21b89d8e working support for editor property json serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran d2c87fd21f initial json serialization for editor sc properties 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
lsemp3d 2b4bd10028 Updated path to icon that was emitting a warning 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
chcurran 584c125fbc rename serializer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 3374b82360 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 4 years ago
chcurran aaa847a569 Remove empty User Functions and Script Event sections 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
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>
 4 years ago
chcurran c0ed0a7925 Added more tool tip data to repeater. 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago
lsemp3d 2c96556576 Removed unnecessary argument in node generic macro 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 1f0fcf2aa2 Updates GetDirectionVector nodes to also return the distance between the points 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 20515c46be Updated DirectionTo node's tooltips to match the translation file 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 6188df4b49 Added Get Direction Vector node for Vector2,3 and 4 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago
chcurran 893a80a54e Fix variables names in the property window 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 3633bf2ed0 remove accidental submission of commented out event handling 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
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>
 4 years ago
carlitosan 41421d82fc
Merge pull request #2589 from aws-lumberyard-dev/carlitosan/development 
fix dangling component variables on cleared script, fix EntityIDNode …
 4 years ago
chcurran 43dfffa3fd fix dangling component variables on cleared script, fix EntityIDNode reflection 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 9475d1612b
Merge branch 'development' into carlitosan_fix_for 4 years ago
chcurran d7a4b0d930 fix for double asset registration and multiple outs from loop nodes 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
pappeste e3344bdf8d ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
chcurran 055915ec4f merge from latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
carlitosan 1e3c55246a
Merge pull request #2490 from aws-lumberyard-dev/carlitosan/fix_null_check 
remove null data check from connected slots
 4 years ago
chcurran 76a3195487 remove null data check from connected slots 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
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>
 4 years ago
chcurran b8300c6248 fix entity reference removal when not in a variable 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 3ad8f0dbf9 adjust location of disabling SC unit tests on Linux 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
chcurran 6f07a0b136 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 4 years ago
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>
 4 years ago
lsemp3d 9a4a7bc156 Script Canvas: Fixed Scope and Initial Value selection boxes 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
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>
 4 years ago
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
 4 years ago
lsemp3d 6c4fdd3af5 Missing early out if no contract exists 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago
lsemp3d 8d56a031ef crash guard when the data has a list with an empty contract 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 4 years ago