Commit Graph

3657 Commits

Author SHA1 Message Date
scottr 36929f59ae Merge branch 'stabilization/2106' into cpack/jenkins-main 2021-06-22 09:52:14 -07:00
SJ d5490ecf69 Update AWS android package version to rev4
Merge pull request #1461 from aws-lumberyard-dev/LYN-4593
2021-06-22 09:39:20 -07:00
moudgils 4f84ec90d3 Various new metal fixes (#1465)
* - Fix the second window related tabbing issue
- Merge calls to UseResoources acrooaa all the SRGs
- Move SamplerCache to the device to ensure only one cache to reduce duplication
- Fixes to compute threading numbers getting reset to 0,0,0
- Cleanup withing BufferPoolResolver
- Argument buffers are now queued to be cleaned up upon shutdown
2021-06-22 08:58:15 -07:00
jjjoness 0aad6ad08d Merge pull request #1477 from aws-lumberyard-dev/LYN-2509b
Cherry picked from development
2021-06-22 14:46:18 +01:00
Benjamin Jillich 7d5a7b47ac [LYN-3717] When pulling in an actor FBX, two entities are spawned & [ATOM-15258] Clicking and Dragging fbx file into viewport produces 2 entities (#1392)
* [LYN-3717] When pulling in an actor FBX, two entities are spawned & [ATOM-15258] Clicking and Dragging fbx file into viewport produces 2 entities
* Added another operation to the CanSpawnEntityForProduct that checks the other products and can veto the creation process.
* The model product will not create an entity in case there is already an actor exported, which prevents the issue reported by two different teams/users.
2021-06-22 14:12:42 +02:00
Terry Michaels 858dee2210 Need to keep full asset paths around in LuaIDE (#1470) 2021-06-22 07:05:42 -05:00
John Jones-Steele 66c4541e14 Fixed merge error in NewLevelDialog 2021-06-22 11:25:53 +01:00
greerdv 602baa44d9 Merge pull request #1463 from aws-lumberyard-dev/non-uniform-scale-migration
add editor python script to help with migrating levels with non-unifo…
2021-06-22 10:49:55 +01:00
jjjoness 1ec238685d Merge branch 'stabilization/2106' into LYN-2509b 2021-06-22 10:07:28 +01:00
John Jones-Steele 2dce6954a1 Cherry picked from development 2021-06-22 09:41:48 +01:00
sphrose 4d02e0b8bb Merge pull request #1454 from aws-lumberyard-dev/LYN-3619
New level dialog has no way to select a different folder
2021-06-22 09:15:08 +01:00
AMZN-mnaumov 759d719a44 Merge pull request #1471 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15292
[ATOM-15292] Camera no longer resets when typing something
2021-06-21 18:53:52 -07:00
Esteban Papp bfd266db8f LYN-4659 OSX: Prebuilt Editor and Asset Processor fail to launch (#1446)
* LYN-4657 OSX: Building AutomatedTesting project fails

* forgot this file

* fixing lrelease patching in mac/windows

* reverting change and disabling warning, the intention of the test is to compare to unitialized values

* Fix for dxc

* no need to disable the warning, just remove the const

* missing dependency to EditorCommon
2021-06-21 18:24:29 -07:00
mnaumov 5a276b11b0 Fixing includes 2021-06-21 16:56:06 -07:00
mnaumov 4de1d90994 [ATOM-15292] Camera no longer resets when typing something 2021-06-21 16:52:05 -07:00
AMZN-mnaumov 25a8dc4146 Merge pull request #1469 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14412
[ATOM-14412] Fixing PDO offset tooltip
2021-06-21 16:50:51 -07:00
Danilo Aimini a0f4f16b98 Fix Duplicate function to correctly replace the aliases in patches that get ported over. Also correctly undo/redo link creation. (#1449) 2021-06-21 15:47:25 -07:00
mnaumov ac7ec103c8 Fixing PDO offset tooltip 2021-06-21 15:20:22 -07:00
greerdv 17908a277a Merge branch 'stabilization/2106' into non-uniform-scale-migration 2021-06-21 22:29:35 +01:00
greerdv b69b6af305 add copyright notice 2021-06-21 22:28:50 +01:00
Terry Michaels ca76a4d1ab Moved helpers to the top level menu bar above viewport (#1464) 2021-06-21 16:11:50 -05:00
cgalvan 46f8c7c1ba [LYN-3412] Updated LandscapeCanvas component to properly serialize with prefabs. (#1224)
* [LYN-3412] Updated LandscapeCanvas component to properly serialize with prefabs.

* [LYN-3412] Updated PR with feedback.

* [LYN-3412] Reverted unintentional changes.

* [LYN-3412] Removed one more comment.

* [LYN-3412] Additional PR feedback fixed.
2021-06-21 14:03:49 -07:00
amzn-mike a963cd3ac8 Merge pull request #1382 from aws-lumberyard-dev/Helios_TransformImporterFixV2_stabilization_2106
AssImp: Transform Importer Fix V2
2021-06-21 15:46:10 -05:00
greerdv 40a84c3c74 add editor python script to help with migrating levels with non-uniform scale 2021-06-21 20:09:48 +01:00
Terry Michaels 74bb2737ca Replaced menu icon in secondary toolbar (#1459) 2021-06-21 12:50:26 -05:00
amzn-mike 514cfc3b4c Fix compile error 2021-06-21 12:27:13 -05:00
sconel e357dea06c Merge pull request #1447 from aws-lumberyard-dev/Spawnable/GameModeLoadErrorFix
Spawnable/game mode load error fix
2021-06-21 09:57:44 -07:00
amzn-mike 40ed743ca9 Merge branch 'stabilization/2106' into Helios_TransformImporterFixV2_stabilization_2106 2021-06-21 11:50:17 -05:00
greerdv 0e5ec11cdc Merge pull request #1455 from aws-lumberyard-dev/non-uniform-scale-hydra
exposing non-uniform scale component id as a behavior constant for hydra
2021-06-21 17:21:17 +01:00
jjjoness 3549205d29 Merge pull request #1458 from aws-lumberyard-dev/LYN-4195b
LYN-4195b - UX - main menu updates - prevent hover effect on the top level menu icon, dim the link icon and increase space between text and icon throughout.
2021-06-21 17:20:33 +01:00
Eric Phister 22ff37ecda Fixes issue with ACE displaying only banks (#1427)
Updates to some AzCore functions a while ago made some path functions
strip off a trailing slash, which caused bad paths to be used when
loading middleware data.  Updated the code to use better path APIs.
2021-06-21 11:18:03 -05:00
amzn-mike d2d588901e Address PR feedback 2021-06-21 11:00:27 -05:00
Gene Walters 530573abf3 Merge pull request #1424 from aws-lumberyard-dev/SPEC7185_RenamingIsNetEntityRoleMethods
Updating IsNetEntityRole Helper Methods for Clarity
2021-06-21 08:53:23 -07:00
amzn-sean 9f934a6f63 add Draw Helpers changed notification + physx draw helpers listens to it (#1456) 2021-06-21 16:25:45 +01:00
John Jones-Steele 5e4f021d55 Cherry picked from development 2021-06-21 15:28:41 +01:00
amzn-mike bfe391b4bb Merge branch 'stabilization/2106' into Helios_TransformImporterFixV2_stabilization_2106 2021-06-21 08:16:21 -05:00
sphrose a8ba1a99af Update BasicEditorWorkflows_LevelEntityComponentCRUD.py 2021-06-21 11:57:14 +01:00
greerdv 772a75b5bc exposing non-uniform scale component id as a behavior constant for hydra 2021-06-21 11:12:50 +01:00
sphrose a3b7cbeffc New level dialog has no way to select a different folder 2021-06-21 10:02:10 +01:00
Gene Walters 526a0f1289 Fix for Jenkins Validation: removing tabs and removing unwanted spaces. 2021-06-20 20:51:59 -07:00
scottr 64a960e428 Merge branch 'cpack/jenkins-main' of https://github.com/aws-lumberyard-dev/o3de into cpack/jenkins-main 2021-06-20 20:21:48 -07:00
scottr 00bb33587a [cpack/jenkins-main] fixed bug applying some cpack build job parameters 2021-06-20 20:17:11 -07:00
scottr b089facc23 [cpack/jenkins-main] fixed bug where some resources were not embedded in the bootstrapper 2021-06-20 20:00:23 -07:00
scottr 26017c1b49 Merge branch 'stabilization/2106' into cpack/jenkins-main 2021-06-20 17:49:23 -07:00
scottr b3a5afe8a3 [cpack/jenkins-main] trailing new line in PackagingConfig.cmake 2021-06-20 17:20:57 -07:00
scottr 587aa58b87 [cpack/jenkins-main] fixed bug with implicit aws upload profile 2021-06-20 15:16:18 -07:00
scottr 25f99bce79 [cpack/jenkins-main] fixed incorrect host name comparison string for python script name 2021-06-20 14:48:48 -07:00
scottr 3ca839a580 [cpack/jenkins-main] update installer job params and how they are applied 2021-06-20 14:45:03 -07:00
scottr e8f250bed8 [cpack/jenkins-main] rework build tag generation to be at cpack time through LY_INSTALLER_AUTO_GEN_TAG 2021-06-20 14:31:10 -07:00
scottr 21d92a414e [cpack/jenkins-main] update commit date format string to something that works on all machines 2021-06-20 13:38:16 -07:00