9b78646397
Missed these changes
karlberg
2021-04-22 14:35:51 -07:00
c8bc5b7463
Initial work on multiple gem multiplayer components
karlberg
2021-04-22 14:35:24 -07:00
13ef98f1f9
[ATOM][RHI][Vulkan][Android] Fix VkValidation copy for new 3rd party system
Peng
2021-04-22 14:31:29 -07:00
8f76dd0f26
Fixing string interpolation security risk in test metrics
evanchia
2021-04-22 14:30:15 -07:00
15d253ac49
Merge branch 'main' into cpack_installer
scottr
2021-04-22 14:25:35 -07:00
8ee6a16567
- Removing another mistakenly re-merged test file - Updating conftest.py to point to new location for saved layouts
jckand
2021-04-22 16:22:11 -05:00
f44f06c9f0
AssImp set to be the default FBX processor (#78) (#136)
AMZN-stankowi
2021-04-22 14:09:44 -07:00
17dbe55189
Added undo and redo support for nested prefab creation
srikappa
2021-04-22 13:57:08 -07:00
5c354868ec
[cpack_installer] moved inclusion of CPack.cmake to be for engine local builds only
scottr
2021-04-22 13:56:39 -07:00
34f4ba7821
Merge from main
pereslav
2021-04-22 21:40:26 +01:00
9e2836613f
Merge branch 'main' into amzn-mike/lyn-2249-disable-cancel
amzn-mike
2021-04-22 15:38:32 -05:00
8c29ebe728
chaging name from Lumberyard to od3e
evanchia
2021-04-22 13:30:11 -07:00
9f2386fd09
- LYN-2764: Updating asset in TreeNavigation test - Removing mistakenly re-merged test file
jckand
2021-04-22 15:29:13 -05:00
38f0203546
Merge pull request #239 from aws-lumberyard-dev/ly-sdk/phistere/LaunchApFromSDK
Eric Phister
2021-04-22 14:32:14 -05:00
08bd4ee740
[LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar.
Chris Galvan
2021-04-22 14:28:42 -05:00
db7689bf49
[cpack_installer] addressed feedback regarding install error checking and default property values for cpack
scottr
2021-04-22 12:23:33 -07:00
43b7a42a0b
Merge pull request #188 from aws-lumberyard-dev/Atom/santorac/CavityMaps-ATOM-14040
Chris Santora
2021-04-22 12:15:22 -07:00
9a6bd4a629
Fix crash in AssetProcessor on Mac
SJ
2021-04-22 11:57:10 -07:00
d680995074
Renamed several non-inclusive terms (#236)
Terry Michaels
2021-04-22 13:31:26 -05:00
e5a990b05c
LYN-3120: Temporarily disabling reset of view pane layout in editor_test_helper.py teardown. Updating view of planting area for several DynVeg tests that was changed with the addition of the default level entity.
jckand
2021-04-22 13:20:44 -05:00
4b88d3683d
Merge branch 'main' into LYN-3077
amzn-sj
2021-04-22 10:11:13 -07:00
3aa0544076
Fix AssetProcessor crash on Mac
amzn-sj
2021-04-22 10:06:28 -07:00
3907ffc173
Add unit test
amzn-mike
2021-04-16 13:50:39 -05:00
bd23944531
Fix issues with rapid asset cancellation / reload: * Asset<T>::QueueLoad didn't trigger any loads in the case where an asset was in a Queued state, it simply returned the reference. This caused problems in the case where an asset was in the process of being cancelled and garbage collected, as it could be in a queued state with nothing actively loading it. The method now detects this case and calls GetAsset(), which triggers a new load. * AssetContainer::IsValid() was returning true for canceled containers that no longer had a root asset. Now it returns false, to help ensure the container doesn't try to get reused. * AssetContainer would add entries to the preloadList even if any potential preloads were filtered out from the load. They are no longer added, since they shouldn't be waiting for any dependent assets to load. (This could cause incorrect warnings to print in some situations) * AssetContainer was erroneously warning about removing assets from a missing waiting list. The warning was removed, as the condition could occur when the same asset was being loading by two different containers - once with dependencies and once without. * AssetDataStream::RequestCancel has been added, as it was missing, but nothing currently needs to use it. * AssetManager::GetAssetContainer() now verifies that the container is valid before attempting to reuse it. This prevents asset containers that are in the middle of cancellation from getting reused.
mbalfour
2021-04-12 14:57:23 -05:00
ba324b8806
[LYN-3013] Github TQO Animation: MorphTarget has data integrity issue (#237)
Benjamin Jillich
2021-04-22 18:53:27 +02:00
cc4d69f279
Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher
hultonha
2021-04-22 17:51:28 +01:00
cf4bbe569b
Remove Prefab cache undo node generation for container entities - will move that work to a separate PR.
daimini
2021-04-22 09:47:18 -07:00
dbcb2f9916
Added sys_assert level 3 which will make asserts to crash the application(#208)
AMZN-AlexOteiza
2021-04-22 17:46:37 +01:00
69d997e9c7
Merge pull request #233 from aws-lumberyard-dev/SPEC-6316-main
Steve Pham
2021-04-22 08:22:47 -07:00
8c76e193e9
[cpack_installer] removed INSTALL_COMPONENT as public argument from ly_add_target and cleaned up internal usage
scottr
2021-04-22 08:22:29 -07:00
ace7a64b24
Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK
phistere
2021-04-22 10:06:40 -05:00
62564e68de
Fixing hang when parameters are passed
pappeste
2021-04-15 15:02:02 -07:00
012ab89a23
Changed Play Console to right of toolbar.
jjjoness
2021-04-22 15:45:55 +01:00
c49be543b9
Merge branch 'main' into hultonha_LYN-2772_whitebox-atom
hultonha
2021-04-22 15:41:46 +01:00
96bbfb3ff0
Revert disable CryRenderer changes and leave CryRendererNull running. Also delete CryRenderAtomShim
rgba16f
2021-04-21 20:34:38 -05:00
22e9abf6a0
add ShadowTest map with its assets and update the hydra test + test scripts with correct paths
jromnoa
2021-04-21 18:09:08 -07:00
f36bfd9db5
LYN-2524: Adding more files to CMake install to help AP run from SDK. Fixes an issue configuring an external project.
phistere
2021-04-21 19:53:07 -05:00
39f6cc4421
Merge branch 'main' into Atom/guthadam/ATOM-15221_cherrypick
guthadam
2021-04-21 19:49:46 -05:00
215931a1ae
Updating trace recorder to allow limiting the number of messages stored
guthadam
2021-04-21 15:57:44 -05:00
0e6fea21fc
ATOM-15221 Material Editor: Capturing trace warnings and errors to display in error message boxes
guthadam
2021-04-21 10:30:27 -05:00
67fa4a332b
Change CreateLink to return the LinkId
daimini
2021-04-21 17:43:22 -07:00