birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,931 Commits 3 Branches 3 Tags
main
Commit Graph

230 Commits

Author SHA1 Message Date
hultonha 1220ea6539 Merge pull request #2093 from aws-lumberyard-dev/Renaming_Urls_Names 
Changed all amazon reverse urls to o3de reverse urls
 2021-07-13 10:13:08 +01:00
SergeyAMZN c4a50b961e Merge pull request #2102 from aws-lumberyard-dev/MultiplayerRigidBodiesLerp 
Added an option to character component not use auto-apply velocities on a physics tick
 2021-07-12 19:49:50 +01:00
pereslav 39daa9f361 Added an option to not use auto-apply velocities on a physics tick 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-07-12 18:29:02 +01:00
aaguilea 36a8c0a8cc changed all amazon to o3de 
Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-07-12 16:34:01 +01:00
greerdv 08c3bb6bd7 some tidying up 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-09 19:39:07 +01:00
greerdv c7b3a06c6b expose scene queries to lua 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-09 19:24:09 +01:00
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-08 13:56:47 -05:00
moraaar 7d5f8d5125 Updating linux version of NvCloth, poly2tri and v-hacd. 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-07-08 11:55:59 +01:00
moraaar 15e0aa7984 Use latest version of nvcloth, poly2tri and v-hacd 3rdParty libraries for windows, android, mac and ios. 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-07-08 11:55:59 +01:00
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 40f9761f86 Fixed more copyright header issues caused by script replacement 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 16:21:26 -05:00
Chris Galvan b9e06e70d9 Fixed copyright header issues per new validator 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 15:34:04 -05:00
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 12:42:44 -05:00
AMZN-stankowi 73522e90c9 FBX -> Scene, part 2. Code changes, file renames (#1704) 
* First pass FBX -> Scene File conversion.
This is the simple pass, minimizing code changes and focused on comments.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Step 1 of part 2 of the FBX -> Scene rename

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renaming FbxSceneBuilder folder to SceneBuilder

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renamed files

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* More FBX -> Scene

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
 2021-07-01 15:46:55 -07:00
AMZN-stankowi 4c4be73bd5 First pass FBX -> Scene File conversion. (#1699) 
This is the simple pass, minimizing code changes and focused on comments.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
 2021-07-01 08:53:47 -07:00
greerdv ef1c6732c8 fix licence on new file 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-01 14:11:47 +01:00
greerdv 05a2ce4fe1 update based on PR feedback 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-01 13:35:57 +01:00
greerdv 88615f462c merge from stabilization/2106 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-01 11:30:16 +01:00
greerdv 899350b5c7 bring across lua raycast improvements from 1.x 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-01 11:24:10 +01: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 f905b71844 Adding missing o3de copyright headers 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 13:48:45 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
Terry Michaels 21ebff5709 Updated help search and all docs.o3de.org links to o3de.org (#1594) 2021-06-25 15:23:57 -05:00
Terry Michaels 1e457928f5 Update help URLs and remove unneeded links (#1520) 2021-06-23 14:42:33 -05:00
amzn-sean a160ffb9a3 fix possible double connect of the Collider m_debugDisplayDataChangedEvent (#1518) 2021-06-23 19:04:45 +01:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622 
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
 2021-06-22 12:55:18 -05:00
amzn-sean c1b6bb122e fix physics mac nightly build (#1480) 2021-06-22 15:36:30 +01:00
amzn-sean 9f934a6f63 add Draw Helpers changed notification + physx draw helpers listens to it (#1456) 2021-06-21 16:25:45 +01:00
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
amzn-sean b17c5ca3e6 adding physics tick time to post simulate event (#1401) 2021-06-18 14:09:34 +01:00
amzn-sean ed186aff18 add missing disconnect SimulatedBodyBus to ragdoll destroy (#1404) 2021-06-18 12:29:53 +01:00
Hasareej 4ad97342c2 Hasareej fix whitebox and physx cluster icons (#1398) 
Fixing the issue with the icons not appearing & deleting duplicate icons.
 2021-06-18 11:45:48 +01: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
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15 
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
 2021-06-15 10:41:13 -07:00
Aaron Ruiz Mora 62f3c93c68 Fixed HelpPageURL links in physics components (#1328) 2021-06-15 17:51:15 +01:00
Chris Burel 259542b3ca Fix new instance that triggers -Wnon-pod-varargs (#1290) 2021-06-11 18:31:42 -07:00
Aaron Ruiz Mora 42cc4214ba Use dropdown comboboxes in Physics Materials fields' of PhysX Groups in FBX Settings (#1242) 2021-06-10 18:39:42 +01:00
Aaron Ruiz Mora 7a053d82e1 UX Workflow improvements for Physics Materials (#1237) 
- Added button to PhysX Collider Component in PhysX Mesh's field to open FBX Settings.
- Added button Material Selection to open the physics material library in Asset Editor.
- Default Material in PhysX configuration is read only and consistent with the text in combo boxes.
- Material configuration field "Surface Type" renamed to "Name"
- Fixed bug in EditorColliderComponent where the material selection was not updated when changing the library.
- Fixed bug where the materials selection was not set to default when a physics material from the asset was not found in the library.
- Added attributes 'BrowseButtonEnabled' and 'BrowseButtonVisible' to PropertyAssetCtrl.
- Updated physx configuration setreg files of AutomatedTesting project.
 2021-06-10 16:36:38 +01:00
Aaron Ruiz Mora 9d41954d0e Added configurable physics materials per asset in PhysX group in FBX Settings. (#1186) 
- Added back the' Physics Materials from Asset' tick in the collider components.
- Made physics materials names case insensitive.
- Refactored how to gather material information from fbx and used the same code for exporter and physx groups.
 2021-06-10 12:22:16 +01:00
Terry Michaels adf6d93a06 Moved toggle pivot to lower in the context menu, converted all context menu additions to use a singular mechanism (#1209) 2021-06-09 22:37:28 -05:00
amzn-sean 4241eb9c2c fix crash in ragdoll (#1210) 2021-06-09 17:42:16 +01:00
Esteban Papp 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
Aaron Ruiz Mora b73de269ee Use '<Default Physics Material>' instead of 'Default' in Material Selection widget. (#1140) 2021-06-04 15:24:22 +01:00
Esteban Papp 5d7aae9bd8 SPEC-2513 Fixes to enable w4459 (#1107) 
* fixing w4459

* Fixes for nounity

* putting OLD_APARAM_USER in a common place to avoid duplicated declarations
 2021-06-03 11:12:54 -07:00
Esteban Papp 29c71b4e53 SPEC-2513 Fixes to enable w4701 (#1105) 
* Some fixes

* more fixes

* fixes for debug
 2021-06-03 09:30:33 -07:00
Esteban Papp 370f28f69c Missing PHYSX_ENABLE_MULTI_THREADING for PhysX.Editor 2021-06-01 09:28:13 +01:00
AMZN-AlexOteiza 0495d26d72 Added template for creation of default material library (#1040) 2021-05-28 22:11:15 +01:00
greerdv 2c36d6a19a Merge pull request #1039 from aws-lumberyard-dev/transform-float-scale-3 
refactor vector scale in Transform to float scale
 2021-05-28 21:20:03 +01:00