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

4593 Commits

Author SHA1 Message Date
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
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
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
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
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
Roman 2c58da46dc Follow character option (#5538) 
* Follow character option

Signed-off-by: rhhong <rhhong@amazon.com>

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-11 13:57:52 -08:00
Pip Potter 4a34686e4e AWS Core CDK: Add option to cleanup resources that are retained by default (#5470) 
* Add option to cleanup resources that are retained by default

Signed-off-by: Pip Potter <61438964+lmbr-pip@users.noreply.github.com>
 2021-11-11 13:20:47 -08:00
amzn-mike c3838464cc Blast gem cleanup m_materialLibrary asset on Deactivate to avoid holding onto asset reference after AssetManager has shutdown (#5505) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-11-11 14:58:21 -06:00
bosnichd 19acf94606 Remove the legacy ViewSystem and some other tangentially related legacy code. (#5558) 
Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-11-11 13:29:51 -07:00
Luis Sempé 9e2a3226fd Script Canvas, replace the text replacement system to a JSON file based one (#5228) 
It is now possible to right click on nodes on the node palette to navigate to the file that holds the text data for any given node, this way it is easy to update and improve the naming of titles, subtitles, categories, tool tips and slots.
 2021-11-11 11:53:51 -08:00
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-11-11 10:15:52 -08:00
sphrose fac3d0b1bf Merge pull request #5543 from aws-lumberyard-dev/terrain/sphrose/lost_unit_tests 
Redoing tests that got lost when TerrainPhysicsManager was merged.
 2021-11-11 17:46:38 +00:00
Tom Hulton-Harrop 2812ec2024 Fix brute force mesh intersection function (#5447) 
* fix brute force mesh intersection function

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add test for brute force ray intersection fix

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* refactor tests to remove as much duplication and provide API for future tests if required

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* small updates after review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update following review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for pointer offset

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-11 16:33:08 +00:00
AMZN-stankowi 6e70097ad7 Fixed all errors with default seeds (#5489) 
* 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>
 2021-11-11 07:50:25 -08:00
sphrose 398decd06e review changes 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-11-11 12:57:48 +00:00
AMZN-Igarri 4e0e3c7904 Entering the Game Mode when the SlideAlongAxisBasedOnAngle in the Camera Rig is set results in an assert (#5410) 
* Fixed assert and added None behavior.

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

* cleaned up file

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

* Switched over to checkboxes

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

* Fixed naming.

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

* Fixed naming

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

* Fixed serialize version and zero vector normalization

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

* Cleaned up format.

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

* Fixed Warnings

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
 2021-11-11 12:16:11 +00:00
sphrose c3093edffe Redoing tests that got lost when TerrainPhysicsManager was merged. 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-11-11 12:12:18 +00:00
SergeyAMZN e5dbd0a2a9 Merge pull request #5467 from aws-lumberyard-dev/LYN-7815_RPCCompilationFix 
Fix to Allow Compiling the 4 Types of RPCs
 2021-11-11 11:06:59 +00:00
greerdv d65f863cec Merge pull request #5510 from aws-lumberyard-dev/prevent-invalid-twist-limits 
prevent twist limits being created with equal lower and upper limits
 2021-11-11 10:28:28 +00:00
sphrose 23faf4d36a Merge pull request #4628 from aws-lumberyard-dev/terrain/sphrose/surface_materials_list_tests 
Terrain/sphrose/surface materials list tests
 2021-11-11 10:14:00 +00:00
Chris Galvan 3ca30d559b Merge pull request #5522 from aws-lumberyard-dev/cgalvan/FixLCPrefabCrash 
Fixed LC crash by preventing graphs from staying open after they are no longer in prefab focus.
 2021-11-10 18:30:44 -06:00
hershey5045 9c57c9e64f Fix track view bug where postfxs do not render correctly. (#5465) 
* Fix track view bug where postfxs do not render correctly.

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>

* Reduce scope and add comments.

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>
 2021-11-10 16:03:50 -08:00
Allen Jackson 9b393d16fe [lyn3736] adding init files to module paths (#5111) 
* fixing class names in PYI files

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
 2021-11-10 17:34:20 -06:00
Guthrie Adams 04326673cb Merge pull request #5514 from aws-lumberyard-dev/Atom/guthadam/add_null_check_to_emfx_systemcomponent 
Added a null pointer check to EMFX system component
 2021-11-10 17:12:01 -06:00
Chris Galvan e7035c5af6 Fixed typo. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-10 16:56:29 -06:00
antonmic 0712bc7f87 Merge pull request #5482 from aws-lumberyard-dev/Atom/antonmic/skinMeshSrgFix 
Fixed issue where skin material wouldn't render if applied to a model with several submeshes and those submeshes had different material types applied to them.
 2021-11-10 14:28:51 -08:00
Chris Galvan 7a2eb349ca Fixed LC crash by preventing graphs from staying open after they are no longer in prefab focus. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-10 16:20:12 -06:00
Guthrie Adams 2bfef84aa2 Merge pull request #5512 from aws-lumberyard-dev/Atom/guthadam/cherrypick_material_source_data_loading 
cherry pick material source data loading from stabilization to development
 2021-11-10 16:10:40 -06:00
greerdv 5054cfe9b5 fix typo 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-10 22:04:40 +00:00
Guthrie Adams 246f174528 inverted game mode ptr check 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 16:02:12 -06:00
jiaweig d5081a47db Fix/update swapchain recreation on vsync interval changes (#5502) 
Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>
 2021-11-10 13:32:23 -08:00
Qing Tao 21a254e9dc Fixed a type with pass filter (#5506) 
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 2021-11-10 13:15:04 -08:00
Junbo Liang cf58398c6c [AWSMetrics] Fail to build the project when include AWSMetricsBus header in the project C++ code (#5468) 2021-11-10 13:05:32 -08:00
Guthrie Adams 41a64b1346 Added a null pointer check to EMFX system component 
Material editor and other tools load runtime dependencies from game projects. The EMFX system component is checking for game mode by getting a pointer to the editor interface, which will not exist outside of the main O3DE editor.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 14:56:17 -06:00
Guthrie Adams 6f80aab699 Updating parent path usage has part of cherry picked from stabilization combining source data changes with relative path changes 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 14:42:55 -06:00
rgba16f cebf6e2de3 Atom CPU threading optimization (#5481) 
* Small change to make the RasterPass Scope jobs split the work more evenly over the cores

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

* Update with PR feedback. Remove scale of EstimatedItemCount, modify the command list cost threshold instead

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-11-10 12:08:55 -08:00
antonmic 3fd03479de Addressed PR feedback 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-11-10 11:56:45 -08:00
sphrose 2fe40929e6 Merge pull request #4625 from aws-lumberyard-dev/terrain/sphrose/dependency_tests 
Add missing shape failure test, tidying up.
 2021-11-10 19:52:26 +00:00
santorac 04c6f3cc94 cherry-pick 48f3bb7d 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:37:15 -06:00
Guthrie Adams 824da6cabf update comment and error message 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:34:35 -06:00
Guthrie Adams c73b6bbe27 Changing lua material functor script loading code to pass the correct sub ID for a compiled script asset 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:33:48 -06:00
Guthrie Adams 287f08a33c Fix parent material loading 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:33:10 -06:00
Guthrie Adams 086859d49a updated comments and error messages 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:32:27 -06:00
Guthrie Adams fbebf04161 cherry-pick c0acbe7b 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:31:24 -06:00
greerdv d945a031c1 prevent twist limits being created with equal lower and upper limits 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-10 19:30:12 +00:00
Guthrie Adams 6ea951214c Moving material type asset PostInit call to be consistent with material asset 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 12:58:47 -06:00