Commit Graph

915 Commits

Author SHA1 Message Date
alexmontAmazon 9ef25cb5c4 rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640) (#1726)
* rewrite of the filter code to fix [LYN-4156][LYN-4545]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* improved onRowCountChanged() per comments

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
2021-07-01 13:59:10 -07:00
Mike Balfour d34d088191 Miscellaneous prefab/converter bugfixes to support TrackView (#1701)
This has a small bundle of bugfixes and improvements all based around improving prefab TrackView support:

* JsonMerger - improved the error message when patch remove operations fail to make the specific failure more obvious
Instance - swapped the order of destroying entities vs clearing the lookup tables so that lookups still produce valid results during destruction. (This could happen while creating undo caches)
* InstanceEntityIdMapper - in the case where an id isn't found, it now returns an invalid id instead of an "attempted-valid" one that still generally turned out to be not-valid
* PrefabUndo - downgraded a potential crash to an error message if for some reason the patch contains changes to an entity that doesn't currently have an alias. (This case can be caused occasionally by other bugs and error conditions)
* EditorSequenceComponent - downgraded a potential crash to an assert for the times when it tries to remove components, fails, but thinks it succeeded. (This case can currently be caused by using Maestro with Prefabs enabled)
* EditorSequenceAgentComponent - added an undo cache refresh whenever the component deletes itself, so that deleting itself during an EditorSequenceComponent destruction chain of events leaves the undo cache in the correct state.
* SliceConverter - fixed the conversion of entity references in top-level slice instance entities that refer down to nested slice entities. There was a chicken-and-egg problem in terms of which entities need to be created first to make the references and the prefab patching & serialization happy. This was worked around by creating placeholder top-level entities, then the nested slice entities, then replacing the top-level entities with the fully-realized ones.

Specific changes:
* Added more informative error message.

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 672608a6c833c07295996cd9b3449825222b74d0)

* Changed the error condition to produce a "valid" invalid id instead of a deterministic but not-valid id

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 3673950c949de8e067b32ddafaffd07e648a13d8)

* Guard against invalid reference assert/crash

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 268d4ef3447f268a1372d07e028b9e67bac5c64e)

* Downgrade an invalid reference crash to an assert

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 38c9303770845f4e863273dd6fb8fc7e83380425)

* Improved logic for handling entity references across nested slices.

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 7e89a016d95fb72cb5f119e1e3768daa60e6bfb4)

* Changed order of entities.clear() call so that instance lookups are still valid during entity destruction.

Signed-off-by: mbalfour <mbalfour@amazon.com>

* Add undo cache notification when removing Maestro components.

