cc937e0809
feedback from PR
5 years ago
fd8b42c45e
Merge branch 'main' into non-uniform-scale-mesh
5 years ago
f0ae8056c8
feedback from PR
5 years ago
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>
5 years ago
7f169855f3
Merge branch 'main' into cgalvan/EntityHelperRefactor
5 years ago
06d6ab9715
[LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback.
5 years ago
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
5 years ago
e497b7ac33
Merge branch 'main' into non-uniform-scale-mesh
5 years ago
6d3b9e4f51
Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot
5 years ago
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
5 years ago
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
5 years ago
bf2732a26d
Moved the PlatformDefaults files from AzFramework to AzCore
5 years ago
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
5 years ago
a6c7815685
SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile
5 years ago
6dadc84581
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot
5 years ago
10faddb113
Integrating github/staging through commit ef88e6e
5 years ago
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.
5 years ago
2a53f018fa
Merge pull request #70 from aws-lumberyard-dev/physx_system_comp
...
SystemComponent is now only built once in the PhysX.Static target
5 years ago
102a0e5dc8
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
5 years ago
a757d327a0
Merge branch 'main' into non-uniform-scale-visibility
5 years ago
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
5 years ago
8074e0fb18
Remove formal template parameter name to resolve shadowed variable warning on clang
5 years ago
c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components
5 years ago
76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs
...
Make creation of new prefabs use a relative path to the project
5 years ago
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
5 years ago
4da29a09d2
Merge branch 'main' into Prefab/RelativePathForNewPrefabs
5 years ago
9d84fdcb23
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
5 years ago
3bbef11d15
Merge branch 'main' into non-uniform-scale-visibility
5 years ago
10ab7666db
Merge branch 'main' into limit_max_scale
5 years ago
23cf2d5d68
SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects.
5 years ago
7c5f7181eb
updates following review feedback - remove explicit resize and update concrete type to alias
5 years ago
4c582a2b0a
Merge branch 'main' into non-uniform-scale-mesh
5 years ago
d8169e08fb
merging from main
5 years ago
2410d299c1
Make creation of new prefabs use a relative path to the project
5 years ago
88120999f9
Merge remote-tracking branch 'origin' into MultiplayerComponents
5 years ago
7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport
...
Switch on the Atom-native viewport by default
5 years ago
828bedf7a9
Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline
...
Fixed dangling pointer in InitializeCatalog
5 years ago
0f13a71bd2
[LYN-2255] Refactored some EditorEntityHelpers so they can be re-used.
5 years ago
90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD
5 years ago
bf0db7a3c6
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
5 years ago
217009de2b
adding tests for transforming Aabb with Matrix3x4 and fixing bug in implementation
5 years ago
efe5715e68
Merge branch 'main' into mbalfour/spec-6178
5 years ago
a7a22bfcc0
Merge branch 'main' into sceneapi_script_autotest
5 years ago
2fb2813b48
updating atom mesh component to support non-uniform scale component
5 years ago
59252235d5
Fixed dangling pointer in InitializeCatalog
5 years ago
9c8fd1f9e4
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
5 years ago
e1e746066d
add some preliminary tests for ByteStreamSerializer
5 years ago
2655aaa633
update ByteStreamSerializer to use Base64 encoding
5 years ago
ca3df5d6c8
Various bug fixes to get entity replication working
5 years ago
8469c9ca0a
Integrating github/staging through commit 5f214be
5 years ago
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