Commit Graph

1135 Commits (0c339d2e2d85aec0703a99bf640880c54dfdc93c)

Author SHA1 Message Date
Terry Michaels d9ec159f0e
Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
Gitflow 7/16/21 - O3DE
5 years ago
Steve Pham 38261d0800
Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
5 years ago
sconel b05984d4ca
Prevent cached world transform and parent data from being serialized in prefab (#2219)
Porting over @AMZN-daimini 's work to clean up unneeded data from prefabs by removing cached transform data from json serialization. This is done by writing an explicit json serializer for the Editor Transform component and opting not to store or load the cached Transform fields.

Tested by creating new prefabs, loading and as well as resaving old prefabs which included patches aimed at cached transform data.

Signed-off-by: sconel <sconel@amazon.com>
5 years ago
Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py
5 years ago
lumberyard-employee-dm 448469025b
Updated the AZ Path Code to perform case-insensitive hashing of path (#2226)
segments when using the Windows Path Separator

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
amzn-mike 8116e239f4
Restore fix lost in merge: [LY-121929] Asset Processor Error : Sqlite - Failed to prepare statement. (#2202)
Fixed unresolved product dependency query to be able to handle much larger queries (tested with 100,000 products) by storing queried products in a temp table first

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
5 years ago
jjjoness facd1e18b5
One hamburger menu to rule them all (#2232)
* Icon changes

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Icon changes to svg files

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
hultonha 6839ef1512 Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hultonha 5a0c1fab9f Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
Esteban Papp 3771ba80a4
Combine Framework.Tests and AzToolsFramework.Tests targets into one target
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 087c9f6edb more fixes for Jenkins vs local behavior
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 4aebea61af Fixes for Jenkins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
hultonha a365ae1da1 Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hultonha 2c9922d4b5 Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash 5 years ago
lsemp3d 104e0f73bf Fixed Lua class enumeration, there was a crash when traversing into methods
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
Esteban Papp 24831b1970 Code review changes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp d8ac5654d2 Merge branch 'development' into cleanup/SPEC-1670 5 years ago
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>
5 years ago
hultonha d69897fd86 add [[maybe_unused]] attribute to prevent innocuous warning
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hultonha 5c177ef48a Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
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>
5 years ago
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>
5 years ago
srikappa da11424119 Merge branch 'development' into Prefab/BestEffortPatching
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
SergeyAMZN 9b6d207163
Merge pull request #2105 from aws-lumberyard-dev/mp_phys_desync_merge
Fix positional desync of network objects plus related log spam
5 years ago
hultonha b0707d3295 ensure the final vertex in a spline cannot be deleted using a manipulator
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hultonha 1220ea6539
Merge pull request #2093 from aws-lumberyard-dev/Renaming_Urls_Names
Changed all amazon reverse urls to o3de reverse urls
5 years ago
Esteban Papp 4e84738ff2 Ordering file alphabetically
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 1dec9d4a9a Fix tests in AzToolsFramework now that the Trace bus is hooked
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp c13720e255 fixes and cmake changes to get it to compile
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp afd97abdcf Move files to AzFramework/Test and AzToolsFramework/Test accordingly
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
srikappa 86a6d75b40 Remove an additional check during patch application to report errors
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
srikappa c494adba88 Use a utility function to compare json document and expected string
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
Chris Galvan f278bbcd65
Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712
Merged stabilization/2106 to development
5 years ago
srikappa b7e3db9d82 Make prefab patch application use a best effort mechanism
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
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
5 years ago
puvvadar a48a0d1f8a Fix positional desync of network objects plus related log spam
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
pereslav 39daa9f361 Added an option to not use auto-apply velocities on a physics tick
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
aaguilea 36a8c0a8cc changed all amazon to o3de
Signed-off-by: aaguilea <aaguilea@amazon.com>
5 years ago
greerdv 504201aef2
Merge pull request #2036 from aws-lumberyard-dev/lua-scene-queries
Lua scene queries
5 years ago
Alex Montgomery 372ac2707f
fix outliner sorting using incorrect types for comparisons (#2052)
* fix outliner sorting using incorrect types for comparisons, fixes for [LY-122258] and [LYN-3666]

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

* fix annoying but necessary Qt type cast

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
5 years ago
Danilo Aimini 1d022907dc
Prefabs | Introduce sanitation of prefab doms on loading (#1929)
* Update PrefabLoader to sanitize ingested prefabs and have core systems operate with default values

Signed-off-by: sconel <sconel@amazon.com>
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove IsExplicitDefault implementation to avoid confusion (since the function isn't virtual).
Avoid copying PrefabDoms over in SanitizeLoadTemplate.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Address naming and commenting concerns from PR reviews.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix to error detection code

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add support for all uuid formats for zero check.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

Co-authored-by: sconel <sconel@amazon.com>
5 years ago
carlitosan 70810dfbb9
Merge pull request #1969 from aws-lumberyard-dev/carlitosan/thecleansing
Fix parser crash related to ebus handler control, and compile time null check
5 years ago
sconel 22a52bc7b2
Fix issue where game and editor entities could exist simultaneously while exiting game mode (#2015)
Signed-off-by: sconel <sconel@amazon.com>
5 years ago
moraaar 4475528df2
Fixed Event Hander's copy constructor and copy assignments
It was missing to save the event before connecting to it. (#2026)

Signed-off-by: moraaar <moraaar@amazon.com>
5 years ago
greerdv 08c3bb6bd7 some tidying up
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
greerdv c7b3a06c6b expose scene queries to lua
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago