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

28702 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
f8c832e50b resolve conflicts on merge with upstream master 2015-07-17 16:48:46 -07:00
ZappoMan
26e8090ec1 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 16:48:42 -07:00
Brad Hefta-Gaub
3ea348b73b Merge pull request #5349 from jherico/marge 
Working on text rendering overlays
 2015-07-17 16:47:48 -07:00
Stephen Birarda
9794770815 put back correct include for memcpy 2015-07-17 16:38:20 -07:00
ZappoMan
eb989fd725 fix the backround colors for text overlays, pending austins PR to really fix them 2015-07-17 16:38:05 -07:00
Stephen Birarda
6419e49f4b call QIODevice constructor from Packet copy 2015-07-17 16:35:26 -07:00
Ryan Huffman
5ae1af0d62 Update users.js to persist isMinimized value 2015-07-17 16:33:24 -07:00
ZappoMan
695470b1c1 fix audio scope 2015-07-17 16:30:10 -07:00
Stephen Birarda
c846efb203 fix type in Packet constructor 2015-07-17 16:24:25 -07:00
Stephen Birarda
1a1c2d6bbe prepend module to QIODevice include 2015-07-17 16:20:53 -07:00
Stephen Birarda
30ee80313e add memory include for PacketList 2015-07-17 16:18:58 -07:00
Stephen Birarda
487f9dc45d add atomic include for NetworkPeer 2015-07-17 16:17:10 -07:00
ZappoMan
8692f51399 dead code cleanup 2015-07-17 16:15:02 -07:00
Stephen Birarda
1fd4a1f0c3 resolve conflicts on merge with upstream master 2015-07-17 16:07:45 -07:00
Howard Stearns
7accc53c0e Merge pull request #5353 from AndrewMeadows/beryllium 
cleanup of EntityItem ctors and friends
 2015-07-17 18:07:35 -05:00
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
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