Brad Hefta-Gaub
ee1f3ac38c
Merge pull request #8881 from jherico/offscreen_texture_memory_stats
...
Report offscreen texture memory usage in stats
2016-10-21 19:15:59 -07:00
Ryan Downe Karpf
f5a116fc92
Merge pull request #8880 from hyperlogic/feature/controller-display
...
Show hand controllers in away.js
2016-10-21 17:43:52 -07:00
Brad Davis
e9ac110072
Correct mip calculation
2016-10-21 17:05:56 -07:00
David Kelly
bdcb58bf8b
Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1
...
fix some data-races in logging system
2016-10-21 15:33:40 -07:00
Anthony J. Thibault
c431c69d60
Merge branch 'master' into feature/controller-display
2016-10-21 13:48:07 -07:00
Brad Davis
1bd398ae5e
Report offscreen texture memory usage in stats
2016-10-21 11:31:37 -07:00
Chris Collins
8481d0baa5
Merge pull request #8872 from birarda/master
...
always go to dev welcome when not using stable services
2016-10-21 06:16:26 -07:00
Anthony J. Thibault
2193c5faad
Integrated controller display from tutorial scripts + assets
2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
6279b273fc
Merge pull request #8867 from jherico/offscreen_textures
...
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
2016-10-20 17:07:29 -07:00
Philip Rosedale
8c5dd1170e
Merge pull request #8871 from howard-stearns/fix-system-hand-laser-flicker
...
fix flicker in system (inside the hud) hand-lasers.
2016-10-20 16:53:57 -07:00
Clément Brisset
b63eb6ba9f
Merge pull request #8665 from zzmp/feat/audio-stats
...
move audio stats to QML/JS, with graphs
2016-10-20 16:43:49 -07:00
Stephen Birarda
5886996bc3
always go to dev-welcome when not using stable services
2016-10-20 16:29:40 -07:00
howard-stearns
0141110805
fix flicker in system (inside the hud) hand-lasers.
2016-10-20 15:42:19 -07:00
Brad Davis
c27ee634ea
Fix debug compile issues
2016-10-20 13:56:01 -07:00
Brad Davis
9523660027
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
2016-10-20 11:55:25 -07:00
Seth Alves
b31acc421a
fix crash on startup
2016-10-20 10:36:14 -07:00
Seth Alves
8ac799ddaf
Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1
2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb
Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0
...
Fix some audio mixer data races
2016-10-20 10:01:26 -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
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
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
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
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
eb8f67b612
cleanup asset file regex, comment in renameMapping
2016-10-19 11:47:57 -07:00
Brad Davis
2705ee7030
Remove the use of implicit ids in geometry cache
2016-10-19 11:18:25 -07:00
Stephen Birarda
7aac2e6916
restrict asset file mapping operations to file path
2016-10-19 10:57:23 -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
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
Seth Alves
a801f27c7c
Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-1
2016-10-18 17:34:22 -07:00
Seth Alves
72998b190c
Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-0
2016-10-18 17:33:57 -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
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
Seth Alves
af5be8d1d9
reduce data-races in logging
2016-10-18 15:59:00 -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
