c0e63988d8
merging latest dev, again, and hopefully dev is not still completely broken
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-11-05 19:23:01 -07:00
a297ceece4
Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/show-gem-repos-update
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-05 17:38:45 -07:00
0295aa7070
revert change to cancel label href
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-05 17:31:01 -07:00
21c02b195f
Update signals/slots to match upstream changes
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-05 17:24:08 -07:00
4ce39ea167
Fix tags, downloads, and several vector copies
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-05 17:17:11 -07:00
479ff188a0
merging latest development
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-11-05 15:05:23 -07:00
6b6eb2c936
Remove markers that occupy <2us for 99% of events
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-11-05 16:01:51 -06:00
c6e77f8e32
Code readability improvements
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-05 14:21:10 -07:00
1399159908
Fix Assert Absorber being leaked due to one of the tests setting m_errorAbsorber to nullptr without deleting the object ( #5176 ) ( #5348 )
...
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
(cherry picked from commit 916fb413c9
2021-11-05 12:39:11 -07:00
6cba64f226
Fix issue with Server Launcher debug console not accepting keystrokes ( #5325 )
...
* Fix issue with debug console ignoring some keys
This problem was reported for Server only, the Enter/Backspace keys were
being ignored in the ImGui Debug Console.
This wasn't an issue if the Server had loaded a map.
The problem was with XConsole explicitly setting a bool in dedicated
server mode. This caused text input to be processed by XConsole code
and not passed further along to DebugConsole where it should have been
handling it via ImGui.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Fix missing runtime dependency of ServerLauncher
ServerLauncher in non-monolithic config was missing a runtime dependency
on Legacy::CrySystem.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
2021-11-05 13:47:24 -05:00
356fec5490
bugfix: resolve crash with FBX Settings ( #4813 ) ( #4944 ) ( #5365 )
...
-prevent export of ModuleInitISystem and ModuleShutdownISystem
Signed-off-by: Michael Pollind <mpollind@gmail.com >
Co-authored-by: Michael Pollind <mpollind@gmail.com >
2021-11-05 15:17:00 +00:00
eddb867ddf
bugfix: change event to WindowBlocked for FancyDocking
...
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-11-04 19:36:09 -07:00
b42f1b022e
replace with ungrab mouse event instead of deactivate window
...
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-11-04 19:36:08 -07:00
b3c7bf47f2
Update Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
...
Signed-off-by: Michael Pollind mpollind@gmail.com
Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-11-04 19:36:08 -07:00
9eb7972e74
bugfix: main window is deactived for tabbed window preventing the use from dragging tabbed windows
...
issue: https://github.com/o3de/o3de/issues/4658
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-11-04 19:36:08 -07:00
567702931f
Updates for the spawnable entity aliases based on provided feedback.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-11-04 19:10:20 -07:00
fdc56b4a57
Merge pull request #5337 from aws-lumberyard-dev/cgalvan/MakeProcessingOverlayWidgetAlwaysOnTop
...
Set window flags so the processing overlay widget always appears on top.
2021-11-04 20:59:21 -05:00
31382d080e
Remove duplication, additional readability and added missed file
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-04 17:07:02 -07:00
c69142b73b
Merge branch upstream/stabilization/2110
...
* Conflict GemModel.h
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-04 17:02:00 -07:00
ed06ef7ed2
Removing ITimeoutHandler to simplify timeout queue interface, removes some unneeded code
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-11-04 16:48:39 -07:00
d582715321
Merge pull request #5318 from aws-lumberyard-dev/StablizationMacPMLaunchEditor
...
[MacOS] Launching Editor from ProjectManager and other misc. fixes
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-04 16:46:24 -07:00
0175e9d3cb
Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux
2021-11-04 15:58:44 -07:00
393f08fc4b
Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/clouddownloadicon
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-04 15:41:59 -07:00
9d977e81da
Uncomment temporary disabling of toast notifications
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-04 15:20:35 -07:00
c37767f92a
Set window flags so the processing overlay widget always appears on top.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-04 16:30:44 -05:00
f97fa6dbe0
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 13:44:28 -07:00
d942c90c56
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 13:44:22 -07:00
0ee217acac
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 13:41:18 -07:00
4ba2c06386
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 13:41:15 -07:00
ac7cda86c5
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 13:40:51 -07:00
f5dea72dfe
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 13:40:00 -07:00
20edb35cdc
[LYN-7245] Fix test thread being created multiple times ( #5267 ) ( #5315 )
...
* Fix test thread being created multiple times
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Update test to not use a callback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add some more comments
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add back the callback, remove the use of a thread/sleep
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
(cherry picked from commit 73202c2091
2021-11-04 13:29:39 -07:00
46d1b19816
Merge pull request #5275 from aws-lumberyard-dev/burelc/LYN-6480
...
[Linux] Unify Editor and Game raw mouse event handling
Signed-off-by: Chris Burel burelc@amazon.com
2021-11-04 13:17:39 -07:00
4721ef8298
License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements ( #5272 )
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-04 13:04:06 -07:00
6f294457da
fix issue #5172 ( #5198 )
...
Signed-off-by: Vishal Das <dvishal485@gmail.com >
2021-11-04 12:11:31 -07:00
9a4cc6bde9
Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/FixEntityOrdering
2021-11-04 12:07:53 -07:00
52604d79f6
Address some review feedback
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-11-04 12:06:37 -07:00
b6be57d2cf
Merge pull request #5264 from aws-lumberyard-dev/MacPMLaunchEditor
...
[MacOS] Launching Editor from ProjectManager and other misc. fixes
2021-11-04 11:11:44 -07:00
781a635ef7
Cleanup: Remove cry load dll functions ( #5295 )
...
* Removes VTUNE profiler hooks from Cry
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Remove cry load dll functions
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* removes unused restricted section
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-11-04 11:10:29 -07:00
1bd5a63919
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 11:10:25 -07:00
6eeae875e9
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 11:10:25 -07:00
6c7bc7a296
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 11:10:24 -07:00
04652abb8f
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 11:10:24 -07:00
06ec40452e
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 11:10:24 -07:00
179389726b
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 11:10:23 -07:00
9958e5f012
[MacOS] Launching Editor from ProjectManager and other misc. fixes
...
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-11-04 11:04:01 -07:00
774b7c2593
Fixed minor logic issue with gem removal warning
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-04 11:03:36 -07:00
0decc57dfc
Merge branch 'development' into Prefabs/SpawnableEntityAlias
2021-11-04 10:39:59 -07:00
600bb5b34e
Fix alt-tabbing out of full screen on Windows. ( #5288 )
...
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-11-04 11:17:52 -06:00
0b7bff79d3
Removes VTUNE profiler hooks from Cry ( #5291 )
...
* Removes VTUNE profiler hooks from Cry
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* some more vtune cleanup
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-11-04 10:10:29 -07:00
kberg-amzn
Alex Peterson
Jeremy Ong
AMZN-Phil
amzn-mike
amzn-phist
moraaar
Michael Pollind
Michael Pollind
AMZN-koppersr
Chris Galvan
chcurran
Chris Burel
AMZN-nggieber
Vishal Das
nvsickle
AMZN-Phil
Esteban Papp
amzn-sj
bosnichd