Commit graph

44607 commits

Author SHA1 Message Date
James B. Pollack
1cda8afa40 simplify code 2016-07-08 13:37:59 -07:00
James B. Pollack
24832df14a changes 2016-07-08 13:13:32 -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
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
James B. Pollack
71392bc1b2 change to sphere now that sphere alpha works. 2016-07-07 16:30:30 -07:00
James B. Pollack
5c83db3b28 take care of naughty intervals 2016-07-07 14:37:51 -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
James B. Pollack
93081e73d8 thumb and trigger 2016-07-07 12:12:22 -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
James B. Pollack
3c3bad4d3b Merge remote-tracking branch 'upstream/master' into viveteleporter 2016-07-07 01:36:39 -07:00
James B. Pollack
54e0c131a5 cleanup and protect against some interval naughtiness 2016-07-06 18:30:50 -07:00
James B. Pollack
5626938fb4 add instant mode 2016-07-06 18:13:42 -07:00
James B. Pollack
1728878982 working smooth arrival 2016-07-06 17:52:18 -07:00
Brad Hefta-Gaub
41a74f7652 Merge pull request #8193 from huffman/fix/model-overlay-dims
Fix model overlays not correctly scaling
2016-07-06 16:17:22 -07:00
James B. Pollack
5cb585aec3 remove debug prints 2016-07-06 15:25:01 -07:00
James B. Pollack
696169ed37 terminate lines at intersection 2016-07-06 15:19:10 -07:00
James B. Pollack
dc8e21d76c cleanup stretchy stuff 2016-07-06 15:16:31 -07:00
James B. Pollack
e993a69519 last commit for stretched beams -- doesnt work at long distances due to lack of precision 2016-07-06 14:06:53 -07:00
James B. Pollack
b2ef491b97 rotate target toward you 2016-07-06 13:20:42 -07:00
James B. Pollack
2d073cc99c working teleporter in huffmans build 2016-07-06 12:31:03 -07:00
Ryan Huffman
7d803b7513 Fix model overlays not correctly scaling 2016-07-06 11:54:39 -07:00
Sam Gondelman
7a529b1484 Merge pull request #8188 from jherico/export_fix
Fix export entities by region
2016-07-06 10:27:19 -07:00
James B. Pollack
b0494ec9d5 bug notes 2016-07-05 17:48:30 -07:00
James B. Pollack
26950eaaa6 working second model adjustment with hack but wtf 2016-07-05 17:30:17 -07:00
James B. Pollack
c78dbe26b6 working initial beam, still trying to clear up no intersection beam issues 2016-07-05 17:25:21 -07:00
Andrew Meadows
a9dd2c7015 Merge pull request #8172 from sethalves/fix-issue-8159
fix canRezTmp logic (incorrectly) resets valid lifetimes to the maximum value
2016-07-05 14:47:05 -07:00
James B. Pollack
cbd1f8df88 add stuff for fading in/out and also for a nice stretchy beam 2016-07-05 13:11:14 -07:00
Brad Davis
d6250d4c5a Fix export entities by region 2016-07-05 10:37:53 -07:00
James B. Pollack
056e9e3a72 add teleport models etc 2016-07-05 10:31:47 -07:00
James B. Pollack
ac99ec04d0 Merge remote-tracking branch 'upstream/master' into viveteleporter 2016-07-05 10:28:07 -07:00
Clément Brisset
7c0879d919 Merge pull request #8183 from humbletim/fix-typedarrays
fix TypedArray byte ordering and .subarray indexing
2016-07-05 10:00:15 -07:00
James B. Pollack
ff745a345e remove dupe 2016-07-05 09:44:51 -07:00
Brad Hefta-Gaub
372f8245e6 Merge pull request #8162 from SamGondelman/snapshotFix
Snapshot takes picture of HMD window instead of preview
2016-07-05 09:25:59 -07:00
James B. Pollack
f4d409f1e1 fix typo 2016-07-05 09:22:19 -07:00
Brad Hefta-Gaub
e6df17d01d Merge pull request #8185 from ctrlaltdavid/20984
QA READY: prevent users window from being dragged off screen
2016-07-05 09:16:39 -07:00
David Rowe
0ad7aa72fb Prevent users window from being dragged offscreen 2016-07-04 14:34:38 +12:00
Brad Hefta-Gaub
87cdb4144d Merge pull request #8182 from kencooke/master
floating-point versions of the audio resampler and reverb
2016-07-03 18:48:22 -07:00
Ken Cooke
f43c6447e1 remove unneeded #pragma 2016-07-03 11:46:23 -07:00
Ken Cooke
014f6fa259 PR feedback: better naming of convertInput() and convertOutput() 2016-07-03 11:40:32 -07:00
Ken Cooke
f7c9957bb1 PR feedback: better naming of convertInput() and convertOutput() 2016-07-03 11:33:05 -07:00
Sam Gondelman
34042d51ad Merge pull request #8180 from ctrlaltdavid/fix-users-border
don't show users border when hover mouse if logged out
2016-07-03 03:14:17 -07:00
humbletim
b7874116b9 fix TypedArray byte ordering and .subarray end indexing 2016-07-02 23:36:08 -04:00
Ken Cooke
941067b9d0 Added floating-point audio reverb 2016-07-02 07:25:04 -07:00
Ken Cooke
ad8f17a142 Add support for deinterleaved float-point audio (native format) 2016-07-01 19:29:43 -07:00
Ken Cooke
d3c006b5da Added floating-point audio resampler 2016-07-01 18:50:53 -07:00
James B. Pollack
9b822f97c0 end of day 2016-07-01 17:26:52 -07:00
Stephen Birarda
e784d7c400 Merge pull request #8170 from huffman/fix/multiple-sessions
Fix multiple sessions being created for some users
2016-07-01 16:41:56 -07:00