hultonha
2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-06 17:34:04 +01:00
amzn-sean
636ff587c3
Shape casts correctly report positions of colliders that intersect or in contact of the initial pose ( #1848 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-07-05 18:06:20 +01: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
bf4b65afde
Fix crash in character component when using prefabs ( #798 )
2021-05-19 14:18:54 +01:00
amzn-sean
7f79cc8796
RemoveSimulatedBody automatically updates the requested handle to be invalid once removed. ( #740 )
2021-05-13 15:04:00 +01:00
amzn-sean
d690c3fee4
static rigid body and rigid body component use Handles instead of pointers ( #662 )
2021-05-13 11:59:22 +01:00
amzn-sean
0e803713bf
Ragdoll now uses Add/Remove SimulatedBody
...
Addressed Minor Character PR feedback
2021-04-22 17:01:39 +01:00
amzn-sean
7ac246bab5
Character controller now uses Add/Remove Simulated Body
2021-04-21 11:13:27 +01: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
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00