Commit graph

44855 commits

Author SHA1 Message Date
Anthony J. Thibault
e62d34136d Added haptics and hysteresis to drop gesture 2016-07-14 10:53:47 -07:00
Anthony J. Thibault
51cce939b3 removed shake to drop 2016-07-14 10:32:02 -07:00
Anthony J. Thibault
23ea85541c Animate equip hotspots scale instead of alpha 2016-07-14 10:24:08 -07:00
Anthony J. Thibault
66830a0538 First pass at equip sphere animation 2016-07-13 19:44:51 -07:00
Anthony J. Thibault
f3ef2801b4 Support for model overrides for equip hotspots rendering
Bug fix for modelScale on hotspots
2016-07-13 19:13:40 -07:00
Anthony J. Thibault
0ce970408c Fix for double rendering of equip hotspots 2016-07-13 19:13:40 -07:00
Anthony J. Thibault
848d5a8975 Reduce calls to Entity.getEntityProperties().
By using a single EntityProprtiesCache instance instead of one per controller.
2016-07-13 19:13:39 -07:00
Chris Collins
1c6b5e89ac Merge pull request #8239 from ZappoMan/codecPlugins
fix razor blades in your ears when switching between domains with no codecs installed
2016-07-13 17:25:47 -07:00
Chris Collins
ff2d7addd7 Merge pull request #8232 from birarda/ignore
add a script to ignore other avatars
2016-07-13 17:10:49 -07:00
Chris Collins
047688a494 Merge pull request #8209 from davidkelly/dk/firstLameAttempt
Initial cut of htrf for mono localOnly injectors
2016-07-13 17:07:50 -07:00
Brad Hefta-Gaub
a267843e3e fix razor blades in your ears when switching between domains with no codecs installed 2016-07-13 16:37:30 -07:00
Stephen Birarda
aa433e7233 handle click event on overlays only when in ignore mode 2016-07-13 16:23:40 -07:00
Stephen Birarda
946c7d4644 only handle trigger events when overlays are shown 2016-07-13 16:21:12 -07:00
Stephen Birarda
61975fe33a use correct function for peeked overlay 2016-07-13 15:47:52 -07:00
Stephen Birarda
9deb9744c6 handle trigger off in controller mapping 2016-07-13 15:34:20 -07:00
Stephen Birarda
cd1c114807 enable the trigger mapping so it's actually usable 2016-07-13 15:20:31 -07:00
David Kelly
dde4d16759 Merge branch 'master' of github.com:highfidelity/hifi into dk/firstLameAttempt 2016-07-13 15:15:35 -07:00
Stephen Birarda
30f55418db only prepare packet list packets if they need a message number 2016-07-13 15:06:31 -07:00
Stephen Birarda
cc9b72daa4 fix seeking in packet, use nodeActivated for ignore list send 2016-07-13 15:06:31 -07:00
Stephen Birarda
b68958317a re-send ignore requests when mixers are re-added 2016-07-13 15:06:31 -07:00
Stephen Birarda
a6f39d5e68 add code from entitySelectionTool to handle hmd overlay pick 2016-07-13 15:06:31 -07:00
Stephen Birarda
0918b55e7e add ignore to defaultScripts 2016-07-13 15:06:31 -07:00
Stephen Birarda
07c1777485 push the packet version for NodeIgnoreRequest 2016-07-13 15:06:31 -07:00
Stephen Birarda
5fc2afe549 switch to new icon for ignore target 2016-07-13 15:06:31 -07:00
Stephen Birarda
599d9c568a remove unneeded check from copy-paste 2016-07-13 15:06:31 -07:00
Stephen Birarda
aeabae4faf handle removal of an overlay for an avatar that is removed 2016-07-13 15:06:31 -07:00
Stephen Birarda
7bd8c45098 add the correct ignore icon, cleanup data structure 2016-07-13 15:06:31 -07:00
Stephen Birarda
22ab3fc7b5 cleanup a couple of comments 2016-07-13 15:06:31 -07:00
Stephen Birarda
154834b0ab hook up ignoring of user to overlay 2016-07-13 15:06:31 -07:00
Stephen Birarda
3c330d0c48 show simple overlay for script testing 2016-07-13 15:06:31 -07:00
Stephen Birarda
8724f0d0d9 add a stubbed version of the ignore script 2016-07-13 15:06:31 -07:00
Stephen Birarda
345478eb36 add removeButton API to ToolbarScriptingInterface 2016-07-13 15:06:31 -07:00
Stephen Birarda
39c7805ca2 don't process packets for ignored avatars 2016-07-13 15:06:31 -07:00
Stephen Birarda
609900f246 move ignore set handling to NodeList 2016-07-13 15:06:31 -07:00
Stephen Birarda
6b6513d5f9 immediately fade out ignored avatars 2016-07-13 15:06:31 -07:00
Stephen Birarda
d5af323057 don't self-ignore from UsersScriptingInterface 2016-07-13 15:06:31 -07:00
Stephen Birarda
095bd7e6c8 cleanup logging, move packet parsing to mixers 2016-07-13 15:06:31 -07:00
Stephen Birarda
441b6d2813 fix recursive mutex lock, conditional, logging 2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6 add a scripting interface to ignore users 2016-07-13 15:06:31 -07:00
Stephen Birarda
a134ac72de add packet type and plumbing for node ignore 2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub
487aacde3c Merge pull request #8216 from huffman/feat/improved-domain-loading
Update max request limit and number of processing threads
2016-07-13 14:47:24 -07:00
Brad Hefta-Gaub
f8910d475e Merge pull request #8225 from ZappoMan/codecPlugins
Audio codec plugins
2016-07-13 14:47:03 -07:00
David Kelly
c951f507e3 Fixed issue with calling setOptions
Since the stereo option is computed from the .wav file, if you call
setOptions later (like the cow.js does), it resets stereo to false.
So, I now just copy the stereo flag into the new options, since the
sound file is the same.

Also, calling AudioClient::outputLocalInjector on the AudioClient
thread now to avoid potential concurrency issues accessing the
vector of injectors.
2016-07-13 11:28:36 -07:00
David Kelly
8f41b8a5c9 Merge branch 'master' of github.com:highfidelity/hifi into dk/firstLameAttempt 2016-07-13 11:28:10 -07:00
Andrew Meadows
0d58274028 Merge pull request #8231 from AlexanderOtavka/fix-orientation
Fix orientation being reset to 0,0,0,1
2016-07-13 08:44:13 -07:00
Brad Hefta-Gaub
20b7ae2e1b Merge pull request #8222 from AndrewMeadows/better-simple-compound
simple-compound = wrap each render part of each submesh
2016-07-12 19:56:04 -07:00
Brad Hefta-Gaub
3aa0ec8900 Merge pull request #8229 from jherico/hmd_frame_resize
Expand frame decoration when mouse is over a window in HMD mode
2016-07-12 18:05:27 -07:00
Ryan Huffman
fcd59ea94f Update target number of processing threads to be based on system 2016-07-12 17:44:23 -07:00
Brad Davis
6336362d40 Fixing decoration inflation 2016-07-12 17:23:13 -07:00
Brad Davis
f2220288fb Expand frame decoration when mouse is over a window in HMD mode 2016-07-12 16:40:53 -07:00