samcake
744474982d
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-17 13:28:03 -07:00
Brad Davis
9ebc0c28c8
Fix hover states for toolbar buttons
2016-07-15 17:12:49 -07:00
Brad Davis
317dee1b23
Fix decoration inflation
2016-07-15 16:15:53 -07:00
Sam Gondelman
e24b064ccd
Merge pull request #8244 from BingShearer/logrolling
...
Delete Old Interface Logs If the Sum Size of Those Logs Exceeds Reasonable Size
2016-07-15 14:14:44 -07:00
Bing Shearer
9ee64d114b
Sam's space.
2016-07-15 13:47:36 -07:00
Brad Hefta-Gaub
574aaa9f28
Merge pull request #8248 from jherico/edit_toolbar
...
Migrate edit.js toolbar to the new toolbar API
2016-07-15 12:42:13 -07:00
Brad Hefta-Gaub
7bb31fe075
Merge pull request #8240 from jherico/hand_controller
...
Menu & hand controller polish
2016-07-15 12:36:31 -07:00
samcake
a3f6ed6a89
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-15 09:22:34 -07:00
Brad Davis
43e045c22a
Restore mouseover events for items in windows
2016-07-14 17:40:05 -07:00
Brad Davis
a6d71f508e
Fix edit toolbar button vanishing, persistent edit button
2016-07-14 17:40:04 -07:00
Brad Davis
fdcbf71623
Remove fade effect from toolbar buttons
2016-07-14 17:40:02 -07:00
Brad Davis
ffdaadf13c
Make toolbars work even when debugging a script
2016-07-14 17:40:02 -07:00
Brad Hefta-Gaub
45aa78702c
Merge pull request #8217 from sethalves/fix-throwing
...
fix throwing
2016-07-14 15:52:41 -07:00
Bing Shearer
4fb9d8801c
More coding standard fun!
2016-07-14 13:55:26 -07:00
Bing Shearer
9641ae8cd8
Coding standard fun!
2016-07-14 13:22:43 -07:00
Brad Davis
8d5b60a266
Simulate LTClick/RTClick for Oculus Touch and Hydra controllers
2016-07-14 12:30:17 -07:00
Brad Davis
882139ebcf
Allow scripts to override the navigation focus state set by QML dialogs
2016-07-14 12:10:46 -07:00
Brad Davis
cdffb453c6
Trigger 'nav select' on the new trigger click signal, not any trigger value
2016-07-14 12:07:38 -07:00
samcake
3ab56062d4
Address some warnings and syntax issues
2016-07-14 12:06:02 -07:00
Bing Shearer
be0446f9a9
Delete old logs if the sum size of those logs exceeds reasonable size.
2016-07-14 11:36:48 -07:00
Brad Davis
656da16c4d
Remove highlight animation duration on menus
2016-07-14 10:30:36 -07:00
Brad Davis
091e798267
Make hand pointer lasers 'click' on fully pressing and clicking the vive controller
2016-07-14 10:30:35 -07:00
Ryan Huffman
e18d664204
Merge pull request #8238 from hyperlogic/bug-fix/jumbo-fish
...
Support for scale property on model overlays
2016-07-14 05:22:56 -07:00
Anthony J. Thibault
789297d849
Remove redundant isValid check.
2016-07-13 17:39:39 -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
345478eb36
add removeButton API to ToolbarScriptingInterface
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
bb68e777e6
add a scripting interface to ignore users
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
samcake
8acc18ae8b
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-13 11:42:07 -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
Brad Hefta-Gaub
c4dba51337
Merge pull request #8226 from jherico/2d_glow
...
Add glow to UI hand lasers and termination points
2016-07-12 16:21:19 -07:00
Brad Hefta-Gaub
9fcecb6277
Merge pull request #8204 from hyperlogic/bug-fix/avatar-url-and-model-name-access-from-js
...
Fix MyAvatar name and url accessors.
2016-07-12 15:30:06 -07:00
Brad Hefta-Gaub
b8d79ec263
Merge pull request #8179 from SamGondelman/snapshotFix3
...
Various snapshot improvements
2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
819cab4aab
Merge pull request #8158 from sethalves/raypick-avatars
...
Raypick avatars
2016-07-12 15:27:30 -07:00
Brad Hefta-Gaub
84dfe1b0e9
Merge pull request #8219 from jherico/circles
...
Support alpha and color gradients in circle overlays
2016-07-12 15:25:49 -07:00
Seth Alves
0dd2171b75
remove commented-out code
2016-07-12 11:57:57 -07:00
Seth Alves
6c14ef3392
added a comment
2016-07-12 11:56:57 -07:00
Brad Davis
6242816f68
Adding glow to hand lasers
2016-07-12 10:10:01 -07:00
samcake
5d4b55eeea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-12 09:19:28 -07:00
samcake
ba7590712a
BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore
2016-07-11 18:33:57 -07:00
Seth Alves
85cc5f8956
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-11 18:02:18 -07:00
Seth Alves
62abe43996
Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing
2016-07-11 17:06:52 -07:00
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
