Commit Graph

5870 Commits

Author SHA1 Message Date
AMZN-ScottR f55ffae994 Merge branch 'development' into redcode/crythread-2nd-pass
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-11 20:31:58 -07:00
AMZN-ScottR c173dee2bc [redcode/crythread-2nd-pass] removed MultiThread.h along with external CryInterlocked* definitions
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-11 16:38:54 -07:00
Esteban Papp 3f34fa5636 Some cleanup of platform.h and other CryCommon files 2021-08-11 16:34:00 -07:00
SJ 0f347c11bf Add header file needed for no unity builds (#3047)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-08-11 18:08:21 -05:00
Chris Burel 094d06f1e3 Update EMotionFX layouts to deal with changed QObject names (#3045)
Commit 1837d05169 changed some of the EMotionFX editor's QObject names
to match their new class member names. Unfortunately this broke the
EMotionFX layouts. This recreates the good layouts to contain the new
QObject names.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-11 18:08:05 -05:00
Chris Burel dba26cc235 Fix code that trips -Wsign-compare (#3046)
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-11 18:07:46 -05:00
AMZN-ScottR 337ea488b6 [redcode/crythread-2nd-pass] replaced remaining CryInterlocked* usage with equivalent AZStd version
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-11 15:57:49 -07:00
AMZN-ScottR 5a891c8cbd [redcode/crythread-2nd-pass] replaced remaining CrySpinLock/CryWriteLock usage with equivalent AZStd version
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-11 15:54:59 -07:00
AMZN-ScottR 6c83dcd702 [redcode/crythread-2nd-pass] fixed another missing include
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-11 15:44:04 -07:00
Chris Galvan 0f8ea17235 Merge pull request #3051 from aws-lumberyard-dev/cgalvan/gitflow_210811_dev
Merged stabilization/2106 to development
2021-08-11 17:41:29 -05:00
Jacob Hilliard 016cfef6ca Visualizer: fix empty rows being shown (#2881)
Fixes a bug with the visualizer where there would be empty rows shown,
e.g. threads without any profiling regions. This was especially
noticable when going from a high thread count sample (MultiThread) to a
low thread count sample, where most of the visualizer would be empty
lines. This adds a data culling step to remove the threads without any
remaining execution data + an early out so that all threads shown
onscreen must have some regions recorded.

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
2021-08-11 15:32:11 -07:00
chiyenteng 7e5cbdab1e Create a new automated test for Prefab basic workflows (#2715)
Adds a new ebus for prefab apis and refactored the apis
Removed an empty test level
Auto delete tmp level when teardown tests
Add Base test level in Prefab folder
Removed unused comments
Checked if absolute path as an input of Create Prefab functions
Changed created prefab file path to support all platfroms
Added missing includes

Signed-off-by: chiyteng <chiyteng@amazon.com>
2021-08-11 14:11:26 -07:00
Junbo Liang c6714595b1 Define a new Jenkins build script to deploy AWS resources (#2983)
* Define a new Jenkins job to deploy AWS resources

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

* Address PR comments

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

* Add error checking for all the calls

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

* Remove the weekly-build-metrics tag

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

* Parameterize ARN/Region and move it to a Jenkins envvar.

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

* Revert the changes for build_config.json

Signed-off-by: junbo <junbo@amazon.com>
2021-08-11 13:59:29 -07:00
Esteban Papp 041aa42307 fixes after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-11 13:56:03 -07:00
Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-11 15:33:50 -05:00
dmcdiarmid-ly e10e62b399 Merge pull request #2863 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15995
Add callback mechanism for GPU resource release
2021-08-11 13:05:27 -07:00
AMZN-ScottR ce7598c10b [redcode/crythread-2nd-pass] fixed missing includes
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-11 12:59:32 -07:00
Esteban Papp 5f22dc817c Merge branch 'development' into cmake/SPEC-7182 2021-08-11 12:39:51 -07:00
smurly 2564e8f8dc MaterialEditor BasicTests added to AutomatedTesting for AR (#3022)
* MaterialEditor BasicTests added to AutomatedTesting for AR

Signed-off-by: Scott Murray <scottmur@amazon.com>

* launch_and_validate_results adding a waiter.wait_for to the log monitor so the log file exists

Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-08-11 12:15:31 -07:00
jromnoa 6d1bb8e439 Add Light component GPU (screenshot) test to AutomatedTesting nightly o3de runs. (#2923)
* adds the Light component GPU screenshot test to AutomatedTesting

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

* add LIGHT_TYPE_PROPERTY constant to test script since it is re-used multiple times

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

* removes redundant f strings, adds LIGHT_COMPONENT and LIGHT_TYPE_PROPERTY constants for re-use, removed formattng errors, increase CMakeLists.txt timeout, add attach_component_to_entity() to hydra_editor_utils.py

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

* fix ImportError

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

* moves the LIGHT_TYPES constant to a new file since scripts rely on it that do not have the Editor launched (can't see hydra bindings so failes with ModuleNotFound error)

Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-08-11 11:19:22 -07:00
Esteban Papp 37ffe90353 Merge branch 'development' into cmake/SPEC-7182
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/QtUtil.h
#	Code/Legacy/CryCommon/Linux_Win32Wrapper.h
#	Code/Legacy/CryCommon/ProjectDefines.h
#	Code/Legacy/CryCommon/StringUtils.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CryCommon/UnicodeEncoding.h
#	Code/Legacy/CryCommon/UnicodeFunctions.h
#	Code/Legacy/CryCommon/UnicodeIterator.h
#	Code/Legacy/CryCommon/WinBase.cpp
#	Code/Legacy/CryCommon/platform.h
#	Code/Legacy/CryCommon/platform_impl.cpp
#	Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
#	Gems/Maestro/Code/Source/Cinematics/Movie.cpp
2021-08-11 11:16:24 -07:00
sconel fbcb6510e6 Update storage of Prefab Dom info to be best effort (#2862)
* Update storage of Prefab Dom info to be best effort

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

* Update IssueReporter to Skipped instead of PartialSkip

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

* Address PR feedback

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

* Fix failing Prefab Unit Test that expected default values to be stripped

Signed-off-by: sconel <sconel@amazon.com>
2021-08-11 10:45:31 -07:00
antonmic 193fa3c918 Merge pull request #2584 from aws-lumberyard-dev/Atom/antonmic/SrgDebugImprovements
Shader resource group debug improvements
2021-08-11 10:37:36 -07:00
Esteban Papp d0666a5304 Removal of CryString and related files/classes 2021-08-11 10:13:30 -07:00
Jeremy Ong 36c639e417 Merge pull request #3027 from aws-lumberyard-dev/RenderDoc
Hide RenderDoc integration behind LY_RENDERDOC_ENABLED option
2021-08-11 09:34:45 -06:00
Esteban Papp 3845f43088 missing header include after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-11 08:13:38 -07:00
Esteban Papp 9f7d280a1e Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ResourceSelectorHost.cpp
2021-08-11 07:55:26 -07:00
hultonha a26d6d5ec9 Editor: code style fixups in 2 files
Merge pull request #2933 from nemerle/denitify_1
2021-08-11 13:43:56 +01:00
AMZN-AlexOteiza da4dfea9ca Adjustment to property row so the label is more visible (#2866)
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
2021-08-11 11:15:41 +02:00
Benjamin Jillich 5c90bc0d58 Skip blend shapes that influence multiple meshes (#3009)
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-08-11 09:45:47 +02:00
Benjamin Jillich 6a5a7740ad EMotion FX: Selecting Motion Properties crashes the Editor (#3005)
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-08-11 09:45:27 +02:00
AMZN-ScottR 6f2b7baae8 [redcode/crythread-2nd-pass] removed CryThread*.h files
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-10 21:27:22 -07:00
dmcdiar ccc4f27129 Changed check for latest garbage to a for loop.
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-08-10 21:09:55 -07:00
AMZN-ScottR f99f1f00f4 [redcode/crythread-2nd-pass] removed or replaced remaining CryMutex/CryLock usage with equivalent AZStd version
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-10 20:35:55 -07:00
Esteban Papp 2361490c8b Fixes for Android
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-10 20:18:59 -07:00
Esteban Papp fa2032d21d Linux fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-10 19:02:38 -07:00
jonawals a7a0e8d2ef Fix for PathLib unlink wrong version parameter. (#3020)
* Fix for PathLib unlink wrong version parameter.

* Fix dst target for TIAF.

* Remove TIAF historic data arhciving on s3 buckets

* Change permissions for TIAF bucket upload

Signed-off-by: John <jonawals@amazon.com>
2021-08-10 18:43:44 -07:00
Esteban Papp fe635d5ab4 Merge branch 'development' into cmake/SPEC-7182 2021-08-10 18:05:28 -07:00
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>
2021-08-10 19:07:01 -05:00
AMZN-mnaumov 25844a9ed6 Selecting entities when duplicating prefabs (#2995)
* Selecting entitie when duplicating prefabs

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

* PR feedback

Signed-off-by: mnaumov <mnaumov@amazon.com>
2021-08-10 16:40:51 -07:00
Jeremy Ong cfa6e259f3 Hide RenderDoc integration behind LY_RENDERDOC_ENABLED option
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-10 17:27:45 -06:00
Esteban Papp d71674579a fixing startup on game launcher
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-10 16:23:04 -07:00
Luis Sempé 29c2ee9b0e Merge pull request #3014 from aws-lumberyard-dev/burelc/removeMCoreAlignedArray
Replace `MCore::AlignedArray` with `AZStd::vector`
2021-08-10 14:48:16 -07:00
Esteban Papp 2147b1d128 Merge branch 'development' into cmake/SPEC-7484 2021-08-10 14:30:07 -07:00
Esteban Papp c484e685d1 SPEC-2513 Fixing w4018 2021-08-10 14:28:29 -07:00
Esteban Papp 181998f810 Fixes a nightly build and a CMake warning (#2941)
* Addressing CMake warning and removing timeouts that are the same as the default

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* missed this one

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Making it an error so developers stops putting timeouts longer than the allowed one since it causes AR issues

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixing warning from the nightly build

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* disabling test that is triggering a timeout

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-10 14:05:14 -07:00
Esteban Papp 4450eb4e22 fix new warning hit
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-10 13:24:57 -07:00
Olex Lozitskiy 5363105c6d SIG/Network - Migrated legacy multiplayer per entity analytics over to O3DE Multiplayer Gem
Added a new ImGui menu under Multiplayer: "Multiplayer Entity Stats"
2021-08-10 15:55:10 -04:00
antonmic 5472d6768e Minor improvements
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-08-10 12:48:26 -07:00
michabr ab1b6ff3b4 Add LyShine gem runtime dependency to Material Editor in AutomatedTesting project (#2996)
Signed-off-by: abrmich <abrmich@amazon.com>
2021-08-10 14:41:24 -05:00