d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com >
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com >
2021-06-30 19:51:55 -07:00
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
9f62d631fb
Physics joints updated to the new API ( #1361 )
...
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com >
2021-06-17 15:52:27 +01:00
937118f0a1
physxdebug switch viewport id to AzFramework::g_defaultSceneEntityDebugDisplayId ( #1188 )
2021-06-08 17:49:52 +01:00
bcff7ff698
fix argument processing for physx debug console commands
2021-06-08 14:53:22 +01:00
36cb0f6d40
SPEC-7178 Removal of precompiled cpp files ( #1171 )
...
* SPEC-7178 Removal of precompiled cpp files
* Missing files...
2021-06-07 15:59:58 -07:00
14bc0ba8ac
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-06-02 14:57:00 -07:00
b013d7ac67
Minor cleanup
2021-06-02 14:53:33 -07:00
a69db3bf76
Converts physx console commands from cry console to az console, fixes some bugs in the multiplayer gem
2021-06-02 14:44:02 -07:00
4652d47fb3
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
19adbf2f41
Removing adding runtime dependencies for gems that are in the BUILD_DEPENDENCIES
2021-05-25 15:12:17 -07:00
c9d5d7fb77
The new gem registration and usage system
...
Merge from mainline (Rebase)
2021-05-20 10:47:03 -07:00
cb44a7ebb2
first pass at moving physx debug from gEnv->pRenderer to DebugDisplayRequestBus ( #600 )
2021-05-07 14:10:28 +01:00
771a7a25aa
Adding OUTPUT_NAME to physics gems shared libraries to avoid conflicting with their 3rdParty libraries
2021-04-29 18:00:06 +01:00
95a44c481a
fixed errors from main merge
2021-04-27 14:17:05 +01:00
28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
aa0b54838c
Fix PhysXDebug and PhysXEditor loading order ( #14 )
...
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com >
2021-04-12 14:16:01 +01:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
Chris Galvan
Steve Pham
Gene Walters
amzn-sean
greerdv
Esteban Papp
karlberg
lumberyard-employee-dm
pappeste
Nicholas Lawson
Aaron Ruiz Mora
Chris Burel
alexpete
Ulugbek Adilbekov