amzn-mike
ff81b0bfd6
Use contains method instead of find. Rename parentFillerAnimations -> fillerAnimations
2021-06-17 10:40:33 -05:00
amzn-mike
9cadcc17f9
Merge branch 'stabilization/2106' into stabilization/2106_Helios_TransformImporterFixV2
2021-06-16 17:55:56 -05:00
amzn-hdoke
b74a153f75
Update AWSAttribution endpoint to prod endpoint ( #1335 )
2021-06-16 14:25:26 -07:00
amzn-mike
4c9b3b12cb
Merge branch 'stabilization/2106' into V2Mainline
2021-06-16 12:05:28 -05:00
amzn-mike
57b19feca5
Cleanup code
2021-06-16 12:03:47 -05:00
AMZN-stankowi
1fd0886b70
Updated AssImp to v10 for Windows Invert PostRotation matrix in animation chains ( #1340 )
2021-06-16 08:32:47 -07:00
srikappa-amzn
604dca1c3e
Merge pull request #1349 from aws-lumberyard-dev/BenchMarksReset
...
Change create-spawnable benchmarks to not destroy created spawnables immediately
2021-06-15 16:18:02 -07:00
Eric Phister
74491c88b8
Fix AssetBuilders when project-path has a trailing slash ( #1345 )
...
* Fixes issues with project paths w/ trailing slash
When launching AP with a --project-path that has a trailing slash, the
AssetBuilders would get that slash instead of a normalized version.
This would mess up the params sent to AssetBuilders.
* Missed a variable name replacement
* Addresses feedback on code style guidelines
Removed 'auto' keyword in favor of explicit types.
2021-06-15 17:50:40 -05:00
carlitosan
889e6e2b14
Merge pull request #1287 from aws-lumberyard-dev/carlito/stabilization/2106
...
Remove unwanted entries from ScriptCanvas node palette
2021-06-15 15:01:54 -07:00
srikappa-amzn
bd8b6aea8e
Moved vector declartion inside state for loop
2021-06-15 14:12:08 -07:00
yuriy0
e40a598648
Bug fix: check for valid extension in case insensitive manner ( #1339 )
2021-06-15 12:41:58 -07:00
chcurran
9f7f6e84a4
Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into carlito/stabilization/2106
2021-06-15 12:10:10 -07:00
Mike Balfour
ab3aa904f0
Fixed misc slice conversion bugs
...
* Fixed crash caused by nesting the same slice twice
If the same slice is nested at multiple levels in the same slice hierarchy, the second conversion would reregister the prefab and crash. Now that case is detected and the slice isn't reconverted.
* Fixed json array patches where multiple elements are removed.
The patches now generate removals from back to front, instead of front to back, so that the indices remain valid as each patch is applied.
2021-06-15 14:00:47 -05:00
srikappa-amzn
9f9c01e781
Used reserve instead of resize
2021-06-15 11:10:45 -07:00
srikappa-amzn
5b4333e4b1
Added a comment and gave a variable better name
2021-06-15 11:07:43 -07:00
srikappa-amzn
c8ba42d04f
Merge branch 'stabilization/2106' into BenchMarksReset
2021-06-15 10:59:36 -07:00
cgalvan
13c59385a7
Merge pull request #1332 from aws-lumberyard-dev/cgalvan/FixPrefabActionsWhenDisabled
...
[LYN-4527] Make sure the PrefabIntegrationManager is only created when prefabs are enabled, otherwise could result in crashes.
2021-06-15 12:50:10 -05:00
sconel
bd2a2ebcf5
Merge pull request #1293 from aws-lumberyard-dev/Prefabs/RemoveEditorInfoFromNestedContainerEntities
...
Fix nested container entities not getting editor info removed during prefab processing
2021-06-15 10:36:13 -07:00
Chris Galvan
1aad201a98
[LYN-4527] Make sure the PrefabIntegrationManager is only created when prefabs are enabled, otherwise could result in crashes.
2021-06-15 10:51:36 -05:00
rgba16f
0198f6121b
Rebind the DebugDisplayRequestBus Instance to handle drawing in GameMode. ( #1275 )
2021-06-14 20:29:37 -05:00
amzn-mike
625e1326e3
Merge branch 'stabilization/2106' into V2Mainline
2021-06-14 19:55:01 -05:00
Alex Peterson
ecded991b5
Display error when unable to start Python
...
Added AzFramework Application, logging, unit tests
2021-06-14 17:02:22 -07:00
amzn-mike
364187a87b
Merge pull request #1047 from aws-lumberyard-dev/Helios_AssImp_TransformImporterFix
...
Fix AssImpTransformImporter logic for bone nodes
2021-06-14 18:41:09 -05:00
AMZN-nggieber
948075fa61
Gem Catalog Allows Filtering by Gem Selected Status Live ( #1274 )
2021-06-14 15:56:54 -07:00
sharmajs-amzn
86d0acf76c
fixes for invalid drive letter casing for scanfolder ( #1281 )
2021-06-14 13:55:37 -07:00
Mike Balfour
6f61454be4
Added support for remapping entity refs across slice instances ( #1284 )
...
* Fixed memory assert on shutdown.
Cleaned up the entity pointers on serialization, so that they no longer leak themselves, their asset references, or anything else within them.
* Added support for remapping entity refs across slice instances.
Slice instances can have components with entity references that have been modified to reference entities in other slice instances, or even in the parent. This change detects and remaps those references so that they work correctly.
2021-06-14 14:20:39 -05:00
amzn-mike
a3ae330e6d
Merge branch 'stabilization/2106' into Helios_AssImp_TransformImporterFix
2021-06-14 10:17:29 -05:00
amzn-mike
7dc4d8438b
Fix non-bone transforms setting the wrong matrix variable
...
(cherry picked from commit 838a8b47da73e50fca4ea9ee5abc7c33250bf25d)
2021-06-14 08:08:51 -05:00
amzn-mike
9b039c1f9d
Fix creating bone data for non-bones
...
(cherry picked from commit 8d1bdd1456e70e4efc47aa36dce660bc91e7dfcf)
2021-06-14 08:08:31 -05:00
amzn-mike
10999b6999
All bones have animations
...
(cherry picked from commit d17a8070010cdc5bc4e08d17b1549736d031414a)
2021-06-14 08:06:48 -05:00
amzn-mike
66a030b800
Fix transform data
...
Use first offsetMatrix for a bone (there may be multiple) and calculate using offsetOfParent * inverseRootOffset * rootOffset * inverseOffset
(cherry picked from commit a8eae976dda39ad28f9aa235e1e6ba34715ac48a)
# Conflicts:
# Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
2021-06-14 08:06:25 -05:00
amzn-mike
d841f0c0db
Got transform result close for 3 bone chain, longer chains are still not correct
...
(cherry picked from commit 5ac65de6148dcc03b9f2953e97dd943493f23ed9)
# Conflicts:
# Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
2021-06-14 08:03:39 -05:00
greerdv
d72d988195
Merge pull request #1280 from aws-lumberyard-dev/simd-division-by-zero
...
avoid some divisions by zero in simd math types
2021-06-14 11:48:32 +01:00
amzn-mike
9ff007024d
Merge branch 'main' into Helios_AssImp_TransformImporterFix
2021-06-13 16:56:44 -05:00
SJ
6fdbce01eb
Fix build and link errors in monolithic builds
...
Merge pull request #1288 from aws-lumberyard-dev/SPEC-7273
2021-06-11 18:40:52 -07:00
sconel
e4921c8d0a
Fix nested container entities not getting editor info removed during prefab processing
2021-06-11 17:45:46 -07:00
Danilo Aimini
f32590d241
LYN-4042 | No UI Indication that Level is Modified ( #1277 )
...
* Restore the code that display the dirty marker on the Level container. Ensure the dirty marker is cleared on level save.
* Moving call one level up to allow usage of the SaveTemplateToString function without clearing the dirty flag.
2021-06-11 16:43:53 -07:00
amzn-sj
a86062bd91
Skip interface libraries when genrating StaticModules for game server as well
2021-06-11 16:42:09 -07:00
amzn-sj
469b1a0858
Fix monolithic link error involving gem variants which are "aliased" as interface libraries with multiple gem target dependencies
2021-06-11 16:30:46 -07:00
chcurran
10081fefb9
Remove unwanted entries from node palette
2021-06-11 16:28:34 -07:00
srikappa-amzn
e6ec9e48b4
Changed spawnables benchmark test to create multiple spawnables at once
2021-06-11 16:17:26 -07:00
amzn-sj
ac5196dbf5
Revert previous change
2021-06-11 15:19:28 -07:00
amzn-sj
21f209311c
Parameter may be unused
2021-06-11 14:54:24 -07:00
cgalvan
b08245a7f5
Merge pull request #1276 from aws-lumberyard-dev/cgalvan/FixInstantiatePrefabPopup
...
[LYN-4160] Fixed intermittent crash by changing instantiate prefab dialog to use the AzToolsFramework::GetActiveWindow() helper which always gives a valid active window.
2021-06-11 16:52:58 -05:00
amzn-sj
e6b8dc2ce1
Disable AzTest and AzTestRunner in monolithic builds
2021-06-11 14:37:12 -07:00
greerdv
3895c93e04
avoid some divisions by zero in simd math types
2021-06-11 22:05:37 +01:00
carlitosan
43e157035e
Merge pull request #1272 from aws-lumberyard-dev/carlito/stabilization/2106
...
Carlito/stabilization/2106 Fix for AP errors on graph, and Lua properties table fix
2021-06-11 13:51:08 -07:00
Chris Galvan
015f85db20
[LYN-4160] Fixed intermittent crash by changing instantiate prefab dialog to use the AzToolsFramework::GetActiveWindow() helper which always gives a valid active window.
2021-06-11 15:15:45 -05:00
srikappa-amzn
1582cb5257
Enabled instantiate benchmarks
2021-06-11 12:43:35 -07:00
Danilo Aimini
9bb34a6121
Remove references to Wireframe menu item that was removed in a previous PR ( #1263 )
2021-06-11 11:48:59 -07:00