2e9ad896db
Add some debug rendering options. ( #4950 )
...
* [WIP] Adding rendering options
Signed-off-by: rhhong <rhhong@amazon.com >
* code review feedback. Also add the renderflag as qsettings.
Signed-off-by: rhhong <rhhong@amazon.com >
* fix broken test
Signed-off-by: rhhong <rhhong@amazon.com >
* fix linux build
Signed-off-by: rhhong <rhhong@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:45:11 -07:00
a9fc376d6c
Upload AP logs when there is an AP eeror ( #4896 )
...
* Updating LFS config to new endpoint (#1624 )
Signed-off-by: AMZN-alexpete
* Updates licenses to APACHE-2.0 OR MIT (#1685 )
Not to be committed before 7/6/2021
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com >
* Updating CONTRIBUTING.md
Signed-off-by: Terry Michaels <miterenc@amazon.com >
* Fixed typo
Signed-off-by: Terry Michaels <miterenc@amazon.com >
* Updated text to be more descriptive
Signed-off-by: Terry Michaels <miterenc@amazon.com >
* Upload AP logs when there is an AP eeror
Signed-off-by: shiranj <shiranj@amazon.com >
* Add AP log upload step for single step Asset jobs
Signed-off-by: shiranj <shiranj@amazon.com >
* Address more comments
Signed-off-by: shiranj <shiranj@amazon.com >
* Only call CreateUploadAPLogsStage() once in try/catch block
Signed-off-by: shiranj <shiranj@amazon.com >
* Revert acciental update to README.md
Signed-off-by: shiranj <shiranj@amazon.com >
Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
Co-authored-by: Chris Galvan <chgalvan@amazon.com >
Co-authored-by: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com >
Co-authored-by: Terry Michaels <miterenc@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:45:09 -07:00
89177790f5
Disable custom titlebar on Mac, Linux, fix resize ( #4973 )
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:45:06 -07:00
f162ae2dc0
Scaffold PythonGem template ( #4888 )
...
* Renamed ctest_pytest.ini to pytest.ini so it is used by default, added TestSuite_ as collection file (#4822 )
* Fixed warnings of unused marks, renamed ctest_pytest.ini to pytest.ini to better consistency on runs
* Fixed some test suites to run propertly
* Fix missing arguments
* Fixed missing cmakelists and renamed missing file
* Temp disable editor_testing_tests as timeout in jenkins
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* scaffold PythonGem template
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* CustomTool was not added to CMakeLists
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* Update Templates/PythonGem/Template/Code/CMakeLists.txt
makes sense thank you for the help
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* Update Templates/PythonGem/Template/Code/CMakeLists.txt
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* Delete ${NameLower}_tests_files.cmake
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* suggested changes made
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* cleanup not needed files
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* fix up template.json
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* made a correction
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* made a correction
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* fixes
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* fixes
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* more fixes, fixed a file name
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* Added helper method to az_qt_helpers for retrieving the main window instance.
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
* additional fixes
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* Fix for AP trowing errors at boot (can not get mainwindow)
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* Added missing EBus connect/disconnect calls in the EditorSystemComponent
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* additional fix up
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
* adding dialog internals
Signed-off-by: Jonny Gallowy <gallowj@amazon.com >
Co-authored-by: AMZN-AlexOteiza <82234181+AMZN-AlexOteiza@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: Chris Galvan <chgalvan@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:45:04 -07:00
6c67996f85
Set Project Manager minimum height 700px ( #4970 )
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:45:01 -07:00
ce3e998a32
Add xcb input dev packages ( #4962 )
...
Signed-off-by: Mike Chang <changml@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:58 -07:00
7f6d72b5d9
Added Hydra API to extract all the classes, globals and EBuses exposed ( #4953 )
...
* Added Hydra API to extract all the classes, globals and EBuses exposed
to lua:
azlmbr.script.LuaSymbolsReporterBus:
GetListOfClasses
GetListOfGlobalProperties
GetListOfGlobalFunctions
GetListOfEBuses
Also exposed to Hydra the classes that can be used to dump
the symbols
azlmbr.script.LuaPropertySymbol
azlmbr.script.LuaMethodSymbol
azlmbr.script.LuaClassSymbol
azlmbr.script.LuaEBusSender
azlmbr.script.LuaEBusSymbol
The python file Assets/Editor/Scripts/lua_symbols.py
can be used with "pyRunFile <script_name> [output.txt]"
to create Game/output.txt will all the symbols
OR
passing up to three additional arguments "c" or "g" or "e" to dump only
classes, globals or ebuses or a combination of those. Example:
To create an output file with only classes and Ebuses:
"pyRunFile <script_name> [output.txt] c e"
Signed-off-by: garrieta <garrieta@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:56 -07:00
e00c760ffd
Normalize Shader vs Shaders Folders ( #4925 )
...
Normalize Shader vs Shaders Folders (#4925 )
Signed-off-by: garrieta <garrieta@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:53 -07:00
5e09f85801
Fixed some files missed when groundplane_521 was renamed to 512 ( #4958 )
...
* Fixed references to 521x521 to reference the correct 512x512 FBX file
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Fixed asset hints
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:51 -07:00
b31d47e91f
ATOM-16489 Add find passes functions for Scene or RenderPipeline in PassSystemInterface ( #4739 )
...
* ATOM-16489 Add find passes functions for Scene or RenderPipeline in PassSystemInterface
Introduced new PassSystemInterface::ForEachPass() funtion to replace PassSystemInterface::FindPasses(), PassSystemInterface::GetPassesByTemplateName and ParentPass::FindPassByNameRecursive() functions.
Update all the places which were using those three functions.
The new pass finding filter support any combination of pass name, pass template name, pass class type, pass hirechary, owner scene, owner render pipeline.
Update unit tests.
Signed-off-by: Qing Tao <qingtao@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:48 -07:00
b4f42b599a
Adding Shaderball test and asset files. ( #4743 )
...
Signed-off-by: Rosario Cox <lesaelr@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:45 -07:00
328cefc972
Terrain Macro Material component improvements ( #4930 )
...
* First pass of non-working changes to Terrain Macro Material Component.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Reworked Terrain Macro Material to use properties instead of a material.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Fixed comments.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* PR feedback - disable attributes when no normal map selected
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Fix linux compile error - unused variables.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:42 -07:00
4ce40281df
Asset Browser Search View fixes ( #4814 )
...
* Fixed RowCount method.
Signed-off-by: igarri <igarri@amazon.com >
* Fixed Signals
Signed-off-by: igarri <igarri@amazon.com >
* Fixed Delegate case
Signed-off-by: igarri <igarri@amazon.com >
* Fixed issue when displaying branch icons
Signed-off-by: igarri <igarri@amazon.com >
* Fixed AssetBrowser Delegate
Signed-off-by: igarri <igarri@amazon.com >
* Removed optimize flags
Signed-off-by: igarri <igarri@amazon.com >
* AssetBrowsertableModel cleanup
Signed-off-by: igarri <igarri@amazon.com >
* Fixed Typos
Signed-off-by: igarri <igarri@amazon.com >
* Fixed Comment
Signed-off-by: igarri <igarri@amazon.com >
* Added check for rowCount == 0
Signed-off-by: igarri <igarri@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:40 -07:00
725ac83667
Minor updates in response to code review feedback.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:37 -07:00
334899b0dc
Moved the Material Component property override renaming to EditorMaterialComponent via ApplyAutomaticPropertyUpdates.
...
MaterialAssignment::ApplyProperties() still reports warnings but does not update the m_propertyOverrides.
MaterialAssignment::ApplyProperties() will now skip the old name'd overrides if overrides are present for the new names. I'm not sure if this will ever happen, but it did happen while I had some intermediate changes, so I imagine it could happen again.
I had to update the Material::FindPropertyIndex function to expose information about renames when they occur. This should make it easier for other systems to get (somewhat) automatic benefit from the version update feature.
I also found that there was an issue with material inspector where it wouldn't be initialized the the right override values when renames were present. Now it applies the renames to whatever override data it gets from the Material Component.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:35 -07:00
6da17abba4
Made material property auto-rename procedure apply to Material Component at runtime. This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure.
...
I added an ApplyPropertyRenames function to MaterialTypeAsset very similar to the one in MaterialTypeSourceData.
Updated the MaterialAssignment class to apply any property renames when it discovers the old name doesn't work. This will be written to disk when the level or prefab is saved.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:32 -07:00
cea5a0d187
Fix desktop shortcuts created by Windows installer
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:15 -07:00
4996e76f6c
Read engine version from setting registry ( #4926 )
...
* Read engine version from setting registry
Signed-off-by: Junbo Liang <junbo@amazon.com >
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:44:13 -07:00
48c438f469
Reverting the debugging code I was using to narrow down the problem on Jenkins now that the issue was fixed by PR-4946
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-28 09:42:13 -07:00
c9a02e3c8a
Revert "Lowering timeout so pytest doesnt abort, but still get mode time to read the server logs"
...
This reverts commit 8380c5ff24genewalt@amazon.com >
2021-10-28 09:42:10 -07:00
eabfed5562
Merge branch 'LYN-7655_MultiplayerEditorToEditorServerConnectionReverse' into LYN-6770_AutomatedTestNetInputs
2021-10-25 14:15:05 -07:00
b4865e32f5
Minor whitespace fix
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-25 13:04:20 -07:00
fe071f0736
Adding warnings if MPEditorConnection cannot find certain cvars
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-25 12:57:40 -07:00
2f651c05c8
Python passes lower-case net-player-prefab path.
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-24 23:28:10 -07:00
03e90e7df5
Merge branch 'LYN-7655_MultiplayerEditorToEditorServerConnectionReverse' into LYN-6770_AutomatedTestNetInputs
2021-10-24 23:09:21 -07:00
7de5c17fb6
The editor might not be the connector so make sure to connect to the actual MP simulation even if the editor isn't the editor-server connect (if editorsv_launch=true then the editor-server will connect to the editor)
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-24 23:07:58 -07:00
ea4a898d74
Minor, adding some null checks
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-23 19:30:51 -07:00
8380c5ff24
Lowering timeout so pytest doesnt abort, but still get mode time to read the server logs
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-23 16:41:30 -07:00
3d7346ac32
increasing multiplayer is-in-game timeout, going to try this on Jenkin. Maybe AssetProcessor isn't finished and thats why its failing?
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-23 16:02:41 -07:00
5ade5291b0
Minor code comment edit
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-22 17:13:44 -07:00
5ba090feec
Merge branch 'upstream/development' into LYN-7655_MultiplayerEditorToEditorServerConnectionReverse
2021-10-22 17:01:58 -07:00
6ef6164ad8
merging latest dev
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-22 17:00:47 -07:00
569dbc7db3
Merge editor-server race condition fix; will test on Jenkins
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-22 16:39:04 -07:00
0c5110b1ed
Fix a race condition where the editor tries to connect to the editor-server before the editor-server is ready (originally discovered on lower-spec Jenkin machines). Change editor-server so that editor waits to receive a EditorServerReadyForInit before trying to send all the level data.
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-22 16:34:42 -07:00
297f40d6c4
Merge pull request #4928 from aws-lumberyard-dev/antonmic/buildfix
...
buildfix: adding .aszl to shader references
2021-10-22 16:28:57 -07:00
69771ab2e1
Merge pull request #4892 from aws-lumberyard-dev/TrackDownloadProgress
...
Project Manager track progress of, and cancel downloads
2021-10-22 15:53:29 -07:00
45701a9972
buildfix: adding .aszl to shader references
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-10-22 14:48:15 -07:00
45b164e722
Merge pull request #4881 from aws-lumberyard-dev/lytt_update_defaults
...
Lytt update defaults
2021-10-22 14:27:56 -07:00
e1b46b7e5c
Add comment about additional callback function and be explicit on return value.
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-10-22 14:23:55 -07:00
b609dbbbbb
Pass a callback instead of weak linking a module
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-10-22 14:07:32 -07:00
6bd1b3980c
Merge pull request #4865 from aws-lumberyard-dev/Atom/antonmic/DepthOfField01
...
Atom/antonmic/depth of field01
2021-10-22 13:41:36 -07:00
a4e0d69e83
Update Splashscreen and About Us dialogs for General Availability ( #4901 )
...
* Add new image for splashscreen. Layout changes incoming.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Adapt layouts to new splashscreen style with transparent background.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Ensure cropping logic works correctly when screen scaling is used.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Remove old image. Replace new image with new version with more readable credits.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-10-22 12:46:06 -07:00
a27738317b
Merge pull request #4918 from aws-lumberyard-dev/Atom/santorac/RequireAzslExtensionInShaderFile
...
The .shader file must now include the .azsl extension when referencing a .azsl file
2021-10-22 12:45:04 -07:00
efbf2f224e
Merge pull request #4913 from aws-lumberyard-dev/cgalvan/AddFindComponentsByServiceAPI
...
Added API for finding components based on required/incompatible services
2021-10-22 14:38:21 -05:00
45926d0dbd
LYN-7539 + LYN-7541 | Focus Mode - Show prefab names and dirty markers instead of instance names in breadcrumbs ( #4850 )
...
* Change Prefab Focus breadcrumb widget to display template filename instead of instance container entity name. Also display dirty state for the template (*) and refresh it in real time.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Streamline path creation code; fix stem retrieval to ensure extension is cut correctly; delay refresh one frame when path is clicked to correctly refresh it.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Remove test code.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Simplify code to use Native directly.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor variable renaming and comment adjustments to make them clearer.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-10-22 12:37:43 -07:00
243532c5de
Addressed feedback from PR 4874. ( #4915 )
...
* Addressed feedback from PR 4874.
* Removed second copy of HeightfieldProviderBus.h from cmake file
* Changed CookedMeshShapeConfiguration and HeightfieldShapeConfiguration to have less messy implementations, instead opting for the slightly less messy const_cast inside of Utils.cpp and DebugDraw.cpp.
* Changed InitHeightfieldShapeConfiguraiton to CreateHeightfieldShapeConfiguration with a better API signature.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Fixed indentation
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
2021-10-22 14:33:36 -05:00
2fe4524458
Terrain API cleanups ( #4914 )
...
* Terrain API fixups
Moved SurfaceData definitions in AzFramework out of terrain into separate files.
Added some missing API calls: Get*FromVector2, GetSurfacePoint*
Changed OrderedSurfaceTagWeightSet to SurfaceTagWeightList
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* PR feedback - remove IsClose check.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Fixed PhysX test compile failures by redcoding a bunch of "dummy terrain" implementation that's unused.
It was originally added for the PhysX Terrain component, but that component is long gone and has been superceded by the more generic PhysX Heightfield Collider.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Fixed up failing terrain unit tests.
Added API changes, and changed the assumption on where the surface weight sort is taking place. The component is no longer expected to provide the sorted list, it only needs to be sorted at the end coming out of the terrain system, so the unit tests have been modified to reflect that.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
2021-10-22 14:22:57 -05:00
ea1284c581
fixing up atom_feature_common_asset_files.cmake
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-10-22 12:14:35 -07:00
5cb59bd035
finishing merge
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-10-22 12:12:45 -07:00
972a501851
merging to resolve conflicts
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-10-22 12:11:49 -07:00
Roman
Shirang Jia
Alex Peterson
Jonny Galloway
Mike Chang
galibzon
AMZN-stankowi
Qing Tao
LesaelR
Mike Balfour
AMZN-Igarri
santorac
AMZN-Phil
Junbo Liang
Gene Walters
antonmic
AMZN-Phil
Sean Sweeney
Danilo Aimini
Chris Galvan