birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,262 Commits 3 Branches 3 Tags
0dcf49affc16ea6ab6487883736fbcf48adbb141
Commit Graph

9262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tommy Walton 0dcf49affc Merge commit 'b0dfe26232b318e520887af65cd579ec87016636' into amzn-tommy/gitflow_211116_o3de2 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 2021-11-16 11:45:09 -08:00
Tommy Walton e44fa2a52a Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:42:19 -08:00
Tommy Walton 21d5e62f85 Merge commit 'cb1a45f9ec01ebaede35da2924bde66f31c31ea2' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:42:15 -08:00
Tommy Walton d9eb4fa688 Merge commit 'c0df1846f4f34e7a8adb5191fbda213ff68a5a24' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:42:11 -08:00
Tommy Walton 4e8f18aad4 Merge commit 'b44ce82435b7f737bca73bcf25e553d6c7b23f27' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:42:07 -08:00
Tommy Walton 1f64ff039b Merge commit 'bceadf7597a4af57d37a18c4cb2f81b5e840dbb6' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:42:03 -08:00
Tommy Walton fc61bce3af Merge commit 'a544800536a5bebda96812951befa4d43b0474d3' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:59 -08:00
Tommy Walton 81a2f565c9 Merge commit '2fa3c134e04c89b61b1e47bf0b44bdc74b840866' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:55 -08:00
Tommy Walton 841c55c831 Merge commit 'b8f7767cd6ca0201cd5ae0a44c37b75d42f22299' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:51 -08:00
Tommy Walton 5232fe9166 Merge commit 'e4ca568433e3de3bc002176ab2fd6bf380a03c18' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:47 -08:00
Tommy Walton 72f2d2701f Merge commit '6ffee4b0a8292b5ad6bb9a35b49655c62b2b5b3b' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:43 -08:00
Tommy Walton 4ab3bd487f Merge commit 'e0d736dd844a82b0c232739540a168078e63e276' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:39 -08:00
Tommy Walton 6080801c55 Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:35 -08:00
Tommy Walton 30325a34fe Merge commit 'e3c3db4ba61b230a69b670e02873c0f4b7766504' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:31 -08:00
Tommy Walton 783bb72944 Merge commit 'f1d9e7ae28bf0667487c939aa32b1ef833da80f4' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:26 -08:00
Tommy Walton 65c3ad6545 Merge commit 'cbe2948ba87397fca12af8061fa90f74206ee426' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:22 -08:00
Tommy Walton 830c10b8b0 Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:18 -08:00
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
 2021-11-16 09:19:41 -08:00
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>
 2021-11-16 12:45:02 +01:00
Roman 9a72dd7446 Bugfix - Render normal is incomplete when multiple mesh present. (#5605) 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-16 00:17:40 -08:00
Sean Sweeney 3791149c6b Merge pull request #5531 from aws-lumberyard-dev/linux_ar 
Enable python-based tests in Linux AR
 2021-11-15 15:50:58 -08:00
Luis Sempé d19ff1e779 Merge pull request #5596 from aws-lumberyard-dev/scripting/text_updates 
Script Canvas node naming & generation improvements
 2021-11-15 14:56:41 -08:00
lsemp3d 35b4f6a538 Replaced float with AZ::u32 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 14:46:38 -08:00
sweeneys 4e1045c005 Merge branch 'development' into linux_ar 2021-11-15 13:40:42 -08:00
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>
 2021-11-15 12:23:56 -08:00
lsemp3d cffd93642e Reverted unnecessary change 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 11:48:35 -08:00
lsemp3d ca66c609aa Added user setting to change the Script Canvas node palette context menu 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 11:43:16 -08:00
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>
 2021-11-15 11:28:06 -08:00
lsemp3d ed05318059 Fixed fallback name for EBus methods, improved more names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 10:29:45 -08:00
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>
 2021-11-15 10:05:59 -08:00
moudgils c0192e7543 Remove CPU Spin lock to help conserve power/perf (#5597) 
Signed-off-by: moudgils <moudgils@amazon.com>
 2021-11-15 09:56:28 -08:00
sweeneys 95254bccf8 Merge branch 'development' into linux_ar 2021-11-15 08:48:14 -08:00
lsemp3d 4af92fffb8 Updated names 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 08:40:08 -08:00
lsemp3d 6eddf084aa Audio related text updates 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 08:33:56 -08:00
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>
 2021-11-15 08:30:25 -08:00
lsemp3d 3fc95230af Updated names for more SC elements 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-15 08:24:39 -08:00
SergeyAMZN f9824fc4ee Merge pull request #5586 from aws-lumberyard-dev/IMGUI_EntityOutlinerFix 
Fixed IMGUI Entity Outliner to show net entities
 2021-11-15 14:23:10 +00:00
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>
 2021-11-15 12:11:58 +00:00
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>
 2021-11-15 09:21:50 +00:00
sweeneys 80a6658c9d disable TerrainTests 
Signed-off-by: sweeneys <sweeneys@amazon.com>
 2021-11-12 16:46:46 -08:00
lsemp3d 56834361bc Fixed some missing node palette entries since display name was not populated yet 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 16:01:02 -08:00
lsemp3d 5072c2667f Fixed the application of translation overrides to free standing BehaviorProperty constants 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 15:45:55 -08:00
sweeneys 3ae8f8b199 merge from development 
Signed-off-by: sweeneys <sweeneys@amazon.com>
 2021-11-12 14:47:08 -08:00
lsemp3d 4fac65b600 Added missing forward declaration 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 14:02:43 -08:00
lsemp3d a0667f7ae8 Improved BehaviorProperty method text generation and updated some translations in the process 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 13:07:11 -08:00
galibzon b0dfe26232 The Build Time Stamp of ShaderAsset And (#5373) 
* The Build Time Stamp of ShaderAsset And
ShaderVariantAsset Should Be Based On
GetTimeUTCMilliSecond()

GetTimeNowMicroseconds() is useful to measure time stamp differences.
GetTimeUTCMilliSecond() is for time stamps based on absolute clock/wall time.

* Updated DiffuseGlobalIllumination precompiled shaders

Co-authored-by: dmcdiar <dmcdiar@amazon.com>
Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
 2021-11-12 13:51:07 -06:00
Guthrie Adams 520c2b52d4 Merge pull request #5584 from aws-lumberyard-dev/Atom/guthadam/remove_mtl_references 
Removing references and builders for legacy MTL assets
 2021-11-12 13:47:50 -06:00
kberg-amzn cb1a45f9ec Merge pull request #5578 from aws-lumberyard-dev/LYN-7816_FixNoParamRPCCompilation 
RPCs Without Parameters Compile
 2021-11-12 11:37:04 -08:00
rgba16f 57adfd795e Add a name to JobManager (#5576) 
* Add a name to JobManager, all worker threads use that name to label their threads

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

* update with PR feedback, changed to use AZStd::fixed_string::format

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

* Fix copy paste errors using local variable names

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-11-12 13:15:41 -06:00
Alex Peterson c0df1846f4 Create desktop shortcut functionality (#5536) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-12 11:03:43 -08:00