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

9031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jromnoa 9d93282e42 Merge pull request #5530 from aws-lumberyard-dev/Atom/scottmur/ssao_p0 
SSAO component P0 automation
 2021-11-11 10:36:22 -08:00
greerdv 27076cab73 Merge pull request #5135 from aws-lumberyard-dev/tick-tests 
Tick tests
 2021-11-11 16:36:55 +00:00
SWMasterson 984ea571f4 Add P0 test for Entity Reference component. (#5456) 
Signed-off-by: Sean Masterson <semaster@amazon.com>
 2021-11-11 10:32:33 -06:00
SergeyAMZN aee52d1677 Merge pull request #5533 from aws-lumberyard-dev/LYN-8169_ServerShouldNotLoadClientCfg 
Removing Old Cry Code that Causes ServerLauncher to Load Client.cfg
 2021-11-11 16:06:06 +00:00
greerdv 9d05168cfc address feedback from PR 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-11 15:10:46 +00:00
AMZN-AlexOteiza edefb57cfd Fixed crash when typing asset name and clicking browse (#5495) 2021-11-11 13:58:00 +00:00
greerdv 53c6a22ac2 add python test for smoothness of character gameplay component motion 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-11 10:47:43 +00:00
greerdv 06ef037278 fix typo 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-11 10:47:40 +00:00
greerdv 128b3d7ec0 fix copy paste error in test description 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-11 10:47:38 +00:00
greerdv 2ced6011e9 add python test for smoothness of interpolated rigid body motion 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-11 10:47:36 +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
Gene Walters 161600a412 Removing old cry code that would load client.cfg for server launcher. Client.cfg should not be loaded by default. If you want to load a cfg then you should provide it via commandline (--console-command-file). 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-10 16:24:55 -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
Scott Murray b202bbfbc9 SSAO component P0 automation 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2021-11-10 15:26:32 -08: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
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
Guthrie Adams 246f174528 inverted game mode ptr check 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 16:02:12 -06:00
amzn-mike efe78d035f Updated project path to use absolute path (#5459) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-11-10 13:48:58 -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
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
amzn-mike 61d0ec9d6b Remove debug messages. (#5429) 
Leaving in the print for absorbed asserts to avoid running into future situations where important asserts are accidentally absorbed

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-11-10 13:22:47 -06:00
Mike Chang 5a8f95a414 Fix Wix root and installer url config (#5500) 
Signed-off-by: changml <changml@amazon.com>
 2021-11-10 11:21:49 -08: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
Guthrie Adams 6729941942 adding ifdef to compare loading vs creating material type assets 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 12:57:56 -06:00
Guthrie Adams b72970201b cleanup and setting asset preload flags 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 12:56:38 -06:00
Guthrie Adams b038faf9ca material editor loads source data 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 12:55:57 -06:00
bosnichd 528a747876 Don't allocate memory when processing WM_INPUT messages. (#5491) 
This change was made years ago in CrySystem (see CSystem::HandleMessage in System.cpp), but looks like it never made it into the NativeWindow_Windows version.

Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-11-10 11:28:21 -07:00
SJ f5c00e9e72 Fix Editor crashes on asset failures (#5421) 
* 1. Add nullptr checks to prevent crashes when non-critical shaders fail to compile.
2. Add a higher "launch_ap_timeout" for Mac because launching a newly built/downloaded AP can take a while.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Fix one more nullptr dereference.

Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-11-10 11:31:49 -06:00
Esteban Papp 21f9a789c1 Merged the Editor.Camera.Tests with the Editor.Tests (#5463) 
* Merged the Edtiror.Camera.Tests witht eh Editor.Tests

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Adds dependency to Camera.Editor gem which is used by the test

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Inheirts from TraceBusHook instead of adding the default env to the test

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* makes order consistent between Setup/Teardown

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* adds missing header for non-unity builds

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes dependency to Camera gem

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-10 08:57:39 -08:00
Scott Romero ab37eb138c [development] removed CryLibrary (#5474) 
* [redcode_crylibrary] replaced CrySystem loading in launcher and editor with new custom wrapper that uses AZ::DynamicModuleHandle

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] removed all remaining references to CryLibrary

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] migrate CrySystem loading to use AZ::DynamicModuleHandle directly instead

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] clean up of CrySystemModuleHandle and old CrySystem module [un]init functions

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] added trailing newline to DllMain.cpp in CrySystem

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-10 09:43:13 -07:00
rgba16f 8b5fe4a015 Move PipelineStateCache validation of set uniqeness to only be active in debug builds (#5472) 
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-11-10 10:26:03 -06:00
Benjamin Jillich 838970206b Animation Editor: Remove preview label (#5449) 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-11-10 16:23:43 +01:00
bosnichd eb775a48dc Make InputDeviceId's constructor constexpr. (#5433) 
* Make InputDeviceId's constructor constexpr.

See also https://github.com/o3de/o3de/pull/4220

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

* Updates based on review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-11-10 08:06:27 -07:00
SergeyAMZN 354802d387 Merge pull request #5320 from yuriy0/physx_multi_shape_rigid_body 
Fix a bug where a rigid body with multiple shapes would ignore all shapes except the first
 2021-11-10 12:48:24 +00:00
SergeyAMZN b9f6d1ec9f Merge pull request #5311 from aws-lumberyard-dev/HierarchiesFixes 
Fixed client hierarchy construction to check for authority instead of controller
 2021-11-10 12:47:43 +00:00
Luis Sempé 29de7c0542 Merge pull request #5464 from aws-lumberyard-dev/scripting/improve_assert_msg 
Improved messaging on assert about argument types lacking reflection …
 2021-11-09 17:34:01 -08:00
Vincent Liu 0dca09b039 Update AWS gem info content (#5281) 
* Update AWS gem info content

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

* Tweak requirement statement based on feedback

Signed-off-by: liug <liug@amazon.com>
 2021-11-09 16:56:06 -08:00
lsemp3d 934c0f2ec7 Made SerializeContext and BehaviorContext consistent with their class name 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-09 15:25:06 -08:00
lsemp3d d3b8b761fd Improved messaging on assert about argument types lacking reflection for scripting 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-09 14:51:10 -08:00
Mikhail Naumov e1d53395fe Propagation Optimization (#5355) 
* Merge changes

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* removing leftover immediate flag

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-11-09 14:05:15 -08:00
Roman aa229976f3 Render Colliders (#5434) 
* Render Colliders

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

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-09 13:42:56 -08:00
Ronald Koppers e6a1f8ed0a Merge pull request #5108 from aws-lumberyard-dev/Prefabs/SpawnableEntityAlias 
Ability to setup aliases for entities spawned from spawnables.
 2021-11-09 13:17:59 -08:00