Commit Graph

9285 Commits (320ef4cd05cf111455d46ca24bdd671475e8e384)
 

Author SHA1 Message Date
Tommy Walton 320ef4cd05 Merge commit '5c0fe6a54f14d1770334679e0457702a37a946c2' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton dc1aa6ee39 Merge commit '533b80095b48857e02f4bfeba5a0ecfd1ad85b16' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 8887b55fc8 Merge commit 'c44d03a40df0899851c6cbd929a673fac48ce82b' into amzn-tommy/gitflow_211116_o3de2
Signed-off-by: Tommy Walton <waltont@amazon.com>
4 years ago
Tommy Walton fc2b5192b8 Merge commit 'f2068397fa4542bd034e9d34002cca4b976c31b1' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton ade8183473 Merge commit '76b7e73f6f1b34a2499e3d192a7683dc91ce70e2' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 14e4fd40d4 Merge commit '5ec582484978e61429ccd7a962405c3e9f1ba819' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 2d34700dc2 Merge commit '4d3c977d5832d9d1d04ea419d3e54314f4412b2e' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 0dcf49affc Merge commit 'b0dfe26232b318e520887af65cd579ec87016636' into amzn-tommy/gitflow_211116_o3de2
Signed-off-by: Tommy Walton <waltont@amazon.com>
4 years ago
Tommy Walton e44fa2a52a Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 21d5e62f85 Merge commit 'cb1a45f9ec01ebaede35da2924bde66f31c31ea2' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton d9eb4fa688 Merge commit 'c0df1846f4f34e7a8adb5191fbda213ff68a5a24' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 4e8f18aad4 Merge commit 'b44ce82435b7f737bca73bcf25e553d6c7b23f27' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 1f64ff039b Merge commit 'bceadf7597a4af57d37a18c4cb2f81b5e840dbb6' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton fc61bce3af Merge commit 'a544800536a5bebda96812951befa4d43b0474d3' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 81a2f565c9 Merge commit '2fa3c134e04c89b61b1e47bf0b44bdc74b840866' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 841c55c831 Merge commit 'b8f7767cd6ca0201cd5ae0a44c37b75d42f22299' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 5232fe9166 Merge commit 'e4ca568433e3de3bc002176ab2fd6bf380a03c18' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 72f2d2701f Merge commit '6ffee4b0a8292b5ad6bb9a35b49655c62b2b5b3b' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 4ab3bd487f Merge commit 'e0d736dd844a82b0c232739540a168078e63e276' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 6080801c55 Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 30325a34fe Merge commit 'e3c3db4ba61b230a69b670e02873c0f4b7766504' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 783bb72944 Merge commit 'f1d9e7ae28bf0667487c939aa32b1ef833da80f4' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 65c3ad6545 Merge commit 'cbe2948ba87397fca12af8061fa90f74206ee426' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 830c10b8b0 Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Luis Sempé 9cf49845a4
Merge pull request #5621 from aws-lumberyard-dev/scripting/expand_context_menu
Added user option to define the size of the Script Canvas node palette context menu
4 years ago
Benjamin Jillich 84ba4afc54
EMotion FX: Deleting a corresponding anim graph when a Reference node is open crashes the Editor (#5612)
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
Roman 9a72dd7446
Bugfix - Render normal is incomplete when multiple mesh present. (#5605)
Signed-off-by: rhhong <rhhong@amazon.com>
4 years ago
Sean Sweeney 3791149c6b
Merge pull request #5531 from aws-lumberyard-dev/linux_ar
Enable python-based tests in Linux AR
4 years ago
Luis Sempé d19ff1e779
Merge pull request #5596 from aws-lumberyard-dev/scripting/text_updates
Script Canvas node naming & generation improvements
4 years ago
lsemp3d 35b4f6a538 Replaced float with AZ::u32
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
sweeneys 4e1045c005 Merge branch 'development' into linux_ar 4 years ago
amzn-mike 63713ca284
Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context (#5575)
Also made the unlock conditional.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
lsemp3d cffd93642e Reverted unnecessary change
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
lsemp3d ca66c609aa Added user setting to change the Script Canvas node palette context menu
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
amzn-mike 0cea59d669
[LYN-7463] Fix insert streaming request failure (#5604)
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Re-enable disabled test which was failing for the same reason.

Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Instead of using a mutex, re-order the statements to remove the streamer request first

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
lsemp3d ed05318059 Fixed fallback name for EBus methods, improved more names
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
mrieggeramzn 5c0fe6a54f
Fix for CSM shimmering (#5607)
* Fix for CSM shimmering

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

* removing debug code

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
mrieggeramzn 533b80095b
Fix for cascade shadow map clipping out too close to the camera (#5509)
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
lsemp3d 9adb968e7a Fixed EBus generation to pull the BC metadata, and a few text updates
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
moudgils c0192e7543
Remove CPU Spin lock to help conserve power/perf (#5597)
Signed-off-by: moudgils <moudgils@amazon.com>
4 years ago
AMZN-stankowi c44d03a40d
Asset bundler test fixes (#5548)
* Cleaning up errors with default assets, used in bundled release builds

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated simple asset references to be to the product, not source assets

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed test_WindowsAndMac_FilesMarkedSkip_FilesAreSkipped to pass again.

Updated the test to verify the assets are actually skipped and not just missing, by having it first run without the skip command and verify they are in the first run. Also updated logging to print out sorted lists, to make it easier to debug failures on Jenkins in the future.

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed a test marked skip for legacy levels that featured a lot of assets that are no longer valid.

I don't think we need this specific test anymore in the future because prefabs replace the level system, and prefabs should have their own tests for product dependencies.

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated project path to use absolute path (#5459)

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Updated project path to work with latest project path changes

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Changed to workspace.paths.project() for getting full path to projects

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

Co-authored-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
sweeneys 95254bccf8 Merge branch 'development' into linux_ar 4 years ago
lsemp3d 4af92fffb8 Updated names
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
lsemp3d 6eddf084aa Audio related text updates
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
Pip Potter a7778c89ff
HttpRequestorGem: Add basic autogen documentation to headers (#4929)
* Add basic autogen documentation to headers

Signed-off-by: rppotter <61438964+lmbr-pip@users.noreply.github.com>
4 years ago
lsemp3d 3fc95230af Updated names for more SC elements
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
SergeyAMZN f9824fc4ee
Merge pull request #5586 from aws-lumberyard-dev/IMGUI_EntityOutlinerFix
Fixed IMGUI Entity Outliner to show net entities
4 years ago
amzn-sean 38a03817bb
Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409)
Replaced and removed the CryTimer (gEnv->pTimer). The new TimeSystem is a merger of the current time functionality found in the engine.

* Rename TimeSystemComponent.h/.cpp to TimeSystem.h/.cpp
* Adding New TimeSystem
* remove old timer cvars
* small improvements to the time system.
 - updated parts to use the time conversion functions.
 - in AdvanceTickDeltaTimes applying t_simulationTickScale is now uses doubles instead of floats.
* Replace gEnv->pTimer / ITimer usages with TimeSystem
* Updating usages of AZ::TimeMs{ 0 } and AZ::TimeUs{ 0 } to AZ::Time::ZeroTimeMs and AZ::Time::ZeroTimeUs
* red code the CryTimer
* using TimeUs instead of TimeMs is some cases + updating usages of old cvars to new

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
AMZN-Igarri f2068397fa
CameraRigComponent - Disable Component Checkbox when the two others are toggled (#5546)
* Disable component checkbox when the other two components are already ignored.

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed EditContext Indents

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed Header file

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed Spaces

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* fixed new line

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
4 years ago
Michael Pollind 0ada8b335b
feat: add whitebox module support for linux(#4654) (#5075)
* feat: fix whitebox module to work on linux(#4654)

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* update with AZStl

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* feat: update format

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: minor changes

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: update clang warnings

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: fix clang errors

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: remove unused refrence for g_indices and address range based for loop warnings

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: fix clang warnings for test cases

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago