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

9236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sergey Pereslavtsev 3fb97b1334 Added more info to comment 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2021-11-12 18:13:20 +00:00
lsemp3d bc73eaac69 Updated Asset Data text 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 09:25:06 -08:00
lsemp3d abafd435ed Added C++ tooltip for custom nodes, updated text for AnimAudioComponentRequestBus 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-12 09:08:09 -08:00
AMZN-AlexOteiza cb93bafc4f Fixed physics tests on linux (#5579) 
* Fixed physics tests on linux

* Fixed unit tests because of new implementation

* Fixed bug in lock, fixed unit tests

Co-authored-by: aljanru <aljanru@uc5564ff5a5ee55.ant.amazon.com>
 2021-11-12 16:09:09 +00:00
Terry Michaels 8bbb99d741 Merge pull request #5587 from aws-lumberyard-dev/miterenc/FixTrackViewFixture 
TrackView Fixture now disables save on finalize
 2021-11-12 09:21:46 -06:00
Terry Michaels 9e84c409bd Trackview Fixture now disables save on finalize 
Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-11-12 08:03:43 -06:00
Terry Michaels 876576e568 Trackview Fixture now disables save on finalize 
Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-11-12 08:02:12 -06:00
Sergey Pereslavtsev 435f839666 Fixed IMGUI Entity Outliner to show net entities 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2021-11-12 13:36:14 +00:00
lsemp3d 1463e72016 Updated Actor Animation nodes, fixed subtitles and improved tooltip information 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-11 18:31:02 -08:00
jromnoa 5d9f5ae15a Merge pull request #5564 from aws-lumberyard-dev/Atom/jromnoa/fix-asset-path-calls-to-use-new-asset-test-class 
Update asset files, & update golden image files to match new smaller asset file.
 2021-11-11 15:32:23 -08:00
Luis Sempé b0e9313df0 Script Canvas added text generation for BehaviorContext properties (#5568) 
Added generation and navigation options for BehaviorProperty items
 2021-11-11 15:26:41 -08:00
jromnoa 0af8754d08 Merge pull request #5563 from aws-lumberyard-dev/Atom/semaster/add_look_modification_p0 
Look Modification P0 Automation
 2021-11-11 15:15:04 -08:00
Ken Pruiksma 23bcc70844 Exposing ibl exposure to the lighting preset. This value was already being serialized and used, just never exposed to the edit context. This will help artists tweak the look of lighting presets and is particularly helpful when dealing with lighting in HDR environments. (#5570) 
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-11-11 17:06:20 -06:00
Nicholas Van Sickle 2c2c1d8137 Merge pull request #5562 from aws-lumberyard-dev/nvsickle/StabToDevNov21 
Merge `stabilization/2110` as of `fac3d0b1bf` into `development`
 2021-11-11 15:04:18 -08:00