Commit graph

16555 commits

Author SHA1 Message Date
Stephen Birarda
88a75a3585 fix for goToUser from ChatWindow 2014-09-12 11:27:54 -07:00
Stephen Birarda
348bcdb37a resolve conflicts on merge with upstream master 2014-09-12 11:23:16 -07:00
Stephen Birarda
1084483dd5 fix for default param of default constructed quat 2014-09-12 11:22:34 -07:00
Stephen Birarda
93ff34baaa force address bar lookup through handleLookupString 2014-09-12 11:21:38 -07:00
Stephen Birarda
ab7df8679d fix broken hifi linking 2014-09-12 11:19:22 -07:00
Stephen Birarda
b77a3f4904 cleanup application file event handler 2014-09-12 10:15:51 -07:00
Stephen Birarda
1f2020d169 some url handling repairs, move existing error reply handlers to new format 2014-09-12 10:13:33 -07:00
Stephen Birarda
7896119228 remap two goToUrl calls to AddressManager 2014-09-12 09:56:40 -07:00
Stephen Birarda
74295a3869 repairs for new location lookup 2014-09-12 09:52:34 -07:00
Stephen Birarda
745edb8b0a fix error handling for location naming 2014-09-12 09:10:47 -07:00
Philip Rosedale
8428b1a4ba Merge pull request #3401 from chansensturm/audio-noise
New stereo audio panning object
2014-09-11 17:53:55 -07:00
Stephen Birarda
5f6563f4c9 don't allow named location creation with no domain UUID 2014-09-11 17:42:04 -07:00
Craig Hansen-Sturm
ee0f8acaf4 Merge pull request #3396 from ZappoMan/someCleanup
Some cleanup
2014-09-11 17:38:40 -07:00
Stephen Birarda
7964180905 handle place creation at new API endpoint 2014-09-11 17:33:01 -07:00
Craig Hansen-Sturm
ecae9d5e85 compiler warnings 2014-09-11 17:20:15 -07:00
Stephen Birarda
b56ea5c936 centralize path creation from position and orientation to AddressManager 2014-09-11 17:17:47 -07:00
Craig Hansen-Sturm
1d0ba52445 implemented new audio panning object which implements constant power sin^2+cos^2=1 law 2014-09-11 17:15:49 -07:00
Brad Hefta-Gaub
f33bd82ed8 Merge pull request #3395 from PhilipRosedale/master
Updated move and butterfly scripts, entity renderer uses glutCube to temporarily fix crash
2014-09-11 14:32:14 -07:00
Stephen Birarda
afef42509d Merge pull request #3397 from birarda/fix-stuck-drive-key
fix for MyAvatar save crash
2014-09-11 14:13:45 -07:00
Stephen Birarda
52176786d0 use prefix and not postfix operator 2014-09-11 14:13:39 -07:00
Stephen Birarda
81758c9df6 fix for drive key clear enumeration 2014-09-11 14:12:23 -07:00
ZappoMan
7db2930d91 remove calls to calculateRotatedExtents() use Extents.rotate() instead 2014-09-11 12:33:38 -07:00
ZappoMan
ceb1740f38 handy conversions between AABox, AACube, and Extents 2014-09-11 12:33:24 -07:00
ZappoMan
a022d47792 improve constness for operators on PropertyFlags<> 2014-09-11 12:33:04 -07:00
ZappoMan
f88970f8fe moved Extents to shared 2014-09-11 12:32:47 -07:00
Philip Rosedale
5c77040235 remove debug print 2014-09-11 12:15:02 -07:00
Stephen Birarda
23a0ef2de1 remove some spacing in AddressManager 2014-09-11 12:13:13 -07:00
Philip Rosedale
d16b42ff47 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-11 12:11:28 -07:00
Philip Rosedale
385c88619a Merge pull request #3394 from birarda/fix-stuck-drive-key
fix for avatar drive keys
2014-09-11 12:09:37 -07:00
Craig Hansen-Sturm
0cc586d49f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-11 11:59:59 -07:00
Stephen Birarda
de24842cf0 fix stuck drive keys for Avatar when modifier released 2014-09-11 11:48:26 -07:00
AndrewMeadows
0e4de53c99 Merge pull request #3391 from chansensturm/audio-windows
log audio device framing errors, don't assert
2014-09-11 11:23:06 -07:00
Craig Hansen-Sturm
893d4686db comments 2014-09-11 11:18:05 -07:00
Stephen Birarda
6d21c4bf0d make lookup for hostnames case insensitive 2014-09-11 11:07:42 -07:00
Craig Hansen-Sturm
0d5f28c7df audio buffer framing issue / comments 2014-09-11 11:05:27 -07:00
Stephen Birarda
684aa97b98 add port parsing for domain hostname in address bar 2014-09-11 11:00:24 -07:00
Stephen Birarda
aaabe6b1e1 handle domain changes via address bar 2014-09-11 10:45:45 -07:00
Craig Hansen-Sturm
63b8dd2d77 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows 2014-09-11 10:43:01 -07:00
Craig Hansen-Sturm
f3e618bfb9 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-11 10:39:17 -07:00
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
Andrzej Kapolka
b1cfafdbe7 Missed a spot in the TextRenderer conversion. 2014-09-10 23:09:03 -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
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