Commit Graph

15 Commits

Author SHA1 Message Date
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
Steve Pham 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
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
amzn-sean 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
amzn-sean 937118f0a1 physxdebug switch viewport id to AzFramework::g_defaultSceneEntityDebugDisplayId (#1188) 2021-06-08 17:49:52 +01:00
greerdv bcff7ff698 fix argument processing for physx debug console commands 2021-06-08 14:53:22 +01:00
karlberg b013d7ac67 Minor cleanup 2021-06-02 14:53:33 -07:00
karlberg 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
amzn-sean cb44a7ebb2 first pass at moving physx debug from gEnv->pRenderer to DebugDisplayRequestBus (#600) 2021-05-07 14:10:28 +01:00
amzn-sean 95a44c481a fixed errors from main merge 2021-04-27 14:17:05 +01:00
Ulugbek Adilbekov aa0b54838c Fix PhysXDebug and PhysXEditor loading order (#14)
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
2021-04-12 14:16:01 +01:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00