Commit Graph

25 Commits

Author SHA1 Message Date
amzn-sean 7ac246bab5 Character controller now uses Add/Remove Simulated Body 2021-04-21 11:13:27 +01:00
nvsickle 4f9d7e3782 Simplify ResetInputChannels 2021-04-20 15:27:38 -07:00
nvsickle 5ea2240787 Fix editor controls working in game mode
-Implements ResetInputChannels for ViewportController API and SetEnabled for ViewportControllerList
-Disables all viewport controllers while in game mode
2021-04-20 15:27:34 -07:00
amzn-sj f53c1e8084 3rd Party static libraries need to be public dependencies to work from installed engine. 2021-04-20 12:16:40 -07:00
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 2021-04-16 21:12:55 -05:00
mcgarrah 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
mcgarrah bf2732a26d Moved the PlatformDefaults files from AzFramework to AzCore 2021-04-16 18:55:05 -05:00
mcgarrah 6dadc84581 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot 2021-04-16 15:23:26 -05:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
amzn-sean 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
greerdv a757d327a0 Merge branch 'main' into non-uniform-scale-visibility 2021-04-16 09:57:04 +01:00
mcgarrah 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
greerdv 3bbef11d15 Merge branch 'main' into non-uniform-scale-visibility 2021-04-15 14:17:11 +01:00
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 2021-04-15 13:44:53 +01:00
amzn-sean 23cf2d5d68 SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects. 2021-04-15 12:24:48 +01:00
pereslav 59252235d5 Fixed dangling pointer in InitializeCatalog 2021-04-14 13:13:01 +01:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
greerdv 90e52d69bc fixing bug with subdivision level for runtime asset colliders and adding caching for collider aabbs 2021-04-13 10:50:07 +01:00
greerdv 8ee92978f4 setting max value for scale 2021-04-12 13:07:40 +01:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00