Commit Graph

1169 Commits

Author SHA1 Message Date
srikappa be6cee806d Show detach prefab only when a single instance is selected 2021-05-28 02:14:28 -07:00
lumberyard-employee-dm 3c0c066f88 Updating the ProjectManager Gem validation check to make sure the name isn't empty either 2021-05-28 02:54:54 -05:00
srikappa dc4a15628f Remove unused GetNestedInstance method in Prefab Instance class 2021-05-28 00:43:31 -07:00
pappeste 8b9f5230f6 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-28 00:16:26 -07:00
phistere b73bc09ce7 Fixes a name comparison issue during module load
A name like Camera.dll was matching against
Atom_Component_DebugCamera.dll so it thought the module was already seen
and wouldn't add it to the list of dynamic modules to load.
2021-05-28 01:20:24 -05:00
Benjamin Jillich 5bb55ac1c7 [LYN-2514] Optimizing for new window dimensions (#990) 2021-05-28 07:38:05 +02:00
Steve Pham 051384e9a7 Remove AZ_TRAIT_DISABLE_ASSET_JOB_PARALLEL_TESTS from Linux traits (#1018) 2021-05-27 20:13:45 -07:00
karlberg e737307168 Merging latest origin/main 2021-05-27 20:00:54 -07:00
karlberg 802943bbb3 Bug fixes, naming changes to make variables more clear, and adds a cvar to adjust client window size 2021-05-27 19:54:56 -07:00
srikappa 57913d8378 A couple of bug fixes 2021-05-27 18:19:28 -07:00
Terry Michaels 9435305f01 Make entity creation via asset drag and drop properly create an entity so it works with prefabs correctly (#1010) 2021-05-27 19:31:32 -05:00
chiyteng c21a59af50 Remove print dom for debug previously 2021-05-27 17:19:32 -07:00
AMZN-koppersr c45697fd51 Fixed unit test compile error with spawnables 2021-05-27 16:57:15 -07:00
Nicholas Van Sickle 5e87250f67 Fix viewport icon rendering on high DPI devices (#1006)
* Clarify ViewportWorldToScreen being in widget space and add DeviceScalingFactor

* -Fix viewport icons being draw wrong on high DPI displays
-Fix loading viewport icons from absolute paths, which

* Address review feedback, fix build
2021-05-27 16:31:30 -07:00
AMZN-koppersr 40dbf22b00 Merge branch 'main' into SpawnablePriorityQueue 2021-05-27 16:16:10 -07:00
AMZN-koppersr 2550c3e1ff Spawnable Entity Manager threshold default to "m_highPriorityThreshold" 2021-05-27 16:13:32 -07:00
scottr bd3dae077e Merge branch 'main' into ftue_auto_register 2021-05-27 15:25:47 -07:00
scottr e1dfac34fc [ftue_auto_register] wrapped registration pybind calls with ExecuteWithLock 2021-05-27 15:24:39 -07:00
scottr 3137b961bf [ftue_auto_register] elevated error to assert if registration fails 2021-05-27 14:54:51 -07:00
lumberyard-employee-dm 394ac7ab6a Updated the enable gem and disable gem API (#54)
* Updated the enable gem and disable gem API
Renamed remove_gem_project.py -> disable_gem.py
Renamed add_gem_project.py -> enable_gem.py
Renamed the "add-gem-to-project" command -> "enable-gem"
Renamed the "remove-gem-from-project" command -> "disable-gem"

Fixed the parsing of the enabled gems from the enabled_gems.cmake file

* Adding newline to the end of the CMakeLists.txt
2021-05-27 16:44:50 -05:00
scottr ecc18338fa [ftue_auto_register] move engine registration check into private helper function 2021-05-27 14:19:31 -07:00
scottr 78afc45709 [ftue_auto_register] add logic to auto register engine if it is not already 2021-05-27 12:39:14 -07:00
AMZN-koppersr c946d57928 Addressed PR feedback. 2021-05-27 11:14:21 -07:00
jackalbe 5b5d02baa4 {LYN-4060} Helios - Fix to load PAK Archive files (#964)
* {LYN-4060} Helios - Fix to load PAK Archive files

{LYN-4060} Helios - Fix to load PAK Archive files

* Helios - Archive does not load from PAK files due to IsFileExists() error
* the decompression tag does not need to be ZCRY, so removed it
* the PAK files are on disk, so a "on disk file exists" method is used
* the mapped files m_mapFiles need to track the file path, not just the filename

Tests: Release Launcher with a new level

* re-adding the read only flag check so that ZIP files can be created
2021-05-27 12:59:42 -05:00
sconel 933f012def Code cleanup, removed pragma optimize macro 2021-05-27 10:50:56 -07:00
Terry Michaels b600dd9b71 Fixed issues with mac build caused by a double define of "MAC" (#996)
* fixed missed reference to name change

* Fixed MAC double define issue, changed to MAC_ID
2021-05-27 12:49:16 -05:00
pappeste 01933f45b1 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
2021-05-27 10:39:37 -07:00
pappeste f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
Tom Hulton-Harrop b4ab2032e8 Fix for viewport ui crash and small refactor (#992) 2021-05-27 18:03:01 +01:00
greerdv 066de9d365 Merge pull request #987 from aws-lumberyard-dev/manipulator-transform-scale
update manipulators to avoid using vector scale Transform functions
2021-05-27 17:55:37 +01:00
jjjoness 5942cf066d Merge pull request #983 from aws-lumberyard-dev/LYN-1914
Changed editor icon
2021-05-27 17:41:14 +01:00
Alex Peterson 7cd325bad9 Adding ProjectManager as an Editor runtime dependency
The project manager is needed by the editor if it does not know what project to use
2021-05-27 09:40:48 -07:00
Terry Michaels fd8fe8b939 Fixed newly created level having the right source field set (#986)
* Fixed an issue with the source field a newly created level not being set correctly
2021-05-27 11:40:16 -05:00
AMZN-stankowi 9d94977b2c FbxImportRequestHandler is now loaded only once per AssetBuilder and Editor + re-enabled STL support (#933)
* Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)"

This reverts commit 58adcf168f.

* Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter"

This reverts commit 798d96f1a2, reversing
changes made to eb31d90ad9.

* Revert "Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter""

This reverts commit c1124f26d957388e88cc4990021314b5af247e1d.

* Revert "Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)""

This reverts commit 978477097892a22e83519646527ff52ba6532f35.

* Fixed how FbxImportRequestHandler is loaded

* Bumped version to force FBX to rebuild + removed unused variable

* Revert "Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)""

This reverts commit 978477097892a22e83519646527ff52ba6532f35.

* Revert "Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter""

This reverts commit c1124f26d957388e88cc4990021314b5af247e1d.

* Fixed a bad revert

* Better error reporting at AP launch

* AZ_CRC -> AZ_CRC_CE and removed delayed reload of settings registry file now that it's available at startup

* fixed typo in comment
2021-05-27 08:45:32 -07:00
amzn-sean 529e29071c update Ragdoll component to only uses Handles (#981) 2021-05-27 16:42:17 +01:00
John Jones-Steele bdbeaa8e54 Merge branch 'main' into LYN-1914 2021-05-27 16:09:23 +01:00
greerdv f286057046 update manipulators to avoid using vector scale Transform functions 2021-05-27 16:05:18 +01:00
John Jones-Steele 072f6e194e Changed editor icon 2021-05-27 14:02:01 +01:00
greerdv 34c59a81b8 update rigid body to use non-deprecated function and remove many deprecated transform bus functions 2021-05-27 10:51:36 +01:00
Tom Hulton-Harrop 4205a69106 Allow ComponentAdapter (and related types) to work with EntityComponentIdPairs as well as EntityIds (#920)
* provide the ability for component adapters to support multiple components per entity

* add missing explicit keywords

* updates following review feedback - update how template logic works

* small updats (fix typo, remove redundant includes)

* add missing this->

* naming change, common -> controller

* add [[maybe_unused]]
2021-05-27 09:34:52 +01:00
michabr 8bd4c8d974 Add back text drawing using Draw2d (#928)
This is used by the UI Editor's viewport and also by LyShine to display debug text.
2021-05-26 20:51:05 -07:00
Alex Peterson 13de9de3c1 Project Manager Toolbar Update
- use flow control for projects page for automatic updates when resizing
- made the first time screen only display the first time
2021-05-26 19:47:17 -07:00
srikappa 053e273b97 Clear dirty entities at the end of InstantiatePrefab logic 2021-05-26 18:24:49 -07:00
Terry Michaels 9b1be43367 Renamed osx_gl to mac and es3 to android for cache folders (#949) 2021-05-26 19:17:17 -05:00
chiyteng 4fc7d72b2b modify DetachPrefabFromParent function for debugging 2021-05-26 16:49:09 -07:00
sconel 07ecb938e7 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/ScriptCanvas/Integration 2021-05-26 16:45:23 -07:00
sconel b5599ca739 Add asset picker support to spawn SC node and thread safety measures 2021-05-26 16:45:04 -07:00
AMZN-koppersr 1248dc5fb4 Spawning priority threshold through SetReg
The priority threshold to consider a task high priority can now be configured through the Settings Registry under key "/O3DE/AzFramework/Spawnables/HighPriorityThreshold".
2021-05-26 16:39:24 -07:00
Nicholas Van Sickle d1863c6c5b Restore Editor viewport icon rendering (#879)
This introduces an EditorViewportIconDisplayInterface that will eventually be used to outright remove CIconManager, it provides a simple interface for loading 2D image assets and rendering them on-screen. It also introduces AtomBridge::PerViewportDynamicDraw for getting a dynamic draw instance on a per-viewport basis
2021-05-26 16:36:54 -07:00
Terry Michaels 5ed4454e8b Moved Create New Level logic out from SaveToStream (#967) 2021-05-26 17:52:34 -05:00