 greerdv
|
87a3dfc968
|
fixing bug in editor bodies for rigid bodies with non-uniformly scaled asset colliders with position offsets
|
2021-04-13 09:04:13 +01:00 |
|
|
greerdv
|
a99786fe59
|
fixing bug with visibility aabb for non-uniformly scaled polygon prism at activation
|
2021-04-13 09:00:33 +01:00 |
|
 AMZN-mnaumov
|
1a7bf94917
|
Merge branch 'main' into Atom/mnaumov/ATOM-14904_2
|
2021-04-12 22:27:18 -07:00 |
|
 nvsickle
|
2f117c553d
|
Merge remote-tracking branch 'upstream/main' into nvsickle/EditorViewportWidgetFixes
|
2021-04-12 16:27:40 -07:00 |
|
 mnaumov
|
f188e1c9a7
|
Fixing ShaderVariantAsyncLoader shutdown not releasing it's assets
|
2021-04-12 16:03:10 -07:00 |
|
|
AMZN-mnaumov
|
51a1b19730
|
Merge branch 'main' into Atom/mnaumov/ATOM-14904
|
2021-04-12 12:41:52 -07:00 |
|
 Nicholas Van Sickle
|
22684af141
|
Merge branch 'main' into nvsickle/EditorViewportWidgetFixes
|
2021-04-12 12:15:45 -07:00 |
|
 moraaar
|
cb2ee625be
|
Merge branch 'main' of https://github.com/aws-lumberyard/o3de
|
2021-04-12 19:51:04 +01:00 |
|
 Alex Peterson
|
cd12226849
|
Merge branch 'main' into github/staging
|
2021-04-12 08:48:09 -07: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 |
|
 hultonha
|
5fc4aeaf09
|
add alias for AZStd::vector<u8> before potential change
|
2021-04-12 11:03:46 +01:00 |
|
|
mnaumov
|
0dd57ae901
|
Adding mutex to ImageProcessingBus
|
2021-04-09 21:18:30 -07:00 |
|
|
nvsickle
|
2190787c40
|
Fix build
|
2021-04-09 14:19:05 -07:00 |
|
 jackalbe
|
d09dc500d3
|
fake commit
|
2021-04-09 14:55:39 -05:00 |
|
|
nvsickle
|
1dabb39b98
|
Migrate fixes from CodeCommit branch
|
2021-04-09 12:40:43 -07: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 |
|
 Brian Herrera
|
39f53338bf
|
Merge branch 'main' into LoadPipelineFromGitHub
|
2021-03-26 17:05:57 -07:00 |
|
|
alexpete
|
36c4e827bd
|
Integrating latest from github/staging
Integrating up through commit 5e1bdae
|
2021-03-26 14:32:02 -07:00 |
|
|
Brian Herrera
|
e8bbb5a0d5
|
Set scripts to be executable
This is required to build on linux/mac
|
2021-03-26 09:26:12 -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 |
|