Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 11:13:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3623 commits 71 branches 56 tags 1.2 GiB
Commit graph

3623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
75c89f2c22 OK, I found the problem: duplication of state for the "autosave" option. 
Let's just use the QAction, as does everything else.
 2013-06-07 13:42:49 -07:00
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
birarda
f42f248db2 Merge pull request #509 from ZappoMan/bug_fixes 
fix several delete/delete[] mismatches
 2013-06-07 10:51:18 -07:00
ZappoMan
ba7863605c fix several delete/delete[] mismatches 2013-06-07 10:49:43 -07:00
birarda
c2fd9d0d8d Merge pull request #508 from ZappoMan/color_reaveraging 
Color reaveraging fixes
 2013-06-07 10:36:16 -07:00
ZappoMan
065e85e328 rename server's VoxelTree and make it a color reaveragging tree 2013-06-07 10:29:56 -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
e57db88c07 remove redundant calls to reaverageVoxelColors() now only use recursion unwinding 2013-06-07 10:28:25 -07:00
ZappoMan
a7f13aadab Merge pull request #507 from ZappoMan/bug_fixes 
fix bug with animation server not sending entire billboard
 2013-06-07 10:02:58 -07:00
ZappoMan
b4c39c321c fix bug with animation server not sending entire billboard 2013-06-07 10:00:15 -07:00
Philip Rosedale
d8337536e7 Merge pull request #505 from ZappoMan/master 
Clean up menus slightly
 2013-06-07 09:43:14 -07:00
ZappoMan
887e3428c2 cleaned up menus slightly 2013-06-07 09:39:24 -07:00
ZappoMan
237fb9d31d Merge pull request #504 from ZappoMan/recursive_voxel_delete 
Just trying to get my branches in sync - no changes
 2013-06-07 09:25:38 -07:00
ZappoMan
20312e9f99 Merge branch 'master' of https://github.com/worklist/hifi into recursive_voxel_delete 2013-06-07 09:24:33 -07:00
ZappoMan
fb8fa60890 Merge pull request #501 from PhilipRosedale/master 
Added a timing test to debug menu that reports various usec times for common stuff we use
 2013-06-07 09:21:55 -07:00
ZappoMan
d94b5074c2 Merge branch 'master' of https://github.com/worklist/hifi into recursive_voxel_delete 2013-06-07 09:20:02 -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
Philip Rosedale
cbec812f09 Merge pull request #503 from Atlante45/19365 
Code Review for Job #19365
 2013-06-07 08:45:49 -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
Philip Rosedale
d2eedeb815 Merge pull request #499 from ey6es/gyroquat 
Converted gyro rotation computations to use quaternions, fixed coordinates and increased rate of convergence to current gravity.
 2013-06-06 16:13:32 -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
birarda
b40af0f02b Merge pull request #496 from ey6es/master 
Apply the head rotation to the head bones, show balls when no avatar voxel URL is set.
 2013-06-06 13:51:54 -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
birarda
519e4c5383 Merge pull request #498 from birarda/synthesis 
unlink STK from targets while not being used
 2013-06-06 11:58:13 -07:00
Stephen Birarda
233ce67379 don't link STK library while not being used 2013-06-06 11:57:38 -07:00