31addc43dc
Windows and Linux compiling
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 14:02:45 -07:00
6bdef50444
Code/Framework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 13:00:45 -07:00
257557c692
Code/Framework/AzToolsFramework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 17:56:42 -07:00
588d702e43
Code/Framework/AzToolsFramework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 17:53:31 -07:00
b96b99363c
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:35 -07:00
9245a31196
more fixes for Code
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:48:42 -07:00
c1f236a70b
Merge pull request #3337 from aws-lumberyard-dev/cgalvan/ComponentSearchIncludeCategory
...
Include the category name when performing search in the component palette.
2021-08-19 16:34:43 -05:00
24a8308711
Include the category name when performing search in the component palette.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-19 13:44:12 -05:00
d0238a5977
More fixes after merge
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-19 09:37:45 -07:00
f8e99cd7dd
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
# Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-19 08:53:41 -07:00
fdc464c6fd
Merge pull request #3272 from aws-lumberyard-dev/PIX
...
Profiler spring cleaning
2021-08-19 08:48:23 -06:00
80e08dd947
Fix issue with mouse input for viewport camera ( #3210 )
...
* fix for drift accumulating in the viewport camera
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* fix typo and update how events are stored
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* respond to PR feedback and fix linux and windows build issues
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* fix failing unit tests in camera input
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-08-19 09:06:24 +01:00
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:09 -06:00
1e136a02b0
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Framework/Crcfix/crcfix.cpp
2021-08-18 12:39:24 -07:00
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
8589bb99de
cleaned up comments
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-18 12:01:07 -07:00
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
db91bdbf51
Improvements to Entity Outliner context menu
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-17 18:30:46 -07:00
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
0c6a838c6f
fix warnigns after merge
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-17 13:22:52 -07:00
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
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
a20428d393
Fixing non unity build
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-17 11:10:42 -07:00
6303b82976
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679
2021-08-17 09:53:04 -07:00
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
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
b8787739e1
more fixes after rebase
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 17:05:50 -07:00
3eb658534b
More Code/Framework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:42:19 -07:00
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
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
3522f622f3
more castings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:06:20 -07:00
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
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
0884f96997
PR feedback
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-16 16:02:09 -07:00
d5b92fa93a
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372
2021-08-16 15:23:34 -07:00
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
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
e42c5c03ab
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679
2021-08-16 10:36:30 -07:00
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
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
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
d6c5f1444b
fixing hidden variable warning
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-08-14 14:30:54 -05:00
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
9aa391bf74
Fixing Level Save As
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-13 19:51:55 -07:00
e633b5bdc7
Addressing Ronald's feedback
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-13 19:50:35 -07:00
c8cd3b1923
reverting another file
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-12 14:44:09 -07:00
8f21563ba9
Undoing old changes and storing linkId to prefabDom
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-08-12 14:44:07 -07:00
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
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
7e5cbdab1e
Create a new automated test for Prefab basic workflows ( #2715 )
...
Adds a new ebus for prefab apis and refactored the apis
Removed an empty test level
Auto delete tmp level when teardown tests
Add Base test level in Prefab folder
Removed unused comments
Checked if absolute path as an input of Create Prefab functions
Changed created prefab file path to support all platfroms
Added missing includes
Signed-off-by: chiyteng <chiyteng@amazon.com >
2021-08-11 14:11:26 -07:00
Esteban Papp
Chris Galvan
Jeremy Ong
hultonha
Jeremy Ong
Mikhail Naumov
chiyenteng
Guthrie Adams
Guthrie Adams
amzn-phist
sphrose