Commit Graph

2339 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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 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
AMZN-stankowi b88a7faf64 Fixed issues with blend shape animations (#3080)
Duplicate blend shape animations are now handled correctly.
Invalid animation targets are now an error instead of a crash in the builder.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-08-16 10:18:45 -07:00
Danilo Aimini 577c75d68d Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 2021-08-16 09:43:10 -07:00
Esteban Papp 4f2d4d00ec Auto-completing the inserted text by pressing TAB within Editor's Console results in a silent crash
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 08:40:27 -07:00
jonawals 5925bd22f6 Further subdivide TIAF data by suite. (#3128)
* Further subdivide TIAF data by suite.
* Key fix typo.

Signed-off-by: John <jonawals@amazon.com>
2021-08-16 14:15:02 +01:00
sphrose f7e536bfb1 compile fix - signed/unsigned mismatch (#3139)
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-08-16 12:37:12 +01:00
sphrose 181698b950 LY-91616 Dyn Veg: Push (up) and Pop (down) Items in Descriptor List (#3013)
* LY-91616 Dyn Veg: Push (up) and Pop (down) Items in Descriptor List

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Changes as per reviews.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Additional review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review change

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-08-16 10:54:15 +01:00
Guthrie Adams 885357a6b5 AtomTools: restoring log message filter to ignore source control spam
Added message filter support to TraceLogger

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-14 16:58:31 -05:00
Guthrie Adams d6c5f1444b fixing hidden variable warning
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-14 14:30:54 -05:00
Guthrie Adams fe3b30e42c AtomTools: Fix python terminal help crash ATOM-16242
Checking EditorWindowRequests::GetAppMainWindow before searching for main window

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-14 14:07:36 -05:00
Esteban Papp 093a03cfbc fix for non-unity mac build (#3118)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-13 15:58:01 -07:00
Danilo Aimini 564981ab0f Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking
# Conflicts:
#	Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp
2021-08-13 15:04:47 -07:00
lumberyard-employee-dm 9060423592 Settings registry notification deadlock fix (#3065)
* Added a StealHandlers function to AZ Event

The StealHandlers function is able to take all the handlers from an AZ
Event parameter and register them with the current AZ Event

This allows stealing handlers from expiring AZ Events, which is useful
for a lock and swap algorithm for thread safety.
1. Lock persistent AZ::Event
2. Swap persistent AZ::Event with local AZ::Event
3. Unlock persistent AZ::Event - Other threads can now add to this
   AZ::Event
4. Invoke handlers from local AZ::Event
5. Relock persistent AZ::Event
5. Swap local AZ::Event with persistent AZ::Event
6. Local AZ::Event now contains handlers that were added when the lock
   was free
7. Persistent AZ::Event now steals from local AZ::Event
8. Unlock persistent AZ::Event

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Separated SettingRegistry update/query mutex from Notifier update mutex

The Settings Registry update/query mutex is also better scoped to reduce
the amount of lock time.

The Notifier mutex being separate allows the Settings Registry to signal
a notification event without being under any mutex, by locking and
swapping the notifier event with a local instance

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Renamed StealHandlers function to ClaimHandlers
Replaced decltype keywords in ClaimHandlers to auto

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-13 16:20:08 -05:00
kberg-amzn 6518cf82d6 Merge remote-tracking branch 'origin/development' into MultiplayerDesyncsAndCorrectionFixes 2021-08-13 09:58:21 -07:00
Alex Peterson a55cb3e35f Fixed white-bar at bottom of Project Manager screen (#3091)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-08-13 09:09:55 -07:00
Kevin Y 99b369198b Typo fix in duplicate project progress window (#2969)
Signed-off-by: Kevin Yu <kevinjoeyu@gmail.com>
2021-08-13 14:59:38 +02:00
Scott Romero f2958bac93 [development] complete removal of CryThread*.h and MultiThread.h from CryCommon (#3067)
- Replaced Cry-threading related code with AZ equivalents in the Remote Console runtime
 - Replaced (or removed) usage of CryMutex/CryLock with appropriate AZStd mutex type
 - Replaced usage of CrySpinLock/CryWriteLock with equivalent AZStd::spin_mutex
 - Replaced usage of CryInterlocked* with AZStd atomics
 - Removed all CryThread*.h files
 - Removed MultiThread.h
 -- Includes removal of the CryInterlocked* and Cry*CriticalSection functions defined elsewhere
 - Removed re-implemented stubs of Windows synchapi.h functions

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-08-13 05:43:21 -07:00
moudgils 4cf384c2c5 Fix minor typo (#3095)
Signed-off-by: moudgils <moudgils@amazon.com>
2021-08-12 21:12:41 -07:00
Chris Galvan f46f9fb7bc Merge pull request #3094 from aws-lumberyard-dev/cgalvan/CreateEntitiesInViewportCorrectPosition
Fixed creating entities in the viewport logic to use hit test detection.
2021-08-12 19:15:22 -05:00
AMZN-ScottR f0ff8da1d7 [redcode/crythread-2nd-pass] post merge duplicates removed
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-12 16:51:54 -07:00
AMZN-ScottR f660990e8a Merge branch 'development' into redcode/crythread-2nd-pass
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-12 16:47:02 -07:00
Esteban Papp 8f05c7aa2f Several build fixes 2021-08-12 16:42:18 -07:00
Chris Galvan 11d5009f46 Fixed creating entities in the viewport logic to use hit test detection.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-12 16:31:39 -05:00
AMZN-ScottR b32cf24310 Merge branch 'development' into redcode/crythread-2nd-pass
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-12 14:20:15 -07:00
AMZN-ScottR c3ee798acc [redcode/crythread-2nd-pass] updated condition variable handling in Remote Console runtime to cut out extra unlock/lock
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-12 14:18:10 -07:00
Chris Galvan 48503679c4 Merge pull request #3081 from aws-lumberyard-dev/cgalvan/StyledTreeView
Moved custom tree view dragging logic from Entity Outliner to common class so it could be re-used for the UI Editor tree view.
2021-08-12 15:21:49 -05:00
AMZN-ScottR cc3d2e9969 [redcode/crythread-2nd-pass] replaced instances of AZStd::lock_guard<> with AZStd::scoped_lock as per feedback
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-12 12:40:03 -07:00
moudgils c2b8542bbd Support for refresh rate and sync interval (#2989)
* Add support for querying the refresh rate and sync interval
2021-08-12 12:07:46 -07:00
Chris Galvan c9df7c69a4 Updated slice entity outliner to use new consolidated StyledTreeView as well.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-12 13:20:55 -05:00
Sean Sweeney bdb3132e27 Merge pull request #1997 from aws-lumberyard-dev/aztestrunner_retry_command
Adding C++ retry command
2021-08-12 11:15:46 -07:00
AMZN-ScottR 72e99dd52b [redcode/crythread-2nd-pass] removed platform.h include hack linked to CryThread.h for apple platforms in ILog.h and ISystem.h
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-12 11:02:44 -07:00
AMZN-ScottR 28c477997d [redcode/crythread-2nd-pass] fixed missing iOS include
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-12 10:58:41 -07:00
AMZN-ScottR bbe6ff7b90 [redcode/crythread-2nd-pass] re-add LARGE_INTEGER definition to AppleSpecific.h
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-12 10:55:32 -07:00
Chris Galvan 8997cab253 Merge pull request #3070 from aws-lumberyard-dev/michabr/env_var
Fix for checking environment variable existence
2021-08-12 12:52:03 -05:00
Chris Galvan 2063e7f2dd Added missing header include.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-12 11:43:23 -05:00
Alex Peterson 538276c993 Allow project path changing and auto-completion (#3057)
* Allow project path changing and auto-complete

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>

* Improved error message regarding the absolute path requirement

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-08-12 09:32:23 -07:00
Chris Galvan b5828e327d Moved custom tree view dragging logic from Entity Outliner to common class so it could be re-used for the UI Editor tree view.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-12 11:15:55 -05:00
Chris Galvan d273298840 Merge pull request #3064 from aws-lumberyard-dev/michabr/editor_input
Fix for input not being reenabled after game mode
2021-08-12 10:20:46 -05:00
AMZN-Alexandre Corcia Aguilera 83e56b6ab5 Remove new camera flag functions and legacy code paths (#3071)
Signed-off-by: aaguilea <aaguilea@amazon.com>
2021-08-12 15:06:16 +01:00
hultonha c410f1385c First step removing legacy code from the camera
Merge pull request #2997 from aws-lumberyard-dev/legacy_camera_removing
2021-08-12 09:36:45 +01:00