7e48bee48f
Fixing thumbnail pixelation
2021-04-19 18:24:23 -07:00
967d182ccc
Fixed a couple of typos
2021-04-19 17:29:03 -07:00
8d94f45b19
Merge branch 'main' into Prefab/CreatePrefab
2021-04-19 17:26:53 -07:00
6abf17439a
Adding "Create New Material" context menu option to folder in Material Editor
...
Improving MaterialBrowser filter to show empty folders
2021-04-19 15:22:32 -07:00
707f7cb6ce
Added some comments
2021-04-19 15:06:41 -07:00
8bc2998d82
Merge branch 'main' into Prefab/CreatePrefab
2021-04-19 13:50:52 -07:00
65b2d9de1b
Added couple of helper functions
2021-04-19 13:43:54 -07:00
7f169855f3
Merge branch 'main' into cgalvan/EntityHelperRefactor
2021-04-19 13:18:27 -05:00
f3ff5ec886
Add helper method for adding link in CreatePrefab
2021-04-19 11:05:28 -07: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
889158e3a9
A couple of minor fixes
2021-04-19 09:53:45 -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
2dbd9e4a05
Changed to use direct line drawing rather than adding svg.
2021-04-19 15:54:41 +01:00
1c151e6a75
Merge branch 'main' into LYN-1932
2021-04-19 11:10:51 +01:00
e497b7ac33
Merge branch 'main' into non-uniform-scale-mesh
2021-04-19 11:05:10 +01:00
7e85cdd045
Part 1 of changing colors to O3DE.
2021-04-19 10:58:26 +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
22d6e1ec0d
Modularized undo instannce update undo operation and enabled setting container entity to be selected
2021-04-16 16:18:34 -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
10faddb113
Integrating github/staging through commit ef88e6e
2021-04-16 12:05:11 -07:00
beafc80939
Fixed entities not being deselected when entering game mode in editor.
...
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
jira: LYN-2998
2021-04-16 18:37:13 +01: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
a59e212134
Merge branch 'main' into MultiplayerPipeline
2021-04-16 07:58:35 -07:00
f6fc8f95a9
Fixed random button highlights & toolbar order.
2021-04-16 15:28:05 +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
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
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
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
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
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
4962218d29
Refactored root spawnable instantiation, added selective instantiation of root spawnable entities
2021-04-16 00:19:43 +01: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
a5fdbddeda
Merged MultiplayerPipeline from CodeCommit
2021-04-15 20:24:50 +01:00
c63f09adce
Merge branch 'main' into Prefab/CreatePrefab
2021-04-15 11:08:27 -07: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
mnaumov
srikappa
Chris Galvan
mcgarrah
sphrose
jjjoness
greerdv
Esteban Papp
alexpete
amzn-sean
Tom Hulton-Harrop
karlberg
hasareej
hultonha
kberg-amzn
pereslav
srikappa-amzn
Terry Michaels