Commit Graph

4529 Commits

Author SHA1 Message Date
nvsickle 2d550cc994 Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes 2021-05-20 11:07:45 -07:00
puvvadar 7ecb00cca1 Cleanup jinja formatting and fix log spam 2021-05-20 10:46:48 -07:00
Danilo Aimini c93c457356 Merge pull request #772 from aws-lumberyard-dev/Prefab/Create/PositionFix
LYN-3833 | Position of entity is different after creating it into a prefab
2021-05-20 10:32:42 -07:00
sphrose 3788aa4eec LYN-2139 UX: Goto Position modal is unnecessarily massive 2021-05-20 17:48:18 +01:00
Benjamin Jillich 03b41b620d [LYN-2522] Preparation work for the filter pane (#799)
* [LYN-2522] Preparation work for the filter pane

* Added arrow up/down icons.
* Extended the gem info with the type (Asset, Code, Tool).
* Extended the model with the type and a helper for converting gem uuids into display names.
* Extended the link widget to be clickable with a custom action, needed for the "Show all/less" for the filters.
* Converting the uuids we get from Python to AZ::Uuids and then back to strings to have them all in the same format.
2021-05-20 18:42:37 +02:00
amzn-sj d33fa7dccc Fix for tests that are failing due to project_path not being set 2021-05-20 09:27:47 -07:00
Chris Galvan 8d8504aec3 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 2021-05-20 10:40:50 -05:00
Chris Galvan 2d89c60175 [LYN-2255] Updated Prefab Duplicate to select the newly duplicated entities. Also addressed some other PR feedback. 2021-05-20 10:39:57 -05:00
jonawals feb2909508 Address PR comments 2021-05-20 16:38:56 +01:00
amzn-mike 798d96f1a2 Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter
[LYN-3689] AssImp: Data driven supported filetypes
2021-05-20 10:36:29 -05:00
Tom Hulton-Harrop eb31d90ad9 Updates to fix BoxSelect when using Orbit with the new Camera (#825)
* update camera controller to block box select during orbit

* simplify update for modern viewport camera controller

* wip working lmb box select with orbit

* add test for changes to click detector

* add unit test for camera system to validate events

* remove debugging code, tidy-up changes for PR

* small updates before posting PR

* fix for linux build failure
2021-05-20 15:54:36 +01:00
jonawals b33569638e Address PR comments 2021-05-20 10:06:14 +01:00
amzn-mike ca94c59e28 Switch FbxImportRequestHandler to inherit from AZ::Component instead of BehaviorComponent
Previously FbxImportRequestHandler used to be activated as part of DllMain init and never had CreateDescriptor called, which meant reflect was not called.  BehaviorComponents get created and Activated as part of special SceneCore logic.  Since this component now needs to be activated as part of the normal flow, reflecting it caused it to be picked up by the SceneCore activate logic, causing it to be created/activated twice
2021-05-19 23:22:44 -05:00
puvvadar 2452149e7d Add RPC Events plus reflection plus fix Ctrl+G retry 2021-05-19 19:34:48 -07:00
nvsickle 1654553e9c Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes 2021-05-19 19:12:07 -07:00
nvsickle 8d4fb4d67d Fix dummy rendering pipeline being created for the Editor
-This ensures OnBootstrapSceneReady still fires even if the bootstrap system component doesn't create a default scene
-This also disables default scene creation for non-game projects by default to ease tools development

Tested with the Editor, AtomSampleViewer, the Material Editor, and the AtomTest launcher
2021-05-19 19:11:23 -07:00
daimini 2112d67b6b Rename variable to make it clearer it's a map 2021-05-19 16:15:18 -07:00
lumberyard-employee-dm 73335c7160 Fixed AZ::Utils::GetHomeDirectory function for non-Windows platforms (#821)
* Fixed AZ::Utils::GetHomeDirectory function for non-Windows platforms

* Adding back missing path variable

* Fix typo in homePath variable
2021-05-19 18:05:29 -05:00
daimini e638c6b0d5 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix 2021-05-19 15:30:48 -07:00
amzn-sj 268fd8b714 Remove bootstrap.cfg and references to it. 2021-05-19 13:57:35 -07:00
karlberg 6a643392f0 Merging latest main 2021-05-19 13:37:45 -07:00
karlberg 487e989e68 Several updates to complete rewind support and remove unneeded functionality 2021-05-19 13:27:24 -07:00
AMZN-stankowi f779821ac0 Helios - LYN-3250 - Fixed morph targets for meshes that had multiple … (#696)
* Helios - LYN-3250 - Fixed morph targets for meshes that had multiple materials (#374)

Fixed morph targets for meshes that had multiple materials and were split by AssImp: Recombined them into one mesh in the O3DE scene graph, so the behavior would match FBX SDK.
2021-05-19 13:02:31 -07:00
AMZN-nggieber 25e811ff6c Completed FirstTimeUseScreen with Final UX Look (#812)
* Forced Project Manager window to 1200x800

* Final look for FirstTimeUseScreen, essentially complete

* Remove margins on screens

* Added License info for image
2021-05-19 12:48:55 -07:00
jonawals e70d86501c Add runtime api headers 2021-05-19 20:35:13 +01:00
sconel 6a108c0515 Merge pull request #806 from aws-lumberyard-dev/Spawnable/Instantiation/EntityIdReferenceFix
Updating SpawnAllEntities to handle entity references during spawn
2021-05-19 11:26:10 -07:00
Vincent Liu ad2d2381a4 [SPEC-6713] Add common session interfaces and notifications (#773) 2021-05-19 10:33:48 -07:00
sconel 31e5a312b4 Updated loadAll check to set to false if previous entities already spawned on ticket 2021-05-19 08:58:12 -07:00
sconel 4769664e9e Updating the loadAll flag after a SpawnAllCommand 2021-05-19 08:50:14 -07:00
amzn-sean 8dbcd9f199 increase physics max frame time to 0.1 seconds (10fps) (#824) 2021-05-19 16:44:53 +01:00
sconel a4f673eb32 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix 2021-05-19 08:40:09 -07:00
sconel d8126d59c7 Moved to iterative clone instead of bulk, addressed PR feedback 2021-05-19 08:39:00 -07:00
sphrose 815e750439 Merge pull request #94 from aws-lumberyard-dev/LY-113714
Ly 113714 QT Widget component card updates - Array: Bold title and add separator bar.
2021-05-19 16:05:35 +01:00
jonawals b00906ef36 Delete moved and obselete runtime files 2021-05-19 13:49:35 +01:00
jonawals abe35aad75 Add missing args to PythonBindingsExample.Tests 2021-05-19 13:45:26 +01:00
greerdv 7def4741cd merge from main 2021-05-19 12:14:25 +01:00
igarri 0b50b6cc63 Fixed code Style and minor issues from feedback 2021-05-19 12:04:40 +01:00
lumberyard-employee-dm c6b0e3562e Updating the python import paths for the o3de scripts to use the new package o3de package location 2021-05-19 00:52:28 -05:00
daimini 977030a27a On prefab creation, inherit the patches when moving the nested prefab instances and then update the link with the new parent if necessary. 2021-05-18 17:53:27 -07:00
sconel 8733f0e492 Remove extra newline 2021-05-18 17:16:44 -07:00
sconel 66a7db44f7 Reduced scope of change to focus on SpawnAllEntities 2021-05-18 17:13:24 -07:00
sconel b2ab26b428 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix 2021-05-18 17:10:06 -07:00
bosnichd a2608e187b Resurrect error.log and error.dmp file output when the engine crashes (LYN-3873) (#811)
Resurrect error.log and error.dmp file output when the engine crashes (LYN-3873). This was recently removed as part of 96b85e6813920554f7dfdc7752c1dd4452919b92
2021-05-18 17:37:02 -06:00
AMZN-puvvadar 29b4ab6ff3 Merge pull request #522 from aws-lumberyard-dev/mp_editor_pipeline
Integrating network prefab processing with Multiplayer.Editor to enable server launch on Ctrl+G via an Editor specific network connection
2021-05-18 16:28:08 -07:00
sconel fb290a27af Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix 2021-05-18 16:24:23 -07:00
daimini a4953a5204 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
2021-05-18 15:04:34 -07:00
puvvadar 55ecd8517d Add assert to new Asset constructor to declare intent and safeguard ID overwrite 2021-05-18 14:57:27 -07:00
daimini bb458254a2 Polish pass - rename arguments to be more generic, add comments, restore patches to links during instantiation that were mistakenly removed in previous changes. 2021-05-18 14:52:30 -07:00
srikappa-amzn 3c40aad148 Merge pull request #792 from aws-lumberyard-dev/Prefab/CreatePrefab
Bug fixes for creating prefabs with nested entities
2021-05-18 13:33:34 -07:00
SergeyAMZN 6626a7cf8e Merge pull request #682 from aws-lumberyard-dev/MultiplayerPipeline
Added support for parent-child networked entities
2021-05-18 21:23:32 +01:00