Commit graph

57563 commits

Author SHA1 Message Date
Zach Fox
17c7e38fce Bugfixes? 2017-07-26 15:02:52 -07:00
Zach Fox
bd5f7b85d8 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_renderMOde 2017-07-26 14:11:28 -07:00
Zach Fox
1e80736718 Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-26 14:11:03 -07:00
Zach Fox
3a05219c59 Closer still 2017-07-26 14:10:41 -07:00
Zach Fox
65c28ca821 Bugfixes 2017-07-26 13:17:51 -07:00
Zach Fox
62f6c10b2b Renaming things; bugfixes; improvements 2017-07-26 12:45:10 -07:00
Zach Fox
24ddbb4b22 Silly bug preventing the whole thing from working 2017-07-26 12:08:55 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
Brad Hefta-Gaub
4a3e3cf777 Merge pull request #11045 from huffman/fix/skybox-not-loading
Fix bug where skybox doesn't load and physics takes a long time to engage
2017-07-26 08:58:28 -07:00
Zach Fox
9020607ccf First pass 2017-07-25 17:54:46 -07:00
Zach Fox
7702bfceaa Big cleanup and preparation; Actually fix desktop tablet 2017-07-25 16:12:32 -07:00
Seth Alves
2f004abd81 Merge pull request #11050 from birarda/bug/error-decrypting
Reduce erroneous messages about username signature decryption
2017-07-25 16:10:02 -07:00
Stephen Birarda
dd3755596c fix typo in comment in DomainGatekeeper header 2017-07-25 15:43:34 -07:00
Stephen Birarda
e9845784d5 don't return error decrypting for optimistic public keys 2017-07-25 15:28:05 -07:00
Brad Davis
8d37e54a4e Merge pull request #11051 from highfidelity/qt59
Changes for Qt 5.9 warnings and build issues
2017-07-25 15:05:28 -07:00
Brad Davis
030b54542c Merge pull request #11049 from jherico/qt59_temp
Move hosting for quazip back to hifi S3
2017-07-25 13:43:57 -07:00
Brad Davis
b1aa6e1962 Move hosting for quazip back to hifi S3 2017-07-25 13:43:10 -07:00
Zach Fox
30a571cc48 Merge pull request #11041 from amvmoody/wl_21472
WL 21472: restore snails ability to eat sprouts
2017-07-25 13:07:58 -07:00
Stephen Birarda
2d0c5ff37a remove preloading of allowed user keys since it happens on connect 2017-07-25 11:41:34 -07:00
Zach Fox
772372a031 Merge pull request #11044 from zfox23/contextOverlays_handleInsideBox
Handle the case when the camera is inside the bounding box of an entity
2017-07-25 11:16:39 -07:00
Zach Fox
c71dca5b4b Missed a magic number 2017-07-25 11:15:44 -07:00
Zach Fox
256b7efdd2 Handle the case when the camera is inside the bounding box of an entity 2017-07-25 11:06:54 -07:00
Ryan Huffman
6817cf9db4 Fix entity properties sometimes being resent
When writing entity properties to a packet, we start off with a list of
requested properties (`requestedProperties`) and keep track of which properties
didn't fit (`propertiesDidntFit`) the packet, which is intialized to
requestedProperties. As we pack the properties, we remove them from
propertiesDidntFit if they didn't need to be written or were able to be
packed. At the end we store propertiesDidntFit, and use it in the future
as our requestedProperties when we try to pack more data into a packet.

