birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,555 Commits 3 Branches 3 Tags
2ea9bfb144b2f472fa7fdaa2050efa68049f1e1e
Commit Graph

121 Commits

Author SHA1 Message Date
hultonha 2ea9bfb144 merge stabilization/2106 into development 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-06 17:34:04 +01:00
Aaron Ruiz Mora 9d5a9ff925 NvCloth automated tests use default renderer to be more stable and complete (#1850) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-07-05 16:52:24 +01:00
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 12:42:44 -05: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 dcea6f47fa linux build fix 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 19:23:21 -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 66a935dfa4 Fix missing icon issue leading to failed nightly test: LYN-4926 SPEC-6982 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 18:04:06 -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
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>
 2021-06-29 13:51:24 -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
Terry Michaels 149863c527 Removed Amazon as Company for QSettings (#1649) 
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-06-29 14:00:11 -05: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
Terry Michaels 21ebff5709 Updated help search and all docs.o3de.org links to o3de.org (#1594) 2021-06-25 15:23:57 -05:00
Terry Michaels 1e457928f5 Update help URLs and remove unneeded links (#1520) 2021-06-23 14:42:33 -05:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
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
 2021-06-22 12:55:18 -05:00
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
chcurran d907c14682 Remove any null entries from AbstractCodeModel::ModAllRoots() LYN-4658 2021-06-18 09:11:36 -07:00
igarri 3ed6b318ab Merge branch 'develop' into LYN-1767-AB 2021-06-16 12:30:10 +01:00
chcurran 94edb18ed0 disabled upgrade menu until we can stabilize the tool (LYN-3799) 2021-06-15 13:36:03 -07:00
chcurran 2fd985f162 Fix for unconverted once nodes 2021-06-15 12:13:25 -07:00
chcurran 10081fefb9 Remove unwanted entries from node palette 2021-06-11 16:28:34 -07:00
chcurran 168042dee4 Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into carlito/stabilization/2106 2021-06-11 10:50:51 -07:00
carlitosan 0d01ee4a4e Merge pull request #1270 from aws-lumberyard-dev/carlito/stabilization/2106 
Fix for running game mode with brand new graph with prefabs. Fixes: LYN-4004
 2021-06-11 10:28:28 -07:00
chcurran f1b3bf4c73 Fix for running game mode with brand new graph with prefabs. 2021-06-10 17:43:45 -07:00
Terry Michaels 91fb8be535 Added toolbar icons, updated viewport header UX (#1240) 2021-06-10 11:42:25 -05:00
Terry Michaels adf6d93a06 Moved toggle pivot to lower in the context menu, converted all context menu additions to use a singular mechanism (#1209) 2021-06-09 22:37:28 -05:00
chcurran 8ab2752f42 Fix for using BC class constants LYN-3777 2021-06-09 14:52:33 -07:00
igarri be21e585a0 Merge branch 'develop' into LYN-1767-AB 2021-06-09 11:42:31 +01: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
Esteban Papp 36cb0f6d40 SPEC-7178 Removal of precompiled cpp files (#1171) 
* SPEC-7178  Removal of precompiled cpp files

* Missing files...
 2021-06-07 15:59:58 -07:00
igarri 4f2acd1340 Merge branch 'main' into LYN-1767-AB 2021-06-07 15:22:26 +01: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
AMZN-koppersr 8c541b5205 Moved default values to object in the Spawnable Entities Interface 2021-06-03 10:56:30 -07:00
igarri e7752e3ad4 Merge branch 'main' into LYN-1767-AB 2021-06-02 12:03:22 +01:00