a7f5462f3d
Merge pull request #114 from aws-lumberyard-dev/sceneapi_script_regression
...
{LYN-2635} Helios - Wrote auto tests for Python asset builder and scene API
2021-04-19 12:07:32 -05:00
d6788996fc
Merge pull request #130 from aws-lumberyard-dev/LYN-3055
...
Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
2021-04-19 11:52:16 -05:00
4c2260af97
Lyn 2651 rebased to main ( #74 )
...
* Helios - LYN-2651 Lerping bones, cleaned up key frame generation for morph targets. Merge from 1.0.
2021-04-19 08:51:52 -07:00
9412078992
Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
...
"/Amazon/AzCore/Bootstrap/assets" key is set, then it would append that
value to the default asset platform value for the OS
2021-04-19 10:23:58 -05:00
ce6d9e51ee
Merge branch 'main' into sceneapi_script_regression
2021-04-19 09:32:29 -05:00
6d3b9e4f51
Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot
2021-04-16 21:12:55 -05:00
944dab2ecb
Merge pull request #121 from aws-lumberyard-dev/nvsickle/ViewportFixesFrom10Round1
...
Cherry-pick from 1.0: Fix EditorViewportWidget stealing keyboard focus
2021-04-16 18:40:38 -07:00
1e80012df1
Merge pull request #79 from aws-lumberyard-dev/LYN-2461-Bootstrap
...
Removed AssetProcessor Settings from the bootstrap.cfg file as they get overridden by the Engine/Registry/bootstrap.setreg file and is therefore a "trap" to set them.
Users will not see any functionality change from modifiying those values.
2021-04-16 20:30:40 -05:00
41db22be3d
[CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence ( #103 )
...
* [CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#85 )
2021-04-16 17:06:58 -07:00
603ee5bf83
Updated the MergeSettingsToRegistry_AddRuntimeFilePaths to use the default asset platform associated with the OS, if the /Amazon/AzCore/Bootstrap/assets key isn't found in the settings registry
2021-04-16 18:55:08 -05:00
96ef349931
Update the AzFramework and AzCore cmake files to point at the new location of the PlatformDefaults.h and PlatformDefaults.cpp file
...
Added an inline namespace for the PlatformDefaults code to ease with aliasing it into the AzFramework namespace
2021-04-16 18:55:06 -05:00
bf2732a26d
Moved the PlatformDefaults files from AzFramework to AzCore
2021-04-16 18:55:05 -05:00
373f60f29c
Added a call to update the runtime file paths again after merging all Engine, Gem and Project Settings Registry in case they modified the asset platform key which is used for setting the project cache root
2021-04-16 18:54:58 -05:00
a519bd6d0c
Fix EditorViewportWidget stealing keyboard focus
...
grabKeyboard was used by CRenderViewport to ensure it received some events, but that logic is no longer needed and the corresponding release was removed. This just removes grabKeyboard entirely - eventually all input event logic will be removed as well.
2021-04-16 16:48:22 -07:00
a6c7815685
SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile
2021-04-16 16:06:54 -07:00
6dadc84581
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot
2021-04-16 15:23:26 -05:00
085aa78ec9
Merge branch 'main' into sceneapi_script_regression
2021-04-16 14:29:47 -05:00
10faddb113
Integrating github/staging through commit ef88e6e
2021-04-16 12:05:11 -07:00
405276a7ae
Merge pull request #37 from aws-lumberyard-dev/hultonha_LYN-2528_whitebox_prefab
...
Add Json serialization support for ByteStream
Fixes serialization issue with the White Box component when Prefabs are enabled.
2021-04-16 18:28:12 +01:00
0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901
...
Lyn 1901
2021-04-16 18:11:15 +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
a757d327a0
Merge branch 'main' into non-uniform-scale-visibility
2021-04-16 09:57:04 +01: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
8074e0fb18
Remove formal template parameter name to resolve shadowed variable warning on clang
2021-04-15 17:56:08 -07:00
c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components
2021-04-15 16:30:36 -07:00
76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs
...
Make creation of new prefabs use a relative path to the project
2021-04-15 13:20:18 -07:00
020d7801bb
Make sure Recent Files list is correctly enabled/disabled when the list changes ( #73 )
...
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
2021-04-15 14:28:57 -05:00
2f698626cf
Merge pull request #64 from aws-lumberyard-dev/nvsickle/CherryPickContextMenuFix
...
Cherry-pick: Fix context menu popping up in EditorViewportWidget when it shouldn't
2021-04-15 11:33:57 -07:00
0997a2cfbf
Merge branch 'main' into sceneapi_script_regression
2021-04-15 13:22:45 -05:00
80f8c0f68b
behavior context class SceneGraph::NodeIndex -> "NodeIndex"
2021-04-15 13:21:24 -05:00
4da29a09d2
Merge branch 'main' into Prefab/RelativePathForNewPrefabs
2021-04-15 11:01:15 -07:00
9d84fdcb23
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
2021-04-15 18:26:54 +01:00
3bbef11d15
Merge branch 'main' into non-uniform-scale-visibility
2021-04-15 14:17:11 +01:00
10ab7666db
Merge branch 'main' into limit_max_scale
2021-04-15 13:44:53 +01:00
23cf2d5d68
SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects.
2021-04-15 12:24:48 +01:00
390aa36480
Merge branch 'main' into LYN-1901
2021-04-15 11:08:04 +01:00
11081aeddd
Changed logo to O3DE
2021-04-15 11:01:08 +01:00
7c5f7181eb
updates following review feedback - remove explicit resize and update concrete type to alias
2021-04-15 10:32:46 +01:00
8019312b35
Merge pull request #28 from aws-lumberyard-dev/LYN-2883
...
Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter
2021-04-14 20:55:27 -05:00
2410d299c1
Make creation of new prefabs use a relative path to the project
2021-04-14 17:51:15 -07:00
88120999f9
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-04-14 17:47:58 -07:00
f7aabebb37
Fix context menu popping up when it shouldn't
2021-04-14 17:03:21 -07:00
03aaf33b6e
Merge pull request #62 from aws-lumberyard-dev/SPEC-6295
...
[iOS] Fix build issues
2021-04-14 16:47:12 -07:00
7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport
...
Switch on the Atom-native viewport by default
2021-04-14 15:47:56 -07:00
d29fe24396
Merge remote-tracking branch 'upstream/main' into LYN-2883
2021-04-14 17:43:20 -05:00
7609248c49
Fix build errors
2021-04-14 15:42:24 -07:00
828bedf7a9
Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline
...
Fixed dangling pointer in InitializeCatalog
2021-04-14 22:59:39 +01:00
78e5a069fa
Removed Cry branding on error messages ( #41 )
2021-04-14 14:31:44 -05:00
90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD
2021-04-14 12:14:38 -07:00
jackalbe
lumberyard-employee-dm
AMZN-stankowi
Nicholas Van Sickle
chiyenteng
Esteban Papp
alexpete
Tom Hulton-Harrop
jjjoness
amzn-sean
hultonha
greerdv
karlberg
kberg-amzn
srikappa-amzn
Terry Michaels
srikappa
SJ
mcgarrah
SergeyAMZN