f278bbcd65
Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712
...
Merged stabilization/2106 to development
2021-07-12 14:05:19 -05:00
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
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
e924ed0b86
Merged stabilization/2106 to development; Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-12 10:45:23 -05:00
08c3bb6bd7
some tidying up
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-09 19:39:07 +01:00
c7b3a06c6b
expose scene queries to lua
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-09 19:24:09 +01:00
e3be8b4c46
Enable AZ_TRAIT_AZFRAMEWORK_USE_PROJECT_MANAGER for Mac/Linux ( #2017 )
...
Validated it opens the project manager in Mac
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-09 09:01:35 -07:00
9ea9cbf589
Merge pull request #1989 from aws-lumberyard-dev/cgalvan/gitflow_210708
...
Merged stabilization/2106 to development
2021-07-08 18:03:30 -05:00
43a0e89c20
[LYN-4820] Add more logs for gamelift workflow ( #1651 )
...
* [LYN-4820] Add more logs for gamelift workflow
Signed-off-by: onecent1101 <liug@amazon.com >
* Address feedback
Signed-off-by: onecent1101 <liug@amazon.com >
2021-07-08 15:18:13 -07:00
3b1873b045
Merged stabilization/2106 -> development (resolved merge conflicts).
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-08 13:56:47 -05:00
9ca7a698df
Fix Mac Editor crash when adding PhysX Collider component to an entity. ( #1930 )
...
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-07-07 18:17:40 -05:00
4babf69361
Address a few more review things
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 13:50:09 -07:00
52ae7433b3
Use synthetic keyboard and mouse devices instead of synthetic input channels
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 13:50:06 -07:00
8dc59a13da
Revert "Add InputChannel API to disable forwarding events to the underyling device"
...
This reverts commit c4be5021116fd7f4944ac300056031b7d5be25be.
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 13:50:04 -07:00
042e465622
Harden a few pieces of viewport controller logic
...
-Don't eat mouse/keyboard release events in the ViewportManipulatorController
-Do a key activity check in the LegacyViewportCameraController instead of checking state (this could be done elsewhere but it seems to be working as-is and is scheduled to go away)
-Ignore idle mouse delta updates sent to the modular camera controller
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 13:50:02 -07:00
8e51a4763f
Add InputChannel API to disable forwarding events to the underyling device
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 13:49:55 -07:00
2fefa80937
Use AZ::DynamicModuleHandle
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:18 -07:00
21dbe8b48f
Address review feedback
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:16 -07:00
0c97888d0f
Revert accidental change
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:13 -07:00
6b76eceb1f
Add GetDpiScaleFactor to native window API
...
-This includes implementations of the API for the Editor and Windows, all other platforms will have a 1.0 scale for now
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:08 -07:00
40726a32dc
Merge pull request #1898 from aws-lumberyard-dev/hultonha/gitflow_210706_o3de
...
stabilization2106 -> development merge (210706)
2021-07-07 16:08:06 +01:00
51733f3809
Fix for rotation matching and resetting also scaling the entity transform ( #1856 )
...
* fix issue with rotation matching (ditto)
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* fix for context menu appearing
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* minor tidy-up in EditorContextMenu
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* add option to disable cursor during free-look
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* small fixes after PR comments
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-07 15:48:33 +01:00
2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-06 17:34:04 +01:00
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
45b83e49da
Move camera properties from CVars to the Settings Registry ( #1766 )
...
* updates to camera inputs
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* update test names to include types
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* move all camera input controls to the settings registry
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* small fixes before PR
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-05 13:08:05 +01:00
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
b9e06e70d9
Fixed copyright header issues per new validator
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 15:34:04 -05:00
04a00e6a54
Resolved latest merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 13:29:55 -05:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
dafe9f6690
Add customization point for begin/end of camera behaviors (hide cursor with RMB look) ( #1758 )
...
* add customization points for begin/end of camera input to all cursor customization
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* remove cursor experiments, use cursor bus
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* run clang-format
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* add additional unit tests for new camera behaviors
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* update test name to use snake_case to increase readability
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-02 18:17:44 +01:00
6b2c02e477
Merge branch 'stabilization/2106' into Prefab/DisableDestroyGameEntity
...
Signed-off-by: srikappa <srikappa@amazon.com >
2021-07-01 12:24:42 -07:00
bab4e5eaf3
Improved function comments
...
Signed-off-by: srikappa <srikappa@amazon.com >
2021-07-01 12:11:27 -07:00
05a2ce4fe1
update based on PR feedback
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-01 13:35:57 +01:00
88615f462c
merge from stabilization/2106
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-01 11:30:16 +01:00
899350b5c7
bring across lua raycast improvements from 1.x
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-01 11:24:10 +01: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
c61e69d794
Add correct prefix for param tag
...
Signed-off-by: srikappa <srikappa@amazon.com >
2021-06-30 17:16:13 -07:00
cd3fad20b4
Disable support to destroy game entities through behavior context when prefabs are enabled
...
Signed-off-by: srikappa <srikappa@amazon.com >
2021-06-30 17:16:10 -07:00
827855f01c
Removal last CryTek references
...
- 'Crytek application' is now 'O3DE application' in ISystem.h
- 'CryTek' is now 'O3DE' in ProjectDefines.h (comment)
- 'Crytek Legacy' is now 'O3DE Legacy' in LocalizedStringManager.cpp
- 'Crytek extended data' references are now 'O3DE extended data'
Signed-off-by: spham <spham@amazon.com >
2021-06-30 12:48:16 -07:00
bafcdfe037
Merge pull request #1655 from aws-lumberyard-dev/genewalt/gitflow_210628
...
Merging Stabilization/2106 into Development
2021-06-30 11:07:30 -07:00
8d35f31fa6
API documentation pass for CameraInput types ( #1681 )
...
* add api comments for new camera system
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-06-30 18:16:35 +01:00
f905b71844
Adding missing o3de copyright headers
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 13:48:45 -07:00
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
7a2a2dc0d7
Updated branding for application names ( #1617 )
2021-06-28 11:35:13 -05:00
ce955715a8
Merge pull request #1543 from aws-lumberyard-dev/native-ui-changes
...
More specific component error messaging and modes for native UI to prevent blocking dialog in some applications
2021-06-25 19:18:03 -04:00
149cb2e2f2
Merge 'gameliftfeature' branch into 'development' branch ( #1534 )
2021-06-24 09:13:35 -07:00
fb3940fa31
More specific component error messaging and modes for native UI to prevent blocking dialog in some applications
2021-06-23 21:05:17 -04:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
db92dffb14
Fix Vegetation Modifier behavior when in-game ( #1441 )
...
* Removed a bit of dead legacy code
* Fixed entity references during spawning
Entities that had references to other entities that hadn't been spawned yet weren't getting their IDs remapped correctly, since the new ID wasn't available yet. By pre-generating the full set of IDs, the references now remap correctly.
* Fixed up Entity References to work across multiple SpawnEntities calls
With SpawnEntities, entity references need to forward-reference to the *first* entity spawned, then from that point on backwards-reference to the *last* entity spawned. Added that logic, along with some initial unit tests for SpawnAllEntities.
* Added more unit tests for SpawnEntities / SpawnAllEntities
2021-06-22 15:20:28 -05:00
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
Chris Galvan
SergeyAMZN
pereslav
greerdv
Esteban Papp
Terry Michaels
Vincent Liu
SJ
nvsickle
hultonha
hultonha
amzn-sean
srikappa
Steve Pham
Gene Walters
Gene Walters
amzn-mgwynn
mgwynn
Mike Balfour
mbalfour