Commit Graph

1433 Commits (0c6a838c6f994614db2e03aedbb153d775fac3b0)

Author SHA1 Message Date
Esteban Papp 0c6a838c6f fix warnigns after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
4 years ago
mnaumov 6303b82976 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679 4 years ago
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>
4 years ago
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
4 years ago
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>
4 years ago
Esteban Papp 9a8ec8bfcd fix for clang
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 0f26a6508a fixing comment
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b8787739e1 more fixes after rebase
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp f0fa62bde3 PR comments/observations
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 3eb658534b More Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 06e6f83907 Cleanup and fixing of Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 0eacd54b14 removing unnecessary bigobj flags from files (its applied globally)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e7f07147cb More fixes for Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 3172a82937 Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 58f8b563d0 fix them all
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Guthrie Adams ff4d65dc2d added functions to remove and clear trace logger filters
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Esteban Papp e9b4f48f71 more fixes, will merge fixes for w4245 and w4389
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 3522f622f3 more castings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 8b3ab8eb0b fixing warning issued in Jenkins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 52068911bb More fixes that are failing on Jenkins but not locally
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 75c388b746 change conversions to static_cast
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 8ba0807cfc Code/Framework/AzCore
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste f6cdcddc52 fixes for Code/CryEngine
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 81d26d322d Code/Framework fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
kberg-amzn 109ce65c7d
Merge pull request #2993 from aws-lumberyard-dev/MultiplayerDesyncsAndCorrectionFixes
Multiplayer desyncs and correction fixes
4 years ago
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
4 years ago
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
4 years ago
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>
4 years ago
mnaumov e42c5c03ab Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679 4 years ago
Danilo Aimini 577c75d68d Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 4 years ago
sphrose f7e536bfb1
compile fix - signed/unsigned mismatch (#3139)
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
4 years ago
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>
4 years ago
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>
4 years ago
Guthrie Adams d6c5f1444b fixing hidden variable warning
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
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>
4 years ago
mnaumov 9aa391bf74 Fixing Level Save As
Signed-off-by: mnaumov <mnaumov@amazon.com>
4 years ago
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
4 years ago
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>
4 years ago
kberg-amzn 6518cf82d6 Merge remote-tracking branch 'origin/development' into MultiplayerDesyncsAndCorrectionFixes 4 years ago
moudgils 4cf384c2c5
Fix minor typo (#3095)
Signed-off-by: moudgils <moudgils@amazon.com>
4 years ago
Esteban Papp 8f05c7aa2f
Several build fixes 4 years ago
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.
4 years ago
moudgils c2b8542bbd
Support for refresh rate and sync interval (#2989)
* Add support for querying the refresh rate and sync interval
4 years ago
Chris Galvan 2063e7f2dd Added missing header include.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
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>
4 years ago
abrmich f6e7760e85 Fix for checking environment variable existence
Signed-off-by: abrmich <abrmich@amazon.com>
4 years ago
Danilo Aimini 04e64e274f Fix typo in copypasting...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini ed199b736a Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 4 years ago
Esteban Papp 3f34fa5636
Some cleanup of platform.h and other CryCommon files 4 years ago