Commit Graph

1210 Commits

Author SHA1 Message Date
srikappa-amzn 604dca1c3e Merge pull request #1349 from aws-lumberyard-dev/BenchMarksReset
Change create-spawnable benchmarks to not destroy created spawnables immediately
2021-06-15 16:18:02 -07:00
Eric Phister 74491c88b8 Fix AssetBuilders when project-path has a trailing slash (#1345)
* Fixes issues with project paths w/ trailing slash

When launching AP with a --project-path that has a trailing slash, the
AssetBuilders would get that slash instead of a normalized version.
This would mess up the params sent to AssetBuilders.

* Missed a variable name replacement

* Addresses feedback on code style guidelines

Removed 'auto' keyword in favor of explicit types.
2021-06-15 17:50:40 -05:00
carlitosan 889e6e2b14 Merge pull request #1287 from aws-lumberyard-dev/carlito/stabilization/2106
Remove unwanted entries from ScriptCanvas node palette
2021-06-15 15:01:54 -07:00
srikappa-amzn bd8b6aea8e Moved vector declartion inside state for loop 2021-06-15 14:12:08 -07:00
yuriy0 e40a598648 Bug fix: check for valid extension in case insensitive manner (#1339) 2021-06-15 12:41:58 -07:00
chcurran 9f7f6e84a4 Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into carlito/stabilization/2106 2021-06-15 12:10:10 -07:00
Mike Balfour ab3aa904f0 Fixed misc slice conversion bugs
* Fixed crash caused by nesting the same slice twice
If the same slice is nested at multiple levels in the same slice hierarchy, the second conversion would reregister the prefab and crash.  Now that case is detected and the slice isn't reconverted.

* Fixed json array patches where multiple elements are removed.
The patches now generate removals from back to front, instead of front to back, so that the indices remain valid as each patch is applied.
2021-06-15 14:00:47 -05:00
srikappa-amzn 9f9c01e781 Used reserve instead of resize 2021-06-15 11:10:45 -07:00
srikappa-amzn 5b4333e4b1 Added a comment and gave a variable better name 2021-06-15 11:07:43 -07:00
srikappa-amzn c8ba42d04f Merge branch 'stabilization/2106' into BenchMarksReset 2021-06-15 10:59:36 -07:00
cgalvan 13c59385a7 Merge pull request #1332 from aws-lumberyard-dev/cgalvan/FixPrefabActionsWhenDisabled
[LYN-4527] Make sure the PrefabIntegrationManager is only created when prefabs are enabled, otherwise could result in crashes.
2021-06-15 12:50:10 -05:00
sconel bd2a2ebcf5 Merge pull request #1293 from aws-lumberyard-dev/Prefabs/RemoveEditorInfoFromNestedContainerEntities
Fix nested container entities not getting editor info removed during prefab processing
2021-06-15 10:36:13 -07:00
Chris Galvan 1aad201a98 [LYN-4527] Make sure the PrefabIntegrationManager is only created when prefabs are enabled, otherwise could result in crashes. 2021-06-15 10:51:36 -05:00
rgba16f 0198f6121b Rebind the DebugDisplayRequestBus Instance to handle drawing in GameMode. (#1275) 2021-06-14 20:29:37 -05:00
Alex Peterson ecded991b5 Display error when unable to start Python
Added AzFramework Application, logging, unit tests
2021-06-14 17:02:22 -07:00
amzn-mike 364187a87b Merge pull request #1047 from aws-lumberyard-dev/Helios_AssImp_TransformImporterFix
Fix AssImpTransformImporter logic for bone nodes
2021-06-14 18:41:09 -05:00
AMZN-nggieber 948075fa61 Gem Catalog Allows Filtering by Gem Selected Status Live (#1274) 2021-06-14 15:56:54 -07:00
sharmajs-amzn 86d0acf76c fixes for invalid drive letter casing for scanfolder (#1281) 2021-06-14 13:55:37 -07:00
Mike Balfour 6f61454be4 Added support for remapping entity refs across slice instances (#1284)
* Fixed memory assert on shutdown.
Cleaned up the entity pointers on serialization, so that they no longer leak themselves, their asset references, or anything else within them.

* Added support for remapping entity refs across slice instances.
Slice instances can have components with entity references that have been modified to reference entities in other slice instances, or even in the parent.  This change detects and remaps those references so that they work correctly.
2021-06-14 14:20:39 -05:00
amzn-mike a3ae330e6d Merge branch 'stabilization/2106' into Helios_AssImp_TransformImporterFix 2021-06-14 10:17:29 -05:00
greerdv d72d988195 Merge pull request #1280 from aws-lumberyard-dev/simd-division-by-zero
avoid some divisions by zero in simd math types
2021-06-14 11:48:32 +01:00
amzn-mike 9ff007024d Merge branch 'main' into Helios_AssImp_TransformImporterFix 2021-06-13 16:56:44 -05:00
SJ 6fdbce01eb Fix build and link errors in monolithic builds
Merge pull request #1288 from aws-lumberyard-dev/SPEC-7273
2021-06-11 18:40:52 -07:00
sconel e4921c8d0a Fix nested container entities not getting editor info removed during prefab processing 2021-06-11 17:45:46 -07:00
Danilo Aimini f32590d241 LYN-4042 | No UI Indication that Level is Modified (#1277)
* Restore the code that display the dirty marker on the Level container. Ensure the dirty marker is cleared on level save.

* Moving call one level up to allow usage of the SaveTemplateToString function without clearing the dirty flag.
2021-06-11 16:43:53 -07:00
amzn-sj a86062bd91 Skip interface libraries when genrating StaticModules for game server as well 2021-06-11 16:42:09 -07:00
amzn-sj 469b1a0858 Fix monolithic link error involving gem variants which are "aliased" as interface libraries with multiple gem target dependencies 2021-06-11 16:30:46 -07:00
chcurran 10081fefb9 Remove unwanted entries from node palette 2021-06-11 16:28:34 -07:00
srikappa-amzn e6ec9e48b4 Changed spawnables benchmark test to create multiple spawnables at once 2021-06-11 16:17:26 -07:00
amzn-sj ac5196dbf5 Revert previous change 2021-06-11 15:19:28 -07:00
amzn-sj 21f209311c Parameter may be unused 2021-06-11 14:54:24 -07:00
cgalvan b08245a7f5 Merge pull request #1276 from aws-lumberyard-dev/cgalvan/FixInstantiatePrefabPopup
[LYN-4160] Fixed intermittent crash by changing instantiate prefab dialog to use the AzToolsFramework::GetActiveWindow() helper which always gives a valid active window.
2021-06-11 16:52:58 -05:00
amzn-sj e6b8dc2ce1 Disable AzTest and AzTestRunner in monolithic builds 2021-06-11 14:37:12 -07:00
greerdv 3895c93e04 avoid some divisions by zero in simd math types 2021-06-11 22:05:37 +01:00
carlitosan 43e157035e Merge pull request #1272 from aws-lumberyard-dev/carlito/stabilization/2106
Carlito/stabilization/2106  Fix for AP errors on graph, and Lua properties table fix
2021-06-11 13:51:08 -07:00
Chris Galvan 015f85db20 [LYN-4160] Fixed intermittent crash by changing instantiate prefab dialog to use the AzToolsFramework::GetActiveWindow() helper which always gives a valid active window. 2021-06-11 15:15:45 -05:00
srikappa-amzn 1582cb5257 Enabled instantiate benchmarks 2021-06-11 12:43:35 -07:00
Danilo Aimini 9bb34a6121 Remove references to Wireframe menu item that was removed in a previous PR (#1263) 2021-06-11 11:48:59 -07:00
srikappa-amzn 4c6bd5fcb7 Disabled instantiate and spawnable benchmarks 2021-06-11 11:38:49 -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
jackalbe 4818d1ce80 {LYN-4224} Fix for the file scan slowdown (#1252)
* {LYN-4224} Fix for the file scan slowdown (#1183)

* {LYN-4224} Fix for the file scan slowdown

* Fixed a slowdown in the file scanning logic
* Improved the file scanning logic from previous code by 40%

Tests:
Using Testing\Pytest\AutomatedTesting_BlastTest

old code:
=== 7 passed in 96.13s (0:01:36) ===

current code:
=== 7 passed in 160.45s (0:02:40) ====

newest code:
=== 7 passed in 52.91s ===

* fixing a unit test compile error

* unit test fixes

* another file improvement

* fix for legacy level loading taking too long

* making an enum for the search types

* switched the enum to "allow" types to make the input more clear

* got rid of orphaned const variables
2021-06-11 12:25:45 -05:00
srikappa-amzn 2722ed46c3 Reset prefab system in all prefab benchmarks 2021-06-11 10:03:20 -07:00
Eric Phister 0c7605c9b6 Update minimum required CMake version to 3.20 (#1253)
* Update the minimum CMake version to 3.20

Sets the cmake_minimum_required calls to version 3.20 and updates the
README.md to point at the general CMake download page instead of a stale
link.

* Remove unnecessary cmake minimum version

It was using an old 3.0 version and can be removed.

* Additional updates to CMake 3.20, build scripts

Updates the version and remove logic to find a CMake in 3rdParty.

* Removing backup path to ninja path in the build_ninja_windows.cmd

The backup path for finding ninja was coming from the Perforce depot which isn't available for o3de builds.

* Removing reference to 3rdParty Android SDK 29 from the build and run unit test script

The Android SDK is not part of the new 3rdParty system and users are expected to install the Android SDK on their own in order to build the engine for Android.

* Update the get_python scripts and README

No longer try to append a CMake path to LY_3RDPARTY_PATH, but do still
support LY_CMAKE_PATH because there are still uses of it.  Remove
mention of an LY_3RDPARTY_PATH-relative CMake path from the README.md.

* Removing LY_NINJA_PATH from the build_ninja_windows.cmd

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-11 12:00:55 -05:00
chcurran a995aee35a Properties__Index and Properties__NewIndex upvalue counts no reflect removal of net binding component 2021-06-11 09:47:44 -07:00
sconel 38b1a89631 Merge pull request #1233 from aws-lumberyard-dev/Prefabs/NestedContainerExport
Fix issue involving missing parent container entities in spawnables
2021-06-10 16:28:56 -07:00
Terry Michaels 6fdf7b01a5 Updated camera speed display and bounds (#1251) 2021-06-10 17:23:39 -05:00
Mike Balfour ffe913a2d6 Added ability to convert multiply-nested slices (#1239) (#1245)
* Addressed feedback from previous PR
* Change missing entity aliases to be deterministic.
When converting slices, this helps produce the same results on multiple reconversions of the same data.
* Exposed the asset filter callback.
This allows the slice converter to specifically load nested slices as opposed to not loading *any* referenced assets.
* Added support for multiply-nested slice instance conversion.

(cherry picked from commit 86136ddfa6)
2021-06-10 16:16:03 -05:00
sconel 40fa0a3a46 Remove optimization pragma 2021-06-10 13:53:25 -07:00
cgalvan 64ea419c5c Merge pull request #1243 from aws-lumberyard-dev/cgalvan/FixCreateCameraFromView
[LYN-4390] Implemented EditorCameraRequestBus::GetActiveCameraState on the EditorViewportWidget so that the "Create camera entity from view" action works again.
2021-06-10 15:51:50 -05:00
Terry Michaels 829a6fcc8d Removed Wireframe menu option since it doesn't work with Atom (#1248) 2021-06-10 15:42:06 -05:00