birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,312 Commits 3 Branches 3 Tags
07ea4edbc2d4dfad38ab094cd39525687776091e
Commit Graph

1509 Commits

Author SHA1 Message Date
Mikhail Naumov 2c4e5c5630 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-3904 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-18 12:11:54 -07:00
Mikhail Naumov 8589bb99de cleaned up comments 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-18 12:01:07 -07:00
Esteban Papp dd80a3ebae Linux and non-unity build fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-18 11:09:14 -07:00
chiyenteng 28d035c275 Add a new auto test for delete prefab workflow (#3143) 
* Add a new auto test for delete prefab

Signed-off-by: chiyteng <chiyteng@amazon.com>
 2021-08-18 10:55:45 -07:00
John Jones-Steele 740ee1f8a4 Fixed wheel working on spinbox non focussed 
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
 2021-08-18 12:27:10 +01:00
Mikhail Naumov db91bdbf51 Improvements to Entity Outliner context menu 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-17 18:30:46 -07:00
Esteban Papp ac7be2fb5a PR observation about another race condition 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-17 18:29:24 -07:00
Esteban Papp a49e07c8e9 improving comment 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-17 16:20:39 -07:00
Esteban Papp 4adf5c051e more NameTest fixes, AzCore passing ASan 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-17 16:16:19 -07:00
Esteban Papp e29479552b alignment fix 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-17 15:53:14 -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
Esteban Papp 0c6a838c6f fix warnigns after merge 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-17 13:22:52 -07:00
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
 2021-08-17 12:10:46 -07:00
Esteban Papp 7be2b0b6c3 Fix for a leaky test 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-17 11:49:51 -07: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
Esteban Papp 3e06307461 Merge branch 'development' into cmake/AddressSanitizer 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-17 10:43:37 -07: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
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
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
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