Commit Graph

323 Commits

Author SHA1 Message Date
Terry Michaels d9ec159f0e Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
Gitflow 7/16/21 - O3DE
2021-07-16 17:50:44 -05:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py
2021-07-16 13:21:55 -07:00
lumberyard-employee-dm 448469025b Updated the AZ Path Code to perform case-insensitive hashing of path (#2226)
segments when using the Windows Path Separator

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-16 15:13:47 -05:00
hultonha 5a0c1fab9f Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-16 10:30:37 +01:00
Esteban Papp 3771ba80a4 Combine Framework.Tests and AzToolsFramework.Tests targets into one target
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-15 16:57:15 -07:00
hultonha 2c9922d4b5 Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash 2021-07-15 09:28:47 +01:00
lsemp3d 104e0f73bf Fixed Lua class enumeration, there was a crash when traversing into methods
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-07-14 23:39:48 -05:00
Esteban Papp ae46eea1e8 Fix tests in Linux and discover path comparison problem in Windows (fixed)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 20:24:15 -07:00
jackalbe ffcfa44b49 {LYN-4514} Engine updates to enable PAB for the Blast Gem (#2140)
* {LYN-4514} Engine updates to enable PAB for the Blast Gem

* Engine updates to enable Python Asset Building for the Blast Gem
* added API to detect IsPythonActive()
* ExportProductList behavior
* scene manifest usage of generated assetinfo
* updated ScriptProcessorRuleBehavior to handle OnPrepareForExport

Tests: new tests for scene behavior via ExportProduct

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* updated base on PR feedback
added more comments for IsPythonActive()
added a serializeContext for export product list

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
2021-07-14 14:54:22 -05:00
hultonha d69897fd86 add [[maybe_unused]] attribute to prevent innocuous warning
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-14 10:33:39 +01:00
srikappa da11424119 Merge branch 'development' into Prefab/BestEffortPatching
Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-13 11:52:07 -07:00
srikappa 86a6d75b40 Remove an additional check during patch application to report errors
Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-12 15:01:11 -07:00
srikappa c494adba88 Use a utility function to compare json document and expected string
Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-12 14:21:04 -07:00
srikappa b7e3db9d82 Make prefab patch application use a best effort mechanism
Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-12 11:58:14 -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
greerdv 504201aef2 Merge pull request #2036 from aws-lumberyard-dev/lua-scene-queries
Lua scene queries
2021-07-12 11:57:51 +01:00
Danilo Aimini 1d022907dc Prefabs | Introduce sanitation of prefab doms on loading (#1929)
* Update PrefabLoader to sanitize ingested prefabs and have core systems operate with default values

Signed-off-by: sconel <sconel@amazon.com>
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove IsExplicitDefault implementation to avoid confusion (since the function isn't virtual).
Avoid copying PrefabDoms over in SanitizeLoadTemplate.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Address naming and commenting concerns from PR reviews.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix to error detection code

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add support for all uuid formats for zero check.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

Co-authored-by: sconel <sconel@amazon.com>
2021-07-09 16:22:38 -07:00
carlitosan 70810dfbb9 Merge pull request #1969 from aws-lumberyard-dev/carlitosan/thecleansing
Fix parser crash related to ebus handler control, and compile time null check
2021-07-09 15:30:40 -07:00
moraaar 4475528df2 Fixed Event Hander's copy constructor and copy assignments
It was missing to save the event before connecting to it. (#2026)

Signed-off-by: moraaar <moraaar@amazon.com>
2021-07-09 11:48:04 -07:00
greerdv c7b3a06c6b expose scene queries to lua
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-09 19:24:09 +01:00
lumberyard-employee-dm 8a76ec713e Updated the SettingsRegistry Specialization tag name max size to 64 (#2016)
The tag name max size should match the maximum size of a project name,
since the project name is automatically added as a specialization tag in
the settings registry when loading .setreg files from within the
<ExecutableDirectory>/Registry directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-09 12:41:43 -05: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
Esteban Papp d075d5f7b5 fix AzGenericTypeInfo template handling with clang 12+ (#833) (#1947)
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Co-authored-by: Tom "spot" Callaway <72474383+spotaws@users.noreply.github.com>
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
2021-07-08 11:29:55 -07: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
Chris Burel 80bdd4e17b Clang compile fixes (#1876)
* Fix compile error from -Wwritable-strings

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix flags used to build MaskedOcclusionCulling with clang

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix class that has a final destructor, but the class itself was not final

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-07 14:34:45 -07:00
hultonha ab354f2e9b Merge pull request #1903 from aws-lumberyard-dev/hultonha_SPEC-7644_disable-ParallelDeepAssetReferences
Disable ParallelDeepAssetReferences test until sporadic failures are root caused
2021-07-07 16:52:40 +01:00
hultonha fe9c9f66f1 disable ParallelDeepAssetReferences test
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-07 15:05:17 +01:00
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-06 17:34:04 +01:00
Sandeep 4c684b1a10 Merge pull request #1657 from aws-lumberyard-dev/carlitosan/scriptcanvas/prefabs
Initial prefab integration
2021-07-02 14:05:25 -07:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
Mike Balfour d34d088191 Miscellaneous prefab/converter bugfixes to support TrackView (#1701)
This has a small bundle of bugfixes and improvements all based around improving prefab TrackView support:

* JsonMerger - improved the error message when patch remove operations fail to make the specific failure more obvious
Instance - swapped the order of destroying entities vs clearing the lookup tables so that lookups still produce valid results during destruction. (This could happen while creating undo caches)
* InstanceEntityIdMapper - in the case where an id isn't found, it now returns an invalid id instead of an "attempted-valid" one that still generally turned out to be not-valid
* PrefabUndo - downgraded a potential crash to an error message if for some reason the patch contains changes to an entity that doesn't currently have an alias. (This case can be caused occasionally by other bugs and error conditions)
* EditorSequenceComponent - downgraded a potential crash to an assert for the times when it tries to remove components, fails, but thinks it succeeded. (This case can currently be caused by using Maestro with Prefabs enabled)
* EditorSequenceAgentComponent - added an undo cache refresh whenever the component deletes itself, so that deleting itself during an EditorSequenceComponent destruction chain of events leaves the undo cache in the correct state.
* SliceConverter - fixed the conversion of entity references in top-level slice instance entities that refer down to nested slice entities. There was a chicken-and-egg problem in terms of which entities need to be created first to make the references and the prefab patching & serialization happy. This was worked around by creating placeholder top-level entities, then the nested slice entities, then replacing the top-level entities with the fully-realized ones.

Specific changes:
* Added more informative error message.

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 672608a6c833c07295996cd9b3449825222b74d0)

* Changed the error condition to produce a "valid" invalid id instead of a deterministic but not-valid id

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 3673950c949de8e067b32ddafaffd07e648a13d8)

* Guard against invalid reference assert/crash

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 268d4ef3447f268a1372d07e028b9e67bac5c64e)

* Downgrade an invalid reference crash to an assert

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 38c9303770845f4e863273dd6fb8fc7e83380425)

* Improved logic for handling entity references across nested slices.

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 7e89a016d95fb72cb5f119e1e3768daa60e6bfb4)

* Changed order of entities.clear() call so that instance lookups are still valid during entity destruction.

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

* Add undo cache notification when removing Maestro components.

Signed-off-by: mbalfour <mbalfour@amazon.com>
2021-07-01 13:53:17 -05: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 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 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
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
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
sharmajs-amzn deadf448c9 Fix for module file path (#1598) 2021-06-28 09:45:05 -07:00
amzn-mgwynn ce955715a8 Merge pull request #1543 from aws-lumberyard-dev/native-ui-changes
More specific component error messaging and modes for native UI to prevent blocking dialog in some applications
2021-06-25 19:18:03 -04:00
mgwynn 6721485946 Added parameter names to virtual function definitions for intellisense 2021-06-25 17:03:02 -04: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
mgwynn a9ef02d29a Renaming nativeUI mode setting for all platforms 2021-06-25 15:37:14 -04:00
mgwynn 692c993bdb Incorporating review comments. Adding nativeUI setting for launchers. 2021-06-25 15:34:32 -04:00
Benjamin Jillich bf0816fb69 [LYN-4574] [LYN-4603] [LYN-4669] Saving motions and actors to json-based .assetinfo files in the Animation Editor fails (#1509)
* Fixes saving motions from within the Animation Editor
* Fixes saving actors from within the Animation Editor
* The motion event chunk of the .motion file format now also stores the event data as json (rather than XML) reducing motion file sizes (Example: 60KB motion went down to 49KB, containing only 4 motion events from 2 tracks).
* Fully backward compatible
* New motion meta data rule stores the event data directly rather than command strings or objects. This is the way that aligns with the Json paradigm and as side-effect bypasses the optionals that we use for the commands which fixes the issue.

* [LYN-4574] Adding new motion event meta data rule that stores the event data directly rather than via commands to align with the Json paradigm
* [LYN-4574] Preparing motion, event table and event track for Json serialization
* [LYN-4574] New chunk to store motion event data in Json format (fully backward compatible to XML)
* [LYN-4669] Json: Empty AZStd::vector<AZStd::shared_ptr<T>> serializes into 1x element with nullptr as data
* [LYN-4603] EMotion FX: Cannot save actors with physics or simulated object setup in Json format
2021-06-25 11:47:09 +02:00
Esteban Papp 1a5a8bd0ea LYN-4657 OSX: Building AutomatedTesting project fails 2021-06-24 15:01:02 -07:00
mgwynn fb3940fa31 More specific component error messaging and modes for native UI to prevent blocking dialog in some applications 2021-06-23 21:05:17 -04: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