Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 02:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28750 commits 25 branches 0 tags 1.1 GiB
Commit graph

28750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
54edc6f993 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-07-17 16:04:45 -07:00
Stephen Birarda
6ba89a1c99 Merge pull request #8 from birarda/atp 
final fixes for new networking API
 2015-07-17 16:03:16 -07:00
ZappoMan
c20c6e4b90 fix retina in an Austin approved manner 2015-07-17 16:01:32 -07:00
Stephen Birarda
331bb54144 remove unused variable 2015-07-17 15:59:39 -07:00
Stephen Birarda
39272652e5 fix seeks in InboundAudioStream 2015-07-17 15:59:24 -07:00
Atlante45
151481d5bf Remove seek 2015-07-17 15:58:58 -07:00
Stephen Birarda
35c8a60f3b seek to correct place for bulk avatar data 2015-07-17 15:57:52 -07:00
Stephen Birarda
b71678dfdb repair constructor that takes QByteArray in PacketList 2015-07-17 15:47:37 -07:00
Sam Gateau
8a269b6972 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-17 15:47:27 -07:00
Sam Gateau
9eff19b0f7 add th emissing function 2015-07-17 15:47:17 -07:00
ZappoMan
03a44a1c80 fix retina 2015-07-17 15:45:42 -07:00
Stephen Birarda
9c9c3d5120 remove extra debug in PacketList 2015-07-17 15:44:17 -07:00
Stephen Birarda
0f534b9f7b fixes for new read and NLPacketList 2015-07-17 15:43:20 -07:00
Stephen Birarda
ad63be4efc Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 15:40:03 -07:00
Atlante45
e3f7c33767 Fix index check in setJointRotation 2015-07-17 15:39:25 -07:00
Stephen Birarda
dbc19cb467 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 15:39:20 -07:00
Atlante45
d505527e5a Remove setExtendedheader call 2015-07-17 15:38:36 -07:00
Atlante45
c97c2f0ed0 Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-17 15:32:45 -07:00
Stephen Birarda
59e14dfd65 Merge branch 'protocol' of https://github.com/huffman/hifi into atp 2015-07-17 15:32:09 -07:00
ZappoMan
ccd2f98a76 one more try 2015-07-17 15:28:25 -07:00
Stephen Birarda
34617f0391 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 15:28:01 -07:00
Stephen Birarda
9a4cc1308d fix packet list segment break 2015-07-17 15:27:57 -07:00
Ryan Huffman
1e7691941c Add raw data read to Packet 2015-07-17 15:27:29 -07:00
Atlante45
3f4041595a Fix compile error in connect 2015-07-17 15:26:04 -07:00
Andrew Meadows
32b1fe0918 proper fix for incorrect render of scaled entities 2015-07-17 15:21:02 -07:00
Atlante45
cbf7f7c2e1 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-17 15:16:21 -07:00
Stephen Birarda
8447046636 Merge pull request #7 from birarda/atp 
repairs for new networking code
 2015-07-17 15:07:58 -07:00
Howard Stearns
3de7801463 Merge pull request #1 from sethalves/rig 
Rig
 2015-07-17 17:01:40 -05:00
Seth Alves
8bc2a4424d Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-17 14:59:36 -07:00
Seth Alves
18197314c5 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-17 14:55:06 -07:00
Howard Stearns
d8287ac2b4 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-17 14:53:10 -07:00
Seth Alves
d287817829 give SkeletonModel created by MyAvatar a Rig pointer 2015-07-17 14:52:37 -07:00
Brad Hefta-Gaub
2df75f8bff Merge pull request #5337 from bwent/audioStatsDialog 
Added a dialog box to display Audio Network Statistics
 2015-07-17 14:45:51 -07:00
Stephen Birarda
fe0cdc0529 put AvatarHashMap slots back to private 2015-07-17 14:35:38 -07:00
Bradley Austin Davis
3bfa8aae0b Removing debug output 2015-07-17 14:34:24 -07:00
Brad Davis
914b47069b Working on line height 2015-07-17 14:33:32 -07:00
Bradley Austin Davis
24643ca282 Working on line spacing 2015-07-17 14:19:39 -07:00
Stephen Birarda
8ff8a17f02 remove TODO added for DS, check sockets 2015-07-17 14:17:48 -07:00
Stephen Birarda
8a2bb55231 add back a removed comment from jurisdiction map 2015-07-17 14:00:02 -07:00
Stephen Birarda
08bd2adb51 remove dead listeners from set of directly connected objects 2015-07-17 13:58:14 -07:00
bwent
5ba82faa4b keyLightDirection displays in degrees in edit.js UI 2015-07-17 13:52:00 -07:00
Brad Davis
6f998e5d28 Working on line spacing on mac 2015-07-17 13:32:31 -07:00
Seth Alves
4ec5f4c5b6 Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-17 13:31:56 -07:00
Seth Alves
bcd6b30ec3 move AnimationHandle from render-utils to animation. give Rig some jointstates and animation lists 2015-07-17 13:31:48 -07:00
ZappoMan
4dadf60724 some tweaks from Sam 2015-07-17 12:50:20 -07:00
Bradley Austin Davis
c5e0298f8d Working on mac sizing 2015-07-17 12:22:38 -07:00
Andrew Meadows
1c7afbda04 workaround for bad sphere radius 2015-07-17 12:14:53 -07:00
Andrew Meadows
f09b3eb736 set creation time when loading unknown timestamp 2015-07-17 12:14:07 -07:00
David Rowe
550e9224c5 Mute / un-mute face tracking when menu item is changed from script 2015-07-17 11:45:15 -07:00
ZappoMan
33464dfd6c cleanup dead code 2015-07-17 11:35:42 -07:00