Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 22:54:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28349 commits 71 branches 56 tags 1.2 GiB
Commit graph

28349 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
Stephen Birarda
00c1dce3e5 disconnect readyRead in LimitedNodeList dtor 2015-07-15 16:16:26 -07:00
Stephen Birarda
dd4c2eaccd add seek back for ping packet 2015-07-15 16:10:32 -07:00
Atlante45
4db2a77f9f Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 15:58:28 -07:00
Atlante45
f065638748 Ping code cleanup 2015-07-15 15:58:14 -07:00
Stephen Birarda
97936c82f2 add a missing library link 2015-07-15 15:58:05 -07:00
Stephen Birarda
85a5d7059c fix naming of variable in timePingReply 2015-07-15 15:56:31 -07:00
Atlante45
a39610da09 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 15:50:39 -07:00
Stephen Birarda
52fdce4a44 fix fromRawData call for silent audio packet 2015-07-15 15:41:45 -07:00
Atlante45
8aa2892fde Remove OctreePacketProcessor dtor 2015-07-15 15:35:13 -07:00
Atlante45
725383e43a Check ptr, not addr 2015-07-15 15:30:54 -07:00
Atlante45
8483b168be Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 15:26:34 -07:00
Atlante45
85391cefbb Bug fixes 2015-07-15 15:26:22 -07:00
Stephen Birarda
f45c62413f remove definition of OctreePacketProcessor dtor 2015-07-15 15:19:41 -07:00
Stephen Birarda
5a2a3009c2 don't double unregister in OctreePacketProcessor 2015-07-15 15:13:31 -07:00
Stephen Birarda
5a2d59c530 fix ScriptEngine cleanup for Agent 2015-07-15 15:07:34 -07:00
Brad Hefta-Gaub
7d8f2e906b Merge pull request #5340 from cozza13/20617 
CR for Job #20617 - Change default Minimum Desktop FPS
 2015-07-15 14:59:43 -07:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect 
Remove the glow effect.
 2015-07-15 14:50:15 -07:00
Brad Hefta-Gaub
ae6e7f05b6 Merge pull request #5341 from samcake/daft 
Remove the glGet( viewport ) from DeferredLightingEffect
 2015-07-15 14:26:08 -07:00
samcake
5e2fe8dbec Merge pull request #5333 from ZappoMan/removeNakeGL 
Remove more naked GL
Tested
 2015-07-15 14:19:05 -07:00
Atlante45
ebeeee62bf Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 14:07:06 -07:00
Atlante45
039bdc8900 Check dependencyManager return value 2015-07-15 14:06:39 -07:00
Stephen Birarda
3d02cfc6ad only print no listener for packet one time 2015-07-15 14:06:19 -07:00
Atlante45
057afa980e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 14:00:21 -07:00
Stephen Birarda
6c06d4c49e use fromRawData for writeDatagram, correct type for PingReply 2015-07-15 13:59:58 -07:00
Atlante45
b677f8de28 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 13:50:52 -07:00
Stephen Birarda
7207bdfe2b Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-15 13:50:40 -07:00
Stephen Birarda
7dfbb74d67 ping packets are verified packets 2015-07-15 13:49:34 -07:00
Atlante45
43c6fba94a Register DomainServerAddedNode 2015-07-15 13:49:06 -07:00
Atlante45
8b5a577a5d Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 13:42:14 -07:00
Atlante45
5a5a396b62 Check we have an AM before sending packet 2015-07-15 13:41:35 -07:00
Stephen Birarda
d4680ee1dd fix for no current packet in PacketList 2015-07-15 13:41:28 -07:00
Stephen Birarda
312780a2f6 fix offset for source UUID and verification hash 2015-07-15 13:31:36 -07:00
Stephen Birarda
6b05b7ef31 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-15 13:17:38 -07:00
Stephen Birarda
a79c8ab193 fix check for writing of packet header 2015-07-15 13:17:32 -07:00
ZappoMan
849b584596 more GlowEctomy 2015-07-15 13:16:38 -07:00
Atlante45
501460d489 Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-15 13:14:36 -07:00
Atlante45
2730201a3e erge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 13:14:21 -07:00
Atlante45
f3800cacda Don't unregister packet listeners when no nodelist 2015-07-15 13:10:16 -07:00
Chris Collins
ff288fdd5d While we work on FPS I have decreased the default LOD FPS 
While we work on FPS I have decreased the default LOD FPS. In a new
users preferences this will now show as 15 desktop and 30 HMD.
 2015-07-15 13:09:55 -07:00
Atlante45
aa517adb73 Fix Application inheritance formatting 2015-07-15 13:09:34 -07:00
ZappoMan
c17794849d more GlowEctomy 2015-07-15 12:58:15 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Stephen Birarda
e90ace6231 fix child assignment UUID, adjust for NLPacket after unpack 2015-07-15 12:37:30 -07:00
Stephen Birarda
c4a97de985 fix verification of source but unverified packets 2015-07-15 12:12:04 -07:00
Atlante45
e744e08577 Missed one connection secret 2015-07-15 11:56:01 -07:00
Stephen Birarda
432048addf use macro for AvatarMixer, show type for unknown 2015-07-15 11:55:50 -07:00
Atlante45
edc14ec6eb Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 11:53:11 -07:00
Atlante45
cee1734006 Remove helper function 2015-07-15 11:48:30 -07:00
Stephen Birarda
0b700d690a fix bad assert for payload size 2015-07-15 11:48:27 -07:00