Commit graph

16707 commits

Author SHA1 Message Date
Stephen Birarda
dd1b23044f hook meta+enter up to address bar display 2014-09-11 10:24:04 -07:00
Stephen Birarda
71f2c0b542 initial addition of the AddressManager with location switch hooked up 2014-09-11 10:14:00 -07:00
AndrewMeadows
49af620665 Merge pull request #3393 from ey6es/master
shared TextRenderer instances; hostname for Faceshift connection
2014-09-11 09:20:47 -07:00
AndrewMeadows
d3d4717a92 Merge pull request #3385 from ctrlaltdavid/19933
Code Review for Job #19933
2014-09-11 08:39:51 -07:00
ZappoMan
f00947ada7 handle registration point in rendering of box, sphere, and model entities 2014-09-11 08:33:41 -07:00
Andrzej Kapolka
b1cfafdbe7 Missed a spot in the TextRenderer conversion. 2014-09-10 23:09:03 -07:00
ZappoMan
a3e3a1dc2b cleanup dead code 2014-09-10 20:07:45 -07:00
Andrzej Kapolka
7b3d06a783 Add option to change Faceshift hostname. 2014-09-10 19:34:21 -07:00
Philip Rosedale
634bfe5e1d remove renamed script 2014-09-10 19:02:22 -07:00
Philip Rosedale
0078b45a8f update headMove to have optional concept of a room that we cannot escape, update and rename butterflies script 2014-09-10 19:00:24 -07:00
Andrzej Kapolka
de8dd4cecc Share instances of TextRenderer. 2014-09-10 18:55:36 -07:00
ZappoMan
a3e47aa301 fix angular velocity damping so we don't get bad quats 2014-09-10 17:46:50 -07:00
Philip Rosedale
2216f89b8d Merge pull request #3392 from ey6es/master
Fixes for 3DTV/Oculus (deferred lighting/ambient occlusion/glow/culling/pointers).
2014-09-10 17:43:53 -07:00
Craig Hansen-Sturm
bc29c73d61 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-10 17:35:42 -07:00
Andrzej Kapolka
8762073853 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-10 17:04:57 -07:00
Andrzej Kapolka
146a6526be Fix for Oculus mouse pointer. 2014-09-10 17:02:04 -07:00
Craig Hansen-Sturm
18975aef57 log audio device framing errors, copy as much data as we can, but don't assert 2014-09-10 16:48:35 -07:00
Philip Rosedale
07eba40e33 Merge pull request #3390 from chansensturm/audio-windows
Fix for stereo/mono and echo local server regression
2014-09-10 16:40:51 -07:00
Andrzej Kapolka
590c8042f8 Attempting to fix a bug in the Oculus overlay. 2014-09-10 16:36:32 -07:00
Craig Hansen-Sturm
ca4d1375f5 fix for recent stereo/mono and echo local server regression 2014-09-10 16:21:06 -07:00
Andrzej Kapolka
fe249ef348 Make sure the frustum that we use for culling contains the current camera
information.
2014-09-10 15:51:10 -07:00
ZappoMan
cbdaf76b88 dry up the EntityItemProperties::copyFromScriptValue() with macros for repeated blocks 2014-09-10 15:39:00 -07:00
Andrzej Kapolka
34ccc2ab7b Use the FBO dimensions, which may differ from the widget dimensions (as with
the Oculus).
2014-09-10 15:13:07 -07:00
Stephen Birarda
ee6a90dd54 allow domain to pass down its ID from config 2014-09-10 15:13:02 -07:00
ZappoMan
8339dfaeb3 fix EntityItemProperties::markAllChanged() 2014-09-10 15:05:27 -07:00
ZappoMan
0d80c32306 editModels debug cleanup 2014-09-10 14:51:58 -07:00
ZappoMan
8023735eb3 changed rotational to angular and added angular damping 2014-09-10 14:46:27 -07:00
Andrzej Kapolka
b328304da4 Up/down, not top/bottom. 2014-09-10 14:15:00 -07:00
Andrzej Kapolka
600f36aa64 Fix for Oculus API. 2014-09-10 14:14:02 -07:00
Andrzej Kapolka
423e6d0594 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-10 13:51:46 -07:00
Andrzej Kapolka
2cba7b37bf Attempting to fix 3DTV/Oculus deferred lighting/ambient occlusion. 2014-09-10 13:51:14 -07:00
Andrzej Kapolka
c9ed83ac14 Merge pull request #3389 from chansensturm/audio-windows
Windows/VS2013 Hot Fix
2014-09-10 13:45:05 -07:00
Craig Hansen-Sturm
cb8e832257 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows 2014-09-10 13:14:21 -07:00
Craig Hansen-Sturm
cf6fd4a66f Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows 2014-09-10 13:07:18 -07:00
Craig Hansen-Sturm
015fdec6bd Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows 2014-09-10 13:05:52 -07:00
Andrzej Kapolka
c5ad603321 Fix for glow disabled in 3D TV mode. 2014-09-10 12:47:46 -07:00
Andrzej Kapolka
2fde67be72 Fix for deferred lighting with 3DTV (/Oculus, although I haven't tested that
yet).
2014-09-10 12:40:03 -07:00
wangyix
7a2897fb6b fixes/patches for win32/vs2013 startup and shutdown 2014-09-10 12:24:59 -07:00
ZappoMan
f33690cc38 fix velocity and gravity to be in meters 2014-09-10 11:55:23 -07:00
ZappoMan
bb52c4a1b3 store angular valocity as 3 vector 2014-09-10 11:28:45 -07:00
ZappoMan
d4dad8f4d8 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 2014-09-10 10:45:57 -07:00
ZappoMan
7283e7818f moved macros to sep file 2014-09-10 09:19:24 -07:00
ZappoMan
53da483381 more work on visible, registration point, and rotational velocity 2014-09-10 09:05:46 -07:00
AndrewMeadows
f3b8d68c65 Merge pull request #3381 from chansensturm/audio-noise
Hot FIX:  pulse audio input device frame size
2014-09-10 08:25:42 -07:00
Thijs Wenker
cb907c1891 GlobalServicesScriptingInterface added, functions and properties functional 2014-09-10 13:57:38 +02:00
Philip Rosedale
ccd57163d0 Merge pull request #3388 from ZappoMan/quietDebug
silence some over active debug messages
2014-09-09 20:58:54 -07:00
Philip Rosedale
da057b468e Merge pull request #3387 from ZappoMan/nonBlockingForms
add support for non blocking forms
2014-09-09 20:56:58 -07:00
Philip Rosedale
4294da20bc Merge pull request #3386 from ZappoMan/getUnscaledMeshExtents
add getUnscaledMeshExtents to FBXGeometry
2014-09-09 20:51:23 -07:00
ZappoMan
e88726c7c5 silence some over active debug messages 2014-09-09 20:41:56 -07:00
ZappoMan
fac7d20c8a basic support for PROP_REGISTRATION_POINT, PROP_ROTATIONAL_VELOCITY, and PROP_VISIBLE 2014-09-09 20:38:58 -07:00