Commit graph

44884 commits

Author SHA1 Message Date
James B. Pollack
24832df14a changes 2016-07-08 13:13:32 -07:00
David Kelly
c15ba90980 Merge branch 'master' of github.com:highfidelity/hifi into dk/firstLameAttempt 2016-07-08 13:04:20 -07:00
David Kelly
7a9b3978e9 Better processing of audio
A couple things Ken suggested.  First off, there are now AudioSRC
calls for floats, which simplfied stuff a bit.  Then, I switched to
grabbing network packets first, and only pulling at most that amount
of audio from the local injectors.  That improves things - the
occasional artifacts (when the injectors got more data than the
network for instance) are gone.

Also, fixed build issue (unused variable warning) for mac and android.
2016-07-08 13:01:06 -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 Hefta-Gaub
3c6447326e more codec plumbing 2016-07-07 21:24:24 -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
James B. Pollack
1a46366557 uncomment 2016-07-07 19:23:04 -07:00
James B. Pollack
f8ff0da901 trying to fix interaction with grab script... 2016-07-07 19:22:42 -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
James B. Pollack
7fa1dc7053 make thumb and trigger work in any order and on either button released 2016-07-07 16:36:40 -07:00
Seth Alves
11542aeca2 pick against avatar's capsule and then against the T-pose mesh 2016-07-07 16:36:25 -07:00
James B. Pollack
71392bc1b2 change to sphere now that sphere alpha works. 2016-07-07 16:30:30 -07:00
David Kelly
6cc085b48e Merge branch 'master' of github.com:highfidelity/hifi into dk/firstLameAttempt 2016-07-07 16:15:20 -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
David Kelly
600348bf10 Initial cut of htrf for mono localOnly injectors
Probably need to clean up a bit, but wanted to get this out there
for comment on more general issues, etc...

To test, I added a localOnly: true to the cow in the tutorial.
2016-07-07 16:07:41 -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
James B. Pollack
5c83db3b28 take care of naughty intervals 2016-07-07 14:37:51 -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
Anthony J. Thibault
aba6924dc7 Fix MyAvatar name and url accessors to JS.
Q_INVOKABLE does not support returning references.
MyAvatar.getFullAvatarURLFromPreferences() now returns a QUrl instead of a reference.
MyAvatar.getFullAvatarModelName() now returns a QString instead of reference.

This should fix the JS API for these methods, they will now receive a JS string instead of undefined.
2016-07-07 13:33:36 -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
James B. Pollack
4a9f6e677c add new target model 2016-07-07 12:52:24 -07:00
James B. Pollack
be770c8177 make thumb and trigger mode an option 2016-07-07 12:39:11 -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
James B. Pollack
93081e73d8 thumb and trigger 2016-07-07 12:12:22 -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
James B. Pollack
bd3fa60927 Merge branch 'viveteleporter' of github.com:imgntn/hifi into viveteleporter 2016-07-07 11:45:42 -07:00
James B. Pollack
8212ada4de introduce delay 2016-07-07 11:42:41 -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
Brad Davis
b73fe24848 PR feedback 2016-07-07 11:12:55 -07:00
Brad Davis
eff1c65388 Reduce the number of temporary objects in batch commands 2016-07-07 11:12:55 -07:00
Brad Davis
721cd79b57 Aggressive batch pre-allocation 2016-07-07 11:12:54 -07:00
Brad Davis
c7382ea886 Optimize updateModelBounds 2016-07-07 11:11:26 -07:00
Brad Davis
5be238db08 Suppressing glew link warnings 2016-07-07 11:10:59 -07:00
Brad Davis
09f2a10613 Add rendering performance tool 2016-07-07 11:10:58 -07:00
Brad Hefta-Gaub
38f0cd218b make client server plugins properly copy into plugins directory 2016-07-07 10:31:12 -07:00
Ryan Huffman
d2fedee656 Add missing loading images for Asset Browser 2016-07-07 10:22:52 -07:00
Seth Alves
6786a07ac2 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-07 09:53:24 -07:00
Brad Hefta-Gaub
ac2d3e1cc7 Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-07 09:47:19 -07:00
Brad Hefta-Gaub
7724065298 Merge pull request #8196 from howard-stearns/loaded-machine
an objective test of basic performance on struggling machines
2016-07-07 09:02:31 -07:00