Commit Graph

4529 Commits

Author SHA1 Message Date
Esteban Papp 032a35e495 fix Windows unity build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-15 18:44:38 -07:00
Luis Sempé 8827e3a2f2 Merge pull request #2170 from aws-lumberyard-dev/scripting/fix_gridhub
Removed editor specialization from GridHub, it does not need the gems…
2021-07-15 17:53:14 -07:00
AMZN-nggieber 69312a5e56 Clear Build and Cache Directory After Project Move or Copy (#2184)
* Clear build and Cache directories when copying or moving projects

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

* Updated tests for moving projects and Added tests for copying projects and skipping build files

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

* Address PR feedback and fix a few minor UX issues, and request project be rebuild after copying or moving

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

* Include ProjectInfo.h in ProjectUtils.h so linux will compile

Signed-off-by: nggieber <nggieber@amazon.com>
2021-07-15 17:48:04 -07:00
Esteban Papp 074518454c Merge branch 'development' into cmake/SPEC-7179 2021-07-15 16:58:58 -07:00
Esteban Papp 3771ba80a4 Combine Framework.Tests and AzToolsFramework.Tests targets into one target
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-15 16:57:15 -07:00
lsemp3d 8262a5f8e5 Merge remote-tracking branch 'upstream/development' into scripting/fix_gridhub 2021-07-15 16:01:35 -07:00
chcurran 5885be5711 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-07-15 11:56:28 -07:00
Esteban Papp 087c9f6edb more fixes for Jenkins vs local behavior
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-15 11:40:34 -07:00
Dayo Lawal f215011de4 Copyright header and whitespace fixes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-15 12:44:26 -05:00
John Jones-Steele 45f85bb384 Merge branch 'development' into MuteAudioButtonMightBeBroken
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-15 18:22:02 +01:00
Dayo Lawal 8f22bff1fb QEditorApplication inheriting from AzQtApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-15 12:16:18 -05:00
chcurran e2c1477629 fix for dependency job key on ScriptEvents from SC builder
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-15 09:46:51 -07:00
Esteban Papp 4aebea61af Fixes for Jenkins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-15 09:42:02 -07:00
John Jones-Steele 3b419c02e6 CHange the way the Mute Audio button works depending on the Gem availability
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-15 13:42:02 +01:00
hultonha a365ae1da1 Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-15 13:27:51 +01:00
greerdv 9c1d66f61f improve translations for physics types in Script Canvas
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-15 13:07:34 +01:00
Benjamin Jillich 0863a24490 Revert "[MeshOptimizer] Determine the original vertex index based on the position (#2008)" (#2188)
This reverts commit a077a88d3f due to assets failing on Jenkins.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-15 12:18:10 +02:00
hultonha 2c9922d4b5 Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash 2021-07-15 09:28:47 +01:00
Chris Burel a077a88d3f [MeshOptimizer] Determine the original vertex index based on the position (#2008)
* Determine the original vertex index based on the position

The Assimp library does not expose the FBX control point indices. This
change causes vertices that are close enough in their position to be
considered as coming from the same control point. This allows the mesh
optimizer to consider vertices with the same control point index (or
"original vertex index" as it is called in the code) for deduplication.

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

* Use a filter view instead of reimplementing a filter view

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

* Don't attempt to weld similar vertices if there's blendshapes

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

* Add test for the mesh optimizer's ability to weld nearby vertices

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

* Add logging call to show mesh optimizer effect on vertex count

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

* Use a bunch of temporaries in order to make `position` `const`

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

* Supply the vertex index remapping to the optimized skin weights

This ensures that the optimized skin weights use the vertex indexes from
the optimized mesh

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-15 08:44:40 +02:00
lsemp3d 104e0f73bf Fixed Lua class enumeration, there was a crash when traversing into methods
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-07-14 23:39:48 -05:00
Esteban Papp ae46eea1e8 Fix tests in Linux and discover path comparison problem in Windows (fixed)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 20:24:15 -07:00
Esteban Papp 4a5ac0e204 Fix for ArchiveTest where the assets alias was not being set
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 16:45:36 -07:00
bosnichd 72ea2ca1b4 Change the InputDeviceImplementationRequest to be addressable by an InputDevcieId to account for the situation where someone may want to swap out the implementation for a single instance of a devcie type rather than all instances of that device type (the latter can still be achieved using Broadcast instead of Event when calling the EBus method). (#2180)
Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-07-14 17:44:44 -06:00
evanchia 9bd5b9fbd6 Simplified and moved aztestrunner retry command
Signed-off-by: evanchia <evanchia@amazon.com>
2021-07-14 16:09:00 -07:00
Esteban Papp 24831b1970 Code review changes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 14:54:57 -07:00
Esteban Papp d8ac5654d2 Merge branch 'development' into cleanup/SPEC-1670 2021-07-14 14:53:59 -07:00
rgba16f e32b7a7c87 Mac m1 fixes (#2150)
* Update the Mac Editor plist application bundle identifier to be different than Lumberyard
Fix the editor to have runtime dependencies on the scene modules.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix Metal RHI calling unsupported timestamp query api on M1 Macs.
Add Query for Timestamps supported on device initialization.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Remove AZ::Scene* runtime dependencies from EmotionFX gem and add AZ::SceneUI as a runtime dependency of SceneProcessing::Editor module.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-07-14 13:14:42 -07:00
chcurran 7aab45cbea Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-07-14 13:00:53 -07:00
jackalbe ffcfa44b49 {LYN-4514} Engine updates to enable PAB for the Blast Gem (#2140)
* {LYN-4514} Engine updates to enable PAB for the Blast Gem

* Engine updates to enable Python Asset Building for the Blast Gem
* added API to detect IsPythonActive()
* ExportProductList behavior
* scene manifest usage of generated assetinfo
* updated ScriptProcessorRuleBehavior to handle OnPrepareForExport

Tests: new tests for scene behavior via ExportProduct

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* updated base on PR feedback
added more comments for IsPythonActive()
added a serializeContext for export product list

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
2021-07-14 14:54:22 -05:00
luissemp 5619e0f294 Removed editor specialization from GridHub, it does not need the gems loaded
Signed-off-by: luissemp <luissemp@amazon.com>
2021-07-14 12:10:17 -07:00
Chris Galvan 8f4ded8c64 Use the proper undo sequence so that viewport camera changes are saved properly.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-14 12:10:49 -05:00
Scott Romero acd5546503 [development] update mobile settings editor tool to support new project path structure (#2147)
Fixes #2087

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-07-14 09:41:46 -07:00
Esteban Papp 997594c36c Code/Tools/Standalone
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:37:25 -07:00
Esteban Papp 272b9ba9c7 Code/Legacy/CryCommon
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:37:01 -07:00
Esteban Papp 6a6be193c7 Code/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:36:30 -07:00
Esteban Papp 5bbcf8d725 Editor/Plugins/ProjectSettingsTool
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:35:53 -07:00
Esteban Papp 4e3853ef46 Editor/Plugins/ProjectSettingsTool
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:35:30 -07:00
Esteban Papp b5c2b2a07b Editor/PluginsFFMPEGPlugin
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:35:12 -07:00
Esteban Papp 87ca863ed4 Editor/Plugins/EditorCommon
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:34:56 -07:00
Esteban Papp 35ea178e3c Editor/Plugins/EditorAssetImporter
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:34:38 -07:00
Esteban Papp e214f26392 Editor/Plugins/ComponentEntityEditorPlugin
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-14 09:34:05 -07:00
hultonha d69897fd86 add [[maybe_unused]] attribute to prevent innocuous warning
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-14 10:33:39 +01:00
sphrose b9f2713b15 Merge branch 'development' into LYN-3705-2 2021-07-14 10:24:19 +01:00
sphrose 93cbb7c981 Review changes
Changed text case, removed ClearText API and added GameStartup motify listening.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-07-14 10:22:42 +01:00
hultonha 5c177ef48a Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-14 09:23:26 +01:00
Nicholas Van Sickle 867ae23664 Make Viewport input events fully Qt based (#2142)
* Make Viewport input events fully Qt based.

This should fix an issue with Qt touch event -> mouse event translation in the Editor, and may also fix issues with the Mac Editor and remote desktop (though, lacking the requisite hardware, I can test precisely none of these things personally).

See https://github.com/o3de/o3de/issues/1889

- Adapted LegacyViewportCameraController to use Movement::X & Y (mostly for testing purposes, it's on the slate for being removed soon)
- Moved cursor capture logic from RenderViewportWidget into QtEventToAzInputManager so that it can make sure it generates correct movement deltas
- Removed ViewportMouseCursorRequests::PreviousViewportCursorScreenPosition to have our viewport controllers use our dedicated Movement::X and Y channels instead, which will work in the launcher

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

* Address review feedback

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

* Fix Linux build

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-13 20:58:48 -07:00
Jeremy Ong 11327b59ea Expose vsync interval with new cvar rpi_vsync_interval and support Vulkan vsync (#2061)
* Expose vsync interval with new cvar rpi_vsync_interval

On change, the rpi_vsync_interval is broadcasted to a new event on
the WindowNotificationBus and all swapchains are recreated with the
new vsync value.

Signed-off-by: Jeremy Ong <jeremycong@gmail.com>

* Add vsync interval support to the Vulkan RHI

Vsync intervals are not intrinsically supported using the Vulkan
swapchain extension. Instead, extra presents are enqueued for each
extra vblank requested past 1. Swapchain recreation is triggered
when transitioning to and from the FIFO presentation mode (when
rpi_vsync_interval transitions from and to 0 respectively).

Signed-off-by: Jeremy Ong <jeremycong@gmail.com>

* Rollback vsync > 1 implementation on Vulkan and leverage *Internal pattern

Signed-off-by: Jeremy Ong <jeremycong@gmail.com>
2021-07-13 20:54:06 -07:00
Dayo Lawal 54947791d2 Fixing copyright header
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:51:58 -05:00
AMZN-ScottR 201a387c7e [mobile-settings-crash-fix] removed dep on FileUtil in ProjectSettingsToolWindow.cpp and optimize return in GetPlatformResource
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-07-13 17:46:35 -07:00
chcurran e672c314a1 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-07-13 17:41:12 -07:00