Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-18 08:16:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69422 commits 6 branches 1 tag 1.1 GiB
Commit graph

69422 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wayne Chen
2f75e1988f Merge branch 'master' of https://github.com/wayne-chen/hifi 2018-07-02 16:56:07 -07:00
Wayne Chen
3346adf14a Merge branch 'master' of https://github.com/highfidelity/hifi 2018-07-02 09:07:01 -07:00
Wayne Chen
15bf2707fd Merge branch 'master' of https://github.com/wayne-chen/hifi 2018-07-01 22:10:11 -07:00
Stephen Birarda
bbc757a193
Merge pull request #13385 from marko8904/timestampServerUpdate 
Updated time stamping server for authenticode signatures
 2018-06-29 16:46:22 -07:00
Wayne Chen
fa29bb537f Merge branch 'master' of https://github.com/highfidelity/hifi 2018-06-29 13:17:20 -07:00
John Conklin II
d68815ba27
Merge pull request #13501 from danteruiz/fix-billboard-crash 
Fix web entity crash
 2018-06-29 12:02:31 -07:00
Wayne Chen
d430877c41 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-06-29 10:58:06 -07:00
Sam Gateau
3435e7ca87
Merge pull request #13499 from hyperlogic/bug-fix/space-process-resets-crash 
Guard against memory corruption in Space::processResets()
 2018-06-29 17:56:44 +02:00
Dante Ruiz
8c96597aba Merge branch 'master' of github.com:highfidelity/hifi into fix-billboard-crash 2018-06-28 16:25:52 -07:00
Dante Ruiz
847cad46ca fix billboard crash 2018-06-28 16:25:34 -07:00
Anthony J. Thibault
17f9a01fa2 Fix signed unsigned compare warning 2018-06-28 15:29:01 -07:00
Wayne Chen
d2dda64dad Merge branch 'master' of https://github.com/highfidelity/hifi 2018-06-28 15:16:11 -07:00
Anthony Thibault
a5919ee3fa
Merge pull request #13497 from hyperlogic/bug-fix/script-engine-batchloader-memory-corruption-fix 
Fix memory corruption when running scripts using Script.require().
 2018-06-28 14:18:56 -07:00
Anthony J. Thibault
9772fc4e22 Guard against memory corruption in Space::processResets() 
Check the proxyID before reading from the _proxies vector and writing into the _owners vector.
 2018-06-28 14:04:59 -07:00
Zach Fox
73e45b5fdf
Merge pull request #13498 from zfox23/MS14743_snappyFloor 
Fix MS14743: Change SNAP prints such that they don't fall through the floor
 2018-06-28 13:33:37 -07:00
John Conklin II
0a0e1668d5
Merge pull request #13478 from amantley/glowingOrbMaster 
The client should render "something" for an avatar even if mesh or identity is not available
 2018-06-28 12:12:16 -07:00
Zach Fox
2d27de12bd Fix MS14743: Change SNAP prints such that they don't fall through the floor 2018-06-28 12:06:31 -07:00
Anthony J. Thibault
ac6fcf092c Fix memory corruption via lambdas that capture local variables by reference. 
The lambdas in ScriptEngine::fetchModuleSource() were referencing local stack variables by reference.
This could lead to un-expected results including memory corruption.
To workaround this issue the QTimer and QEventLoop variables are allocated on the heap and held onto by a shared_ptr.
This shared_ptr is passed to the lambda.

This will not result in cycles and should result in the QTimer and QEventLoop being destroyed when the BatchLoader
object they are connected to is deleted.
 2018-06-28 11:15:25 -07:00
John Conklin II
040978830a
Merge pull request #13413 from Atlante45/fix/audio-starve 
Fix audio device sometimes being on the wrong thread
 2018-06-28 09:59:00 -07:00
John Conklin II
b07d317f4c
Merge pull request #13488 from hyperlogic/bug-fix/qstring-from-script-engine 
Fix for heap-corruption in Settings::saveAll due to implicitly shared QStrings
 2018-06-28 09:56:51 -07:00
John Conklin II
af13196d3f
Merge pull request #13489 from r3tk0n/mouse_menu 
Re-added mouse sensitivity settings to General Preferences dialog.
 2018-06-28 09:43:55 -07:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay 
Implement MS16257: Remove 'clear overlay when moving' setting and code
 2018-06-28 09:31:04 -07:00
Sam Gondelman
736c56f5f4
Merge pull request #13487 from gcalero/single_account_manager_android 
Remove the duplicated AccountManager used for android
 2018-06-28 09:07:23 -07:00
r3tk0n
f36ba49fbd
Update TabletGeneralPreferences.qml 
Fixed a typo
 2018-06-27 16:30:38 -07:00
r3tk0n
d6684e5ef7 Re-add mouse sensitivity option to tablet. 2018-06-27 16:23:40 -07:00
r3tk0n
c80ab0d237 Re-added mouse sensitivity settings to General Preferences dialog. 2018-06-27 16:10:07 -07:00
Anthony J. Thibault
70a3c9ce3c Fix for heap-corruption in Settings::saveAll due to implicitly shared QStrings 
Using gflags on windows and enabling full page heap verification, I was able to detect this as a source of
memory corruption.