Signed-off-by: mbalfour <mbalfour@amazon.com>
2021-07-01 13:53:17 -05:00
Tom Hulton-Harrop f2242f1ed5 Merge pull request #1684 from aws-lumberyard-dev/hultonha_LYN-4304_viewport_ui_gamemode
Cherry-pick hiding viewport ui change from development to stabilization
2021-07-01 16:55:31 +01:00
greerdv 05a2ce4fe1 update based on PR feedback
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 13:35:57 +01:00
greerdv 88615f462c merge from stabilization/2106
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 11:30:16 +01:00
greerdv 899350b5c7 bring across lua raycast improvements from 1.x
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 11:24:10 +01:00
hultonha e1de075789 Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha_LYN-4304_viewport_ui_gamemode 2021-07-01 09:58:55 +01:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
Danilo Aimini 7030f663f5 LYN-4890 | Change all instances of teal blue to correct O3DE branding palette colors (#1672)
* Replace old teal color with correct palette colors from the O3DE branding.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix hyperlink color in O3DE About Us dialog to improve visibility.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-06-30 15:20:42 -07:00
Steve Pham 827855f01c Removal last CryTek references
- 'Crytek application' is now 'O3DE application' in ISystem.h
- 'CryTek' is now 'O3DE' in ProjectDefines.h (comment)
- 'Crytek Legacy' is now 'O3DE Legacy' in LocalizedStringManager.cpp
- 'Crytek extended data' references are now 'O3DE extended data'

Signed-off-by: spham <spham@amazon.com>
2021-06-30 12:48:16 -07:00
hasareej 8408f6b815 PR feedback changes 2.0
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-06-30 18:02:44 +01:00
hasareej 32687cbcb2 PR feedback changes
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-06-30 18:01:52 +01:00
hasareej df0fede8d2 Hiding the 2 Clusters during Gameplay mode
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-06-30 18:00:52 +01:00
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 2021-06-30 09:20:08 -07:00
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes
Signed-off-by: pereslav <pereslav@amazon.com>
2021-06-30 13:20:07 +01:00
Terry Michaels ffc05872cc Updated Helpers Icon per UX (#1658)
Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-06-29 17:37:34 -05:00
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 13:55:32 -07:00
Esteban Papp 9f0bbf3b74 SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634)
* git mv Code\CryEngine Code\Legacy
* redirecting CMakeLists.txt
* fixing uic warning
* Some more CryEngine mentions
* validation scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 13:51:24 -07:00
Terry Michaels 149863c527 Removed Amazon as Company for QSettings (#1649)
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-06-29 14:00:11 -05:00
sharmajs-amzn deadf448c9 Fix for module file path (#1598) 2021-06-28 09:45:05 -07:00
Terry Michaels 7a2a2dc0d7 Updated branding for application names (#1617) 2021-06-28 11:35:13 -05:00
greerdv f453967388 fix header ordering issue 2021-06-26 18:29:38 +01:00
AMZN-mnaumov 83d142d7dc Merge pull request #1609 from aws-lumberyard-dev/Atom/mnaumov/cherryPick1571
Cherry-picking thumbnail performance improvements
2021-06-25 19:18:10 -07:00
Yuriy Toporovskyy 2dd8d03654 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 2021-06-25 17:24:32 -07:00
amzn-mgwynn ce955715a8 Merge pull request #1543 from aws-lumberyard-dev/native-ui-changes
More specific component error messaging and modes for native UI to prevent blocking dialog in some applications
2021-06-25 19:18:03 -04:00
mgwynn 6721485946 Added parameter names to virtual function definitions for intellisense 2021-06-25 17:03:02 -04:00
Terry Michaels 21ebff5709 Updated help search and all docs.o3de.org links to o3de.org (#1594) 2021-06-25 15:23:57 -05:00
mgwynn a9ef02d29a Renaming nativeUI mode setting for all platforms 2021-06-25 15:37:14 -04:00
mgwynn 692c993bdb Incorporating review comments. Adding nativeUI setting for launchers. 2021-06-25 15:34:32 -04:00
Danilo Aimini 9b6ef150ff LYN-2480 | Minor fixes to the Prefab system (#1581)
Remove warning when entities that aren't registered to instances get passed to the Prefab Undo Cache (just ignore them to avoid noise in the console).
Also avoid marking templates dirty when they are added.
2021-06-25 08:53:25 -07:00
Benjamin Jillich bf0816fb69 [LYN-4574] [LYN-4603] [LYN-4669] Saving motions and actors to json-based .assetinfo files in the Animation Editor fails (#1509)
* Fixes saving motions from within the Animation Editor
* Fixes saving actors from within the Animation Editor
* The motion event chunk of the .motion file format now also stores the event data as json (rather than XML) reducing motion file sizes (Example: 60KB motion went down to 49KB, containing only 4 motion events from 2 tracks).
* Fully backward compatible
* New motion meta data rule stores the event data directly rather than command strings or objects. This is the way that aligns with the Json paradigm and as side-effect bypasses the optionals that we use for the commands which fixes the issue.

* [LYN-4574] Adding new motion event meta data rule that stores the event data directly rather than via commands to align with the Json paradigm
* [LYN-4574] Preparing motion, event table and event track for Json serialization
* [LYN-4574] New chunk to store motion event data in Json format (fully backward compatible to XML)
* [LYN-4669] Json: Empty AZStd::vector<AZStd::shared_ptr<T>> serializes into 1x element with nullptr as data
* [LYN-4603] EMotion FX: Cannot save actors with physics or simulated object setup in Json format
2021-06-25 11:47:09 +02:00
Esteban Papp 1a5a8bd0ea LYN-4657 OSX: Building AutomatedTesting project fails 2021-06-24 15:01:02 -07:00
Danilo Aimini b2046900fb Bug fix for inability to change actor transform properties | #1468
Actor motion extraction applies at all times, sending transform change events to the Qt widget and overwriting any editing the user is doing. (LY-124903)
2021-06-24 14:02:49 -07:00
sconel 2a1a523091 Merge pull request #1539 from aws-lumberyard-dev/Prefabs/GameModeNewProjectCrash
Fix issue where new projects would crash when exiting game mode
2021-06-24 10:50:09 -07:00
Yuriy Toporovskyy 4d99eeafd2 Merge remote-tracking branch 'upstream/stabilization/2106' into DontClobberUserEditingInVectorInput 2021-06-24 12:25:49 -04:00
SergeyAMZN ba80c102b5 Merge pull request #1516 from aws-lumberyard-dev/MultiplayerEditorFixes
SPEC-7469 Fixed EditorServerInfo packet serialization
2021-06-24 16:56:52 +01:00
Yuriy Toporovskyy c27b417761 Address pr feedback
- Use AZ warning macros instead of #pragma warning
- std::numeric_limits->AZStd::numeric_limits
- IsClose->IsCloseMag
- AZ_Warning->AZ_Assert
2021-06-24 10:17:02 -04:00
Tom Hulton-Harrop 1dfb41b6f8 Merge pull request #1512 from aws-lumberyard-dev/hultonha_LYN-4389_imgui-viewport-ui
Change to move Viewport UI elements to no longer overlap with ImGui menu
2021-06-24 09:38:53 +01:00
mgwynn fb3940fa31 More specific component error messaging and modes for native UI to prevent blocking dialog in some applications 2021-06-23 21:05:17 -04:00
sconel ad181205f8 Add extra space to error message for better formatting 2021-06-23 17:06:13 -07:00
sconel f91e640741 Fix issue where new projects would crash when entering game mode 2021-06-23 16:57:57 -07:00
Terry Michaels 1e457928f5 Update help URLs and remove unneeded links (#1520) 2021-06-23 14:42:33 -05:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
pereslav 970dcea16e SPEC-7469 Fixed EditorServerInfo packet serialization 2021-06-23 15:29:31 +01:00
hasareej e0dd33b084 Comment Update 2021-06-23 13:22:34 +01:00
hasareej 6ae20b9c9c Fixing Issue with TopRight & BottomLeft Corners 2021-06-23 13:22:21 +01:00
hasareej 1cb780b215 Layout right side bug fix. 2021-06-23 13:21:55 +01:00
hasareej 9e0dccbf39 Initial bug fix - Added a margin. 2021-06-23 13:21:22 +01:00
John ef0f4130b7 Fix for White Box mesh disappearing 2021-06-23 12:26:25 +01:00
AMZN-koppersr 5dbfa2d497 Merge pull request #1452 from aws-lumberyard-dev/Streamer/ConfigUpdates
Streamer config updates
2021-06-22 14:57:15 -07:00