594981f130
Remove the PrefabEditManager. Introduce the FocusMode system on the Editor side, and a PrefabFocusHandler on the Prefab side to handle focus.
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-09-20 11:58:31 -07:00
a8908a987a
Fixing Save level As template path ( #4054 )
...
* Fixing Save level As template path
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* CR Feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* CR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* remove emplace
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* more PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-09-15 17:19:01 -07:00
9f6d4125b8
Merge branch 'development' into cmake/warn_virtual
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-09 11:50:40 -07:00
d836503814
some more fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-09 11:50:13 -07:00
f9ce966103
Merge pull request #3440 from aws-lumberyard-dev/Prefab/SaveAllPrefabs
...
Provide options to save prefabs when saving levels
2021-09-09 10:33:22 -07:00
92986c7012
Merge branch 'development' into Prefab/SaveAllPrefabs
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-09-08 14:11:50 -07:00
d58bda5bbf
WIP
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-08 13:43:30 -07:00
c7fbdb0ace
Make level name appear in bold and update save all prefabs settings registry key
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-09-08 11:49:33 -07:00
0f1e117904
Reverted a small local change that got pushed by mistake
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-09-07 14:32:13 -07:00
d0b7ffab67
Changed parameter names to reflect the recursive nature of functions and some more changes
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-09-07 14:27:00 -07:00
2f71b28b97
Fixes AzToolsFramework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-03 15:08:43 -07:00
f6ce3678fa
Used actual types instead of auto and some more minor changes
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-09-03 12:34:32 -07:00
f7d4d80e5b
Add prefab reparenting python auto tests ( #3653 )
...
* Add prefab reparenting python auto tests
Signed-off-by: chiyteng <chiyteng@amazon.com >
* modify prefab python auto test framework
Signed-off-by: chiyteng <chiyteng@amazon.com >
* remove extra spaces
Signed-off-by: chiyteng <chiyteng@amazon.com >
* delete unused files
Signed-off-by: chiyteng <chiyteng@amazon.com >
* delete unused files
Signed-off-by: chiyteng <chiyteng@amazon.com >
* fix nits
Signed-off-by: chiyteng <chiyteng@amazon.com >
* Refactor prefab python tests
Signed-off-by: chiyteng <chiyteng@amazon.com >
* Fix nits
Signed-off-by: chiyteng <chiyteng@amazon.com >
* Modify comments
Signed-off-by: chiyteng <chiyteng@amazon.com >
* Fix nits and add comments for Prefab.py
Signed-off-by: chiyteng <chiyteng@amazon.com >
2021-09-03 14:06:22 -05:00
fbf92e9775
Merge branch 'development' into Prefab/SaveAllPrefabs
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-09-02 23:40:54 -07:00
5a8998add1
Added function comments and nullptr checks
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-09-02 23:35:28 -07:00
7e75559200
Removed unused Qt classes and do some more code clean up
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-09-02 17:26:32 -07:00
f6acf4321d
Did a major refactor of ui to be less dependent on levels
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-09-02 15:37:29 -07:00
567c0ae24d
Modernization + AZStd::function compare fix. ( #3680 )
...
* Modernization + small fix.
Modernize ( `bool`/`override`/other) code in AzCore, AzFramework, AzQtComponents, AzToolsFramework, etc.
Replaced a `bind` or two, use `using` in a few places as well.
Fix nullptr comparison of AZStd::function.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Apply review-based changes
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-09-02 14:55:09 -05:00
3a9268c955
Merge pull request #3685 from aws-lumberyard-dev/cgalvan/UpdateProjectConfiguratorReferences
...
Updated remaining Project Configurator references to Project Manager and consolidated JsonUtils API usage.
2021-08-30 15:59:25 -05:00
fa0f2a1007
Fix unused warnings release ( #3677 )
...
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS
Signed-off-by: Steve Pham <spham@amazon.com >
2021-08-30 13:10:41 -07:00
194205c453
Replaced AzFramework::FileFunc JSON utils API calls with AzCore::JsonUtils APIs that appear to have been duplicated. Also fixed up improper Project Configurator -> Project Manager comment replacements.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-30 14:10:30 -05:00
89a415d50c
Removed az::u8 from Prefab save preference Enum
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-08-24 19:56:29 -07:00
a13fb3c13a
Added some comments and some minor fixes
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-08-24 19:21:06 -07:00
1ca67cad80
Moved PrefabSavePreference settings registry code from PrefabEditorEntityOwnershipInterface to PrefabLoaderInterface
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-08-24 18:34:51 -07:00
79dd041d02
Add helper methods to create and execute save level dialogs
...
Changes in this commit :
- Added AreDirtyTemplatesPresent() method to PrefabSystemComponentInterface
- Added ConstructSaveLevelDialog() helper method to create the save level dialog
- Added ExecuteSavePrefabsDialog() helper method to create and execute the save prefabs dialog
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-08-24 17:23:06 -07:00
d91dbe3d92
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-24 11:49:35 -07:00
9c7b55a31d
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
# Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
# Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
# Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
2021-08-24 10:43:48 -07:00
90912759f7
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-23 17:08:00 -07:00
97a053a540
Initial stub terrain gem ( #3368 )
...
This is the initial Terrain Gem. In this PR, it doesn't do anything, but it contains all of the initial code, icons, and build scripts for the gem to compile and build successfully. The follow-up PR will contain the first round of functioning code.
Also, with the creation of the gem, the TerrainSurfaceDataSystemComponent is getting relocated from the SurfaceData Gem to the Terrain Gem. This should have no impact, as that component has provided no active functionality in o3de. (It will start working again with the initial terrain system code in the next PR)
This also adds a couple of null guards to prefab code to prevent AP crashes, and fixed an incorrect service dependency in the VegetationSystemComponent that was exposed by moving the TerrainSurfaceDataSystemComponent.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
2021-08-23 15:41:57 -05:00
875918deda
Allowing prebas with missing components to load, and clarifying error message
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-23 12:59:13 -07:00
9245a31196
more fixes for Code
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:48:42 -07:00
7a83950f59
Initial draft for save all prefabs workflow
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-08-20 11:35:57 -07:00
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:09 -06:00
28d035c275
Add a new auto test for delete prefab workflow ( #3143 )
...
* Add a new auto test for delete prefab
Signed-off-by: chiyteng <chiyteng@amazon.com >
2021-08-18 10:55:45 -07:00
a20428d393
Fixing non unity build
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-17 11:10:42 -07:00
0884f96997
PR feedback
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-16 16:02:09 -07:00
d5b92fa93a
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372
2021-08-16 15:23:34 -07:00
e633b5bdc7
Addressing Ronald's feedback
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-13 19:50:35 -07:00
c8cd3b1923
reverting another file
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-12 14:44:09 -07:00
8f21563ba9
Undoing old changes and storing linkId to prefabDom
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-12 14:44:07 -07:00
3fe5901a77
Fixing a crash when unparenting prefab instance in a new level
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-12 14:44:05 -07:00
7e5cbdab1e
Create a new automated test for Prefab basic workflows ( #2715 )
...
Adds a new ebus for prefab apis and refactored the apis
Removed an empty test level
Auto delete tmp level when teardown tests
Add Base test level in Prefab folder
Removed unused comments
Checked if absolute path as an input of Create Prefab functions
Changed created prefab file path to support all platfroms
Added missing includes
Signed-off-by: chiyteng <chiyteng@amazon.com >
2021-08-11 14:11:26 -07:00
fbcb6510e6
Update storage of Prefab Dom info to be best effort ( #2862 )
...
* Update storage of Prefab Dom info to be best effort
Signed-off-by: sconel <sconel@amazon.com >
* Update IssueReporter to Skipped instead of PartialSkip
Signed-off-by: sconel <sconel@amazon.com >
* Address PR feedback
Signed-off-by: sconel <sconel@amazon.com >
* Fix failing Prefab Unit Test that expected default values to be stripped
Signed-off-by: sconel <sconel@amazon.com >
2021-08-11 10:45:31 -07:00
25844a9ed6
Selecting entities when duplicating prefabs ( #2995 )
...
* Selecting entitie when duplicating prefabs
Signed-off-by: mnaumov <mnaumov@amazon.com >
* PR feedback
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-10 16:40:51 -07:00
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00
c9301a8c94
Fix a bug in patching templates and improve error messaging ( #2394 )
...
* Fix a bug in patching templates and improve error messaging
* Fixed incorrect order of function arguments
* Fix build errors regarding c style strings and casting entity ids
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-07-29 12:04:04 -07:00
909384bd34
Code/Framework compiling
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-27 19:29:02 -07:00
d8c9c5178e
Reset the prefab root instance before removing the corresponding template ( #2287 )
...
* Remove dirty entities correctly when prefab entities get destroyed
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
* Remove call to clear dirty entity for single entity delete
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
* Removed couple of asserts because order of operations is not fixed
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-07-21 15:42:46 -05:00
ebf0ea6a69
Remove container entity from all maps when entities are cleared from a prefab instance
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-07-16 17:03:03 -07:00
38261d0800
Shorten copyright headers by splitting into 2 lines ( #2213 )
...
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines
Signed-off-by: Steve Pham <spham@amazon.com >
2021-07-16 15:25:48 -07:00
Danilo Aimini
Mikhail Naumov
Esteban Papp
AMZN-koppersr
srikappa-amzn
chiyenteng
Artur K
Chris Galvan
Steve Pham
Mikhail Naumov
Mike Balfour
Jeremy Ong
sconel
srikappa-amzn
pappeste