birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,122 Commits 3 Branches 3 Tags
e1cb40fa33a97b9fefe2cfd4a7cdff80e46d38cb
Commit Graph

590 Commits

Author SHA1 Message Date
Danilo Aimini d1143770e0 Prefab Focus Mode | Fixes to viewport top toolbar (#7094) 
* Fixes to the viewport top toolbar.

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

* Additional checks to prevent issues if widgets aren't set up correctly.

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

* Add asserts to catch UI changes that would break this class.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-01-24 13:17:16 -08:00
Chris Galvan 8d0dce2613 Merge pull request #7101 from siretty/fix_build_linux_clang_13 
Fix Build on Linux with Clang 13 with Debug, Profile and Release Configuration
 2022-01-24 12:24:33 -06:00
Chris Galvan 71640c1c82 Merge pull request #6376 from nemerle/compiletime_filerequest_code2 
Compile time reduction - FileRequest & related changes
 2022-01-24 11:43:27 -06:00
Chris Galvan 3fd7e79891 Merge pull request #5155 from pollend/feat/add-cursor-wrap-mode-viewport 
feat: add cursor wrapped mode
 2022-01-24 11:43:18 -06:00
Gene Walters 7b3631444d Merge pull request #7058 from aws-lumberyard-dev/editor_log_fix 
Temporary fix for editor log stomping during python tests
 2022-01-24 08:08:28 -08:00
Daniel Edwards 0a5f472f43 Clang 13: Fix build errors ... 
... due to local variables only being written to (but never read).

Signed-off-by: Daniel Edwards <dev@danieledwards.de>
 2022-01-23 22:29:03 +01:00
lumberyard-employee-dm 878ba24a3f Removed unused AWSNativeSDK dependency from Editor (#7091) 
* Removed unused AWSNativeSDK dependency from Editor

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove build dependencies on the aws-cpp-sdk library from the Editor


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-21 18:28:26 -06:00
Mikhail Naumov 238962be73 fixing crash when opening different level during simulation mode (#6762) 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2022-01-21 10:02:40 -08:00
Michael Pollind ed5354fcae Merge branch 'development' of https://github.com/o3de/o3de into feat/add-cursor-wrap-mode-viewport 2022-01-21 07:16:44 -08:00
evanchia e2d157006c Temporary fix for editor log stomping during python tests 
Signed-off-by: evanchia <evanchia@amazon.com>
 2022-01-20 15:57:09 -08:00
Steve Pham 59e43813f0 GCC Support for Linux 
Updates and fixes to support GCC for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-20 13:00:02 -08:00
Ignacio Martinez e1b2458591 Asset Browser Collapse All Fix (#6996) 
* Added Icon

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed indent in ui file

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
 2022-01-20 13:09:00 +00:00
Chris Galvan 7adccd0d48 Merge pull request #6722 from tjmgd/bug-import-restrictions-95 
Fix: only files can be selected
 2022-01-19 16:36:29 -06:00
Danilo Aimini a63ea12a1f System shortcuts crash the Editor when Global Preferences are open (#6994) 
* Changes to the keyPressEvent override of the Editor Preferences Dialog to prevent infinite loops on focus switches.

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

* Renaming function to clarify its purpose.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-01-19 09:52:27 -08:00
Ignacio Martinez 65a749494e Fix: Entity Outliner: Outliner is unusable with the Editor in slice mode (#6983) 
* Fixed vertical offset

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed QPoint

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed Entry delegate

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* SetRenderHint in Entry delegate

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Save and restore painter inside the highlighter

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Restoring Painter

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Removed comment

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
 2022-01-19 16:45:52 +00:00
T.J. McGrath-Daly b10195ee1f Merge branch 'development' into bug-import-restrictions-95 2022-01-19 09:46:29 +00:00
Chris Galvan 74623bb1d7 Removed some more unused Editor code and images 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-18 10:21:54 -06:00
Ignacio Martinez e166479bb7 Fixed Camera angle on switch levels (#6954) 
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
 2022-01-18 15:47:27 +00:00
Ignacio Martinez 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
AMZN-byrcolin c778606c89 Templates restricted (#6498) 
* Templates/Restricted upgrade/fixes:
Fixed template storage format: templates now only store true relative paths and no longer save "origin" paths and "optional" has been removed, it was never used.
Upgraded all templates to new standard
Template system now correctly handles child objects: Child objects no longer have to specify restricted they inherit from parent
Restricted now operates at the object level and makes no assumptions about parent
Restricted templates can now be combined and seperated on creation
ly_get_list_relative_filename has been deprecated for o3de_pal_dir
All Gems/Projects/Templates updated to use new code

Signed-off-by: byrcolin <byrcolin@amazon.com>
 2022-01-14 10:27:20 -08:00
lumberyard-employee-dm b62d130475 Updated AnimNode registration in LyShine and Maestro to register to a member variable map (#6786) 
* Updated the Maestro MovieSystem and LyShine AnimationSystem to register
Anim Nodes and Anim Params into a member variable map

Previously the registration was occuring in a global variable map inside
of Movie.cpp and UiAnimationSystem.cpp

Rolled back the changes to update the CUiAnimNode and CAnimParamType to
use the stateless allocator in their m_name string member.
This was only needed because those types were used in global memory.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AZStd::hash specializations for basic_string and
basic_fixed_string to be transparent.

This allows hashing of types that aren't basic_string or
basic_fixed_string using the hash specializations for those types
without needing to create an instance of those types.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding call to disable saving of the UserSettings.xml in the DisplaySettingsPythonBindingsFixture to avoid race condition running the test in parallel

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-14 11:32:29 -06:00
Chris Galvan 3f0bd92853 Removed some unused EditorUtils functions 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-13 10:28:58 -06:00
Chris Galvan 5b195cb028 Removed some unused variables 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-12 12:33:36 -06:00
Chris Galvan e31fa88c00 Removed unused legacy show icons option 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-12 11:13:40 -06:00
Chris Galvan df511c1ae8 Fixed tab order for default input focus on new level dialog 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-11 10:05:05 -06:00
lumberyard-employee-dm 18ea4ba6a8 Added a CriticalAssetsCompiled Lifecycle event (#6469) 
The CriticalAssetsCompiled event can be handled to detect when the
AssetProcessor has finished processing Critical Assets

Also with the new event, an audit has been performed over all the
locations where the AssetCatalogEventBus OnCatalogLoaded event was being
handle to make sure it was the proper event to use.
If the handler was actually examing the enumerating over the full
catalog or querying all assets within the catalog, then it was a proper
use.
For handlers that were interested in a particular asset it was not

Moreover added implementations of `OnCatalogAssetChanged` and
`OnCatalogAssetAdded` to the FileTagComponent and the MaterialViewportComponent.

Any applications which uses the AtomToolsApplication
class(MaterialEditor, AtomSampleViewerStandalone,
ShaderMangementConsole) now signals a "CriticalAssetsCompiled" lifecycle
event as well as loads the "assetcatalog.xml" if it exists.

The Launcher application signals the "CrticalAssetsCompiled" event and
reloads the "assetcatalog.xml" for the ${project}.GameLauncher and
${project}.ServerLauncher in Launcher.cpp

Finally the Editor signals the "CriticalAssetsCompiled" and reloads the
"assetcatalog.xml" in CryEdit.cpp

resolves #6093

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-10 15:21:04 -06:00
nemerle f1f81c3789 Merge remote-tracking branch 'upstream/development' into compiletime_filerequest_code2 2022-01-08 21:25:48 +01:00
Chris Galvan 641f7be041 Removed more unused Editor code and images 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-07 14:24:53 -06:00
Michael Pollind 95c0c83642 chore: remove unused setting and fixed compiling errors 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2022-01-07 07:27:11 -08:00
Michael Pollind 9e91c18726 chore: address changes add test cases 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2022-01-07 07:27:07 -08:00
Michael Pollind fa809a76ca chore: address changes 
- updated checkstyle
- update enum CursorInputMode
- minor refeactor to QtEventToAzInputMapper

Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2022-01-07 07:27:03 -08:00
Michael Pollind 90f710b8c2 feat: add cursor wrapped mode 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2022-01-07 07:27:01 -08:00
sphrose 98b0f206a0 Merge pull request #6705 from aws-lumberyard-dev/3495_preferences_panel_update 
3495 Preferences panel update: fix richtext elision and allow html links
 2022-01-07 08:52:45 +00:00
Chris Galvan d3b36f1814 Added a couple more missing includes 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-06 13:55:52 -06:00
Chris Galvan 53e6f0f99f Added another missing include 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-06 13:27:44 -06:00
Chris Galvan e5c2d574fc Added a missing include and forward declare 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-06 12:51:10 -06:00
Chris Galvan fee88cf5c6 Removed legacy editor DatabaseLibrary code. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-06 10:12:54 -06:00
sphrose 030ba4853b Merge branch 'development' into 3495_preferences_panel_update 2022-01-06 14:29:04 +00:00
T.J. McGrath-Daly dae82b3858 Fix: only files can be selected 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2022-01-06 10:10:46 +00:00
Tom Hulton-Harrop 66985e3569 Updates to ViewportTitleDlg to better expose grid snapping visualization (#6700) 
* updates to ViewportTitleDlg to better expose grid snapping visualization

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* small typo fix

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add escape handling for widget to be more consistent with other QMenu behavior

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove unneeded [[maybe_unused]]

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2022-01-06 09:26:16 +00:00
Chris Galvan 233349ffe3 Removed unused Editor code from EditMode/Geometry/Include/LightmapCompiler 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-05 13:35:09 -06:00
sphrose 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
Chris Galvan c773c9e9aa Removed some unused classes from Editor/Controls 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-04 16:39:04 -06:00
Chris Galvan f051886789 Merge pull request #6675 from aws-lumberyard-dev/cgalvan/RemoveUnusedEditorCommonImages 
Removed unused images under Editor/Common
 2022-01-04 14:36:51 -06:00
Chris Galvan 685706f817 Removed unused images under Editor/Common 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-04 10:58:50 -06:00
Chris Galvan c15ead9c30 Removed unused bone name class. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-04 10:32:52 -06:00
Luis Sempé 7581967da3 Merge pull request #6300 from tjmgd/bug-script-canvas-60 
Script Canvas Groups - Updated keyboard shortcut bindings to avoid conflict with "play game" shortcuts
 2022-01-03 14:56:06 -08:00
Chris Galvan fd9574c648 Removed legacy QtUi/ClickableLabel and re-worked about dialog to use QLabel for terms of use label 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-03 14:21:44 -06:00
Chris Galvan ad38c788f9 Merge pull request #6250 from BytesOfPiDev/issue6198 
Prevent some slice-related commands from being enabled when the slice…
 2021-12-27 16:31:46 -06:00
Jeremy Ong a96387ee35 Fix compile issues blocking adoption of Pix 2108 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-12-21 13:52:20 -07:00