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
4241eb9c2c
fix crash in ragdoll ( #1210 )
2021-06-09 17:42:16 +01:00
529e29071c
update Ragdoll component to only uses Handles ( #981 )
2021-05-27 16:42:17 +01:00
0e803713bf
Ragdoll now uses Add/Remove SimulatedBody
...
Addressed Minor Character PR feedback
2021-04-22 17:01:39 +01:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
Chris Galvan
Steve Pham
Gene Walters
amzn-sean
alexpete