Andrzej Kapolka
|
9da10df9f2
|
We need to set these before initMenu, as that's where we create the QSettings.
|
2013-06-07 13:12:59 -07:00 |
|
Andrzej Kapolka
|
953aec35e6
|
Use the default QSettings constructor and let it get the application info
from the QCoreApplication properties.
|
2013-06-07 11:48:29 -07:00 |
|
Andrzej Kapolka
|
a5c24b5333
|
OK, we don't need this sync. Clearly the problem I was seeing on OS X lies
elsewhere.
|
2013-06-07 11:32:26 -07:00 |
|
Andrzej Kapolka
|
dc8a6c2725
|
Store the avatar voxel URL along with the rest of the avatar settings.
|
2013-06-07 11:30:41 -07:00 |
|
ZappoMan
|
ba7863605c
|
fix several delete/delete[] mismatches
|
2013-06-07 10:49:43 -07:00 |
|
ZappoMan
|
479e8c7811
|
add shortcut key for Kill Local Voxels to help debugging of LOD
|
2013-06-07 10:29:05 -07:00 |
|
ZappoMan
|
887e3428c2
|
cleaned up menus slightly
|
2013-06-07 09:39:24 -07:00 |
|
Philip Rosedale
|
dd0fa021a0
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-07 09:19:54 -07:00 |
|
Philip Rosedale
|
f0c9bd45bb
|
Fixed merge
|
2013-06-07 09:19:49 -07:00 |
|
ZappoMan
|
ece117e0b0
|
Merge pull request #502 from ey6es/gyroquat
Increase YAW_DECAY, remove roll from head camera, provide option for pitch/yaw scale (zero by default).
|
2013-06-07 09:17:11 -07:00 |
|
ZappoMan
|
27c3627e02
|
Merge pull request #500 from birarda/master
indentation and NULL comparison repairs in Avatar
|
2013-06-07 09:15:09 -07:00 |
|
atlante45
|
2a1730af72
|
#19365 - Frustum menu moved inside the Debug menu
|
2013-06-07 16:35:43 +02:00 |
|
Andrzej Kapolka
|
26de3028fa
|
We need to sync in order to ensure that the settings are saved.
|
2013-06-06 18:25:16 -07:00 |
|
Andrzej Kapolka
|
acc8efa026
|
One more "one more try."
|
2013-06-06 18:10:21 -07:00 |
|
Andrzej Kapolka
|
1b698b24e2
|
OK, one more try.
|
2013-06-06 18:05:39 -07:00 |
|
Andrzej Kapolka
|
ce68c1a6a4
|
Think this needs to be a double.
|
2013-06-06 18:03:38 -07:00 |
|
Andrzej Kapolka
|
e0e94481c9
|
Add pitch/yaw scale preference to control degree of view rotation.
|
2013-06-06 17:53:00 -07:00 |
|
Philip Rosedale
|
b5e63fb446
|
Added debug->run timing tests option to speed test some common functions (please add some more, bottom of util.cpp
|
2013-06-06 17:52:19 -07:00 |
|
Andrzej Kapolka
|
ffc1c33455
|
Removed double negation for coordinates, world aligned orientation -> camera
orientation, removed roll.
|
2013-06-06 17:25:52 -07:00 |
|
Stephen Birarda
|
bd553ef061
|
repair indentation and NULL comparisons in Avatar class
|
2013-06-06 16:01:36 -07:00 |
|
Andrzej Kapolka
|
a5abfbe1cd
|
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
|
2013-06-06 15:52:54 -07:00 |
|
Andrzej Kapolka
|
0dbb5375db
|
Approach the "down" direction more rapidly.
|
2013-06-06 15:50:14 -07:00 |
|
Andrzej Kapolka
|
a7c265d017
|
More compiley.
|
2013-06-06 15:44:38 -07:00 |
|
Andrzej Kapolka
|
ba6f2307ba
|
Coordinate fix.
|
2013-06-06 15:43:26 -07:00 |
|
Andrzej Kapolka
|
081f193db8
|
Add back yaw decay the quaternion way.
|
2013-06-06 14:34:28 -07:00 |
|
Andrzej Kapolka
|
d87e165b06
|
Acceleration is presumably relative to the current orientation.
|
2013-06-06 14:08:53 -07:00 |
|
Andrzej Kapolka
|
650981abfa
|
Remove the bounce term; it causes fluctuations in velocity.
|
2013-06-06 13:41:22 -07:00 |
|
Andrzej Kapolka
|
6ef7da5200
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-06 13:09:23 -07:00 |
|
Andrzej Kapolka
|
9afb1b3338
|
Enhanced workiness.
|
2013-06-06 13:09:00 -07:00 |
|
Andrzej Kapolka
|
f04e45b7c1
|
Use quaternions for rotation estimates.
|
2013-06-06 12:07:34 -07:00 |
|
Andrzej Kapolka
|
7f8b6fe0a6
|
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
|
2013-06-06 12:06:29 -07:00 |
|
Andrzej Kapolka
|
14f331b07d
|
Scratch that; need to do this in a branch.
|
2013-06-06 12:05:52 -07:00 |
|
Andrzej Kapolka
|
a851499684
|
Rework rotation estimation bits to use quaternions.
|
2013-06-06 12:03:50 -07:00 |
|
Stephen Birarda
|
233ce67379
|
don't link STK library while not being used
|
2013-06-06 11:57:38 -07:00 |
|
Stephen Birarda
|
ecd03d7b4b
|
replace magic number 1 with sizeof
|
2013-06-06 11:54:44 -07:00 |
|
Andrzej Kapolka
|
b13f22be26
|
Forgot to update the default pose position.
|
2013-06-06 11:14:57 -07:00 |
|
Andrzej Kapolka
|
56b4c04a18
|
Adjusted head base/top transforms.
|
2013-06-06 11:09:09 -07:00 |
|
Andrzej Kapolka
|
d9d6891cc8
|
Use the head rotation to adjust the position, too.
|
2013-06-06 10:54:28 -07:00 |
|
Andrzej Kapolka
|
27717bfcd4
|
Removed unused variables.
|
2013-06-06 10:48:35 -07:00 |
|
Andrzej Kapolka
|
2cc640b6f6
|
Set head bone rotation from head orientation.
|
2013-06-06 10:26:26 -07:00 |
|
Andrzej Kapolka
|
c1bccb04d1
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-06 10:21:10 -07:00 |
|
Philip Rosedale
|
0f4e6a447e
|
Merge pull request #493 from birarda/echo
add back audio echo option
|
2013-06-06 10:20:12 -07:00 |
|
Andrzej Kapolka
|
e0189c9834
|
Build fix, render body as balls if we don't have an avatar.
|
2013-06-06 10:17:57 -07:00 |
|
Andrzej Kapolka
|
80847b3884
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-06 10:10:07 -07:00 |
|
Andrzej Kapolka
|
7af42a1896
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/Avatar.cpp
|
2013-06-06 10:09:48 -07:00 |
|
Andrzej Kapolka
|
4cac35293a
|
Refer to body balls parents, not joint parents.
|
2013-06-06 10:08:15 -07:00 |
|
Philip Rosedale
|
b08fe8f915
|
merge fixes
|
2013-06-06 10:07:50 -07:00 |
|
Philip Rosedale
|
61d4ac2675
|
Fixes per code review.
|
2013-06-06 09:52:39 -07:00 |
|
Stephen Birarda
|
719af3b9e6
|
Merge branch 'master' of github.com:worklist/hifi into echo
|
2013-06-06 09:52:33 -07:00 |
|
Stephen Birarda
|
dd7c1fab2e
|
more spacing fixes in Avatar.cpp
|
2013-06-06 09:51:32 -07:00 |
|