Philip Rosedale
a5d6b2282e
Merge pull request #3201 from wangyix/master
...
moved audio stats to own overlay; audio stats now reset when audiomixer is killed;
2014-07-24 21:40:43 -07:00
Philip Rosedale
9a83be618a
Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine
...
ScriptEngine now inherit from QScriptEngine
2014-07-24 21:38:13 -07:00
Philip Rosedale
e272d0be75
Merge pull request #3203 from Atlante45/laser_pointer_js
...
Laser pointer js
2014-07-24 17:28:08 -07:00
Atlante45
9ca00b55a5
Spelling
2014-07-24 17:19:49 -07:00
AndrewMeadows
509b86f092
Merge pull request #3205 from birarda/select-library
...
lowercase the SIXENSE_ROOT_DIR
2014-07-23 18:01:23 -07:00
Stephen Birarda
e182f54180
exclude sixense debug on UNIX only, not APPLE
2014-07-23 17:52:50 -07:00
Philip Rosedale
f05855dcc2
Merge pull request #3199 from ey6es/master
...
Fix for shadows in close-up inset mirror.
2014-07-23 17:49:55 -07:00
Stephen Birarda
bc96975700
don't look for debug sixense on UNIX to avoid missing symbol
2014-07-23 17:49:38 -07:00
Clément Brisset
279a107272
Merge pull request #3200 from thoys/feature-multiple-JS-cursors
...
Feature multiple js cursors
2014-07-23 17:46:56 -07:00
Stephen Birarda
4cf27a0099
check in sixense not Sixense
2014-07-23 17:44:38 -07:00
wangyix
a36c9e872e
merged with upstream
2014-07-23 15:36:37 -07:00
wangyix
3abd383cd3
cleaned up code more
2014-07-23 15:26:49 -07:00
Thijs Wenker
49fcd302f4
AbstractControllerScriptingInterface matches ControllerScriptingInterface
2014-07-24 00:16:00 +02:00
Atlante45
0d039b1cdb
Fixed invokeMethod bug + removed debug
2014-07-23 14:38:37 -07:00
wangyix
663cbb76dd
removed seq num reset from Audio::reset()
2014-07-23 14:37:11 -07:00
Stephen Birarda
7afc62db15
Merge pull request #3202 from wangyix/7_23_seq_fix
...
fixes seq num errors when spacebar
2014-07-23 14:30:56 -07:00
wangyix
3ac4dfa333
gg
2014-07-23 14:28:32 -07:00
Atlante45
e1365a2927
Forgot one change
2014-07-23 14:19:47 -07:00
Atlante45
cc2bc1ef78
Merge branch 'master' of https://github.com/highfidelity/hifi into make_scriptEngine_a_qScriptEngine
2014-07-23 14:01:58 -07:00
wangyix
06ed8e4b63
fixed some typos in audio stats; cleaned up code
2014-07-23 13:47:03 -07:00
wangyix
bd8b7eb710
minor spacing issue
2014-07-23 12:44:16 -07:00
wangyix
142bda3ed4
fixed audio stats typos
2014-07-23 12:43:26 -07:00
wangyix
5eaa57b3ad
removed more warnings about unused vars
2014-07-23 12:10:25 -07:00
wangyix
4a4d065f00
another parseData change
2014-07-23 12:06:31 -07:00
wangyix
849c489b4c
removed warnings about parseData() overloading in ringbuffer classes
2014-07-23 11:20:30 -07:00
wangyix
ba4403b063
audio stats look good on Mac now
2014-07-23 11:18:25 -07:00
wangyix
5b0b484727
finished new audio stats (looks good on Windows)
2014-07-23 11:00:48 -07:00
Thijs Wenker
e36891fdf2
removed unused variable
2014-07-23 18:56:34 +02:00
Thijs Wenker
9d5c81bd67
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-23 16:59:23 +02:00
Thijs Wenker
b6cb19c2f6
FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors)
2014-07-23 16:55:59 +02:00
Andrzej Kapolka
9cf0d6c851
Fix for shadows in close-up inset mirror.
2014-07-22 19:19:13 -07:00
Philip Rosedale
9cee549bf0
Merge pull request #3198 from ey6es/master
...
Multiply local light colors by material diffuse reflectance.
2014-07-22 21:54:22 -04:00
Andrzej Kapolka
02bf76240a
Multiply local light colors by material diffuse reflectance.
2014-07-22 18:30:28 -07:00
Andrzej Kapolka
34dfbbedde
Merge pull request #3196 from PhilipRosedale/master
...
Tweaks to world and avatar lights, add angular acceleration to hair
2014-07-22 18:16:20 -07:00
Philip Rosedale
0b1c16d453
Merge pull request #3197 from ey6es/master
...
Not sure if everyone sees this or it's just my machine, but the frame rate slowed dramatically using the fixed function state for lights. This switches back to using uniforms.
2014-07-22 21:13:57 -04:00
Andrzej Kapolka
4f87524821
Switched back to using uniforms for light parameters, as using the fixed
...
function state killed my frame rate. Also cleaned up some of the location
tracking.
2014-07-22 18:03:13 -07:00
wangyix
d9692e4af4
changed a > to >= in handleAudioInput; added audio input buffer latency to stats;
2014-07-22 17:34:35 -07:00
Philip Rosedale
4f52098da1
tuning tweaks to world and avatar lights
2014-07-22 20:23:23 -04:00
Philip Rosedale
176473b5ba
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-22 19:29:42 -04:00
AndrewMeadows
07ce6c9a64
Merge pull request #3192 from ey6es/master
...
Fixes for local lights.
2014-07-22 16:24:17 -07:00
Stephen Birarda
4b690f9394
Merge pull request #3195 from birarda/master
...
repair for Visage find module base includes
2014-07-22 15:57:33 -07:00
Stephen Birarda
56efa46812
repair for Visage find module base includes
2014-07-22 15:56:22 -07:00
Andrzej Kapolka
d4904f976a
Missed the local light stats.
2014-07-22 15:50:08 -07:00
Andrzej Kapolka
aa145c8d20
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-22 15:40:42 -07:00
wangyix
c8ac1732ec
removed audio stats from old location
2014-07-22 14:53:45 -07:00
Stephen Birarda
7fb1391cc4
Merge pull request #3194 from birarda/master
...
fix faceshift definition
2014-07-22 14:49:07 -07:00
Stephen Birarda
5c955ca656
fix faceshift definition
2014-07-22 14:48:51 -07:00
Andrzej Kapolka
c085d09835
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-22 14:48:18 -07:00
Leonardo Murillo
82b6e7f784
Merge pull request #3193 from birarda/master
...
repairs to stubbed faceshft constructor
2014-07-22 15:42:18 -06:00
Stephen Birarda
19618182a3
don't show Faceshift option if not present
2014-07-22 14:40:53 -07:00
