Brad Hefta-Gaub
a282d83546
more work on extra lasers
2016-10-24 07:46:04 -07:00
Brad Hefta-Gaub
8a071f18b3
more work
2016-10-20 11:18:20 -07:00
Brad Hefta-Gaub
1a28732b64
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
...
Conflicts:
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
6109f41ae2
Merge pull request #8859 from Atlante45/seq-num-race
...
Fix sequence number race condition
2016-10-20 08:26:31 -07:00
Brad Hefta-Gaub
4a6101060c
Merge pull request #8862 from zzmp/fix/quick-leak
...
fix leak from qml surfaces' render controls
2016-10-20 08:23:28 -07:00
Brad Hefta-Gaub
bf732127ca
Merge pull request #8856 from jherico/geometry_ids
...
Remove the use of implicit ids in geometry cache
2016-10-20 08:14:49 -07:00
Brad Hefta-Gaub
9bfc8502f1
Merge pull request #8863 from zzmp/fix/quick-crash
...
fix intermittent crash on teleport from contextless Qt connection
2016-10-19 22:22:51 -07:00
Brad Hefta-Gaub
9008de72e0
Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments
...
Adjustment to position and visibility of grab sphere.
2016-10-19 21:51:02 -07:00
Brad Hefta-Gaub
e6e988c1a1
Merge pull request #8857 from howard-stearns/fix-crowd-animation-again
...
fix crowd animation again
2016-10-19 17:41:52 -07:00
Brad Hefta-Gaub
00d613a60e
Merge pull request #8848 from sethalves/quiet-compiler
...
quiet warnings in Linux build
2016-10-19 17:41:19 -07:00
Brad Hefta-Gaub
9cb0c973de
Merge pull request #8849 from zzmp/fix/shapekey-ref
...
fix invalid ShapeKey ref
2016-10-19 17:39:06 -07:00
Anthony J. Thibault
55c062098a
Adjustment to position and visibility of grab sphere.
...
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
2016-10-19 17:33:05 -07:00
Zach Pomerantz
02b4c43cff
delete _renderControl after use
2016-10-19 17:09:29 -07:00
Zach Pomerantz
df51646307
add ctx to qml surface cxs
2016-10-19 16:56:13 -07:00
Anthony J. Thibault
ca9d497159
Updated viveControllerConfiguration.js with new controller offset
...
(cherry picked from commit ec2bc3495082dfb0b472948efa9d6881562ed3f9)
2016-10-19 15:59:44 -07:00
Anthony J. Thibault
bcd31e3d99
Adjust size and offset of grab balls to better align with hand controllers.
...
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
2016-10-19 15:59:26 -07:00
Clément Brisset
6cf371becc
Merge pull request #8858 from huffman/fix/users-hide
...
Update users.js to be minimizable when logged out, and by default
2016-10-19 14:26:18 -07:00
Ryan Huffman
9dee1b85fe
Merge pull request #8855 from birarda/blank-asset-delete
...
force valid file path for asset file mapping operations
2016-10-19 14:22:26 -07:00
Atlante45
bc8554fd90
Fix sequence number race condition
2016-10-19 13:31:00 -07:00
Ryan Huffman
f42683cf8b
Update users.js to be minimizable when logged out, and by default
2016-10-19 13:19:29 -07:00
Stephen Birarda
e3f194b4dd
use the err directly on upload error
2016-10-19 12:41:01 -07:00
Howard Stearns
3f4ca27e76
Merge pull request #8839 from howard-stearns/unit-scaled-address-bar
...
Unit scaled address bar
2016-10-19 12:31:00 -07:00
howard-stearns
69a1415873
specify avatar skeleton
2016-10-19 12:29:18 -07:00
Brad Hefta-Gaub
aa50f460c3
Merge pull request #8851 from jherico/qml_limit
...
Rate limit QML web surfaces
2016-10-19 12:04:47 -07:00
Stephen Birarda
179cb67cdb
change order of asset upload failure changes
2016-10-19 11:55:54 -07:00
Stephen Birarda
eb8f67b612
cleanup asset file regex, comment in renameMapping
2016-10-19 11:47:57 -07:00
Stephen Birarda
b80f3fbd7b
fix error handling for failed asset upload
2016-10-19 11:37:35 -07:00
howard-stearns
36951c3c95
colors
2016-10-19 11:24:21 -07:00
Brad Davis
2705ee7030
Remove the use of implicit ids in geometry cache
2016-10-19 11:18:25 -07:00
howard-stearns
a5fc0d92a2
Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar
2016-10-19 11:11:05 -07:00
Stephen Birarda
7aac2e6916
restrict asset file mapping operations to file path
2016-10-19 10:57:23 -07:00
Seth Alves
e247f0aa34
Merge pull request #8850 from zzmp/fix/model-attachment-lifetime
...
ensure model attachment lifetimes
2016-10-19 09:56:02 -07:00
Seth Alves
7e4964db3e
Merge pull request #8684 from Menithal/controller-grab-unequip
...
Fixed HandcontrollerGrab distance unequip
2016-10-19 09:53:04 -07:00
Brad Hefta-Gaub
6bd193cdd8
hacking
2016-10-18 21:33:37 -07:00
Seth Alves
d0e1a69cc3
Merge pull request #8853 from birarda/web-engine-interceptor
...
move HFWebEngineProfile to interface/networking
2016-10-18 20:28:58 -07:00
Stephen Birarda
18523558f7
move HFWebEngineProfile back to interface/networking
2016-10-18 20:04:11 -07:00
Brad Davis
61e5e2861e
Rate limit QML web surfaces
2016-10-18 19:29:11 -07:00
Zach Pomerantz
a9bad592f9
ensure model attachment lifetimes
2016-10-18 18:01:18 -07:00
Zach Pomerantz
cf82cc3f50
fix invalid ShapeKey ref
2016-10-18 17:59:30 -07:00
Seth Alves
b936252609
quiet compiler
2016-10-18 17:56:57 -07:00
Seth Alves
2e73330e8e
quiet warnings in Linux build
2016-10-18 17:47:47 -07:00
Howard Stearns
20ed77d425
Merge pull request #8840 from Atlante45/keyboard
...
Add virtual keyboard for steam username collision
2016-10-18 17:34:55 -07:00
Stephen Birarda
9f2627d31d
Merge pull request #8828 from birarda/web-engine-interceptor
...
move HF access token to authorization header
2016-10-18 17:24:58 -07:00
Stephen Birarda
7a1fb8dd4f
Merge pull request #8677 from birarda/vegas-baby
...
Vegas
2016-10-18 16:44:30 -07:00
Stephen Birarda
22e0e649b1
add a comment for ack count calculations
2016-10-18 16:16:09 -07:00
Stephen Birarda
5bd6cc9fac
fix comparison for reno slow start
2016-10-18 16:01:35 -07:00
Stephen Birarda
ddce913095
cleanup math for leftover ACKs
2016-10-18 15:54:25 -07:00
Stephen Birarda
214d2e4c91
break slow start on vegas timeout loss
2016-10-18 15:54:25 -07:00
Stephen Birarda
71de9701e0
add some additional comments to reno congestion avoidance
2016-10-18 15:54:25 -07:00
Stephen Birarda
974cccf519
cleanup initialization of min RTT member variables
2016-10-18 15:54:25 -07:00
