c1bbe3806d
Asset Browser Search Entries Highlight ( #6133 )
...
* Adding hilight to search entries
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Delegate Cleanup
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* delegate cleanup
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* General cleanup
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* reformatting file
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Updated Comments
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Abstracted richText functions
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Extracting highlighting behavior
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Added highlighter to the entity outliner
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Addressed Code Review Comments
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Switched to static functions
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* changed variable name
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Removed unused variable
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Apply changes to the Entity Outliner Model
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Removed duplicated line
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2022-01-18 12:29:06 +00:00
7e5e4842b0
Merge pull request #6676 from aws-lumberyard-dev/Atom/mriegger/format
...
Remove 'INF' from integer widget and replace it with better formatted…
2022-01-13 17:18:57 -07:00
8ed3da5b7f
Adding header file
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2022-01-05 10:24:53 -08:00
783a04b880
3495 Preferences panel update: fix richtext elision and allow html links
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2022-01-05 18:00:07 +00:00
30e21bc2d1
Updating formatting
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2022-01-04 14:52:00 -08:00
a891993c35
Remove 'INF' from integer widget and replace it with better formatted integers. Also fix warning message with invalid param
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2022-01-04 09:58:30 -08:00
e09a4d20d3
Merge pull request #6240 from tjmgd/bug-keyword-prefab-23
...
Fix for bug in entity outliner search box
2021-12-27 13:12:08 -06:00
3f766629bc
Lua Editor log - text ghosted ( #6329 )
...
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com >
2021-12-22 09:36:34 -08:00
0dfb8d42c4
Disable the ability to instantiate into closed prefabs, and to move the root prefab in focus mode. ( #6320 )
...
* Disable "Move Up" and "Move Down" for focused prefab containers.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Disable the ability to instantiate prefabs inside closed prefab instances.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor comment fix.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-12-13 19:10:04 +01:00
586f146a84
Fixed nullptr error ( #6386 )
...
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
2021-12-13 17:56:46 +00:00
9dc32a0381
Additional read-only prefab workflow changes.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-08 12:30:31 -06:00
363007363a
In the entity outliner search box, the matching results are not expanded and displayed
...
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com >
2021-12-08 09:02:05 +00:00
a8ef23e4ae
Merge pull request #6232 from aws-lumberyard-dev/cgalvan/ReadOnlyPrefabWorkflowChanges
...
Some read-only prefab workflow updates.
2021-12-07 19:38:54 -06:00
3a7d9f9b3a
LYN-8633 | Read-Only Entities - Entity Outliner behavior changes ( #6230 )
...
* Add invalid entityId check to IsReadOnly
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Ensure read-only entities editing is limited (no renaming, limited drag/drop, no asset drop on them)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Removing redundant class definition in wrong namespace.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-12-07 16:58:29 -08:00
6532c50c27
Some read-only prefab workflow updates.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-07 17:22:10 -06:00
cd5306febf
Merging from development
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-07 12:35:41 -08:00
4b97f7bac2
Merge pull request #5296 from aws-lumberyard-dev/sc-editor-asset-redux
...
Sc editor asset redux
2021-12-07 09:15:52 -08:00
15e26b7515
merge development
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-06 12:21:45 -08:00
476e66d902
LYN-8631 + LYN-8632 | Display appropriate read-only icons and procedural prefabs ui in the Outliner ( #6160 )
...
* First step of procedural prefab styling and read-only registration.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* WIP - Introduce read-only handler for procedural prefabs (not hooked up)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Introduce read-only entity interface, handler and unit tests.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Introduce temp read-only icon, use new icon hierarchy in Outliner.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Switch from a push paradigm to a pull paradigm - handlers get to implement logic to determine if an entity should be read-only. This allows multiple systems to weigh into whether an entity is read-only.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fixed to missing call in test
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Post-rebase fixes to class name changes
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Display a lock icon on top of the entity icon in the Entity Outliner. This icon is added programmatically, which prevents having to alter all Outliner icons and future-proofs this functionality.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor style changes to procedural prefabs in the Outliner (use white icon)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Ensure cache is refreshed when the handler is created, and also whenever the focus changes.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Remove Procedural Prefab setreg that was added in the wrong place
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Remove redundant function
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix spacing issue caused by rebase
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Change tooltip so that it accurately says "inspect" instead of "edit" for procedural prefabs.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Address minor styling issues mentioned in PR.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-12-06 12:16:16 -08:00
d583256b17
Merge pull request #6144 from aws-lumberyard-dev/cgalvan/ReadOnlyEntityInspectorChanges
...
Updated Entity Inspector to changed behavior when an Entity has been marked as read-only.
2021-12-06 12:01:39 -06:00
a7989df051
Fixed status combo box style in Entity Inspector.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-06 10:39:49 -06:00
87fb6be964
Fixes to Procedural Prefab instantiation - ensure the container of the procprefab has the correct editor components, and remove limitation to instantiating at the root. ( #6147 )
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-12-03 15:38:29 -08:00
b470f917ca
Listen to read-only entity state changes so we can refresh if the read-only state changes on one of our selected entities.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-03 16:37:35 -06:00
273fb87eeb
Renamed variable to be more descriptive.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-03 16:21:31 -06:00
954642c1ce
Updated Entity Inspector to changed behavior when an Entity has been marked as read-only.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-03 13:40:07 -06:00
c5460c2064
Removes driller from AzToolsFramework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-02 15:40:23 -08:00
6bd0308339
Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-02 14:17:35 -08:00
4424b4d51e
Fix Integer Spin Controller not sending PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished ( #5942 )
...
* IntWidgetHandler::CreateUI now registers and sends editingFinished event
* add tests for int spin control valueChanged and editingFinished signals
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-11-30 10:49:53 +00:00
eca2e36687
Fix clang 13 compilation problems ( #5791 )
...
* Fix clang 13 compilation problems
Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda
which replaces missing `Draw2dLabel` functionality ( added TODO marker
there )
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* apply review suggestions
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix type in assert message
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-11-25 09:24:39 +00:00
6a40d21b66
Merge commit '4ee2f341dc0dc709aedb446b57d5cca61b86160d' into junbo/gitflow_211123_o3de
2021-11-23 13:14:59 -08:00
3b39be7fd0
Merge commit '4ad35f424e01356a4745e5f50631dc050b328c98' into junbo/gitflow_211123_o3de
2021-11-23 13:14:57 -08:00
1937e1ea51
Fixed asset completer model for source handle picker.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-19 16:20:54 -06:00
06e3fa4bef
Made PropertyAssetCtrl more extensible.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-19 14:51:41 -06:00
d91d5a079f
Added method to AssetCompleterModel for specifying a filter directly.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-19 14:48:56 -06:00
4ee2f341dc
Fix several Prefab outliner ordering issues ( #5747 )
...
* Fix several Prefab outliner ordering issues
This change does a few things to address instability in entity order when prefabs are enabled:
- Changes ordering behavior on entity add to always be "insert after the last selected sibling of the new entity, or at the end if there is no selected sibling"
- Adds some logic to ensure selection stays frozen during prefab propagation to allow this behavior to be used
- Alters delta generation in `PrefabPublicHandler::CreateEntity` to use the template instead of reserializing the DOM - this avoids a whole bunch of patching issues caused by EditorEntitySortComponent doing post-hoc order fix-up and should generally be safer/faster as we're producing patches for the actual target for those patches
- Because the duplicate action is DOM-driven, and there's some thorniness around making changes that will affect the template during propagation, this adds `PrefabPublicHandler::AddNewEntityToSortOrder` to directly patch the DOM for the duplicate case
Two bits of this come from patches from the incredibly helpful @AMZN-daimini
- Alters `PrefabPublicHandler::GenerateUndoNodesForEntityChangeAndUpdateCache` behavior for determining what's an override: we now check to see if we're part of the current focused instance but *not* owned by the focus instance directly. This lets entity order for nested prefabs get saved to the owning prefab instead of as an override. I'm putting this up for discussion without a feature flag gating it, but we may wish to make this a toggle or disable it outright for stabilization (in which case entity order won't be saved to the owning prefab)
- Adds a custom serializer for EditorEntitySortComponent. This isn't strictly necessary now, but it was very useful for debugging and ended up receiving much more manual testing its migration path and save/load path more than I've tested without using the serializer.
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
* Add missing serializers
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
* Address some review feedback
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
* Generate patch in `PrefabPublicHandler::CreateEntity` using the instance's fully evaluated template in-memory
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
* Fix up comment
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
* Fix Linux build
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
* Try to make test less timing dependent (haven't been able to repro failure locally)
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
* Fix another build issue
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
* Fix unit test failures
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
* Fix a duplicate issue with sanitization that was causing sporadic test failure (thanks, test!)
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
* One more Linux fix...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-11-19 23:35:19 +05:30
4ad35f424e
Adds check to make sure that there are not too many samples created. ( #5789 )
...
* Adds check to make sure that there are not too many samples created.
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes made from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes made from PR 2
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
2021-11-19 17:57:38 +00:00
724ff3b011
Merge commit 'd222aeef48ad10224958e682294e704c10ee06df' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:47 -08:00
14e4fd40d4
Merge commit '5ec582484978e61429ccd7a962405c3e9f1ba819' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:49:22 -08:00
e44fa2a52a
Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:19 -08:00
db3d41ad9d
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-16 10:06:28 -08:00
7d849cc0d2
Changed the overall strategy for how to handle missing image references. Instead of replacing it with one of the placeholder assets, we replace it with an random UUID which will be interpreted as a missing asset (unless some discovers discovers a UUID collision). This eventually gets replaced by one of the placeholder textures at runtime. This approach gives more consistent results in how missing texture are handled between Material Editor and Material Component.
...
I actually tried this approach before and it didn't seem to work the way we needed, but I realized that's because PropertyAssetCtrl wasn't handling missing assets properly. I fixed a few issues there including showing the error button when the asset can't be found, and fixing a broken reference to the error icon file.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-15 16:51:22 -08:00
38a03817bb
Removal and Replacement of the CryTimer (gEnv->pTimer) ( #5409 )
...
Replaced and removed the CryTimer (gEnv->pTimer). The new TimeSystem is a merger of the current time functionality found in the engine.
* Rename TimeSystemComponent.h/.cpp to TimeSystem.h/.cpp
* Adding New TimeSystem
* remove old timer cvars
* small improvements to the time system.
- updated parts to use the time conversion functions.
- in AdvanceTickDeltaTimes applying t_simulationTickScale is now uses doubles instead of floats.
* Replace gEnv->pTimer / ITimer usages with TimeSystem
* Updating usages of AZ::TimeMs{ 0 } and AZ::TimeUs{ 0 } to AZ::Time::ZeroTimeMs and AZ::Time::ZeroTimeUs
* red code the CryTimer
* using TimeUs instead of TimeMs is some cases + updating usages of old cvars to new
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-11-15 12:11:58 +00:00
5ec5824849
Hide the "up one level" button temporarily. ( #5595 )
...
Signed-off-by: Danilo Aimini <daimini@amazon.com >
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-11-12 14:16:44 -08:00
92c0e598d5
Starting to remove MTL asset references
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-11 19:20:04 -06:00
8d5dd4e35f
Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21
...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-11-11 10:15:52 -08:00
edefb57cfd
Fixed crash when typing asset name and clicking browse ( #5495 )
2021-11-11 13:58:00 +00:00
27f0aa7f13
LYN-7468 | Viewport manipulators for the container of the focused prefab should be hidden ( #5432 )
...
* Extend the level entity behavior to open prefab containers in focus mode. Disable manipulators for these entities too.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor adjustments
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix enum casing in Entity Inspector.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Split views between for Level and FocusedContainer entities.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Slightly different fix to support components on focused containers.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor fixesto RefreshSelectedEntityIds.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-11-10 14:43:32 -08:00
0e3df14ea2
Add missing bus connection/disconnection.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-10 11:59:28 +00:00
33d5109fe8
Merge stabilization/2110 as of 20edb35cdc into development ( #5319 )
2021-11-08 15:22:17 -08:00
c69142b73b
Merge branch upstream/stabilization/2110
...
* Conflict GemModel.h
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-04 17:02:00 -07:00
Ignacio Martinez
Jeremy Ong
mrieggeramzn
sphrose
Chris Galvan
tjmgd
Danilo Aimini
John Jones-Steele
Tobias Alexander Franke
Esteban Papp
carlitosan
amzn-sean
Artur K
Junbo Liang
Nicholas Van Sickle
puvvadar
Tommy Walton
santorac
Guthrie Adams
AMZN-AlexOteiza
John
Chris Burel
Alex Peterson