https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap

Running interface with pageheap before and after, this change leads me to believe that this is a source of
some of our heap-corruption crashes on backtrace.

Specifically these 19 crashes in the last month, and possibly more.

https://highfidelity.sp.backtrace.io/dashboard/highfidelity/project/Interface/query-builder?qb=%7B%22mode%22%3A%22aggregate%22%2C%22sorting%22%3A%7B%22aggFactor%22%3A%22count%22%2C%22aggSortOrder%22%3A%22descending%22%2C%22selectFactor%22%3A%22timestamp%22%2C%22selectSortOrder%22%3A%22descending%22%2C%22sortedColumnNames%22%3A%5B%5D%7D%2C%22dateTimePicker%22%3A%7B%22granularity%22%3A%221M%22%2C%22start%22%3A%222018-05-27T07%3A00%3A00.000Z%22%2C%22end%22%3A%222018-06-27T23%3A05%3A29.399Z%22%7D%7D&qn=&query=%7B%22filter%22%3A%5B%7B%22callstack%22%3A%5B%5B%22contains%22%2C%22saveAll%22%5D%5D%2C%22timestamp%22%3A%5B%5B%22at-least%22%2C1527404400%5D%2C%5B%22at-most%22%2C1530140729%5D%5D%7D%5D%2C%22fold%22%3A%7B%22timestamp%22%3A%5B%5B%22range%22%5D%2C%5B%22bin%22%2C32%2C1527404400%2C1530140729%5D%5D%7D%2C%22group%22%3A%5B%22classifiers%22%5D%2C%22select%22%3A%5B%22timestamp%22%2C%22fingerprint%22%2C%22_deleted%22%2C%22callstack%22%2C%22object%22%5D%7D
 2018-06-27 16:06:23 -07:00
John Conklin II
0cb8b4dfa1
Merge pull request #13471 from danteruiz/disable-flying-by-default 
Disable flying by default
 2018-06-27 16:04:16 -07:00
John Conklin II
3f6be6d259
Merge pull request #13476 from luiscuenca/avatarClusterScaleFix 
Fix scaling avatar points twice
 2018-06-27 16:03:46 -07:00
John Conklin II
d43324a3c8
Merge pull request #13462 from howard-stearns/guard-dynamic-domain-verification 
guard startDynamicDomainVerification against missing entity
 2018-06-27 16:01:55 -07:00
John Conklin II
e9d2797573
Merge pull request #13472 from alexiamandeville/sittingUpdate69 
Restoring Emote app to stable build state, adding sit and love emotes
 2018-06-27 16:00:53 -07:00
John Conklin II
02d0c7d795
Merge pull request #13454 from danteruiz/mac-fix-general-settings 
make general settings be under settings instead of preferences
 2018-06-27 15:59:16 -07:00
John Conklin II
8c516e1ca8
Merge pull request #13480 from birarda/bug/go-to-before-clear-master 
move AddressManager to NodeList thread, make AccountManager safer
 2018-06-27 15:58:56 -07:00
Zach Fox
1b414fbbfe Quick CR comments 2018-06-27 15:11:59 -07:00
Gabriel Calero
e15fc787d3 Remove the duplicated AccountManager used for android 2018-06-27 19:04:27 -03:00
Zach Fox
8ba184db6a Don't use flags; use a bool 2018-06-27 14:59:46 -07:00
amantley
205cd44a49 removed override keyword from OtherAvatar and MyAvatar destructors, also 
added the virtual keyword to the createOrb virtual method in OtherAvatar
 2018-06-27 14:31:39 -07:00
Zach Fox
2347634d72 Fixed View Overlays checkbox (thanks Dante) 2018-06-27 14:28:43 -07:00
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -07:00
John Conklin II
1f4346d221
Merge pull request #13427 from ctrlaltdavid/21897 
Stop desktop app window's QML source from running when window is closed
 2018-06-27 13:46:50 -07:00
Alexia Mandeville
0f25ab7376
Fixing error from typo 2018-06-27 13:30:10 -07:00
John Conklin II
2da3192c33
Merge pull request #13402 from ctrlaltdavid/21895 
Make desktop left and right mouse button actions independent
 2018-06-27 12:46:11 -07:00
John Conklin II
b9439d1e6b
Merge pull request #13384 from ctrlaltdavid/21892 
Fix entity detaching from head joint not becoming visible
 2018-06-27 12:32:52 -07:00
John Conklin II
c1d949351e
Merge pull request #13399 from kitely/roll-log-on-startup 
Always roll hifi-log.txt when starting
 2018-06-27 12:32:20 -07:00
Zach Fox
bdeb22703c
Merge pull request #13474 from zfox23/MS16235_handshakeParticles 
Fix MS16235: Set previously-buggy Handshake particle properties to 0
 2018-06-27 12:16:48 -07:00
amantley
99ff5f9140 made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly 2018-06-27 11:59:53 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
70cab27c1a add a safeguard deleteLater for QNetworkReply 2018-06-27 11:41:37 -07:00
Stephen Birarda
24f92502b5 add warning output of error from AccountManager 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00