ZappoMan
|
72b2845178
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-06-13 09:40:45 -07:00 |
|
ZappoMan
|
0f234d739e
|
remove Camera menu from frustum debugging, because its obsolete and only causes problems
|
2013-06-12 21:44:49 -07:00 |
|
Andrzej Kapolka
|
ccd61ee5a2
|
Found the problem we were having: the domain server was reporting back all
kinds of things as our ID.
|
2013-06-12 16:13:44 -07:00 |
|
Andrzej Kapolka
|
19180ad900
|
Put the debugging back in.
|
2013-06-12 15:56:28 -07:00 |
|
Andrzej Kapolka
|
e4ed9162b9
|
This should help, as well as fix another annoyance: bind to an ephemeral port,
rather than a fixed one.
|
2013-06-12 15:52:29 -07:00 |
|
Andrzej Kapolka
|
f197b4cd62
|
Some debugging to use on the other machine.
|
2013-06-12 14:20:28 -07:00 |
|
Andrzej Kapolka
|
b28df17207
|
Slight tweak: we need to call trigger in order to get the full toggle
behavior.
|
2013-06-12 13:51:16 -07:00 |
|
Andrzej Kapolka
|
178996bb8b
|
Make sure first person mode and mirror mode are mutually exclusive.
|
2013-06-12 13:30:41 -07:00 |
|
Andrzej Kapolka
|
52c616b688
|
Added configurable lean scale, fixed loadSetting.
|
2013-06-12 13:06:28 -07:00 |
|
ZappoMan
|
627f61badb
|
some debug changes for testing occlusion culling
|
2013-06-12 12:36:28 -07:00 |
|
ZappoMan
|
636030b0bb
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-06-12 01:17:03 -07:00 |
|
ZappoMan
|
e2d22a8e21
|
latest cut at occlusion culling
|
2013-06-12 01:16:46 -07:00 |
|
Andrzej Kapolka
|
648aacb53d
|
Let's use a fixed vector for the camera position so that the target doesn't
move with lean.
|
2013-06-11 17:26:41 -07:00 |
|
ZappoMan
|
ac7fbc6320
|
added occlusion tests to debug menu
|
2013-06-11 13:29:01 -07:00 |
|
ZappoMan
|
ab365202c8
|
added some debugging routines to visualize occlusion
|
2013-06-11 12:36:15 -07:00 |
|
ZappoMan
|
74d63cdd1d
|
Merge pull request #522 from birarda/conditional-ds
allow agents to specify which agent types they want to hear about
|
2013-06-11 00:47:36 -07:00 |
|
ZappoMan
|
27f8f5dcb8
|
fix CR feedback
|
2013-06-10 14:50:04 -07:00 |
|
Stephen Birarda
|
a8075e44ca
|
Merge remote-tracking branch 'upstream/master' into conditional-ds
|
2013-06-10 14:01:54 -07:00 |
|
Stephen Birarda
|
7fb42dcb8a
|
fix bug with sent and received agent interest packets
|
2013-06-10 13:48:34 -07:00 |
|
ZappoMan
|
fc3fb7d3f0
|
fixed bug with loading of corrupt settings file where NaN returned for avatar position details
|
2013-06-10 11:46:06 -07:00 |
|
Philip Rosedale
|
fb97d3e04b
|
Merge pull request #520 from tschw/19367
Code Review for Job #19367
|
2013-06-10 08:04:16 -07:00 |
|
atlante45
|
c96e01ef51
|
Fixed merge conflict
|
2013-06-09 23:15:49 +02:00 |
|
atlante45
|
b1aabc2c1f
|
Added shortcup for gravity use
|
2013-06-09 23:02:45 +02:00 |
|
Geenz
|
8dea00052d
|
Merge branch 'master' of https://github.com/worklist/hifi into 19361
|
2013-06-09 02:08:29 -04:00 |
|
ZappoMan
|
b60df9ce89
|
Merge pull request #512 from ey6es/gyroquat
Fixes for preferences: store avatar voxel URL along with other avatar settings, use QAction rather than separate boolean for autosave.
|
2013-06-08 21:36:07 -07:00 |
|
ZappoMan
|
b69cfd4e06
|
fixed CR spacing issue
|
2013-06-08 17:27:48 -07:00 |
|
tosh
|
9ca0b5e7a7
|
removes blank lines that slipped in
|
2013-06-08 02:35:55 +02:00 |
|
tosh
|
d39b25a17b
|
adds menu option to set whether ground plane gets rendered
|
2013-06-08 02:31:23 +02:00 |
|
ZappoMan
|
46c66c39e5
|
implement keyhole frustum
|
2013-06-07 17:23:23 -07:00 |
|
atlante45
|
5c07638ce2
|
19369 - Added "Use Gravity" option
|
2013-06-08 02:05:54 +02:00 |
|
Andrzej Kapolka
|
ac2b7d7f48
|
Fix for initial camera transition.
|
2013-06-07 15:20:26 -07:00 |
|
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
|
fc27c2c7bb
|
more renaming for AGENT_TYPE_VOXEL_SERVER
|
2013-06-07 14:14:13 -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 |
|
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 |
|