Commit Graph

1488 Commits

Author SHA1 Message Date
Esteban Papp 964c2401df Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 18:34:35 -07:00
Esteban Papp 9a8ec8bfcd fix for clang
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 18:13:27 -07:00
Esteban Papp 0f26a6508a fixing comment
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 17:54:17 -07:00
Esteban Papp b8787739e1 more fixes after rebase
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 17:05:50 -07:00
Esteban Papp f0fa62bde3 PR comments/observations
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:46:48 -07:00
Esteban Papp 3eb658534b More Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:42:19 -07:00
Esteban Papp 06e6f83907 Cleanup and fixing of Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:42:17 -07:00
Esteban Papp 0eacd54b14 removing unnecessary bigobj flags from files (its applied globally)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:42:11 -07:00
Esteban Papp e7f07147cb More fixes for Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:42:01 -07:00
pappeste 3172a82937 Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:39:20 -07:00
pappeste 58f8b563d0 fix them all
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:38:33 -07: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
Esteban Papp e9b4f48f71 more fixes, will merge fixes for w4245 and w4389
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:06:22 -07:00
Esteban Papp 3522f622f3 more castings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:06:20 -07:00
Esteban Papp 8b3ab8eb0b fixing warning issued in Jenkins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:06:18 -07:00
Esteban Papp 52068911bb More fixes that are failing on Jenkins but not locally
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:05:45 -07:00
Esteban Papp 75c388b746 change conversions to static_cast
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:05:43 -07:00
Esteban Papp 8ba0807cfc Code/Framework/AzCore
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:05:29 -07:00
pappeste f6cdcddc52 fixes for Code/CryEngine
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:03:28 -07:00
pappeste 81d26d322d Code/Framework fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:02:53 -07:00
mnaumov 0884f96997 PR feedback
Signed-off-by: mnaumov <mnaumov@amazon.com>
2021-08-16 16:02:09 -07: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
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
mnaumov e42c5c03ab Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679 2021-08-16 10:36:30 -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
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
mnaumov 9aa391bf74 Fixing Level Save As
Signed-off-by: mnaumov <mnaumov@amazon.com>
2021-08-13 19:51:55 -07:00
mnaumov e633b5bdc7 Addressing Ronald's feedback
Signed-off-by: mnaumov <mnaumov@amazon.com>
2021-08-13 19:50:35 -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
Esteban Papp b26107e98d Fix for NameDictionary
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-13 10:07:35 -07:00
kberg-amzn 6518cf82d6 Merge remote-tracking branch 'origin/development' into MultiplayerDesyncsAndCorrectionFixes 2021-08-13 09:58:21 -07:00
moudgils 4cf384c2c5 Fix minor typo (#3095)
Signed-off-by: moudgils <moudgils@amazon.com>
2021-08-12 21:12:41 -07:00
Esteban Papp 89e1b6db25 Making allocator use the MallocSchema so we can take full advantage of ASan
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-12 16:44:59 -07:00
Esteban Papp a087fc06a9 fixes for ASAn
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-12 16:44:25 -07:00
Esteban Papp 8f05c7aa2f Several build fixes 2021-08-12 16:42:18 -07:00
mnaumov c8cd3b1923 reverting another file
Signed-off-by: mnaumov <mnaumov@amazon.com>
2021-08-12 14:44:09 -07:00
mnaumov 8f21563ba9 Undoing old changes and storing linkId to prefabDom
Signed-off-by: mnaumov <mnaumov@amazon.com>
2021-08-12 14:44:07 -07:00
mnaumov 3fe5901a77 Fixing a crash when unparenting prefab instance in a new level
Signed-off-by: mnaumov <mnaumov@amazon.com>
2021-08-12 14:44:05 -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
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 2063e7f2dd Added missing header include.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-12 11:43:23 -05:00
Gene Walters 85d4abae83 Move MultiplayerComponent destructor to cpp (which #includes the controller) so that when it comes time to destroy the unique_ptr<Controller> it can do so on a complete type. Also, minor spelling error fix
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-08-12 09:22:56 -07:00