Stephen Birarda
|
c01ff868de
|
comment audio library linkage to eve and injector
|
2013-07-12 10:49:28 -07:00 |
|
Stephen Birarda
|
8fb90602ba
|
send back rand int from 1 to 6 to specify raw file to grab
|
2013-07-12 10:33:38 -07:00 |
|
Stephen Birarda
|
fd64ec44a1
|
Merge branch 'master' of github.com:worklist/hifi into assignee
|
2013-07-12 10:19:15 -07:00 |
|
Stephen Birarda
|
9a2347c8b1
|
repair audio receive by correcting number of bytes
|
2013-07-12 10:18:29 -07:00 |
|
ZappoMan
|
a182c01b76
|
Merge pull request #659 from PhilipRosedale/master
Improvements to Avatar movement and jittering
|
2013-07-11 23:02:37 -07:00 |
|
Philip Rosedale
|
4e9530f946
|
Body slowly turns to follow touch look
|
2013-07-11 22:31:31 -07:00 |
|
Philip Rosedale
|
4e89c679b9
|
Oculus will work with touch look (hopefully)
|
2013-07-11 21:51:13 -07:00 |
|
Philip Rosedale
|
d2dd41ba0f
|
make thrust be in direction of head/view
|
2013-07-11 21:46:13 -07:00 |
|
Philip Rosedale
|
6609a850eb
|
Gyros and touch look now work at same time
|
2013-07-11 21:34:42 -07:00 |
|
Philip Rosedale
|
670de73384
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-07-11 19:52:39 -07:00 |
|
Philip Rosedale
|
4b95f2bae5
|
Better thrust values and no jittering when standing
|
2013-07-11 19:10:34 -07:00 |
|
Stephen Birarda
|
bc008624df
|
Merge pull request #658 from birarda/master
fix audio silence thanks to receive bail
|
2013-07-11 17:56:26 -07:00 |
|
Stephen Birarda
|
76dc01e84e
|
fix audio silence on receive bail
|
2013-07-11 17:55:59 -07:00 |
|
Stephen Birarda
|
9834c10610
|
movement to use AudioInjector classes in Operative code
|
2013-07-11 17:47:35 -07:00 |
|
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 |
|
Stephen Birarda
|
be59035ede
|
Merge pull request #656 from ZappoMan/bug_fixes
fix hungergames circle bug, and improve performance of isLeafOrLOD logic
|
2013-07-11 16:15:20 -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 |
|
Philip Rosedale
|
678b30f494
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-07-11 15:53:19 -07:00 |
|
Philip Rosedale
|
79b2703e1c
|
Improve avatar movement, added Physics.cpp for routines to help with physics calculations
|
2013-07-11 15:53:07 -07:00 |
|
ZappoMan
|
8774cb7ca0
|
fix hungergames circle bug, and improve performance of isLeafOrLOD logic
|
2013-07-11 15:48:17 -07:00 |
|
Stephen Birarda
|
4ebc381e40
|
update dummy operative code for change to packet type
|
2013-07-11 14:43:41 -07:00 |
|
Stephen Birarda
|
d6601ad333
|
resolve conflicts on merge with upstream master
|
2013-07-11 14:33:50 -07:00 |
|
Andrzej Kapolka
|
c3242598f5
|
Merge pull request #655 from ZappoMan/occlusion_culling
Make Delta Sending Default, Added option for "Low Res" mode while moving
|
2013-07-11 14:08:22 -07:00 |
|
ZappoMan
|
f878d549c0
|
Merge pull request #652 from ey6es/master
Improved compass fusion for gyros.
|
2013-07-11 13:55:40 -07:00 |
|
ZappoMan
|
c26e39764a
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-11 13:50:33 -07:00 |
|
ZappoMan
|
7175186e54
|
Merge pull request #654 from birarda/master
fix environment packet sending
|
2013-07-11 13:43:59 -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 |
|
Stephen Birarda
|
e96ed2bcbd
|
fix environment packet header length
|
2013-07-11 13:35:39 -07:00 |
|
Andrzej Kapolka
|
08d2c70db5
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-07-11 13:19:07 -07:00 |
|
ZappoMan
|
241bd7ce37
|
added support for lower LOD when moving with low res moving
|
2013-07-11 13:16:52 -07:00 |
|
ZappoMan
|
cb59df4b9e
|
Merge pull request #653 from birarda/master
refactor sendDomainServerCheckIn to avoid static variable threading issue
|
2013-07-11 13:08:15 -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
|
b201d13e31
|
refactor ping packet sending to push past version byte
|
2013-07-11 12:42:45 -07:00 |
|
Stephen Birarda
|
94b25a18aa
|
add a missing letter, use else-if in voxel-server
|
2013-07-11 12:39:33 -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 |
|
Andrzej Kapolka
|
ee77f59f48
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-07-11 12:25:51 -07:00 |
|
Philip Rosedale
|
489742f1e1
|
Merge pull request #650 from ey6es/kinected
Bugfix: Turn the camera off when disabled.
|
2013-07-11 12:15:17 -07:00 |
|
Andrzej Kapolka
|
4e524d7125
|
Compass tweaks: better initial extents, scale extents to compensate for
anisotropy, converge more quickly on compass heading.
|
2013-07-11 12:10:15 -07:00 |
|
Stephen Birarda
|
4eb25be14c
|
fix node ID return from domain server
|
2013-07-11 12:09:42 -07:00 |
|
Stephen Birarda
|
3ec81b1867
|
Merge pull request #651 from birarda/master
fix node type parsing in domain sever
|
2013-07-11 11:30:43 -07:00 |
|
Stephen Birarda
|
c80b5b6be4
|
parse the nodeType from the correct location in packet
|
2013-07-11 11:30:19 -07:00 |
|
Andrzej Kapolka
|
aa3f4c6f2c
|
Merge branch 'master' of https://github.com/worklist/hifi into kinected
|
2013-07-11 11:21:59 -07:00 |
|
ZappoMan
|
532b0b31f8
|
Merge pull request #628 from birarda/packet-versions
add a version number to each transmitted packet
|
2013-07-11 11:20:41 -07:00 |
|
Andrzej Kapolka
|
baca4353a8
|
Removed stray block.
|
2013-07-11 11:19:28 -07:00 |
|
Andrzej Kapolka
|
c6d01e0acc
|
Merge branch 'master' of https://github.com/worklist/hifi into kinected
|
2013-07-11 11:16:09 -07:00 |
|
Stephen Birarda
|
544f9c2e7a
|
type squish and magic number removal
|
2013-07-11 11:15:02 -07:00 |
|