ZappoMan
|
8331fc1acb
|
removed some old debug code
|
2013-06-18 10:19:49 -07:00 |
|
ZappoMan
|
7fe6c0e3b3
|
added occlusion culling menu option
|
2013-06-18 09:34:12 -07:00 |
|
ZappoMan
|
c9e1c898c2
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-06-14 19:50:38 -07:00 |
|
Philip Rosedale
|
04736fefb5
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-13 15:04:41 -07:00 |
|
Philip Rosedale
|
f6e6ceddfe
|
Head camera scaling always one if gyros off so that mouse look works.
|
2013-06-13 14:53:10 -07:00 |
|
Philip Rosedale
|
1556886a64
|
fixing reversed lookat, rendering for all avatars
|
2013-06-13 14:33:09 -07:00 |
|
Philip Rosedale
|
687966c486
|
Other people's avatar's look where they are mousing
|
2013-06-13 14:04:51 -07:00 |
|
Philip Rosedale
|
e32f9f387a
|
Basic random eye movements added, and fixation on camera in mirror mode.
|
2013-06-13 13:50:56 -07:00 |
|
ZappoMan
|
40c2cf2d44
|
removed some dead code
|
2013-06-13 13:31:26 -07:00 |
|
ZappoMan
|
8320925add
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-06-13 13:30:18 -07:00 |
|
Andrzej Kapolka
|
78072fbde0
|
Merge pull request #523 from PhilipRosedale/master
Better physics, first person to third person transition
|
2013-06-13 12:07:06 -07:00 |
|
Philip Rosedale
|
b85f91a7d4
|
fixes per code review
|
2013-06-13 12:05:06 -07:00 |
|
Philip Rosedale
|
61b1a2f995
|
First person to third person transition driven by velocity, changes to make moving and flying physics more fun.
|
2013-06-13 11:31:41 -07:00 |
|
Andrzej Kapolka
|
db729a04aa
|
Converted double timestamps to long long (64 bit integers), fixed bug with
updating agent timestamps.
|
2013-06-13 11:11:59 -07:00 |
|
ZappoMan
|
72b2845178
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-06-13 09:40:45 -07:00 |
|
Philip Rosedale
|
c0ba2aeebe
|
Added jumping, tuned friction model, tuned thrust
|
2013-06-12 23:45:59 -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 |
|
Philip Rosedale
|
a5a0df09cb
|
removed grab voxel rendering
|
2013-06-12 16:36:55 -07:00 |
|
Philip Rosedale
|
3d1ddf047e
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-12 16:27:53 -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 |
|
Philip Rosedale
|
311b09eee0
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-12 14:30:48 -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 |
|
Philip Rosedale
|
6cffb16279
|
merge fixes
|
2013-06-12 13:29:17 -07:00 |
|
Andrzej Kapolka
|
52c616b688
|
Added configurable lean scale, fixed loadSetting.
|
2013-06-12 13:06:28 -07:00 |
|
Philip Rosedale
|
26ca1a9a1d
|
Remove shortcut on ground plane 'G', was conflicting with turning gravity on/off
|
2013-06-12 12:58:45 -07:00 |
|
ZappoMan
|
627f61badb
|
some debug changes for testing occlusion culling
|
2013-06-12 12:36:28 -07:00 |
|
Philip Rosedale
|
3546bcc101
|
Avatar can set velocity, velocity set to zero on reset
|
2013-06-12 11: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 |
|
Philip Rosedale
|
750d210f0a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-11 21:20:39 -07:00 |
|
Philip Rosedale
|
ad58d0aa23
|
Adding voxel thrust on grabbing/dragging to move avatar
|
2013-06-11 21:19:58 -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 |
|
Philip Rosedale
|
57fcaceec2
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-11 11:10:41 -07:00 |
|
Philip Rosedale
|
b1e3a0984b
|
Improved mouse look behavior to be smoother, removed transmitter debug.
|
2013-06-11 11:10:09 -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 |
|