0f258954fb
Fix for unit test. Checking that AssetManager is ready before spawning entities; MultiplayerSystemComponent will attempt to spawn a default player on init(), but during unit tests the AssetManager isn't stood up
2021-05-27 22:29:40 -07:00
fffbd242c1
Merge pull request #999 from aws-lumberyard-dev/Atom/guthadam/ATOM-15649
...
ATOM-15649 sorting material types in create material dialog
2021-05-28 00:01:31 -05:00
23a5afeefb
Renaming the unit_global_project.py to unit_test_global_project.py. This fixes the unit test not being found
2021-05-27 23:47:51 -05:00
051384e9a7
Remove AZ_TRAIT_DISABLE_ASSET_JOB_PARALLEL_TESTS from Linux traits ( #1018 )
2021-05-27 20:13:45 -07:00
7cdcd06824
Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
2021-05-27 20:13:24 -07:00
69e79867be
Making imported targets global, fixing identiation of the enabled_gems.cmake file
2021-05-27 20:12:48 -07:00
25dc42e298
[ATOM-15600] Fix cpu over usage when loading shader variant assets. ( #1014 )
...
This is a temporary fix, in the future ShaderVariantAsyncLoader will use
OnCatalogAssetRemoved()/ OnCatalogAssetAdded().
Signed-off-by: garrieta <garrieta@amazon.com >
2021-05-27 21:45:19 -05:00
c0c9e5e90d
Merge branch 'main' into Atom/dmcdiar/ATOM-15555
2021-05-27 19:24:16 -07:00
5bc772e126
Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
2021-05-27 21:22:07 -05:00
74464afbf3
Updated the global_project.py script to be able to specify and output
...
path when setting the global project path
Also updated that script to support an input path when reading the
global project path.
Added a unit test for the global_projecy.py "set-global-project" command
2021-05-27 21:20:19 -05:00
425cb3e2fa
Aaaaannnddd another dependency fix
2021-05-27 19:18:42 -07:00
98d9ee44fd
Merge branch 'main' into SPEC6989_MultiplayerHostPlayerShouldBeMarkedAutonomous
2021-05-27 19:04:17 -07:00
fc61ca2d0c
Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
2021-05-27 20:56:14 -05:00
87721cae55
Removed the ability to run download command from the o3de python package without user intervention
2021-05-27 20:56:03 -05:00
68e2fb83dd
More dependency fixes for linux builds
2021-05-27 18:54:22 -07:00
639240576f
Adding alias for the project gem so it gets loaded
2021-05-27 18:37:34 -07:00
32b620501d
Fix some cross dependencies between client and non-client gems
2021-05-27 18:33:28 -07:00
6485ac8ea1
Merge pull request #1013 from aws-lumberyard-dev/gallowj/main/SponzaLicense
...
Added a required CC license for Sponza content
2021-05-27 20:28:41 -05:00
57913d8378
A couple of bug fixes
2021-05-27 18:19:28 -07:00
4a15f55f78
Updating AutomatedTesting/EngineFinder.cmake
2021-05-27 17:37:59 -07:00
9435305f01
Make entity creation via asset drag and drop properly create an entity so it works with prefabs correctly ( #1010 )
2021-05-27 19:31:32 -05:00
d1a2eed40c
Fix identiation issues
2021-05-27 17:26:25 -07:00
c21a59af50
Remove print dom for debug previously
2021-05-27 17:19:32 -07:00
a11c4e9106
Merge branch 'main' into Atom/guthadam/ATOM-15649
2021-05-27 19:02:29 -05:00
b8578a4dc5
Merge pull request #979 from aws-lumberyard-dev/Atom/santorac/MaterialTypeCleanup
...
Various Cleanup of Core Material Types
Did a bunch of general cleanup on Atom's core material types. This gives us much better alignment of configuration between StandardPBR, EnhancedPBR, and Skin material types where they have common functionality. Also made some quality of life improvements for the user like making parallax mapping and UV transforms easier to set up.
ATOM-14838 Make Parallax Look Decent By Default
ATOM-13828 UV Transform Center Default Middle
ATOM-15133 Clean Up EnhancedPBR
ATOM-13216 Delete Deprecated Functors
ATOM-14037 StandardPBR TintedTransparent Opacity
ATOM-15295 Remove Unnecessary Enable Material Properties
2021-05-27 17:01:35 -07:00
62b6cfac42
letting users pass CMAKE_MODULE_PATH to find the engine
2021-05-27 16:58:06 -07:00
c45697fd51
Fixed unit test compile error with spawnables
2021-05-27 16:57:15 -07:00
4d2e453b73
Cleanup flow of logic in serialization
2021-05-27 16:53:53 -07:00
d4ce2849c7
Post-merge fixup.
2021-05-27 16:46:33 -07:00
fee4bbdd5f
Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
2021-05-27 18:41:42 -05:00
da147f273d
Adding VERBOSE messages to the SettingsRegistry.cmake 'ly_get_gem_load_dependencies()' function which logs the gem target to it's load dependencies
2021-05-27 18:41:28 -05:00
5e87250f67
Fix viewport icon rendering on high DPI devices ( #1006 )
...
* Clarify ViewportWorldToScreen being in widget space and add DeviceScalingFactor
* -Fix viewport icons being draw wrong on high DPI displays
-Fix loading viewport icons from absolute paths, which
* Address review feedback, fix build
2021-05-27 16:31:30 -07:00
0c6af23652
Correct numeric cast
2021-05-27 16:27:26 -07:00
291e27a381
Correct numeric cast
2021-05-27 16:26:26 -07:00
40dbf22b00
Merge branch 'main' into SpawnablePriorityQueue
2021-05-27 16:16:10 -07:00
2550c3e1ff
Spawnable Entity Manager threshold default to "m_highPriorityThreshold"
2021-05-27 16:13:32 -07:00
0e0e7591c5
Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
2021-05-27 16:09:52 -07:00
166db0b0c6
Android fix for FastNoise
2021-05-27 16:09:12 -07:00
f007efbc36
Fix various container issues in jinja
2021-05-27 16:01:57 -07:00
a4e128b5b6
Merge branch 'main' into Atom/guthadam/ATOM-15649
2021-05-27 17:52:10 -05:00
c67cd2dc4e
Renaming the TargetCMakeLists.txt.in to InstalledTarget.in to get avoid it being picked up by the CopyrightValidator
2021-05-27 17:35:08 -05:00
bd3dae077e
Merge branch 'main' into ftue_auto_register
2021-05-27 15:25:47 -07:00
e1dfac34fc
[ftue_auto_register] wrapped registration pybind calls with ExecuteWithLock
2021-05-27 15:24:39 -07:00
ed56635c3e
Merge remote-tracking branch 'upstream/main' into Atom/santorac/MaterialTypeCleanup
2021-05-27 15:12:56 -07:00
8ed351018f
Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
2021-05-27 17:12:51 -05:00
1c52147c3a
Fixed path case issue in the declaration of the path to the UiBasics gem
2021-05-27 17:12:28 -05:00
0d80d5ead3
Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
2021-05-27 15:04:40 -07:00
be54df8c1e
Added a required CC license for Sponza content
2021-05-27 17:04:23 -05:00
d6cfa68333
Reverting error check and comment
2021-05-27 15:04:17 -07:00
16286fb43b
Merge pull request #869 from aws-lumberyard-dev/ATOM/tonypeng/ATOM-15576
...
Atom/tonypeng/atom-15576
2021-05-27 15:01:43 -07:00
Gene Walters
Guthrie Adams
lumberyard-employee-dm
Steve Pham
pappeste
galibzon
Doug McDiarmid
Jonny Galloway
srikappa
Terry Michaels
chiyteng
guthadam
Chris Santora
AMZN-koppersr
puvvadar
Nicholas Van Sickle
scottr
Chris Santora
AMZN-tpeng