birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,128 Commits 3 Branches 3 Tags
1cbe4261db7dbfe22f0a26095bb10eb752ad5e32
Commit Graph

5112 Commits

Author SHA1 Message Date
moudgils 577280cc11 Disable shaders for metal compilation until the issues are addressed properly (#6222) 
* Disabling shaders for metal compilation until the issue is fixed properly.

Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com>

* Adding a missed shader

Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com>
 2021-12-07 11:45:55 -08:00
carlitosan 4b97f7bac2 Merge pull request #5296 from aws-lumberyard-dev/sc-editor-asset-redux 
Sc editor asset redux
 2021-12-07 09:15:52 -08:00
rgba16f aad16acf1f Jobify the draw item list sort in View::FinalizeDrawLists (#6176) 
Jobification of the sort saves 0.7ms/frame on the HighInstanceTest on my pc.
Make MeshFeatureProcessor update of the mesh cull bounds part of the job work rather than part of the simulate work. This saves 0.1ms/frame on the HighInstanceTest

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-12-07 10:44:12 -06:00
Guthrie Adams baab10dd99 Merge pull request #6180 from aws-lumberyard-dev/Atom/guthadam/materialeditor/async_load_presets 
Material editor asynchronously loads lighting and model presets
 2021-12-07 10:33:51 -06:00
sphrose 878d03e6b4 Merge branch 'development' into terrain/sphrose/macro_material_tests 2021-12-07 13:01:58 +00:00
sphrose f00923419d Merge branch 'development' into terrain/sphrose/physics_collider_materials_LYN-6431 2021-12-07 08:19:08 +00:00
sphrose f06230f614 fix merge conflict 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-12-07 08:12:20 +00:00
sphrose 2316ddac65 Merge pull request #5784 from aws-lumberyard-dev/terrain/sphrose/vegetation_tests 
Terrain/sphrose/vegetation tests
 2021-12-07 08:04:21 +00:00
Guthrie Adams 1cef580cad Material editor asynchronously loads lighting and model presets 
changed several sequential blocking loads into asynchronous loads to improve material editor startup time

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-12-06 19:49:10 -06:00
benblack75 9698047340 Modified Color Swatch Fix (#6137) 
* Modified Color Swatch Fix

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Updating Macbeth Colors to work with new material formatting

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Tweaks to red color values

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Tweaked red swatch color values provided by Ken

Signed-off-by: Benjamin Black <benblac@amazon.com>
 2021-12-06 16:18:32 -08:00
Allen Jackson dae25beef5 {lyn2264} Adding Python API for Actor Group (#6064) 
* {lyn2264} Adding Python API for Actor Group

* updating the IBoneData with behavior attributes
* adding actor_group.py for making actor group JSON data
* adding physics_data.py for making physics JSON data

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

* fixing dictionary issues

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

* updated comment style to numpydoc

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

* updated to numpydoc style

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

* example of actor group rules

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

* Updated based on feedback

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2021-12-06 17:11:30 -06:00
carlitosan d4206270a6 Use weak reference for undo state, as it is an entirely internal class 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 13:37:29 -08:00
mrieggeramzn 35b7705119 Atom/mriegger/overflow (#6119) 
* first pass

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

* more nice fixes

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

* feedback addressing

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
 2021-12-06 13:33:13 -08:00
carlitosan 15e26b7515 merge development 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 12:21:45 -08:00
carlitosan a76e9bba69 Restore undo/redo 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 12:12:46 -08:00
Guthrie Adams c62b0bf427 Merge pull request #6145 from aws-lumberyard-dev/Atom/guthadam/optimizing_graph_canvas_translation_serializer 
Optimizations to graph canvas translation json serializer
 2021-12-06 11:20:33 -06:00
Guthrie Adams aa5563803f Merge pull request #6110 from aws-lumberyard-dev/Atom/guthadam/update_trace_logger_to_clear_log 
Changing trace logger to clear log file when opened
 2021-12-06 11:17:46 -06:00
sphrose e5a3f21e29 fix merge conflict 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-12-06 16:43:08 +00:00
Olex Lozitskiy 5e0313d453 Multiplayer benchmark cleanup 2021-12-06 11:05:36 -05:00
Tom Hulton-Harrop 969dbf407a Add tests for planar manipulator draw when dealing with scaling (#6164) 
* add support to add a custom debug display request interface for manipulator test framework

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

* wip changes to support tests for manipulator view drawing

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

* add test for planar manipulator draw when dealing with scaling

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

* additional comments for added context

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

* small updates/fixes after PR feedback

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

* fix for missing NullDebugDisplayRequests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-06 14:53:45 +00:00
Guthrie Adams af75b3a52a Made clearing the log file optional and renamed the function 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-12-03 15:44:04 -06:00
Guthrie Adams be607521e7 Optimizations to graph canvas translation json serializer 
A handful of places in tight loops were looking up JSON and map entries multiple times in a row
Moving and reusing string variables in tight loops
Deferring string creation, copying, assignment until needed

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-12-03 14:21:22 -06: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
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
Olex Lozitskiy 701fd7f0d0 Multiplayer benchmark cleanup 
Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com>
 2021-12-03 13:46:28 -05: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
carlitosan c218fd9b77 fixed another string_view printf error caught by linux compiler 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 20:17:36 -08:00
carlitosan f7547a4cbd fixed string_view printf error caught by linux compiler 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 19:55:27 -08:00
carlitosan db798bdbc7 fix linux build error, change translation system errors to warnings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 18:18:06 -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
carlitosan 37ae47dda1 fix linux build error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 16:02:29 -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
carlitosan 6bd0308339 Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 14:17:35 -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
chcurran 1005ec9700 remove uneeded files/comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 13:18:16 -08:00
chcurran 7dc03485b6 remove uneeded files/comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 13:18:14 -08:00