Commit graph

4043 commits

Author SHA1 Message Date
Stephen Birarda
1e05936aea unthread DS check in, allow agents to tell DS who they want to hear about 2013-06-07 15:19:12 -07:00
Stephen Birarda
17750bd5d2 remove ShareAudioFactors struct from audio-mixer 2013-06-07 15:00:33 -07:00
Andrzej Kapolka
096dcd089a Merge branch 'master' of https://github.com/worklist/hifi into gyroquat 2013-06-07 14:28:22 -07:00
Stephen Birarda
fc27c2c7bb more renaming for AGENT_TYPE_VOXEL_SERVER 2013-06-07 14:14:13 -07:00
Philip Rosedale
202c293a77 Merge pull request #513 from Atlante45/19366
19366 - Smaller log display
2013-06-07 14:13:49 -07:00
Stephen Birarda
95971b8303 rename AGENT_TYPE_VOXEL and PACKET_HEADER_DOMAIN_RFD 2013-06-07 14:12:42 -07:00
atlante45
b0d02ab7d8 19366 - Smaller log display 2013-06-07 23:02:00 +02:00
Andrzej Kapolka
5515fc02e4 Merge branch 'master' of https://github.com/worklist/hifi into gyroquat 2013-06-07 13:46:27 -07:00
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
Geenz
89ef026ce8 Remove seemingly unnecessary coordinate space conversion. 2013-06-07 16:42:22 -04:00
Geenz
65ec02044e Add a distance check for selected voxels. 2013-06-07 16:34:10 -04:00
Geenz
1c8d4f7717 Get the average velocity of the avatar. 2013-06-07 16:20:51 -04: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
Geenz
82db388552 Real max velocity stuff. 2013-06-07 16:08:27 -04:00
Geenz
c79bd71fe7 Merge branch 'master' of https://github.com/worklist/hifi into 19361 2013-06-07 16:00:33 -04:00
Geenz
86316bc674 Don't render the voxel selection when we're moving over a maximum velocity. 2013-06-07 16:00:13 -04:00
ZappoMan
15536f1188 Merge pull request #510 from birarda/conditional-ds
couple of patches
2013-06-07 12:04:49 -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
Stephen Birarda
c3915ed078 use system flag for external library includes 2013-06-07 11:34:01 -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
Stephen Birarda
222a596754 remove unnecessary OctalCode include in main 2013-06-07 10:59:40 -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
Geenz
7cefa3fe7b Check if our main window is our application window within Application's event handling functions. 2013-06-06 19:58:33 -04:00