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

11100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Danilo Aimini b1caed0f8e Introduce shortcut labeling in "Find in Viewport" context menu item in the Outliner (#7095) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-01-24 11:22:50 -08:00
Junbo Liang 1cf7d57b3f Update deployment scripts to support AWSI automation tests on Linux (#7038) 
* Update deployment scripts to support AWSI automation tests on Linux

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
 2022-01-24 11:20:15 -08:00
Guthrie Adams 160508d2d6 Merge pull request #7104 from aws-lumberyard-dev/Atom/guthadam/atom_tools_change_preset_browser_to_generic_asset_grid_dialog 
Atom Tools: Changed ME preset browser dialog into generic asset grid dialog in ATF
 2022-01-24 13:15:32 -06:00
Guthrie Adams b5ac9cb66b Merge pull request #7107 from aws-lumberyard-dev/Atom/guthadam/atom_tools_combined_me_viewport_renderer_and_widget 
Atom Tools: Combined ME viewport widget and renderer classes
 2022-01-24 13:11:27 -06:00
Guthrie Adams 56edae53b9 Merge pull request #7105 from aws-lumberyard-dev/Atom/guthadam/atom_tools_replace_custom_help_dialog_with_message_box 
Atom Tools: Replaced custom help dialog with generic message box
 2022-01-24 13:10:49 -06: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
SWMasterson 7bf7b03dd2 Added base level for tests, updated automation to use prefabs, and restored sandboxed tests (#6993) 
Signed-off-by: Sean Masterson <semaster@amazon.com>
 2022-01-24 11:50:37 -06:00
Scott Romero 0d2204917e [development] enabled mouse wheel scrolling in the Profiler gem visualizer (#6930) 
Resolves #6698

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2022-01-24 09:49:13 -08:00
Gene Walters 04e515ee85 Merge pull request #7099 from aws-lumberyard-dev/LYN-8726_NetAutoComponentScriptNodeFrontEndFix 
Fix Network Test Script Nodes Front End
 2022-01-24 09:45:47 -08: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
mrieggeramzn c7d1c4603f Removing lux core (whats left of it) (#7089) 
* Removing lux core (whats left of it)

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

* Removing files recommended by NLawson and EPapp

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
 2022-01-24 11:24:20 -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
moraaar 37c0b661f9 Added blast asset, whose fbx works with Atom, to help testing Blast Gem (#7110) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2022-01-24 15:49:33 +00:00
Michael Pollind 7b649656bc chore: use numeric cast for QtEventTOAzInputMapperTest 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2022-01-24 07:30:39 -08:00
greerdv be877373f1 Merge pull request #7041 from aws-lumberyard-dev/quad-collider-2 
Support for quad shape in PhysX shape collider component
 2022-01-24 14:26:02 +00:00
greerdv 8d7500f9c3 merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2022-01-24 12:39:08 +00:00
greerdv d412f3cc50 update with feedback from PR 
Signed-off-by: greerdv <greerdv@amazon.com>
 2022-01-24 12:38:15 +00:00
Tom Hulton-Harrop 5940982244 Ensure render geometry is refreshed when the mesh component controller is moved (#6452) 
* ensure render geometry is refreshed when the mesh component controller is moved

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

* cache bus pointer and send update notification when mesh changes

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

* add integration test to detect MeshComponentController notification to IntersectionNotificationBus

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

* remove optimize off

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

* update build visibility for AtomLyIntegration editor static lib

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

* move runtime dependencies to gem module

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2022-01-24 10:41:32 +00:00
SergeyAMZN a623e52331 Merge pull request #7040 from aws-lumberyard-dev/TerrainMaterialsFix 
LYN-7640 Terrain Physics Materials hooked up all the way down to PhysX
 2022-01-24 10:25:51 +00:00
Steve Pham 3113b8be03 Fix for 'Cannot Find PThread' when using GCC (#7097) 
* Fix for 'Cannot Find PThread' when using GCC

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

* Fix error when COMPILATION_C and COMPILATION_CXX handling in ly_append_configurations_options

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

* Add missing 'PARENT_SCOPE' when appending to the CMAKE_C_FLAGS and CMAKE_CXX_FLAGS

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

* Fix appending of CMAKE_C_FLAGS and CMAKE_CXX_FLAGS

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

* Workaround for  C/C++ compilation flag settings for gcc. COMPILATION_C/COMPILATION_CXX is wiping out COMPILATION, so define each one separately with no sharing

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

* Remove unnecessary gcc ignore warnings for C files

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2022-01-24 01:17:25 -06:00
Michael Pollind 1643c68fa7 chore: fix compiling errors 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2022-01-23 18:27:17 -08:00
Guthrie Adams aabde7916f Atom Tools: Combined ME viewport widget and renderer classes 
Was looking into options for making any part of this more generic or reusable but 60% of the code is just setup and teardown of processors, handles, entities, and components for the material editor viewport content. The rest is about handling material editors specific setting changes. Most of the general-purpose code has already been moved into atom tools framework render viewport widget. The best reduction or generalization from this point would be using prefabs or some other mechanism to data drive setting up camera, viewport model, IBL, lighting, sky box.

Also discussing options for replacing the material editor viewport camera controller and states with a generic one used in the main editor and animation editor.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2022-01-23 18:20:52 -06: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
Guthrie Adams d6cf8e24f3 Atom Tools: Replaced custom help dialog with generic message box 
The help dialog just displayed some HTML text. The message box class provided by Qt can display the same information and styling without additional code. We don’t want to carry around the extra class to new applications based off of this one or port to ATF.
A simple about box was also added and can be fleshed out in the future.
Both dialogs will eventually need to be updated with additional information.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2022-01-23 15:18:49 -06:00
Guthrie Adams f20bf38f88 Atom Tools: Changed ME preset browser dialog into generic asset grid dialog in ATF 
Moving more potentially shared code out of the material editor into atom tools framework.
This change consolidates the lighting preset browser, model preset browser, and the base dialogue that they shared into a single, grid based, asset selection dialog.
AssetGridDialog should appear as a move and rename of PresetBrowserDialog but there are probably too many differences with new variable renames and SelectableAsset struct.
Along the way I found examples showing that event bus broadcast accepted generic functions and lambdas. Used this to do a minor cleanup of the viewport settings inspector where the preset dialogs were initialized and other places that did several back to back bus calls.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2022-01-23 11:22:48 -06:00
Gene Walters c4addbc0e0 Moved AutomatedTesting specific script translation assets from gems/canvas into AutomatedTesting 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2022-01-21 22:08:31 -08: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
lumberyard-employee-dm 1f7040c6b8 Updating mock calls in unit_test_manifest.py to fix test (#7090) 
The manifest.py `get_all_templates` method was modified to add a call to
`get_all_gems` and `get_gem_templates`.
Those calls were not mocked, so they tried to load an o3de_manifest.json
file that was on user's machine, which failed on the CI node.

Also added a mock call for `load_o3de_manifest`, that validates that it
is not called to catch this issue during Automated Review.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-21 18:28:13 -06:00
chiyenteng dd7706f9fe Fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition (#7079) 
* Ensure to fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Ensure to fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* convert test AreaNodes_DependentComponentsAdded to use prefab system

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Prevent SetupEditorEntity being called twice

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2022-01-21 16:23:31 -08:00
Mike Balfour dbd6ddbc1c Optimized Gradient Previewer (#7074) 
* Faster method with older one commented out for profiling.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Removed commented-out code

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Addressed PR feedback, fixed subtle bug in interlace math.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed unrelated bug in terrain cmake file.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fix linux compile error.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2022-01-21 18:05:19 -06:00
Esteban Papp a145d3c82f Issues/install missing assets (#7081) 
* Fixes for missing assets in the install folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* delayed expansion to try to fix project_engineinstall_profile

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Improvements to build scripts to solve the project build from the install folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-21 15:07:27 -08:00
michabr 7fa6a82f55 Make ILyShine an AZ::Interface (#6923) 
* Move ILyShine instance out of legacy code

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

* Remove last remaining reference of gEnv->pLyShine

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

* Make m_lyShine a unique pointer

Signed-off-by: abrmich <abrmich@amazon.com>
 2022-01-21 15:03:57 -08:00
Chris Galvan cdf748a5ed Merge pull request #7084 from aws-lumberyard-dev/cgalvan/RefactorTableViewHeaderSectionStyling 
Refactored the styling of TableView header sections
 2022-01-21 16:35:14 -06:00
Danilo Aimini 86a0be2561 Prevent read-only entities from being duplicated via prefab workflows (#7076) 
* Refactor the sanitation of the selection for prefab operations to prevent read-only entities from being deleted or duplicated.

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

* Fix comment.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-01-21 12:35:29 -08:00
Chris Galvan 7fc4e4bd10 Refactored the styling of TableView header sections 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-21 14:29:37 -06:00
michabr a8d97cf8aa Fix hi-res display issues in UI Editor (#6912) 
* Fix dpi scaling issues in UI Editor

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

* Remove older method for getting dpi scaling factor

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

* Remove direct call to devicePixelRatioF()

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

* Use existing convenience function

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

* Fix one more text size

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

* Fix compile warning

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

* Remove unnecessary typecast

Signed-off-by: abrmich <abrmich@amazon.com>
 2022-01-21 12:02:20 -08:00
Luis Sempé 090e12e712 Merge pull request #7075 from aws-lumberyard-dev/scripting/text_issues 
Addressed a few Script Canvas translation issues
 2022-01-21 11:59:24 -08:00
Sergey Pereslavtsev b21878d04e Removed unused variable 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2022-01-21 19:57:28 +00:00
michabr 837d6fc4fd Merge pull request #6991 from aws-lumberyard-dev/michabr/lyshine_crycommon 
Move remaining two LyShine headers to the gem
 2022-01-21 11:56:00 -08:00
jckand-amzn 2c33240b72 Converting Dynamic Vegetation and Gradient Signal tests to utilize prefab system (#7034) 
* Adding on-disk prefabs for automated tests

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Resolving import conflict with cherrypick

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Updating DynVeg tests to use open_base_level function

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Converting initial set of DynVeg tests to utilize prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Finalizing DynVeg test conversion to use prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing old test runners

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing optimized suffix from optimized test runners

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing unoptimized test runner

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing optimized suffix from optimized test runner

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Adding wait_for_condition on level save for E2E tests

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2022-01-21 11:55:19 -08:00
Guthrie Adams 179277c67d Merge pull request #7052 from aws-lumberyard-dev/Atom/guthadam/atom_tools_update_autoload_gem_settings 
Atom Tools: updating gem autoload settings registry for ME and SMC to disable script canvas developer gem
 2022-01-21 12:29:40 -06:00
Guthrie Adams 27e121f23d Merge pull request #7051 from aws-lumberyard-dev/Atom/guthadam/atom_tools_deleting_unused_defines_from_me 
Atom Tools: removing unused traits for ME executable extension
 2022-01-21 12:29:18 -06:00
Mikhail Naumov d918991e27 Allowing instantiating of prefab without selecting an entity in outliner (#6763) 
* Allowing instantiating of prefab without selecting an entity in outliner

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* PR feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2022-01-21 10:04:47 -08:00
lsemp3d d5f7bc7c9b Consolidated navigation to file code 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-01-21 10:03:02 -08: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
abrmich cfbd88cb1e Merge remote-tracking branch 'upstream/development' into michabr/lyshine_crycommon 2022-01-21 10:02:28 -08:00
lsemp3d f684fe14ff Categorized Material Data under Rendering 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-01-21 09:45:27 -08:00
lsemp3d be2241bda9 Navigate to file after generating translation (only 1) 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-01-21 09:41:37 -08:00
lsemp3d 1d3b675f88 Regenerated the Input handler .names file 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-01-21 09:35:42 -08:00