guthadam
c8b0a7be8a
Merge branch 'main' into Atom/guthadam/ATOM-15473
2021-05-05 23:32:30 -05:00
AMZN-nggieber
724add6365
Fix Project Manager Qt Ui files not Being Autogenerated ( #588 )
...
* Moved Qt files into to renamed 'S'ource
* Updated files after moving all Qt folder into Source
* Updated Source capitalization in cmake files list
* Adding newline to the end of project_manager_files.cmake
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-05-05 15:45:39 -07:00
hnusrath
97fb763776
Merge pull request #587 from aws-lumberyard-dev/PhysXTestRailLinkRemoval
...
SPEC-6677 Remove TestRail URLs from Physx Tests
2021-05-05 22:53:59 +01:00
guthadam
eb847ce9fa
ATOM-15473 added context menu to material inspector group header with expand and collapse actions
...
https://jira.agscollab.com/browse/ATOM-15473
2021-05-05 16:35:32 -05:00
Zaladane
1455fcbde6
Asset Bundler - Minor Feedback ( #550 )
...
Asset Bundler - Minor Feedback
* updated the formatting so all lines are shorter than 140 characters
* fixed a few nitpicks that came up on a recent PR
* removed a function that wasn't being used anymore
* updated some error messages based on PR feedback
2021-05-05 13:59:37 -07:00
bosnichd
5783bf635b
Fix for LoadLevel not being called. ( #584 )
2021-05-05 13:35:50 -06:00
hnusrath
fdb461b3ca
SPEC-6677 Remove TestRail URLs from Physx Tests
2021-05-05 20:06:39 +01:00
Aaron Ruiz Mora
7ba3a19b40
Remove unnecessary transformation of tangents and bitangents in cloth CPU skinning.
2021-05-05 19:48:56 +01:00
jckand-amzn
be1e4e7b1a
Merge pull request #581 from aws-lumberyard-dev/jckand/FoundationAuto
...
Cherry picking Foundation automation fixes from 1.0 branch
2021-05-05 12:58:40 -05:00
AMZN-nggieber
83e2ec6800
Project Manager - Barebones UI Made for All Screens with Basic Flow ( #507 )
...
* Created all barebone screens, a screen factory, and connected basic transitions between screens
* Changed ProjectManager namespace to O3DE::ProjectManager, removed empty new lines, switch to aznumberic_cast usage
* Project Manager - Moved Qt directory into source
2021-05-05 10:46:34 -07:00
Tom Hulton-Harrop
2d043431bc
Merge pull request #578 from aws-lumberyard-dev/hultonha_LYN-3496_whitebox_freezing
...
Fix for level loading hangs with White Box Component and Atom
2021-05-05 18:32:55 +01:00
SergeyAMZN
dd90c590aa
Merge pull request #564 from aws-lumberyard-dev/MultiplayerPipeline
...
SPEC-6590 Implemented network entities instantiation by network spawnable asset ID
2021-05-05 18:17:44 +01:00
AMZN-stankowi
a7224b6379
Integrating github/Helios_RemoveFbxSdk through commit 6dc2604 ( #391 ) ( #560 )
...
Removing FBX SDK, LYN-1045. If you have an issues please reach out to the Helios team.
2021-05-05 09:29:12 -07:00
Terry Michaels
01976a890c
Removed wireframe from perspective menu and fixed crash on right click ( #575 )
2021-05-05 11:10:19 -05:00
jckand-amzn
8e100499ec
Cherry picking 399e830f from 1.0 branch
2021-05-05 11:00:35 -05:00
jckand-amzn
20dd19c444
Cherry picking 13aa9113 from 1.0 branch
2021-05-05 10:58:41 -05:00
hultonha
1d900947f5
defer rebuilding the white box mesh by a frame to prevent reentrancy causing issues
2021-05-05 16:55:48 +01:00
jckand-amzn
abb5d56572
SPEC-6547: Updating intermittently failing tests to utilize instance validation util
2021-05-05 10:53:49 -05:00
rgba16f
7b95b5e329
Merge pull request #556 from aws-lumberyard-dev/MoveDebugDisplayGlobalID
...
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework
Rename g_mainViewportEntityDebugDisplayId to g_defaultSceneEntityDebugDisplayId
2021-05-05 10:34:17 -05:00
hultonha
b708bc2c10
potential fix for level loading hangs with White Box Component and Atom
2021-05-05 16:08:38 +01:00
bosnichd
d7b796fd73
Remove I3DEngine CryCommon Interface ( #567 )
...
Delete:
- I3DEngine
- Missions
- Time of day
- GameEffectsSystem Gem
- ImageProcessing Gem
- SVOGI Gem
- Various other things that don't do anything now that the legacy renderer has been removed.
2021-05-05 09:07:28 -06:00
pereslav
f4bd72880e
Fixed tabs
2021-05-05 14:28:45 +01:00
pereslav
9e2975ba3c
Fixed unit tests when Spawnable system component was missing
2021-05-05 14:19:23 +01:00
amzn-sean
24df655d8b
Merge pull request #552 from aws-lumberyard-dev/physx_fix_tests
...
Physx fix tests C18243589_Joints_BallSoftLimitsConstrained and C5932042_PhysXForceRegion_LinearDamping
2021-05-05 13:43:03 +01:00
cgalvan
b4e69d3933
Merge pull request #557 from aws-lumberyard-dev/cgalvan/RemoveUnusedCSelectionGroupUsages
...
[LYN-3347] Removed some unused references to CSelectionGroup.
2021-05-05 07:17:10 -05:00
amzn-sean
24167e7c02
address PR comments
2021-05-05 12:40:31 +01:00
amzn-sean
be7d34b856
Merge branch 'main' into physx_fix_tests
2021-05-05 12:40:09 +01:00
Tom Hulton-Harrop
cec56d7b27
Merge pull request #546 from aws-lumberyard-dev/hultonha_LYN-2315_camera-phase-4
...
Camera Updates - Part 4
2021-05-05 09:46:56 +01:00
Nicholas Van Sickle
abce15ea20
Merge pull request #563 from aws-lumberyard-dev/nvsickle/FixMacBuild
...
Fix Mac build
2021-05-04 19:47:45 -07:00
Chris Santora
c371c3a6cd
Merge pull request #304 from aws-lumberyard-dev/Atom/santorac/ShaderCollectionItemFixMain-LYN-2905
...
Cherrypicked the fix from the 1.0 branch to main (see #301 ).
Added a check for m_shaderAsset.IsReady() before trying to use the asset data. Also added a check before calling BlockUntilLoadComplete() to prevent reporting an error message unnecessarily.
Set the reflection name for ShaderCollection::Item to "ShaderCollectionItem" so it doesn't show up as just "Item" in Script Canvas.
2021-05-04 17:56:08 -07:00
dmcdiarmid-ly
f79257e530
Merge pull request #503 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15438
...
[ATOM-15438] Relocate RayTracingSceneSrg from project ShaderLib directory and convert to .azsli
2021-05-04 16:24:32 -07:00
Chris Santora
a940f12183
Merge branch 'main' into Atom/santorac/ShaderCollectionItemFixMain-LYN-2905
2021-05-04 16:16:58 -07:00
Mike Chang
0791d1d05f
Set default CDN for 3p system to production Cloudfront
2021-05-04 16:09:26 -07:00
pereslav
30625cf5d3
merge from main
2021-05-05 00:09:25 +01:00
pereslav
e414cc151d
SPEC-6590 Implemented network entities instantiation by network spawnable asset ID
2021-05-05 00:00:06 +01:00
nvsickle
d4f19cb0b5
Fix Mac build
2021-05-04 15:59:28 -07:00
dmcdiar
71039186ab
Removed RayTracingSceneSrg files from the .cmake file
2021-05-04 15:18:48 -07:00
rgba16f
27472169e2
Change global default scene debug draw id variale declare from static constexpr const to inline constexpr
2021-05-04 17:06:22 -05:00
AMZN-koppersr
baad29edba
Merge pull request #553 from aws-lumberyard-dev/JsonSerializationPointerFix
...
Smart and raw pointer support in Json Serialization behave similarly
2021-05-04 15:04:58 -07:00
sharmajs-amzn
f5f035122b
{LYN-3229} Update AssImp package with latest AssImp 3rd party source changes ( #545 ) ( #554 )
2021-05-04 15:00:02 -07:00
Chris Galvan
9e105fb769
[LYN-3347] Removed some unused references to CSelectionGroup.
2021-05-04 16:52:36 -05:00
dmcdiar
3c4889b929
Merge branch 'main' into Atom/dmcdiar/ATOM-15438
2021-05-04 14:11:12 -07:00
dmcdiarmid-ly
6890cf907d
Merge pull request #537 from aws-lumberyard-dev/Atom/dmcdiar/LYN-3256
...
[LYN-3256] Atom: Baking Reflection Probe crashes the Editor when Prefabs are enabled
2021-05-04 14:05:11 -07:00
Nicholas Van Sickle
788440f3d7
Merge pull request #498 from aws-lumberyard-dev/nvsickle/MinorQtFixes
...
Update Qt 3rdParty packages to fix a minor CMake issue
2021-05-04 13:55:18 -07:00
AMZN-koppersr
2d4a17a2fb
Merge branch 'main' into JsonSerializationPointerFix
2021-05-04 13:53:03 -07:00
AMZN-koppersr
afcbe4e02b
Small updates based on PR feedback.
2021-05-04 13:51:08 -07:00
srikappa-amzn
a5ccfa6053
Merge pull request #456 from aws-lumberyard-dev/Prefab/CreatePrefab
...
Fix undo for nested prefab creation by providing link patches to the undo node
2021-05-04 13:20:37 -07:00
rgba16f
1c1a9aeab4
Merge remote-tracking branch 'upstream/main' into MoveDebugDisplayGlobalID
2021-05-04 14:40:31 -05:00
rgba16f
593528532f
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework and rename it to g_defaultSceneEntityDebugDisplayId
2021-05-04 14:36:48 -05:00
jiaweig
6988843d89
Merge pull request #535 from aws-lumberyard-dev/Atom/jiaweig/ATOM-15391_SSAO_stripes
...
ATOM-15391 [RHI][Vulkan][Android] SSAO introduces horizontal lines
2021-05-04 12:29:24 -07:00