Commit graph

44657 commits

Author SHA1 Message Date
Seth Alves
84c5bef487 back to ignore more recent 3 frames. don't have released entities collide with myAvatar until 0.25 seconds after release 2016-07-11 17:02:11 -07:00
Seth Alves
0d0e0925e5 try skipping 2 rather than 3 2016-07-11 16:00:55 -07:00
Seth Alves
1ef26d39eb blah 2016-07-11 15:31:15 -07:00
Seth Alves
b0f1492ac7 ignore 3 frames for current velocity rather than just 1 2016-07-11 15:08:00 -07:00
Seth Alves
9c17890035 try not including the most recent sample in the smoothed velocity 2016-07-11 14:18:28 -07:00
Seth Alves
53a366d4e8 measure velocity over 6 frames 2016-07-11 13:25:00 -07:00
Seth Alves
c034879b74 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 11:12:20 -07:00
Seth Alves
e0739dcc9c Merge pull request #8224 from sethalves/refresh-feature/grab-script-polish
Refresh feature/grab script polish
2016-07-11 11:11:13 -07:00
Seth Alves
7295e5c101 experimenting 2016-07-11 10:22:44 -07:00
Seth Alves
52a7c8e032 Merge branch 'feature/grab-script-polish' of github.com:hyperlogic/hifi into refresh-feature/grab-script-polish 2016-07-11 10:09:07 -07:00
Seth Alves
eac144f354 experimenting 2016-07-11 09:52:24 -07:00
Seth Alves
1cf57b27a9 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 08:57:11 -07:00
Clément Brisset
e893b17047 Merge pull request #8220 from highfidelity/revert-8215-fix/crash-packet-list
Revert "Fix crash in packet list"
2016-07-08 18:31:53 -07:00
Anthony J. Thibault
6f6fe5f244 reduced radius of grab sphere 2016-07-08 18:23:33 -07:00
Clément Brisset
d933238bda Revert "Fix crash in packet list" 2016-07-08 18:15:14 -07:00
Anthony J. Thibault
bec71e4af4 Went back to transparent spheres for equip points 2016-07-08 17:05:23 -07:00
Clément Brisset
f7b3155178 Merge pull request #8213 from birarda/long-script-name
Interface changes for new Marketplace
2016-07-08 16:57:25 -07:00
Stephen Birarda
15eb1dbafd Merge pull request #8215 from Atlante45/fix/crash-packet-list
Fix crash in packet list
2016-07-08 16:30:06 -07:00
Seth Alves
051616d7c3 experimenting 2016-07-08 16:16:06 -07:00
Atlante45
f0fcb94a6a Typos 2016-07-08 16:00:34 -07:00
Stephen Birarda
11aafc0f48 use endsWith for scriptURL check 2016-07-08 16:00:06 -07:00
Stephen Birarda
43967dc9a6 handle running of non .svo.json JSON files from mp CDN 2016-07-08 15:47:56 -07:00
Atlante45
b665f38c1f Don't process DomainList packets from 2 DS
case 1037
2016-07-08 15:16:41 -07:00
Atlante45
97da515585 Assign random UUID to DS without one. 2016-07-08 15:15:58 -07:00
Atlante45
70cf25bd8b Add missing read locks to LimitedNodeList's hash 2016-07-08 15:15:58 -07:00
Anthony J. Thibault
c8d0decab7 Fix for far grab not working until after edit button is pressed 2016-07-08 14:47:13 -07:00
Stephen Birarda
5bce924eda keep signature for askToLoadScript 2016-07-08 14:34:42 -07:00
Anthony J. Thibault
7d1f52da70 Added glow effect to search beam 2016-07-08 14:33:22 -07:00
Anthony J. Thibault
9242147394 Merge branch 'master' into feature/grab-script-polish 2016-07-08 13:40:01 -07:00
Brad Hefta-Gaub
d78eb19e44 Merge pull request #8194 from jherico/glow_lines
Support for glowing 3D line overlays
2016-07-08 12:50:35 -07:00
Anthony J. Thibault
1ec3472230 Model overlay dimensions fixes
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
2016-07-08 11:36:43 -07:00
Brad Davis
ae1dd29a7a Fix depth writing for glow lines 2016-07-08 10:27:53 -07:00
Stephen Birarda
216e47b29a hide the long URL prefix of scripts from marketplace 2016-07-08 09:43:11 -07:00
Brad Hefta-Gaub
5f71f77445 Merge pull request #8192 from AndrewMeadows/simple-hull-shapes
experimental ModelEntityItem collision shape options (no visual debugging)
2016-07-08 08:55:11 -07:00
Brad Davis
829a871d6f Merge pull request #8208 from SamGondelman/qmlFixes
Fixed issues in Browser.qml and UpdateDialog.qml
2016-07-07 19:51:37 -07:00
Brad Davis
c644c87e69 Fix glow line vanishing, improve transparency interaction 2016-07-07 19:01:41 -07:00
Anthony J. Thibault
0d454cd45e Equip hotspots render when your hand is near them. 2016-07-07 17:28:23 -07:00
Brad Hefta-Gaub
4c100ecc95 Merge pull request #8203 from jherico/zorder
Ensure newly shown windows are popped to the top of the zorder
2016-07-07 16:14:50 -07:00
Brad Hefta-Gaub
33d13956b7 Merge pull request #8206 from jherico/sphere_alpha
Fix rendering of overlay spheres with alpha
2016-07-07 15:39:29 -07:00
SamGondelman
99fc472d77 fixed errors in Browser.qml and UpdateDialog.qml 2016-07-07 14:06:57 -07:00
Brad Davis
828be94089 Fix rendering of overlay spheres with alpha 2016-07-07 14:04:59 -07:00
Brad Davis
8ca3630cfa Support glow effect in 3D line overlays 2016-07-07 13:36:48 -07:00
Brad Davis
790f74da1d Support geometry shaders 2016-07-07 13:36:47 -07:00
Andrew Meadows
e4828b03b1 fix crash when building shape before model loaded 2016-07-07 13:32:30 -07:00
Brad Davis
23700dc90f Ensure newly shown windows are popped to the top of the zorder 2016-07-07 13:16:59 -07:00
Brad Hefta-Gaub
348c7491b8 Merge pull request #8198 from jherico/gpu_perf_testing
Rendering performance testing tool
2016-07-07 12:28:14 -07:00
Brad Hefta-Gaub
6e724d246a Merge pull request #8200 from jherico/batch_cache
Batch optimizations
2016-07-07 12:26:49 -07:00
Brad Hefta-Gaub
eafd8999bc Merge pull request #8202 from jherico/cpu_opt_modelbounds
Optimize updateModelBounds
2016-07-07 11:52:44 -07:00
Brad Hefta-Gaub
6d78c9e7ad Merge pull request #8201 from huffman/fix/add-missing-loading-images
Add missing loading images for Asset Browser
2016-07-07 11:35:43 -07:00
Brad Davis
dfdc1ca1c6 Ensuring render thread is highest priority 2016-07-07 11:14:56 -07:00