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 |
|
David Back
|
2cdda23169
|
more robustness for optional properties
|
2018-06-27 13:05:39 -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 |
|
amantley
|
1804422df0
|
remove orb in the otherAvatar destructor, and check
_otherAvatarOrbMeshPlaceholder pointer before updating the position
|
2018-06-27 11:15:42 -07:00 |
|
Wayne Chen
|
412d5c3709
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-06-27 10:53:32 -07:00 |
|
John Conklin II
|
e7d5ea561b
|
Merge pull request #13469 from hyperlogic/safeLandingFix4
Fix for landing on the roof of some domains.
|
2018-06-27 10:23:35 -07:00 |
|
sabrina-shanman
|
4afb19e091
|
Remove assert in ~Frame causing shutdown crash on Mac in dev build
|
2018-06-27 09:59:48 -07:00 |
|
sabrina-shanman
|
18219464f1
|
Fix shutdown crash on Mac in Application::onPresent
|
2018-06-27 09:56:03 -07:00 |
|
Seth Alves
|
01632ddd29
|
Merge pull request #13345 from ctrlaltdavid/21890
Fix memory leak when reloading scripts
|
2018-06-27 09:39:53 -07:00 |
|
Seth Alves
|
d9f8cd46ea
|
Merge pull request #13415 from ctrlaltdavid/21896
Zero avatar velocity if protocol version mismatch so that overlays show
|
2018-06-27 09:35:15 -07:00 |
|
Angus Antley
|
eba4a27329
|
added newline to the end of AvatarManager.cpp
|
2018-06-27 05:59:53 +01:00 |
|
John Conklin II
|
a03a5693a5
|
Merge pull request #13466 from danteruiz/fix-login-2.0
fix login links (forgot username and password)
|
2018-06-26 18:51:10 -07:00 |
|
Wayne Chen
|
b819b5f57c
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-06-26 17:52:18 -07:00 |
|
amantley
|
39edc21423
|
spaced comment fixed
|
2018-06-26 17:47:36 -07:00 |
|
amantley
|
8b13905d6c
|
final final final coding standards
|
2018-06-26 17:43:45 -07:00 |
|
amantley
|
ea76def2b5
|
more white space errors
|
2018-06-26 17:18:35 -07:00 |
|
amantley
|
1fcaf16b0c
|
removed editor auto format errors
|
2018-06-26 17:07:55 -07:00 |
|
John Conklin II
|
a38859e4da
|
Merge pull request #13397 from ctrlaltdavid/21893
Fix Create app selection updating when entities are deleted
|
2018-06-26 17:06:43 -07:00 |
|
Wayne Chen
|
34824b793c
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-06-26 17:04:13 -07:00 |
|
amantley
|
7ecf8c24df
|
Merge remote-tracking branch 'upstream/master' into glowingOrbMaster
syncing with upstream master
|
2018-06-26 16:44:34 -07:00 |
|
amantley
|
a89c2ea734
|
removed crust
|
2018-06-26 16:40:51 -07:00 |
|
luiscuenca
|
fe571e9638
|
Fix scaling model twice
|
2018-06-26 16:37:12 -07:00 |
|
Sam Gondelman
|
7fb2e535ff
|
Merge pull request #13468 from SamGondelman/secondaryShadows
Disable shadows in secondary camera
|
2018-06-26 15:45:44 -07:00 |
|
Zach Fox
|
6f956ffb8d
|
Fix MS16235: Set previously-buggy Handshake particle properties to 0
|
2018-06-26 15:45:18 -07:00 |
|
Alexia Mandeville
|
b3eec72c90
|
Removing animations.zip
|
2018-06-26 15:39:50 -07:00 |
|
amantley
|
2b6d470467
|
Merge remote-tracking branch 'upstream/master' into glowingOrbMaster
syncing with master
|
2018-06-26 15:16:41 -07:00 |
|
amantley
|
46c70d948f
|
Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn
|
2018-06-26 15:11:58 -07:00 |
|
Alexia Mandeville
|
6f6a9b2c64
|
Style formatting, updating comments
|
2018-06-26 15:02:46 -07:00 |
|
Dante Ruiz
|
3cf36bed55
|
making small adjustments
|
2018-06-26 14:57:15 -07:00 |
|
Alexia Mandeville
|
92acbdbbd7
|
Adding sit and love emotes
|
2018-06-26 14:21:10 -07:00 |
|
John Conklin II
|
4948ad425e
|
Merge pull request #13429 from danteruiz/fix-entity-lag-2
Fix entities rendering a frame ahead or behind when parented to my avatar.
|
2018-06-26 13:57:19 -07:00 |
|
David Back
|
40b2525b99
|
Merge pull request #13439 from dback2/editHandleFixesImprovements
Edit handle fixes
|
2018-06-26 13:33:25 -07:00 |
|