birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,984 Commits 3 Branches 3 Tags
03adf700fe1dd7c85446266e08f35fe61ba548ee
Commit Graph

5041 Commits

Author SHA1 Message Date
Esteban Papp 03adf700fe Merge branch 'development' into redcode/driller_removal 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-03 13:35:16 -08:00
antonmic 2569ba4214 merging dev because AR succeeded but failed to notify github, will re-run AR with latest merged 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-12-03 11:47:04 -08:00
Esteban Papp 799cc68de2 no message 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-03 11:38:49 -08:00
antonmic fcd2ae3bc0 Merge pull request #6101 from aws-lumberyard-dev/Atom/antonmic/RenderdocBuildFail 
Fixing build fail when Renderdoc is enabled
 2021-12-03 11:36:47 -08:00
Luis Sempé ef423abc9f Merge pull request #6134 from aws-lumberyard-dev/scripting/fix_legacy_format_graph 
Resaved LY_SC_UnitTest_NodeableDelay.scriptcanvas to update to json f…
 2021-12-03 11:29:11 -08:00
tjmgd 599e3104a2 Fix for bug in switch group (#5946) 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-03 10:38:45 -08:00
antonmic aaaa35b6c1 addressed PR feedback 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-12-03 09:56:52 -08:00
amzn-mike 5f41463cd6 Procedural Prefabs: Add PhysX mesh group support and example (#6073) 
* Auto LOD script setup

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Working auto LODs

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Correctly selected LODs and added default prefab

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Cleanup code

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Cleanup code

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add missing legal header, move name cleanup to scene_helpers, add documentation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add PhysX mesh group support.

Updated example script to show usage

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add a physics collider component

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update DefaultOrValue call

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-03 09:23:48 -08:00
Allen Jackson 8186c268e3 {lyn7298} removing PythonBuilderRequestBus from PythonAssetBuilder (#6115) 
* {lyn7298} removing PythonBuilderRequestBus from PythonAssetBuilder

* PythonBuilderRequestBus is a depreciated event bus
* removing the unsupported API

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

* removing the PythonBuilderRequestBus_Behavior_Exists test

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2021-12-03 11:21:33 -06:00
lsemp3d e24d8d3f83 Resaved LY_SC_UnitTest_NodeableDelay.scriptcanvas to update to json format 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-12-03 08:55:13 -08:00
sphrose 1962083c72 Merge pull request #4955 from aws-lumberyard-dev/terrain/sphrose_test_terrain_gradient_list_LYN-7376 
Python tests for TerrainHeightGradientList LYN-7376
 2021-12-03 15:42:02 +00:00
Luis Sempé 9db83814f2 Merge pull request #6045 from aws-lumberyard-dev/scripting/fix_translation_reload 
If the asset catalog gets reloaded, clear the translation to avoid du…
 2021-12-03 07:36:54 -08:00
Tom Hulton-Harrop 8344539ab6 Manipulator Bounds updates (#5959) 
* first pass updates to improve manipulators

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

* add setting to enable/disable manipulator axis flipping

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

* update manipulator cvar to use ed_ naming convention

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

* wip updates to add AzToolsFramework values to the SettingsRegistry

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

* expose a number of manipulator settings for configuration

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

* add setting for manipulator base scale to change size of all manipulators together

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

* minor updates before posting PR

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

* add manipulator section for settings registry paths

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

* fix for failing unit test after manipulator changes

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

* fix total scale

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

* fix for polygon prism component shape tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-03 14:46:15 +00:00
sphrose 4e5b62ee25 conflict fix 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-12-03 11:36:58 +00:00
moraaar 8f4ff91915 Merge pull request #6050 from aws-lumberyard-dev/daimini/physicsMaterialNameCrash 
Add additional check to ensure material library is loaded when trying to retrieve names.
 2021-12-03 11:25:25 +00:00
antonmic 393c369055 Fixed pass warning in ASV 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-12-02 23:33:56 -08:00
Esteban Papp bb685ee40b Merge branch 'development' into redcode/driller_removal 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 18:12:48 -08:00
Esteban Papp 7817ed76bf Removes FileIOEventBus 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 18:08:45 -08:00
Esteban Papp 0b9497cd45 Changes call from AZ_TRACE to AZ_PROFILE. AZ_TRACE uses a driller bus that is going to be removed 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 17:12:25 -08:00
lsemp3d 88b6e52248 Fixed support for AZEvent name generation 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-12-02 16:43:21 -08:00
tjmgd 631ebacc0c Fix for bug - switch association fails (#5947) 
* Fix for bug - switch association fails

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

* Change message box button from 'Yes' to 'Ok'

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Changed message box button from 'Yes' to 'Ok'

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

Co-authored-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>
Co-authored-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 2021-12-02 15:50:51 -08:00
Qing Tao f56bbb96b0 LYN-5843. Fixed an issue when exit from full screen game mode in Editor. (#6098) 
* LYN-5843. Fixed an issue when exit from full screen game mode.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 2021-12-02 15:38:24 -08:00
michabr 4d5aad13d1 Remove legacy renderer dependencies in LyShine and move LyShine headers to gem (#6049) 
* Remove CryRenderer dependencies

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

* Fix non-unity compile error

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

* Remove ITexture.h reference

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

* Simple file moves from CryCommon to LyShine Gem

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

* More simple file moves from CryCommon to LyShine Gem

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

* Move more headers from CryCommon to LyShine Gem

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

* Add LyShine gem module as a build dependency to fix compile error in some gems

Signed-off-by: abrmich <abrmich@amazon.com>
 2021-12-02 14:47:32 -08:00
Roman 28f38ca009 Update the deformer in the atom debug draw (#6095) 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-12-02 14:15:59 -08:00
Guthrie Adams 4079b253b6 Merge pull request #6106 from aws-lumberyard-dev/Atom/guthadam/fix_warnings_from_unreflected_system_components 
Fixing warnings caused by system components not added to serialize context
 2021-12-02 16:06:25 -06:00
Esteban Papp bda818dec0 Removes driller usage from Atom 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 14:04:18 -08:00
Esteban Papp 59ef6f983f Removes Driller from ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 13:55:00 -08:00
bosnichd 7a0282a534 Fix debug ImGui asserts I introduced in [b2c13b2]. (#6104) 
Also allow different D3D12_ROOT_SIGNATURE flags to be set for each platform.

Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-12-02 14:17:12 -07:00
Guthrie Adams 82b1b6f337 Merge pull request #6102 from aws-lumberyard-dev/Atom/guthadam/remove_preset_warnings_from_material_editor 
Removing warnings from material editor viewport
 2021-12-02 14:42:18 -06:00
Guthrie Adams 50f094c51e Fixing warnings caused by system components not added to serialize context 
==================================================================
2021-11-30T20:21:23{000000000000395C}[Module Manager]     Trace::Warning
 D:/projects/lyengine/git/ly-dev/o3de/Code/Framework/AzCore/AzCore/Module/ModuleManager.cpp(34): 'bool __cdecl AZ::ShouldUseSystemComponent(const class AZ::ComponentDescriptor &,const class AZStd::vector<class AZ::Crc32,class AZStd::allocator> &,const class AZ::SerializeContext &)'
2021-11-30T20:21:23{000000000000395C}[Module Manager]     Component type MultiplayerToolsSystemComponent not reflected to SerializeContext!
2021-11-30T20:21:23{000000000000395C}[Module Manager]     ==================================================================
2021-11-30T20:21:23{000000000000395C}[Module Manager]
==================================================================
2021-11-30T20:21:23{000000000000395C}[Module Manager]     Trace::Warning
 D:/projects/lyengine/git/ly-dev/o3de/Code/Framework/AzCore/AzCore/Module/ModuleManager.cpp(34): 'bool __cdecl AZ::ShouldUseSystemComponent(const class AZ::ComponentDescriptor &,const class AZStd::vector<class AZ::Crc32,class AZStd::allocator> &,const class AZ::SerializeContext &)'
2021-11-30T20:21:23{000000000000395C}[Module Manager]     Component type PythonEditorFuncs not reflected to SerializeContext!
2021-11-30T20:21:23{000000000000395C}[Module Manager]     ==================================================================

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-12-02 14:34:36 -06:00
Guthrie Adams d0d26ab56f Merge pull request #6097 from aws-lumberyard-dev/Atom/guthadam/prevent_python_asset_builder_from_activating_in_editor 
Removing PythonAssetBuilderSystemComponent from GetRequiredSystemComponents
 2021-12-02 13:58:55 -06:00
antonmic 827d3d930b Merge pull request #6088 from aws-lumberyard-dev/Atom/antonmic/DepthOfFieldVulkanFix 
Atom/antonmic/depth of field vulkan fix
 2021-12-02 11:26:50 -08:00
antonmic 51794f9c52 Changing fix after offline discussion 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-12-02 11:24:11 -08:00
Guthrie Adams 74cc3ccc20 Removing warnings from material editor viewport 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-12-02 13:05:02 -06:00
antonmic 6f074f2f9f Fixing build fail when Renderdoc is enabled 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-12-02 11:03:53 -08:00
tjmgd ba9ae77023 Bug - association update (#5932) 
* Fixed crash when typing asset name and clicking browse (#5495)

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

* Fixed issue where associated control disappears after clicking Save

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

Co-authored-by: AMZN-AlexOteiza <82234181+AMZN-AlexOteiza@users.noreply.github.com>
Co-authored-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>
 2021-12-02 10:55:05 -08:00
tjmgd 11357fbf9f Fix for bug preventing undo function working correctly (#5937) 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-02 10:54:58 -08:00
tjmgd 0842eae3a0 Fix for inappropriate data being used to calc position of audio listerner (#5941) 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-02 10:54:51 -08:00
tjmgd ce717ad48a Improvement to filter types (optimization) (#5944) 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

Co-authored-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>
 2021-12-02 10:54:40 -08:00
Guthrie Adams dea512f02f Removing PythonAssetBuilderSystemComponent from GetRequiredSystemComponents 
This change was prompted by the Python asset builder activating in the material editor and asset processor, leading to conflicts as both initialized, started Python, spamming the console window and log with warnings while trying to save module symbol information.
Because PythonAssetBuilderSystemComponent also has a SystemComponentTag attribute declaring it as an AssetBuilder, it will still be discovered and automatically added to the asset builder.
Removing it from GetRequiredSystemComponents will stop the component from activating outside of the asset builder.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-12-02 12:37:31 -06:00
Luis Sempé ed4498ebe5 Merge pull request #5943 from tjmgd/bug-delete-event-h 
Fixed bug  when deleting event
 2021-12-02 10:23:51 -08:00
Esteban Papp 1b01ec18b0 Replaces handlers of TraceMessageDrillerBus with handlers of TraceMessageBus 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 10:09:39 -08:00
antonmic f82604406c merging dev because AR failed for mysterious reasons 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-12-02 09:47:08 -08:00
mrieggeramzn bce5e36b53 Fix for artifact with thin-film materials and shadows (#6016) 
* *BackL*.azsli

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

* refactoring from feedback

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
 2021-12-02 09:27:01 -08:00
mrieggeramzn f4f7f07721 shadow fixes (#5890) 
* shadow fixes

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

* Adding missing line

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

* Adding point sampler

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

* feedback from pr

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

* better variable name

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

* Fix compile error

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
 2021-12-02 09:26:34 -08:00
SWMasterson 0116f0a520 Adding Macbeth level to AutomatedTesting and converting to Prefab (#6060) 
* Adding macbeth level to AutomatedTesting

Signed-off-by: Sean Masterson <semaster@amazon.com>

* removing unnecessary files

Signed-off-by: Sean Masterson <semaster@amazon.com>
 2021-12-02 08:26:56 -08:00
Luis Sempé 3c624b6d96 Merge pull request #5935 from tjmgd/bug-render-anim-h 
Fix for animation window render options not being persistent
 2021-12-02 08:12:18 -08:00
Luis Sempé cf073dc303 Merge pull request #5823 from pollend/bugfix/5552-LyShine-Transform2d-Overlapping-Anchors 
UI Editor - bugfix: prevent Anchor buttons from overlapping when shrinking layout(#5552)
 2021-12-02 08:11:45 -08:00
Luis Sempé e146299a83 Merge pull request #5911 from tjmgd/bug-motion-set-removal-h 
Bug motion set removal h
 2021-12-02 08:10:56 -08:00
greerdv 6150a60e57 Merge pull request #6030 from aws-lumberyard-dev/ragdoll-collider-alignment 
fix alignment of autosized ragdoll colliders
 2021-12-02 11:13:38 +00:00