birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,702 Commits 3 Branches 3 Tags
ca29b9537146ced499f405e13fcb45cabb5b0ac2
Commit Graph

1768 Commits

Author SHA1 Message Date
Terry Michaels 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
Vincent Liu 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
jonawals 06c65be40a Add handling for integrity failures when applying and resolving change lists (#1993) 
* ApplyAndResoveChangeList integration failure policy

Signed-off-by: John <jonawals@amazon.com>

* Default integrity failure policy for TIAF sequences

Signed-off-by: John <jonawals@amazon.com>

* Fix superfluous quotation marks

Signed-off-by: John <jonawals@amazon.com>

* Remove superfluous args parse

Signed-off-by: John <jonawals@amazon.com>

* Fix broken storage of last commit hash

Signed-off-by: John <jonawals@amazon.com>
 2021-07-08 15:59:05 -05:00
bosnichd 0ebd5810e3 Fix "GameLauncher Log is Saved with Wrong File Extension" (LYN-3972). (#1984) 
I'm pretty sure that CryString::Format is broken, but it's slated for removal along with the rest of CrySystem, so I'm just addressing the symptom rather than the likely cause (mainly to save time, but also out of an abundance of caution in case other code is inadvertently depending on the existing behaviour of CryString::Format).

Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-07-08 13:14:40 -06: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
Esteban Papp d075d5f7b5 fix AzGenericTypeInfo template handling with clang 12+ (#833) (#1947) 
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Co-authored-by: Tom "spot" Callaway <72474383+spotaws@users.noreply.github.com>
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
 2021-07-08 11:29:55 -07:00
Scott Romero 0730960a4f [development] Mobile settings tool validator and save fixes (#1931) 
Updated and simplified the version number validation regex to support 4-component numerical only version strings
Removed stale WAF reconfigure and replaced save notification dialog to inform the user a manual reconfigure of the project may be required for the settings to be propagated
 2021-07-08 11:28:42 -07:00
Esteban Papp c132b00f6e Removing some unused files from Code/Editor/Plugins (#1943) 
* fix path

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* remove some unused files from Code/Editor/Plugins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-08 09:46:31 -07:00
mgwynn 82d2fb9244 Adding header to resolve undefined type error (#1938) 
Signed-off-by: mgwynn <mgwynn@amazon.com>
 2021-07-08 09:26:56 -07:00
Chris Galvan 15acb6b85a Merge pull request #1422 from aws-lumberyard-dev/nvsickle/CameraInputHardening 
Switch RenderViewportWidget to Qt based events instead of AzFramework ones
 2021-07-08 11:23:31 -05:00
Qing Tao 6d9230e292 ATOM-15939 Add support to capture attachment for ParentPass (#1887) 
* ATOM-15939 Add support to capture attachment for ParentPass
- Moved the attachment read back support to Pass class so it supports both ParentPass and RenderPass.
- Added support to output input or output state of an InputOutput attachment.
- Enabled showing ParentPass attachments in PassTree tool.

Signed-off-by: Tao <qingtao@amazon.com>
 2021-07-08 08:23:37 -07:00
sphrose 83d1bc0fbf Merge branch 'stabilization/2106' into LYN-3718 2021-07-08 10:19:11 +01:00
Chris Galvan c097ae8235 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-07 18:43:26 -05:00
SJ 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
nvsickle c8fb453760 Fix copyright header copy/paste issue. 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 14:40:59 -07:00
Chris Galvan 30f8c75613 Merge pull request #1908 from aws-lumberyard-dev/cgalvan/FixLegacyCryIcons 
Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
 2021-07-07 16:39:46 -05:00
Chris Galvan 3037837be6 Fixed logic to remove the tabs not close them. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 16:37:25 -05:00
Chris Burel 80bdd4e17b Clang compile fixes (#1876) 
* Fix compile error from -Wwritable-strings

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix flags used to build MaskedOcclusionCulling with clang

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix class that has a final destructor, but the class itself was not final

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-07-07 14:34:45 -07:00
Terry Michaels 24d21cadae Merge pull request #1475 from aws-lumberyard-dev/nvsickle/ViewportInfoDpiScaling 
Make IMGUI & viewport info scale with DPI
 2021-07-07 15:55:46 -05:00
nvsickle 964b4247f7 Update license header 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:13 -07:00
nvsickle fa9a12eac3 Forward double click events as well 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:11 -07:00
nvsickle 4babf69361 Address a few more review things 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:09 -07:00
nvsickle 049ef81fe9 Address some review feedback, fix license 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:07 -07:00
nvsickle 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
nvsickle 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
nvsickle 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
nvsickle f4c96fc9df -Rework input handling to filter through a global event filter 
-Attempt to support remote desktop for viewport cursor capture

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:00 -07:00
nvsickle 15248e7c12 Add QtEventToAzInputManager 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:49:57 -07:00
alexmontAmazon dae2ddaec2 fix for [LYN-4828], message box style changes (#1911) 
* fix for [LYN-4828], message box style changes

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* now with missing .qss file! Friends don't let friends git add -u

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-07-07 13:49:55 -07:00
nvsickle 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
AMZN-ScottR 34f70cb324 [mobile-settings-fixes] removed stale WAF reconfigure process on settings save 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-07-07 13:17:00 -07:00
AMZN-ScottR 11d36b0b5b [mobile-settings-fixes] simplified and updated version validation regex to support 4 component strings 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-07-07 12:49:34 -07:00
Terry Michaels 8ffb25248b Merge pull request #1906 from aws-lumberyard-dev/hultonha/gitflow_210707_o3de 
Merge from stabilization/2106 to development (2021/07/07)
 2021-07-07 14:12:26 -05:00
nvsickle 2fefa80937 Use AZ::DynamicModuleHandle 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:18 -07:00
nvsickle 21dbe8b48f Address review feedback 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:16 -07:00
nvsickle 0c97888d0f Revert accidental change 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:13 -07:00
nvsickle b328cdf11d Make the launcher's lack of DPI awareness on Windows explicit 
This will enable per-screen DPI awareness to be turned on later

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:10 -07:00
nvsickle 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
Chris Galvan 26d8a62074 Merge pull request #1914 from aws-lumberyard-dev/cgalvan/FixLuaEditorSettings 
Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed
 2021-07-07 13:41:25 -05:00
lumberyard-employee-dm 02922806a5 Updated gem.json for all top-level Gems. (#1715) (#1917) 
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.

Signed-off-by: Cronin <mikecro@amazon.com>

* Fixed minor formatting issues with RADTelemetry gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to QtForPython gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the Twitch gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to AWSCore gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the AtomTressFX gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the AudioEngineWwise gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the CertificateManager gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing extra whitespace in summary of CrashReporting gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the CustomAssetExample gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing extra whitespace in editorPythonBindings gem summary

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the ScriptedEntityTweener gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the Gestures gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing extra whitetspace in the summary of the GameStateSamples gem

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the ExpressionEvaluation gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the default "requirments" field value to be empty string instead
of "None"

This works better with the ProjectManager GemInfoFromPath function.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Correcting "summary" field name

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added the requirements text to the AudioEngineWwise Gem

This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

Co-authored-by: Mike Cronin <58789750+micronAMZN@users.noreply.github.com>
 2021-07-07 13:29:33 -05:00
Chris Galvan cc437d7370 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-07 12:58:28 -05:00
Chris Galvan 91656ded9f Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 11:58:41 -05:00
Chris Galvan 635473e5cf [LYN-4990] Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 11:29:18 -05:00
hultonha ab354f2e9b Merge pull request #1903 from aws-lumberyard-dev/hultonha_SPEC-7644_disable-ParallelDeepAssetReferences 
Disable ParallelDeepAssetReferences test until sporadic failures are root caused
 2021-07-07 16:52:40 +01:00
hultonha 9bfb90a513 Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-07 16:25:06 +01:00
hultonha 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
hultonha 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
hultonha fe9c9f66f1 disable ParallelDeepAssetReferences test 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-07 15:05:17 +01:00
AMZN-Alexandre Corcia Aguilera 4f523e496f Cherry Picking (lyn1751) (#1854) 
* Cherry Picking (lyn1751)

Problem with DCO so we need to cherry pick this branch.

Signed-off-by: aaguilea <aaguilea@amazon.com>

* Cherry picking #2

Signed-off-by: aaguilea <aaguilea@amazon.com>

* Cherry picking 3

Signed-off-by: aaguilea <aaguilea@amazon.com>

* Changed variables reverseurls
This was just changing some name variables.

Signed-off-by: aaguilea <aaguilea@amazon.com>

* Changes from past PR

Signed-off-by: aaguilea <aaguilea@amazon.com>

* changes from past PR and fixed small bug:
Also removed some legacy code from Resources.h

Signed-off-by: aaguilea <aaguilea@amazon.com>

* couple of changes from actual PR

Signed-off-by: aaguilea <aaguilea@amazon.com>

* fixed copyright issues for AR

Signed-off-by: aaguilea <aaguilea@amazon.com>
 2021-07-07 13:28:59 +01:00
Benjamin Jillich 2ab2503337 Revert "[MeshOptimizer] Determine the original vertex index based on the position (#1562)" (#1902) 
This reverts commit ef1f95f1d0.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-07-07 14:28:53 +02:00