Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 13:33:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28435 commits 71 branches 56 tags 1.2 GiB
Commit graph

28435 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
9a2f51c6de Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-16 14:12:19 -07:00
Ryan Huffman
b561014d77 Add head-lean reading back into AvatarData 2015-07-16 14:11:36 -07:00
Ryan Huffman
3429f0f57c Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-16 14:06:21 -07:00
Atlante45
60f44d8e6e Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-16 14:03:45 -07:00
Ryan Huffman
f8f47f99c6 Temporarily disable body lean in avatar 2015-07-16 14:03:36 -07:00
Atlante45
00fbff112f Process avatar data 2015-07-16 14:03:11 -07:00
Atlante45
a7754ad085 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 13:52:32 -07:00
Stephen Birarda
ed928e8a6b actual fix for AddressManager address with port 2015-07-16 13:52:18 -07:00
Atlante45
246b39a18a Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 13:42:08 -07:00
Stephen Birarda
5d84d2ec30 add port to current address if not default 2015-07-16 13:39:14 -07:00
Stephen Birarda
76d47eb4e7 mark the DataServerConfirm packet unused 2015-07-16 13:22:18 -07:00
Atlante45
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
Stephen Birarda
05dd49a4c5 seek back after track of octree packet 2015-07-16 13:02:20 -07:00
Stephen Birarda
60ae02e4e9 some formatting changes in entities 2015-07-16 12:38:39 -07:00
Stephen Birarda
3d6b246782 check version against version in OPP 2015-07-16 12:18:27 -07:00
Ryan Huffman
87f891288f Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-16 12:14:46 -07:00
Ryan Huffman
10c69fefe1 Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-16 12:14:36 -07:00
Ryan Huffman
1d1962d5f5 Fix avatar data processing 2015-07-16 12:10:28 -07:00
Stephen Birarda
7a48463f4e Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-16 12:09:55 -07:00
Stephen Birarda
8921f59e23 fix entity packet send from interface client 2015-07-16 12:09:35 -07:00
Stephen Birarda
61f23f6a5e Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-16 11:56:26 -07:00
Philip Rosedale
62fca613a6 Merge pull request #5345 from huffman/fix-edit-highlight 
Fix bug where edit.js highlights an object after being turned off
 2015-07-16 11:34:01 -07:00
Stephen Birarda
336967e580 fix edit packet sending from client 2015-07-16 11:17:49 -07:00
Ryan Huffman
cf0940a65d Fix edit.js highlighting an object after being turned off 2015-07-16 11:07:01 -07:00
Atlante45
bf637f8f18 Fix broadcast to nodes 2015-07-16 10:50:05 -07:00
Atlante45
ae8e79750b Stop ping timer in handle node kill 2015-07-16 10:00:54 -07:00
Atlante45
8424e91ae1 Added sequence number to packets 2015-07-16 10:00:01 -07:00
Atlante45
c6f6dbd845 Fix QByteArray from rqw data 2015-07-16 09:59:15 -07:00
Ryan Huffman
62ba20a837 Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-16 07:57:28 -07:00
Ryan Huffman
6f112f38c3 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-16 07:57:18 -07:00
Atlante45
d8f4b08ecc Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 19:04:06 -07:00
Stephen Birarda
039ef0750c set jurisdiction listener object name for thread identification 2015-07-15 18:52:59 -07:00
Stephen Birarda
6fa17dafff open packets for write with ReadWrite 2015-07-15 18:27:43 -07:00
Stephen Birarda
000232a55d fix copied packet buffer creation 2015-07-15 17:59:37 -07:00
Atlante45
e6d443f6f6 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 17:52:41 -07:00
Stephen Birarda
1752d5e7ca fix mix packet sample copy bug 2015-07-15 17:52:37 -07:00
Atlante45
9048c3fdc5 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 17:52:34 -07:00
Stephen Birarda
863cc3390a fix send of mixed audio stream packet from AM 2015-07-15 17:41:00 -07:00
Stephen Birarda
765e8cbb87 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-15 17:37:51 -07:00
Stephen Birarda
333cd77d9c cleanup call to parseAudioData 2015-07-15 17:20:02 -07:00
samcake
b7ac84e174 Merge pull request #5342 from ZappoMan/removeNakeGL 
remove some more dead code and naked gl
 2015-07-15 17:07:55 -07:00
Howard Stearns
01a3701b52 Merge pull request #5329 from SamGondelman/hydraFix 
Hydra hand and mouse fixes
 2015-07-15 19:03:04 -05:00
Andrew Meadows
eaa93c1a98 Merge pull request #5336 from sethalves/fix-polyvox-debug-vs-release 
Fix polyvox debug vs release
 2015-07-15 16:50:39 -07:00
Atlante45
f5ef94b6b3 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:47:24 -07:00
Stephen Birarda
9318f464a4 fix position of read in InboundAudioStream 2015-07-15 16:42:58 -07:00
Brad Hefta-Gaub
b276804e4f Merge pull request #5343 from samcake/daft 
Clearing Model.cpp from naked gl call references
 2015-07-15 16:40:10 -07:00
Atlante45
6c98c23524 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:36:22 -07:00
ZappoMan
5165210e11 fix Sams comment about comments 2015-07-15 16:35:20 -07:00
ZappoMan
d5a6e87a02 remove naked gl from Avatar::calculateDisplayNameTransform() 2015-07-15 16:34:23 -07:00
Stephen Birarda
273e92f1fd pass correct size for audio read 2015-07-15 16:34:00 -07:00