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

105 Commits

Author SHA1 Message Date
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
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-12 10:45:23 -05:00
chcurran 45b024bed1 Remove dead backend code 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-08 16:12:45 -07:00
chcurran b63c9a87db compile time null checks avaiable for method node 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-08 15:08:55 -07:00
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-08 13:56:47 -05:00
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>
 2021-07-08 08:53:19 -07:00
chcurran 21b511b174 Merge branch 'carlitosan/thecleansing' of https://github.com/aws-lumberyard-dev/o3de into carlitosan/thecleansing 2021-07-07 17:13:11 -07:00
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>
 2021-07-07 16:33:16 -05:00
lumberyard-employee-dm f9f711c039 Removing superfluous whitespace. 
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-07-07 16:33:09 -05:00
chcurran 2dce2eee2d The Great ScriptCanvas Purge, Part X 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-07 13:43:31 -07:00
chcurran 27577a2e49 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-07 10:45:38 -07:00
chcurran 29652994d8 The Great ScriptCanvas Purge, Part VIII 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-07 10:45:16 -07:00
hultonha 9bfb90a513 Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-07 16:25:06 +01:00
chcurran 75933ff7fd The Great ScriptCanvas Purge, Part VII 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-06 21:03:31 -07:00
pereslav 4a42c32a4b LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-07-07 00:12:30 +01:00
chcurran 0a910a31aa The Great ScriptCanvas Purge, Part V 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-06 15:05:37 -07:00
chcurran 360236b89e The Great ScriptCanvas Purge, Part IV 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-06 13:13:16 -07:00
hultonha 2ea9bfb144 merge stabilization/2106 into development 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-06 17:34:04 +01:00
chcurran fa7accf2dc Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-06 07:27:29 -07:00
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 12:42:44 -05:00
chcurran 88c328c6e2 The Great ScriptCanvas Purge, Part III 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-01 17:50:56 -07:00
chcurran fea83b0b51 The Great ScriptCanvas Purge, Part II 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-01 17:08:16 -07:00
chcurran 59ff74f559 The Great ScriptCanvas Purge. Part I. 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-01 09:57:36 -07:00
chcurran 8cd07c6f4b update license on new files 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-01 05:33:59 -07:00
chcurran 2281330a7c merge latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 20:42:41 -07:00
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>
 2021-06-30 19:51:55 -07:00
chcurran 59f4e865a4 whitespace and string_view fixes 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 18:59:11 -07:00
chcurran 7b149e6f90 remove unnecessary reporting values from user script variable json serializer 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 18:14:05 -07:00
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>
 2021-06-30 18:10:17 -07:00
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>
 2021-06-30 16:55:26 -07:00
chcurran 917dacb61e Added comment explaining state of progress of SC --> C++ 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 12:10:51 -07:00
chcurran df02813cd4 Hide ExecutionState methods from SC, Fixes LYN-4900 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 11:58:04 -07:00
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>
 2021-06-30 11:44:25 -07:00
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>
 2021-06-29 18:42:32 -07:00
chcurran 355776d3a9 Add versioning updates for prefab conversion, and PR clean up & nitpicks 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-29 17:25:23 -07:00
chcurran fb448124e2 removed uneccessary prefab senstive code 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-29 15:23:14 -07:00
chcurran dcb3c71d33 Initial prefab integration 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-29 13:25:56 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
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
 2021-06-25 17:32:27 -05:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
chcurran d907c14682 Remove any null entries from AbstractCodeModel::ModAllRoots() LYN-4658 2021-06-18 09:11:36 -07:00
chcurran 2fd985f162 Fix for unconverted once nodes 2021-06-15 12:13:25 -07:00
chcurran 8ab2752f42 Fix for using BC class constants LYN-3777 2021-06-09 14:52:33 -07:00
chcurran a766e3af5c Fixes for internal if-branch node parser bug (LYN-4347) and exposing properties for AZStd::tuple (LYN-3910) 2021-06-08 13:54:25 -07:00
AMZN-koppersr 4eb5b3554e Merge branch 'main' into SpawnableEntityIdMapping 2021-06-04 14:00:06 -07:00
Esteban Papp 76a6df341b SPEC-2513 Fixes to enable w4457 2021-06-04 10:51:47 -07:00
AMZN-koppersr ce7b81e2e7 Merge branch 'main' into SpawnableEntityIdMapping 2021-06-04 10:11:47 -07:00
chcurran 0a9d6f5f0f Bug fixes and improvements brought over from demo work. 
* Generic Multi Function Call ability added to extensible nodes
* Code gen improvements, including allowing for more manually codewritten extension of codegen facilities
* CVAR to disable automatic update of deprecated node
* Fixed variable sorting error that can apply to parser/runtime added variables
* Made Edit/SerializeContext ClassBuilder public, as it was needlessly private
* Fixed dangerous Datum::GetValueAddress(), it now checks for an empty storage AZSTd::any, as does Datum::Empty()
 2021-06-03 13:13:22 -07:00
AMZN-koppersr 1e7ac60949 Reintroduced spawning multiple instances of the same entity 
The following was changed:
- The remapper in AZ::IdUtils now has an additional argument to tell it what to do when it encounters the same source entity id. The original behavior of ignoring the new entity id and returning the first occurrence is the default. The alternative behavior is to store the last known entity id and return that instead.
- Split the optional arguments for SpawnAllEntities and SpawnEntities.
- SpawnEntities now has an option to continue with the entity mapping from a previous spawn call or to start with a fresh mapping. The latter is the default as the former will come at a performance cost since the mapping table has to be reconstructed.
- Entities spawned using SpawnEntities and ReloadEntities now also get the correct entity mapping applied.
- Added several new unit tests to cover most of the new functionality.
- Fixed some places where the older API version was still called.
 2021-06-03 10:56:34 -07:00