birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,928 Commits 3 Branches 3 Tags
ae4ad7dcac8c84736332d6c3261d03eafbb2e594
Commit Graph

1378 Commits

Author SHA1 Message Date
greerdv 1e2cf9c8d2 merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-07-16 14:47:11 +01:00
hultonha 6839ef1512 Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-16 12:58:39 +01:00
hultonha 5a0c1fab9f Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-16 10:30:37 +01:00
lumberyard-employee-dm e28ff0beea Adding rapidjson.natvis file to the AzCore project to Visualizers to VS 
By adding the natvis to a vcxproj Visual Studio automatically loads it
when using the source engine
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-07-16 03:52:11 -05:00
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
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
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
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
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
hultonha 2c9922d4b5 Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash 2021-07-15 09:28:47 +01: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
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
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
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
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
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
chcurran e672c314a1 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-07-13 17:41:12 -07:00
Dayo Lawal 9c63968833 Style fixing 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:40 -05:00
Dayo Lawal 986ee5aa9b Changing cmake 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:37 -05:00
Dayo Lawal 92ead794fa Removal of AzQtAppWindow 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:35 -05:00
Dayo Lawal d36d1defab Styling fixes and AzQtAppWindow changes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:32 -05:00
Dayo Lawal 27466154be AzQtApplication Window 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:30 -05:00
Dayo Lawal 656a4bb097 o3de.com to o3de.org 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:28 -05:00
Dayo Lawal c86535f892 Styling fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:25 -05:00
Dayo Lawal c63c42c7f4 Adding comments and changing QApplication org/app names 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:23 -05:00
Dayo Lawal 6f44393f3a Moved logging to AzToolsFramework, working with MatEditor and SMC 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:21 -05:00
Dayo Lawal b365f8bddf Fixing problem with FileIO (exception in Environment.h) 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:19 -05:00
Dayo Lawal df18e53ab4 WriteStartupLog() not implemented 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:17 -05:00
Dayo Lawal f930185077 WriteStartupLog() implemented in base class (unresolved external) 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:14 -05:00
Dayo Lawal ecede42501 Fixing logging and cleaning up AzQtApplication 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:12 -05:00
Dayo Lawal 96153aa8d7 On output change 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:08 -05:00
Dayo Lawal 60c89d28cc New class: AzQtTraceLogger 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:05 -05:00
Dayo Lawal 31a2ccb041 Addressing change requests for pull request 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:01 -05:00
Dayo Lawal 1cadf34dc3 Removing commenting and unnecessary header files 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:58 -05:00
Dayo Lawal 290567cfd7 Fixed cmake, AzQtApplication working with other tools 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:56 -05:00
Dayo Lawal 5872138671 AzQtApplication 2 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:53 -05:00
Dayo Lawal d3d9b600f9 AzQtApplication 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:51 -05:00