The bug: because of the order in which propertiesDidntFit is
initialized, it ended up always being the list of all properties for
that entity. This typically wasn't an issue because we usually go
through and try to append all of the properties, and if we don't need to
append them (because they aren't in requestedProperties)
we remove them from our propertiesDidntFit list. When we
don't have enough remaining space in the current packet for even the
entity header, which is fairly small, we don't bother trying to append
any of the properties. When this happens, propertiesDidntFit contains
the full list of properties, which we save for the next pass through the
entity, and use as our requestedProperties, causing us to resend entity
data again. In the worst case we never end up sending all of the
entity's data.
2017-07-25 10:59:03 -07:00
Zach Fox
40038ce54b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-25 09:33:07 -07:00
Zach Fox
483d1e5b96 Merge pull request #11033 from zfox23/contextOverlays_tabletOrientation
Hack to mod tablet orientation when clicking context overlay
2017-07-25 09:27:28 -07:00
Andrew Meadows
2446fcde8e Merge pull request #11039 from amvmoody/21477
WL 21477 Gravity Script
2017-07-25 08:59:22 -07:00
Andrew Meadows
9d1fba3a3b Merge pull request #10821 from ctrlaltdavid/21418
Don't execute body of controllers' plugin update methods if not enabled
2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6 Merge pull request #11029 from cain-kilgore/dominant-hands
WL 21453 - Add a "Dominant Hand" setting
2017-07-25 08:01:31 -07:00
Cain Kilgore
f9204a7034 Now it should appear.. 2017-07-25 09:03:47 +01:00
Mike Moody
34594b914d Added and removed different normalizations. 2017-07-24 23:55:44 -07:00
Mike Moody
dc53017dd4 Created script to let Snails eat brussel sprouts. 2017-07-24 23:17:13 -07:00
Andrew Meadows
a21da8613c Merge pull request #11028 from sethalves/script-getmeshes-for-models
Script getmeshes for models
2017-07-24 23:01:53 -07:00
Andrew Meadows
942a231a70 Merge pull request #11035 from highfidelity/bug/6740
Fixed bug: Disconnected domain (no access token present) is unnecessarily hitting /api/v1/user/friends
2017-07-24 22:43:37 -07:00
Cain Kilgore
2f857a6d1a Forgot a file 2017-07-25 06:05:06 +01:00
Seth Alves
a3f4aeb182 code review 2017-07-24 19:41:30 -07:00
Seth Alves
c4d909927a make atp-client work again 2017-07-24 19:23:39 -07:00
Seth Alves
d1037a49ae Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models 2017-07-24 19:23:30 -07:00
Mike Moody
1bf2855e9b Created script for spherical gravity. 2017-07-24 18:47:24 -07:00
Mike Moody
62efb32671 Created script for spherical gravity. 2017-07-24 18:39:09 -07:00
Mike Moody
e900dae708 Created script for spherical gravity. 2017-07-24 18:34:58 -07:00
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01:00
utkarshgautamnyu
5771ee27e1 Update DomainGatekeeper.cpp 2017-07-24 17:33:01 -07:00
Zach Fox
c22798a8e6 Offset tablet position to left of screen per feedback 2017-07-24 17:16:07 -07:00
Cain Kilgore
84609f27e3 Final Change - They're now Radio Boxes. 2017-07-24 23:53:03 +01:00
Chris Collins
8b978beb31 Merge pull request #11022 from 1P-Cusack/21463
WL21463 - entitySelectionTool: use multiarg findRayIntersection inste…
2017-07-24 15:13:21 -07:00
utkarshgautamnyu
884bdb3b7e Update DomainGatekeeper.cpp 2017-07-24 14:57:22 -07:00
utkarshgautamnyu
7c62ed6dac made sendRequest depend on hasValidAccessToken being true 2017-07-24 14:46:32 -07:00
Cain Kilgore
9c152ddc6f Ticking left will keep it on left, not right 2017-07-24 22:30:43 +01:00
Zach Fox
223ed5b59a Hack to mod tablet orientation when clicking context overlay 2017-07-24 14:29:06 -07:00
Seth Alves
23cb7d8bee Merge pull request #11030 from MiladNazeri/editJs-edit
Fix Parent Joint in edit js WL # 21471 :
2017-07-24 14:11:48 -07:00