f552fc7ccd
Fix for ReadMesh error reporting
2021-04-16 17:30:06 +01:00
e0b66223e4
Merge branch 'main' into Atom/guthadam/material_dialog_button_and_modality_fixes
2021-04-16 11:25:59 -05:00
2f115cb739
Merge branch 'main' into LYN-2893
2021-04-16 09:10:40 -07:00
1363a5b76c
fixing bugs with failing to disconnect from non-uniform scale event handlers in multiple places
2021-04-16 16:52:30 +01:00
d9bb0683ec
Merge branch 'main' into platform/SPEC-6061
2021-04-16 08:12:29 -07:00
ca54931620
Merge pull request #89 from aws-lumberyard-dev/Atom/moudgils/AutomatedTestingNullRHI
...
Enable Null RHI for AutomatedTesting
2021-04-16 08:05:25 -07:00
a59e212134
Merge branch 'main' into MultiplayerPipeline
2021-04-16 07:58:35 -07:00
68082a895c
Merge branch 'main' of https://github.com/aws-lumberyard/o3de
2021-04-16 09:44:08 -05:00
f6fc8f95a9
Fixed random button highlights & toolbar order.
2021-04-16 15:28:05 +01:00
ffbd8ad665
Merge branch 'LY-105687' of https://github.com/aws-lumberyard-dev/o3de into LY-105687
2021-04-16 15:15:59 +01:00
2a339edc4e
[LY-105687]
...
Jira: LY-105687
https://jira.agscollab.com/browse/LY-105687
Renamed svg
2021-04-16 15:14:55 +01:00
db4b080544
Renamed svg
2021-04-16 14:55:39 +01:00
2a53f018fa
Merge pull request #70 from aws-lumberyard-dev/physx_system_comp
...
SystemComponent is now only built once in the PhysX.Static target
2021-04-16 14:04:00 +01:00
102a0e5dc8
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
2021-04-16 12:04:14 +01:00
cbd86cc965
Merge pull request #71 from aws-lumberyard-dev/non-uniform-scale-visibility
...
Bug fixes for non-uniform scale.
Fixing visibility bounds for non-uniformly scaled polygon prism activation.
Fixing editor rigid body position for physx asset colliders with position offsets and NUS.
Fixing runtime subdivision level for asset colliders.
2021-04-16 11:32:50 +01:00
490b2afd31
[LY-105687]
...
Jira: LY-105687
https://jira.agscollab.com/browse/LY-105687
2021-04-16 10:59:27 +01:00
969f94ffb5
Initial pass of ViewportUiSwitcher.
2021-04-16 10:27:13 +01:00
fece27b1b0
Merge branch 'main' into LY-113714
2021-04-16 10:00:04 +01:00
a757d327a0
Merge branch 'main' into non-uniform-scale-visibility
2021-04-16 09:57:04 +01:00
ad142c8c12
Merge branch 'main' into Atom/moudgils/AutomatedTestingNullRHI
2021-04-16 00:38:00 -07:00
41eadd60e4
Merge pull request #83 from aws-lumberyard-dev/Atom/moudgils/BumpResourcePoolBuilder
...
Bump ResourcePoolBuilder as the BufferBindFlags were updated. Also pulled in networking compile fixes to fix profile_nounity from Karl.
2021-04-16 00:35:59 -07:00
51720e269b
Merge branch 'MultiplayerCompileFix' into Atom/moudgils/BumpResourcePoolBuilder
2021-04-15 22:11:39 -07:00
b8ab5be3bb
Merge branch 'main' into Atom/moudgils/AutomatedTestingNullRHI
2021-04-15 21:04:00 -07:00
ca86068d83
Minor update
2021-04-15 20:55:54 -07:00
d0435b4489
Minor update
2021-04-15 20:46:48 -07:00
05359187c4
Test update
2021-04-15 20:45:53 -07:00
89a935cd29
Minor update
2021-04-15 20:44:01 -07:00
ee3f157fb8
Fix memory leak in multiplayer unit test
2021-04-15 20:41:08 -07:00
bff55bd688
LYN-2726 Updated the Settings Registry Merge Utils logic to determine
...
the project root and engine root to fix issues with running the Editor
or AssetProcessor from within the project folder overriding the
project_path with the engine root bootstrap.cfg project_path entry
The order in which the project path is overridden as follows
1. The <engine-root>/bootstrap.cfg is first merged into the Settings
Registry. Any '/Amazon/AzCore/Bootstrap/project_path' would be used
if the following steps don't override that key.
2. Followed by general *.setreg/*.setregpatch files being merged into
the Settings Registry which can override the
'/Amazon/AzCore/Bootstrap/project_path' key
3. Next a project.json file searched upwards from the current executable
directory to determine the project path
4. Finally if a command line parameter that overrides the project path
is supplied it is used instead
2021-04-15 22:40:58 -05:00
62b38bdf9e
Merge branch 'main' into Atom/moudgils/BumpResourcePoolbuilder
2021-04-15 20:24:00 -07:00
82ca4bf221
Merge pull request #80 from aws-lumberyard-dev/AtomTest-Sponza
...
AtomTest Sponza Content
2021-04-15 21:45:02 -05:00
91b2c9e44a
Merge branch 'main' into platform/SPEC-6061
2021-04-15 19:33:16 -07:00
3c631e4a85
Merge branch 'main' into Atom/moudgils/BumpResourcePoolbuilder
2021-04-15 19:16:29 -07:00
4edbf7890b
Bringing fix that has not been migrated to github yet (fixes Windows release builds)
2021-04-15 19:01:15 -07:00
1cf2e11cd3
Merge branch 'main' into Prefab/CreatePrefab
2021-04-15 19:00:28 -07:00
0b29e4ffea
Merge branch 'main' into Prefab/CreatePrefab
2021-04-15 18:47:17 -07:00
778d60bd0c
Replaced unique instance queue with checks in template to instance mapper
2021-04-15 18:45:48 -07:00
d3520ddcf1
Adding "copy name" and "copy path" to Material Editor
2021-04-15 17:59:09 -07:00
8074e0fb18
Remove formal template parameter name to resolve shadowed variable warning on clang
2021-04-15 17:56:08 -07:00
0ce18593d2
Merging latest main
2021-04-15 17:40:21 -07:00
c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components
2021-04-15 16:30:36 -07:00
2c7b552202
Merge branch 'main' into cpack_installer
2021-04-15 16:28:01 -07:00
4962218d29
Refactored root spawnable instantiation, added selective instantiation of root spawnable entities
2021-04-16 00:19:43 +01:00
61c24084e8
Enable Null RHI for AutomatedTesting
2021-04-15 16:13:22 -07:00
62f67b16da
[cpack_installer] wrapped stray PrefabBuilder.Tests around PAL_TRAIT_BUILD_TESTS_SUPPORTED
2021-04-15 16:12:12 -07:00
9848a783e5
Merge branch 'main' into scripting/function_node_fixes
2021-04-15 16:02:49 -07:00
b1bbd3f2ff
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into main
2021-04-15 16:02:26 -07:00
ba04c7858f
Fixed ability to set Array as data input into function definition node, WIP
2021-04-15 16:01:36 -07:00
f76322d13d
Remove Android/iOS pal files since OpenGL is only needed by host tools.
2021-04-15 15:59:30 -07:00
7902eafd7d
Add empty pal files for platforms other than Mac
2021-04-15 15:20:55 -07:00
hultonha
guthadam
amzn-sj
greerdv
spham
moudgils
karlberg
mbalfour
hasareej
sphrose
amzn-sean
greerdv
moudgils
mcgarrah
Jonny Galloway
Esteban Papp
srikappa
mnaumov
kberg-amzn
scottr
pereslav
luissemp