Commit Graph

575 Commits (70a8214c2dba9ee65d29e8f91810b1fbc2bc7903)

Author SHA1 Message Date
lumberyard-employee-dm 4d927cb26e
Merge pull request #2247 from aws-lumberyard-dev/Prefab/ClearEntityMapsTogether
Remove container entity from all maps when entities are cleared from a prefab instance
4 years ago
Guthrie Adams 7cb2f62d4b
Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication
Addition of a base AzQtToolsApplication class
4 years ago
srikappa-amzn ebf0ea6a69 Remove container entity from all maps when entities are cleared from a prefab instance
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
Steve Pham 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>
4 years ago
sconel b05984d4ca
Prevent cached world transform and parent data from being serialized in prefab (#2219)
Porting over @AMZN-daimini 's work to clean up unneeded data from prefabs by removing cached transform data from json serialization. This is done by writing an explicit json serializer for the Editor Transform component and opting not to store or load the cached Transform fields.

Tested by creating new prefabs, loading and as well as resaving old prefabs which included patches aimed at cached transform data.

Signed-off-by: sconel <sconel@amazon.com>
4 years ago
amzn-mike 8116e239f4
Restore fix lost in merge: [LY-121929] Asset Processor Error : Sqlite - Failed to prepare statement. (#2202)
Fixed unresolved product dependency query to be able to handle much larger queries (tested with 100,000 products) by storing queried products in a temp table first

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
hultonha 6839ef1512 Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Esteban Papp 087c9f6edb more fixes for Jenkins vs local behavior
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Dayo Lawal f215011de4 Copyright header and whitespace fixes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Esteban Papp 4aebea61af Fixes for Jenkins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
hultonha a365ae1da1 Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Esteban Papp ae46eea1e8 Fix tests in Linux and discover path comparison problem in Windows (fixed)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 4a5ac0e204 Fix for ArchiveTest where the assets alias was not being set
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 24831b1970 Code review changes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp d8ac5654d2 Merge branch 'development' into cleanup/SPEC-1670 5 years ago
jackalbe ffcfa44b49
{LYN-4514} Engine updates to enable PAB for the Blast Gem (#2140)
* {LYN-4514} Engine updates to enable PAB for the Blast Gem

* Engine updates to enable Python Asset Building for the Blast Gem
* added API to detect IsPythonActive()
* ExportProductList behavior
* scene manifest usage of generated assetinfo
* updated ScriptProcessorRuleBehavior to handle OnPrepareForExport

Tests: new tests for scene behavior via ExportProduct

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* updated base on PR feedback
added more comments for IsPythonActive()
added a serializeContext for export product list

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
5 years ago
hultonha 5c177ef48a Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
Nicholas Van Sickle 867ae23664
Make Viewport input events fully Qt based (#2142)
* Make Viewport input events fully Qt based.

This should fix an issue with Qt touch event -> mouse event translation in the Editor, and may also fix issues with the Mac Editor and remote desktop (though, lacking the requisite hardware, I can test precisely none of these things personally).

See https://github.com/o3de/o3de/issues/1889

- Adapted LegacyViewportCameraController to use Movement::X & Y (mostly for testing purposes, it's on the slate for being removed soon)
- Moved cursor capture logic from RenderViewportWidget into QtEventToAzInputManager so that it can make sure it generates correct movement deltas
- Removed ViewportMouseCursorRequests::PreviousViewportCursorScreenPosition to have our viewport controllers use our dedicated Movement::X and Y channels instead, which will work in the launcher

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

* Address review feedback

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

* Fix Linux build

Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
Dayo Lawal 92ead794fa Removal of AzQtAppWindow
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal d36d1defab Styling fixes and AzQtAppWindow changes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal c86535f892 Styling fixes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal c63c42c7f4 Adding comments and changing QApplication org/app names
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
Dayo Lawal 6f44393f3a Moved logging to AzToolsFramework, working with MatEditor and SMC
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
srikappa da11424119 Merge branch 'development' into Prefab/BestEffortPatching
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
hultonha b0707d3295 ensure the final vertex in a spline cannot be deleted using a manipulator
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hultonha 1220ea6539
Merge pull request #2093 from aws-lumberyard-dev/Renaming_Urls_Names
Changed all amazon reverse urls to o3de reverse urls
5 years ago
Esteban Papp 4e84738ff2 Ordering file alphabetically
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 1dec9d4a9a Fix tests in AzToolsFramework now that the Trace bus is hooked
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp c13720e255 fixes and cmake changes to get it to compile
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp afd97abdcf Move files to AzFramework/Test and AzToolsFramework/Test accordingly
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
srikappa c494adba88 Use a utility function to compare json document and expected string
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
srikappa b7e3db9d82 Make prefab patch application use a best effort mechanism
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
aaguilea 36a8c0a8cc changed all amazon to o3de
Signed-off-by: aaguilea <aaguilea@amazon.com>
5 years ago
Alex Montgomery 372ac2707f
fix outliner sorting using incorrect types for comparisons (#2052)
* fix outliner sorting using incorrect types for comparisons, fixes for [LY-122258] and [LYN-3666]

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

* fix annoying but necessary Qt type cast

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
5 years ago
Danilo Aimini 1d022907dc
Prefabs | Introduce sanitation of prefab doms on loading (#1929)
* Update PrefabLoader to sanitize ingested prefabs and have core systems operate with default values

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

* Remove IsExplicitDefault implementation to avoid confusion (since the function isn't virtual).
Avoid copying PrefabDoms over in SanitizeLoadTemplate.

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

* Address naming and commenting concerns from PR reviews.

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

* Fix to error detection code

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

* Add support for all uuid formats for zero check.

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

Co-authored-by: sconel <sconel@amazon.com>
5 years ago
sconel 22a52bc7b2
Fix issue where game and editor entities could exist simultaneously while exiting game mode (#2015)
Signed-off-by: sconel <sconel@amazon.com>
5 years ago
jjjoness 1b530195fc
Clarify ImGui activation in Editor viewport (#1765)
* Clarify ImGui activation in Editor viewport

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* All working following changes from comments in PR

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* One more change

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* fixes from comments in PR.

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fixed git merge error

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Added header to ImGuiBus.h

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fix for Jenkins error

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Minor typo fix

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts).
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
sphrose 83d1bc0fbf Merge branch 'stabilization/2106' into LYN-3718 5 years ago
nvsickle c8fb453760 Fix copyright header copy/paste issue.
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
nvsickle 964b4247f7 Update license header
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
nvsickle fa9a12eac3 Forward double click events as well
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
nvsickle 4babf69361 Address a few more review things
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
nvsickle 049ef81fe9 Address some review feedback, fix license
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
nvsickle 52ae7433b3 Use synthetic keyboard and mouse devices instead of synthetic input channels
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
nvsickle f4c96fc9df -Rework input handling to filter through a global event filter
-Attempt to support remote desktop for viewport cursor capture

Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
nvsickle 15248e7c12 Add QtEventToAzInputManager
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
Chris Galvan 91656ded9f Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
hultonha 40726a32dc
Merge pull request #1898 from aws-lumberyard-dev/hultonha/gitflow_210706_o3de
stabilization2106 -> development merge (210706)
5 years ago