samcake
219b41e813
Fix the mini mirror perf issue and improve the debugDeferredLighting script
2016-07-13 17:37:35 -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
3154c68769
Merge branch 'master' of https://github.com/highfidelity/hifi into macSandboxPlugin
2016-07-13 17:05: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
Anthony Thibault
1d77cec125
Support for scale property on model overlays
...
If "scale" property is present but "dimensions" are not, the model is NOT scale to fit.
And the scale of the model's natural dimensions will be affected by the scale properties.
If only the "dimensions" property is present, the model will "scale to fit" the dimensions.
If both properties are present, the model still be "scale to fit" but the dimension will be scaled by the scale factor.
For example:
If a model is loaded that is 2cm tall, is loaded with no "dimensions" or "scale" properties.
It will be displayed as 2cm tall.
{"scale": 2}
The above properties will result in a model that is 4cm tall.
{"dimensions": 1}
This will result in a model that is 1cm tall.
{"scale": 2, "dimensions" 2}
Will result in a model that is 2cm tall.
2016-07-13 16:09:56 -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
Andrew Meadows
cba49be9ea
fix compile bug
2016-07-13 15:13:35 -07:00
Andrew Meadows
c106f4c3a0
fix crash for null pointer
2016-07-13 15:13:35 -07:00
Andrew Meadows
3e43859139
setCollisionModelURL() more symmetric with setURL()
2016-07-13 15:13:35 -07:00
Andrew Meadows
4bebb682dc
namechange: fetchResource --> getGeometryResource
2016-07-13 15:13:35 -07:00
Andrew Meadows
c50d41c532
finish name changes as per PR feedback
2016-07-13 15:13:35 -07:00
Andrew Meadows
25fdea6bac
fix for change of API after rebase
2016-07-13 15:13: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
Andrew Meadows
9f7d2cf263
NetworkGeometry --> GeometryResourceWatcher
...
Model class gets render and collision geometries with watchers
also changed names for readability
2016-07-13 15:00:12 -07:00
Andrew Meadows
f6681d4b3d
remove unused cruft
2016-07-13 15:00:12 -07:00
Brad Hefta-Gaub
b6ffabf500
attempt to get mac sandbox plugins to work
2016-07-13 14:58:27 -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
Ryan Huffman
b4b7b7ea34
Update all asset server responses to be reliable
2016-07-13 13:41:45 -07:00
samcake
8acc18ae8b
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-13 11:42:07 -07:00
Brad Hefta-Gaub
9c441d8946
Merge pull request #8233 from samcake/skin
...
Skin
2016-07-13 11:29:27 -07:00
