cc937e0809
feedback from PR
2021-04-20 14:44:31 +01:00
fd8b42c45e
Merge branch 'main' into non-uniform-scale-mesh
2021-04-20 10:29:55 +01:00
f0ae8056c8
feedback from PR
2021-04-20 10:25:19 +01:00
7901fe8625
Reset the whole Qt model when an entry in the EditorEntityModel is removed. ( #48 ) ( #82 )
...
An optimization introduced in Prefab mode currently changes the relative ordering of children, causing stale QModelIndex variables to still be referenced and crash the Editor sporadically. This change is theoretically a bit slower, but still much faster than the pre-optimization times.
Co-authored-by: Shirang Jia <shiranj@amazon.com >
Co-authored-by: Shirang Jia <shiranj@amazon.com >
2021-04-19 21:52:10 -07:00
7f169855f3
Merge branch 'main' into cgalvan/EntityHelperRefactor
2021-04-19 13:18:27 -05:00
06d6ab9715
[LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback.
2021-04-19 12:29:58 -05: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
e497b7ac33
Merge branch 'main' into non-uniform-scale-mesh
2021-04-19 11:05:10 +01:00
6d3b9e4f51
Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot
2021-04-16 21:12:55 -05: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
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
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
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
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
7c5f7181eb
updates following review feedback - remove explicit resize and update concrete type to alias
2021-04-15 10:32:46 +01:00
4c582a2b0a
Merge branch 'main' into non-uniform-scale-mesh
2021-04-15 08:29:57 +01:00
d8169e08fb
merging from main
2021-04-15 08:18:11 +01: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
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
828bedf7a9
Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline
...
Fixed dangling pointer in InitializeCatalog
2021-04-14 22:59:39 +01:00
0f13a71bd2
[LYN-2255] Refactored some EditorEntityHelpers so they can be re-used.
2021-04-14 16:01:26 -05:00
90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD
2021-04-14 12:14:38 -07:00
bf0db7a3c6
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
2021-04-14 10:47:18 -07:00
217009de2b
adding tests for transforming Aabb with Matrix3x4 and fixing bug in implementation
2021-04-14 18:25:38 +01:00
efe5715e68
Merge branch 'main' into mbalfour/spec-6178
2021-04-14 12:07:58 -05:00
a7a22bfcc0
Merge branch 'main' into sceneapi_script_autotest
2021-04-14 08:32:59 -05:00
2fb2813b48
updating atom mesh component to support non-uniform scale component
2021-04-14 14:05:59 +01:00
59252235d5
Fixed dangling pointer in InitializeCatalog
2021-04-14 13:13:01 +01:00
9c8fd1f9e4
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
2021-04-14 12:31:57 +01:00
e1e746066d
add some preliminary tests for ByteStreamSerializer
2021-04-14 12:04:23 +01:00
2655aaa633
update ByteStreamSerializer to use Base64 encoding
2021-04-14 11:30:40 +01:00
ca3df5d6c8
Various bug fixes to get entity replication working
2021-04-13 20:24:08 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
greerdv
AMZN-daimini
Chris Galvan
mcgarrah
Esteban Papp
alexpete
Tom Hulton-Harrop
amzn-sean
hultonha
karlberg
kberg-amzn
srikappa-amzn
Terry Michaels
srikappa
Nicholas Van Sickle
SergeyAMZN
Mike Balfour
jackalbe
pereslav