birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,824 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 'ae46eea1e8'
${ noResults }
Commit Graph

142 Commits (ae46eea1e82b35f3fc24de49dffdc72e543a7abd)

Author SHA1 Message Date
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 5 years ago
chcurran 45b024bed1 Remove dead backend code 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran b63c9a87db compile time null checks avaiable for method node 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 5 years ago
chcurran 3f231075fe Remove last of Great ScriptCanvas purge code, fix purity categorization handler connection control 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 21b511b174 Merge branch 'carlitosan/thecleansing' of https://github.com/aws-lumberyard-dev/o3de into carlitosan/thecleansing 5 years ago
lumberyard-employee-dm 3be4c9a393 Removing extra whitespace from the ScriptCanvas Node Library files 
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 5 years ago
lumberyard-employee-dm f9f711c039 Removing superfluous whitespace. 
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 5 years ago
chcurran 2dce2eee2d The Great ScriptCanvas Purge, Part X 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 27577a2e49 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 5 years ago
chcurran 29652994d8 The Great ScriptCanvas Purge, Part VIII 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
hultonha 9bfb90a513 Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 5 years ago
chcurran 75933ff7fd The Great ScriptCanvas Purge, Part VII 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 65ad412f3e The Great ScriptCanvas Purge, Part VI 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
pereslav 4a42c32a4b LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on 
Signed-off-by: pereslav <pereslav@amazon.com>
 5 years ago
chcurran 0a910a31aa The Great ScriptCanvas Purge, Part V 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 360236b89e The Great ScriptCanvas Purge, Part IV 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
hultonha 2ea9bfb144 merge stabilization/2106 into development 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 5 years ago
chcurran fa7accf2dc Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 5 years ago
Aaron Ruiz Mora 9d5a9ff925
NvCloth automated tests use default renderer to be more stable and complete (#1850) 
Signed-off-by: moraaar <moraaar@amazon.com>
 5 years ago
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 5 years ago
chcurran 88c328c6e2 The Great ScriptCanvas Purge, Part III 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran fea83b0b51 The Great ScriptCanvas Purge, Part II 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 59ff74f559 The Great ScriptCanvas Purge. Part I. 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 8cd07c6f4b update license on new files 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 2281330a7c merge latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
Steve Pham b4a2edec6a
Final update copyright headers to reference license files at the repo root (#1693) 
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
 5 years ago
chcurran dcea6f47fa linux build fix 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 59f4e865a4 whitespace and string_view fixes 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 7b149e6f90 remove unnecessary reporting values from user script variable json serializer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran fe829bfbd4 Use 'missing' vs 'catastrophic' of missing $type field in user script variable json serializer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 66a935dfa4 Fix missing icon issue leading to failed nightly test: LYN-4926 SPEC-6982 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 0136c92467 PR white space feedback, better Lua print error message, fix ACM static variable culling 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 917dacb61e Added comment explaining state of progress of SC --> C++ 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran df02813cd4 Hide ExecutionState methods from SC, Fixes LYN-4900 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 5b7b989733 use more constexpr in ScriptCanvasAttributes.h, remove superfluous string use in SC user data serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 9d9205d067 SC user nodeables now use __index method does not report error on (allowable) nil table entries LYN-3664 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran 355776d3a9 Add versioning updates for prefab conversion, and PR clean up & nitpicks 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
chcurran fb448124e2 removed uneccessary prefab senstive code 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
Esteban Papp 9f0bbf3b74
SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634) 
* git mv Code\CryEngine Code\Legacy
* redirecting CMakeLists.txt
* fixing uic warning
* Some more CryEngine mentions
* validation scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
chcurran dcb3c71d33 Initial prefab integration 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 5 years ago
Terry Michaels 149863c527
Removed Amazon as Company for QSettings (#1649) 
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
 5 years ago
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago
yuriy0 972c640782
Don't give a broken copy constructor to BehaviorContextObject. (#1002) 
* Don't give a broken copy constructor to BehaviorContextObject.

This used to be required by the serialization system, now it handles non-copyable and non-moveable types.

* Explicitly delete the copy constructor instead of defaulting, which implicitly deletes it.

Some compilers complain about such an implicit deletion, and we should be explicit about our intent anyways
 5 years ago
Terry Michaels 21ebff5709
Updated help search and all docs.o3de.org links to o3de.org (#1594) 5 years ago
Terry Michaels 1e457928f5
Update help URLs and remove unneeded links (#1520) 5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622 
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
 5 years ago
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 5 years ago
chcurran d907c14682 Remove any null entries from AbstractCodeModel::ModAllRoots() LYN-4658 5 years ago