Commit Graph

55 Commits (1dd1f85d2b09eb31ae278c12abe0295a8034d96c)

Author SHA1 Message Date
srikappa a9af90be5a Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments 5 years ago
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 5 years ago
mnaumov 5f0e7f2cbc merge from main 5 years ago
Luis Sempé 8996976efb
Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
Fixed Lua IDE startup
5 years ago
luissemp 49322b040b Fixed Lua IDE startup 5 years ago
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 5 years ago
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 5 years ago
amzn-sean b0cb5a381b
Merge pull request #104 from aws-lumberyard-dev/fixed_LYN-2998_main
LYN-2998
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
fixed entities not being deselected when entering game mode in editor.
5 years ago
mnaumov 5f4275336c Fixing deadlock related to thumbnails
Adding smoothing to thumbnails in AssetBrowser
5 years ago
AMZN-daimini 62bc7a66bb
Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. (#149)
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector

* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.

* Separate setting the prefab's template path and the container entity name.

* Disable reparenting to root level

* Disable the ability to rename the level entity.

* Fixes as per Ram's review
5 years ago
srikappa-amzn f8c5048b56
Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
5 years ago
srikappa 78892c8d7e Improved a couple of comments 5 years ago
AMZN-mnaumov f4a57663fa
Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
5 years ago
AMZN-mnaumov 3994d80c7e
Merge pull request #148 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15271
[ATOM-15271] Fixing thumbnail pixelation
5 years ago
AMZN-daimini 7901fe8625
Reset the whole Qt model when an entry in the EditorEntityModel is removed. (#48) (#82)
An optimization introduced in Prefab mode currently changes the relative ordering of children, causing stale QModelIndex variables to still be referenced and crash the Editor sporadically. This change is theoretically a bit slower, but still much faster than the pre-optimization times.

Co-authored-by: Shirang Jia <shiranj@amazon.com>

Co-authored-by: Shirang Jia <shiranj@amazon.com>
5 years ago
mnaumov 7e48bee48f Fixing thumbnail pixelation 5 years ago
srikappa 967d182ccc Fixed a couple of typos 5 years ago
srikappa 8d94f45b19 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
mnaumov 6abf17439a Adding "Create New Material" context menu option to folder in Material Editor
Improving MaterialBrowser filter to show empty folders
5 years ago
srikappa 707f7cb6ce Added some comments 5 years ago
srikappa 8bc2998d82 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 65b2d9de1b Added couple of helper functions 5 years ago
Chris Galvan 7f169855f3 Merge branch 'main' into cgalvan/EntityHelperRefactor 5 years ago
srikappa f3ff5ec886 Add helper method for adding link in CreatePrefab 5 years ago
Chris Galvan 06d6ab9715 [LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback. 5 years ago
srikappa 889158e3a9 A couple of minor fixes 5 years ago
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 5 years ago
srikappa 22d6e1ec0d Modularized undo instannce update undo operation and enabled setting container entity to be selected 5 years ago
Esteban Papp a6c7815685
SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile 5 years ago
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
amzn-sean beafc80939 Fixed entities not being deselected when entering game mode in editor.
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
jira: LYN-2998
5 years ago
mcgarrah bff55bd688 LYN-2726 Updated the Settings Registry Merge Utils logic to determine
the project root and engine root to fix issues with running the Editor
or AssetProcessor from within the project folder overriding the
project_path with the engine root bootstrap.cfg project_path entry

The order in which the project path is overridden as follows
1. The <engine-root>/bootstrap.cfg is first merged into the Settings
   Registry. Any '/Amazon/AzCore/Bootstrap/project_path' would be used
   if the following steps don't override that key.
2. Followed by general *.setreg/*.setregpatch files being merged into
   the Settings Registry which can override the
   '/Amazon/AzCore/Bootstrap/project_path' key
3. Next a project.json file searched upwards from the current executable
   directory to determine the project path
4. Finally if a command line parameter that overrides the project path
   is supplied it is used instead
5 years ago
srikappa 0b29e4ffea Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 778d60bd0c Replaced unique instance queue with checks in template to instance mapper 5 years ago
srikappa-amzn 76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs
Make creation of new prefabs use a relative path to the project
5 years ago
Terry Michaels 020d7801bb
Make sure Recent Files list is correctly enabled/disabled when the list changes (#73)
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
5 years ago
srikappa c63f09adce Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 4da29a09d2 Merge branch 'main' into Prefab/RelativePathForNewPrefabs 5 years ago
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 5 years ago
srikappa 2410d299c1 Make creation of new prefabs use a relative path to the project 5 years ago
srikappa a371edd07f Initial commit of CreatePrefab work 5 years ago
Chris Galvan 0f13a71bd2 [LYN-2255] Refactored some EditorEntityHelpers so they can be re-used. 5 years ago
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 5 years ago
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 5 years ago
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 5 years ago
Alex Peterson cd12226849
Merge branch 'main' into github/staging 5 years ago
greerdv 8ee92978f4 setting max value for scale 5 years ago
greerdv 51f1183ff4 making scale gizmo apply uniform scale to transform 5 years ago
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 5 years ago