Stephen Birarda
|
7c60fd4327
|
Merge pull request #657 from machinelevel/dev4
Some Leap finger fixes, but also temporarily disable Leap data sending, ...
|
2013-07-11 17:11:38 -07:00 |
|
ZappoMan
|
323644d877
|
CR feedback
|
2013-07-11 16:09:08 -07:00 |
|
Eric Johnston
|
58b50067ad
|
Some Leap finger fixes, but also temporarily disable Leap data sending, due to a crash.
Will resolve the crash before re-enabling.
|
2013-07-11 16:06:31 -07:00 |
|
ZappoMan
|
8774cb7ca0
|
fix hungergames circle bug, and improve performance of isLeafOrLOD logic
|
2013-07-11 15:48:17 -07:00 |
|
ZappoMan
|
c26e39764a
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-11 13:50:33 -07:00 |
|
Stephen Birarda
|
4cf0b7ea66
|
switch back to statics for domain server check in, fix environment packets
|
2013-07-11 13:40:29 -07:00 |
|
ZappoMan
|
241bd7ce37
|
added support for lower LOD when moving with low res moving
|
2013-07-11 13:16:52 -07:00 |
|
Stephen Birarda
|
66a998e752
|
correct use of member variables for DS check in
|
2013-07-11 13:05:15 -07:00 |
|
Stephen Birarda
|
a0226b2548
|
avoid static variable thread issue by switching to member variables
|
2013-07-11 13:02:25 -07:00 |
|
ZappoMan
|
57ce20d3ce
|
add support for Low Res sending while moving
|
2013-07-11 12:43:43 -07:00 |
|
Stephen Birarda
|
a1747725d3
|
sensible default for checkInPacketSize
|
2013-07-11 12:28:29 -07:00 |
|
Stephen Birarda
|
769205253f
|
remove extra plus in AvatarData parseData
|
2013-07-11 12:27:48 -07:00 |
|
Stephen Birarda
|
544f9c2e7a
|
type squish and magic number removal
|
2013-07-11 11:15:02 -07:00 |
|
Stephen Birarda
|
6804ab8a33
|
type squish in NodeList
|
2013-07-11 11:12:14 -07:00 |
|
Stephen Birarda
|
38a33e0283
|
couple more type squishes
|
2013-07-11 11:11:39 -07:00 |
|
Stephen Birarda
|
fcb8865d2e
|
resolve conflicts on merge with upstream master
|
2013-07-11 10:58:45 -07:00 |
|
ZappoMan
|
9aed3d3cc6
|
enable delta sending by default
|
2013-07-11 10:37:28 -07:00 |
|
ZappoMan
|
d4ce00de77
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-11 10:24:53 -07:00 |
|
Stephen Birarda
|
4ed231670f
|
put back the missing voxels
|
2013-07-11 10:04:27 -07:00 |
|
ZappoMan
|
5427b263f6
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-11 09:46:10 -07:00 |
|
Stephen Birarda
|
ca0f6a4d10
|
header re-arranging and changing
|
2013-07-11 09:30:45 -07:00 |
|
Stephen Birarda
|
211204e878
|
Merge remote-tracking branch 'upstream/master' into timestamps
|
2013-07-11 09:23:16 -07:00 |
|
Stephen Birarda
|
cbf18160cb
|
include stdint for uint64_t in SimpleMovingAverage
|
2013-07-11 09:22:08 -07:00 |
|
ZappoMan
|
34cebc36c7
|
short circuit node recursion for delta sending
|
2013-07-11 09:11:09 -07:00 |
|
ZappoMan
|
ab8e2916d3
|
improvements to delta sending
|
2013-07-10 19:49:50 -07:00 |
|
ZappoMan
|
dc70675c22
|
removed obsolete ResIn mode
|
2013-07-10 19:04:28 -07:00 |
|
ZappoMan
|
3d3eca9afa
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-10 17:45:04 -07:00 |
|
ZappoMan
|
371bf7d181
|
removed dead code, fixed compiler warning
|
2013-07-10 17:22:30 -07:00 |
|
ZappoMan
|
17e70271ff
|
make occlusion culling default
|
2013-07-10 17:21:51 -07:00 |
|
ZappoMan
|
2bb2fc736c
|
remove dead code
|
2013-07-10 17:14:34 -07:00 |
|
ZappoMan
|
1831cc0de3
|
removed level param from recursion
|
2013-07-10 17:06:22 -07:00 |
|
ZappoMan
|
62c933140d
|
implement max number of polygons in the coverage regions to keep them from getting slow
|
2013-07-10 16:57:42 -07:00 |
|
Andrzej Kapolka
|
100f7c19c3
|
Merge pull request #636 from PhilipRosedale/master
Touchlook tuned and always on!
|
2013-07-10 16:36:10 -07:00 |
|
ZappoMan
|
6694ef3869
|
fixed some compiler warnings
|
2013-07-10 16:33:27 -07:00 |
|
ZappoMan
|
4afda27ee0
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-10 16:28:51 -07:00 |
|
ZappoMan
|
3c150c3ec6
|
only get boundary distance once, since its the same for all grandchildren
|
2013-07-10 16:12:13 -07:00 |
|
Atlante45
|
425ea0aa29
|
merge conflict
|
2013-07-10 14:22:03 -07:00 |
|
ZappoMan
|
02437c6f39
|
fix random big average voxels slightly in view bug
|
2013-07-10 13:29:12 -07:00 |
|
ZappoMan
|
8bccfff5b5
|
fix random big average voxels slightly in view bug
|
2013-07-10 13:14:23 -07:00 |
|
Atlante45
|
7d94f65448
|
Linked ZLIB to voxels library
|
2013-07-10 13:00:16 -07:00 |
|
Atlante45
|
d79acea6a7
|
Merge branch 'master' of git://github.com/worklist/hifi into 19373
|
2013-07-10 12:46:50 -07:00 |
|
Philip Rosedale
|
dae79d8a55
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-07-10 12:20:45 -07:00 |
|
Philip Rosedale
|
2e854b5ed7
|
Tune and smooth 'Touch Look' and always turned on, old mouseLook code removed. Add vec3 speed test. Smooth simulation by passing exact deltaTime to update()
|
2013-07-10 12:20:26 -07:00 |
|
Stephen Birarda
|
ca8f25955a
|
switch usec timestamps to uint64_t
|
2013-07-10 11:46:48 -07:00 |
|
Stephen Birarda
|
c5df53ed52
|
fix cast to 0 for long long in SimpleMovingAverage
|
2013-07-10 11:26:39 -07:00 |
|
ZappoMan
|
845b8924a5
|
removed some dead code
|
2013-07-10 11:21:38 -07:00 |
|
ZappoMan
|
ed8c33ef4b
|
removed some comments
|
2013-07-10 11:19:49 -07:00 |
|
ZappoMan
|
d8b72cb126
|
removed some comments
|
2013-07-10 11:17:23 -07:00 |
|
ZappoMan
|
d89c3c8042
|
add version of recurse tree that uses pointer stack and allows timing breaks
|
2013-07-10 11:09:48 -07:00 |
|
ZappoMan
|
44357fcfb9
|
add 'level' param to tree recursion
|
2013-07-09 13:17:21 -07:00 |
|