Commit graph

47605 commits

Author SHA1 Message Date
Brad Davis
1bd398ae5e Report offscreen texture memory usage in stats 2016-10-21 11:31:37 -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
Howard Stearns
ca0d6587b5 Merge pull request #8869 from hyperlogic/bug-fix/edit-picking-with-hand-controllers
edit.js: Fix for picking and manipulating objects via hand controllers.
2016-10-20 16:59:56 -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
Chris Collins
414a79d986 Merge pull request #8868 from huffman/fix/away-overlays
Remove showing of overlays in away.js
2016-10-20 16:42:05 -07:00
Howard Stearns
0eee6f8abd Merge pull request #8844 from huffman/fix/hud-position
Update default system toolbar position
2016-10-20 16:07:20 -07:00
howard-stearns
0141110805 fix flicker in system (inside the hud) hand-lasers. 2016-10-20 15:42:19 -07:00
Chris Collins
d431081da6 Merge pull request #8866 from sethalves/fix-crash-on-startup-2025
fix crash on startup
2016-10-20 13:56:46 -07:00
Brad Davis
c27ee634ea Fix debug compile issues 2016-10-20 13:56:01 -07:00
Seth Alves
96445f4dee Merge pull request #8861 from hyperlogic/feature/crowd-agent-attachment
Added attachment support to crowd-agent
2016-10-20 13:44:25 -07:00
Anthony J. Thibault
53864abaf2 edit.js: Fix for picking and manipulating objects via hand controllers.
The ray picking was not using the proper grab sphere offset, so it became detached from the visual ray, making picking difficult.
2016-10-20 13:37:31 -07:00
Ryan Downe Karpf
f0766c76e1 Merge pull request #8865 from howard-stearns/fix-resize-on-plugin-switch
fix resize on plugin switch
2016-10-20 12:40:31 -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
Ryan Huffman
fad0607bf6 Remove showing of overlays in away.js 2016-10-20 11:49:23 -07:00
Seth Alves
b31acc421a fix crash on startup 2016-10-20 10:36:14 -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
howard-stearns
6f283a4893 fix resize on plugin switch 2016-10-20 09:39:02 -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
Anthony J. Thibault
c3b05d6477 Added attachment support to crowd-agent 2016-10-19 15:02:55 -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
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