Commit Graph

6068 Commits

Author SHA1 Message Date
chcurran d7d2e84fee Added all the missing serializer support, fixed up serialization notification
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-20 19:35:38 -07:00
chcurran c701522adc update error messaging, remove unnecessary comments
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-18 13:28:01 -07:00
chcurran ca8a148b63 fix Linux compile error
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-18 12:16:39 -07:00
chcurran 1d1cea34dd Undo artifacts for JsonUtils sojourn into AzToolsFramework
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-18 11:58:24 -07:00
chcurran b813f2fbf4 add compiler flag for object stream support of SC editor assets
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-18 10:56:02 -07:00
chcurran 1ad182105b fix memory leak and possible nullptr read
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-17 16:40:48 -07:00
chcurran de9e991ccc merge development
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-17 15:37:30 -07:00
Shirang Jia 3e51240a05 Allow customized Jenkins parameters for different pipelines and add aws integration deployment pipeline (#3248)
Allow customized Jenkins parameters for different pipelines so that we can define different Jenkins parameters for a new pipeline and doesn't affect AR build parameters.

Add aws integration deployment pipeline.
2021-08-17 15:25:32 -07:00
Junbo Liang 401d0c1ad5 Update the AWSNativeSDK version and hash for Mac (#3259) 2021-08-17 15:17:48 -07:00
AMZN-koppersr 2d3c4790b4 Merge pull request #3256 from aws-lumberyard-dev/mnaumov/2372_signOffFix
Fixing a crash when unparenting prefab instance in a new level
2021-08-17 15:05:57 -07:00
Mikhail Naumov fca71f9455 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372_signOffFix
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-17 14:14:56 -07:00
chcurran 778ebc39a2 add listener to cmake files
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-17 14:07:13 -07:00
chcurran 88121f3bb4 move JsonUtils to AzCore
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-17 14:06:24 -07:00
chcurran 0270fb7fbe Initial saving/loading of JSON serialization of sc editor assets
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-17 13:47:20 -07:00
Guthrie Adams 8940425902 Merge pull request #3276 from aws-lumberyard-dev/Atom/guthadam/atomtools_fix_unused_variable_errors
AtomTools: fix unused variable errors
2021-08-17 14:36:19 -05:00
Esteban Papp fb05beffe3 Change LY_UNITY_BUILD default to "ON" (#3244)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-17 12:05:51 -07:00
AMZN-koppersr 8b70b7c045 Merge pull request #3122 from aws-lumberyard-dev/mnaumov/2679
Fixing Level Save As
2021-08-17 12:01:28 -07:00
Jacob Hilliard e865ad5d23 Profiler: implement loading from saved captures (#3026)
* Profiler: implement loading from saved capture
Adds functionality for finding a saved capture on disk and then
deserializing it using rapidjson's built-in buffered stream reader. This
does require use of raw file pointers since saved captures can be
hundreds of megabytes.
Actually showing the data in the visualizer is TODO.
* Profiler: use heap buffer over stack buffer
* Profiler: move deserialization logic to ImGuiCpuProfiler

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
2021-08-17 11:33:13 -07:00
Guthrie Adams 8f4a35b146 AtomTools: fix unused variable errors
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-17 13:21:13 -05:00
Mikhail Naumov 0d0a09b252 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372_signOffFix
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-17 11:11:27 -07:00
mnaumov a20428d393 Fixing non unity build
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-17 11:10:42 -07:00
Chris Galvan fa2fc03a25 Merge pull request #3160 from aws-lumberyard-dev/michabr/lyshine_sc_fix
Fix script canvases not loading if on a UI canvas element
2021-08-17 12:40:03 -05:00
galibzon 2b5f77683c [ATOM-13679] ShaderAssetBuilder: Create UnitTest To Validate (#3096)
* [ATOM-13679] ShaderAssetBuilder: Create UnitTest To Validate
 STDOUT Data Capture From MCPP

azvsnprintf was being used improperly, in particular
in windows if the data to print was larger than the
local buffer in the stack, then azvsnprintf returns -1.

Also azvsnprintf needs a +1 in buffer size to accomodate for
the '\0' character at the end and that was not done.

Added UnitTest to validate all cases:
1. Data to print is smaller than the local buffer.
2. Data to print is the same size as the local buffer.
3. Data to print is bigger than the local buffer.

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

* Fix for MacOS & Linux,
they require va_start to be called each time azvsnprintf is called

Signed-off-by: garrieta <garrieta@amazon.com>
2021-08-17 11:53:22 -05:00
mnaumov 6303b82976 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679 2021-08-17 09:53:04 -07:00
jackalbe eb6569357b {SPEC7767} Fix for PythonAssetBuilding auto tests (#3089)
Fix for PythonAssetBuilding auto tests by updating the logic plus the names of the output models
fix an access violation for auto complete in the console

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
2021-08-17 11:38:10 -05:00
SergeyAMZN 5f8e970700 Merge pull request #3159 from aws-lumberyard-dev/MPWeaponsSQ
Fixed assert about memory override when logged string is longer than …
2021-08-17 17:14:15 +01:00
hultonha 7f603c59ad Fix for events that should have been consumed by manipulators (#3108)
* fix for events that should have been consumed by manipulators making their way to the main viewport handler

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add missing include for SANDBOX_API macro

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add dependency on Qt::Test for AzToolsFrameworkTestCommon

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix order of buttons passed to QMouseEvent

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* potential fix for vtable error on linux

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* potential fix for vtable error on linux again

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-17 17:09:17 +01:00
AMZN-stankowi b98a67e836 Better error reporting on mixing skinned and unskinned meshes. (#3158)
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-08-17 08:21:40 -07:00
Guthrie Adams c95f491635 Merge pull request #3126 from aws-lumberyard-dev/Atom/guthadam/atomtools_restore_source_control_spam_filter
AtomTools: restoring log message filter to ignore source control spam
2021-08-17 10:11:54 -05:00
Guthrie Adams 2cfbaa956a Merge pull request #3098 from aws-lumberyard-dev/Atom/guthadam/atomtools_refactor_document_system
AtomTools: Unified ME and SMC document system into AtomToolsFramework shared classes and buses
2021-08-17 10:11:21 -05:00
amzn-victor eb1593a19c Changes to SDK wrappers and functions to allow more flexible scene file processing (#3112)
These changes allow for usage of different asset import SDKs to process scene files.

    Move AssImp specific code out of node, scene & material wrapper parent classes and into child wrapper classes (AssImpNodeWrapper, etc.), allowing child classes to expose import SDK code. Allows for more convenient implementation of other import SDK's elsewhere (such as in a gem).
    Add a loadingComponentUuid parameter to LoadSceneFromVerifiedPath to allow for usage of different loading components. Changed tests and all calls to this function accordingly.


* Move AssImp specific code out of wrapper parent classes and into child classes for gem usage

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Add loadingComponentUuid parameter to LoadSceneFromVerifiedPath function

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Make wrapper members protected, change pointer cast

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Adding spaces to fix style

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Fix for pointer cast causing test failures

Signed-off-by: Victor Huang <huavicto@amazon.com>
2021-08-17 06:52:20 -07:00
galibzon 4cac875589 [ATOM-15058] Remove Automatic Entry Point Detection (#3150)
.shader files must declare at least  one entry function.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-08-17 08:21:39 -05:00
Nicholas Van Sickle d1cedba042 Fix NativeWindow_Windows returning the wrong size. (#3153)
Make sure WM_WINDOWPOSCHANGED bubbles up so that we can see WM_SIZE.

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-08-17 08:20:33 -05:00
amzn-sean d9ea329cbd Fixes #2796 Collider retains phys mesh asset reference after changing to shape (#3162)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-08-17 13:48:51 +01:00
abrmich 4e3ec08c6a Fix script canvases not loading if on a UI canvas element
Signed-off-by: abrmich <abrmich@amazon.com>
2021-08-16 18:03:13 -07:00
Guthrie Adams 5169e98826 Merge branch 'development' into Atom/guthadam/atomtools_refactor_document_system 2021-08-16 18:30:49 -05:00
Guthrie Adams ae4ad7dcac fixed formatting
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-16 18:29:16 -05:00
Guthrie Adams ff4d65dc2d added functions to remove and clear trace logger filters
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-16 18:22:37 -05:00
pereslav f76d09e215 Fixed assert about memory override when logged string is longer than the buffer size
Signed-off-by: pereslav <pereslav@amazon.com>
2021-08-17 00:19:57 +01:00
mnaumov 0884f96997 PR feedback
Signed-off-by: mnaumov <mnaumov@amazon.com>
2021-08-16 16:02:09 -07:00
Chris Galvan 3fb903b03b Merge pull request #3151 from aws-lumberyard-dev/cgalvan/ReplaceLumberyardReferences
Replaced some Lumberyard references with O3DE.
2021-08-16 17:58:18 -05:00
mnaumov d5b92fa93a Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372 2021-08-16 15:23:34 -07:00
mgwynn a461a82030 Remove non-existant files from icon contents.json files (#3148)
Signed-off-by: mgwynn <mgwynn@amazon.com>
2021-08-16 15:13:35 -07:00
kberg-amzn 109ce65c7d Merge pull request #2993 from aws-lumberyard-dev/MultiplayerDesyncsAndCorrectionFixes
Multiplayer desyncs and correction fixes
2021-08-16 14:53:55 -07:00
Chris Galvan 88bef1074b Replaced some Lumberyard references with O3DE.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-16 15:43:01 -05:00
Guthrie Adams 11ac57d86f Merge pull request #3123 from aws-lumberyard-dev/Atom/guthadam/atomtools_prepend_star_on_modified_tabs
AtomTools: prepend asterisk to denote modified document tabs
2021-08-16 15:16:34 -05:00
Guthrie Adams fe7d953568 Merge pull request #3124 from aws-lumberyard-dev/Atom/guthadam/ATOM-16242_fix_python_terminal_help_crash
AtomTools: Fix python terminal help crash ATOM-16242
2021-08-16 15:15:57 -05:00
Chris Galvan 669f9893ad Merge pull request #3147 from aws-lumberyard-dev/cgalvan/RenameRadiusWeightModifier
Updated Radius Weight Modifier component name for consistency.
2021-08-16 13:57:08 -05:00
Chris Galvan aff3b93297 Merge pull request #3023 from aws-lumberyard-dev/daimini/settings-registry-origin-tracking
Add Pre and Post merge handlers to Settings Registry
2021-08-16 12:53:49 -05:00
amzn-phist d6b268e84e Remove ResourceSelectorHost and clean up/refactor related bits (#3050)
* Sever dependency on legacy resource selector host

Audio resource selectors (browse dialogs) no longer need to be
registered with the legacy IResourceSelectorHost system.  Set up a new
EBus specifically to handle browse button presses and directly invokes
the dialog.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Hook up legacy audio control selector to new EBus

Remaining use of legacy audio selectors (trackview) need to be able to
bypass ResourceSelectorHost now.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removes ResourceSelectorHost and legacy selectors

This removes various Variable types that were tied to resource
selectors, such as GeomCache, Model, Animation, File.  Removes the
ResourceSelectorHost completely.  The two things that still appeared to
have selectors in TrackView are Audio Controls and Texture.  Fixed the
audio control selector to work via EBus and the Texture selector didn't
seem to work at all, but left it in as it was.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Make the default audio selector return old value

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix some signed/unsigned comparison warnings

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Remove deleted function from Editor Mock

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Change audio selector api to use string_view

Per feedback.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-08-16 12:41:24 -05:00