Commit graph

28490 commits

Author SHA1 Message Date
Seth Alves
443cfc8970 build separate debug and release versions of polyvox library 2015-07-15 10:31:21 -07:00
Atlante45
a7fa0a733b Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 10:26:48 -07:00
Stephen Birarda
7d313c4a2b remove extra debugs in PacketReceiver 2015-07-15 10:13:57 -07:00
ZappoMan
0eeddddd6b removed naked GL from drawOnHUD overlays. 2015-07-15 09:46:58 -07:00
Seth Alves
fd84893c61 build separate debug and release versions of polyvox library 2015-07-15 09:42:26 -07:00
Ryan Huffman
9018dedcd6 Merge branch 'protocol' of github.com:Atlante45/hifi into receive_packets 2015-07-15 09:37:31 -07:00
Seth Alves
316c322118 build separate debug and release versions of polyvox library 2015-07-15 09:36:51 -07:00
Brad Davis
029af5354f Merge pull request #5330 from ZappoMan/removeNakeGL
Remove More Naked GL
2015-07-15 09:21:57 -07:00
samcake
f9e7558c3c Merge pull request #5313 from jherico/marge
Make scribe generated shaders more readable
2015-07-15 09:06:01 -07:00
ZappoMan
53c3e3d731 fix CR feedback 2015-07-15 09:03:07 -07:00
Brad Davis
b18dd54c10 Merge pull request #5331 from samcake/punk
Caching the input buffers' gpuObject in GLBackend
2015-07-15 06:57:13 -07:00
samcake
9df26c8488 removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs 2015-07-15 00:24:43 -07:00
samcake
a6148ab73d Remove naked gl call 2015-07-14 22:59:55 -07:00
samcake
c9112966ba revert debug code 2015-07-14 22:00:32 -07:00
ZappoMan
e39ea72daf removed dead code 2015-07-14 21:25:49 -07:00
Stephen Birarda
9204f004c0 remove an extra line 2015-07-14 21:15:39 -07:00
Stephen Birarda
e00dc8bfaa remove an Xcode vim accidentalism 2015-07-14 21:15:22 -07:00
Stephen Birarda
ccc2649d26 fix packing of domain list header 2015-07-14 21:14:15 -07:00
Stephen Birarda
89c44ded38 repairs for domain-server PacketList sending 2015-07-14 21:01:26 -07:00
ZappoMan
5d43c98ebc fix image overlays to not use Naked GL 2015-07-14 20:56:36 -07:00
Stephen Birarda
0327a8d477 fix bytesAvailable, don't double seek in Packet 2015-07-14 20:47:16 -07:00
Stephen Birarda
c210b0db1c don't double seek in Packet::writeData 2015-07-14 20:18:28 -07:00
Atlante45
e3b7b20f36 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 19:18:36 -07:00
Stephen Birarda
a5ca1f7125 fix variable setup in Packet constructor 2015-07-14 19:15:18 -07:00
Atlante45
c6faf6e84a Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 18:59:57 -07:00
Stephen Birarda
88f419dfd7 repairs to packet sending/receiving 2015-07-14 18:59:33 -07:00
ZappoMan
8bb6616a25 remove nakedGL from skeleton IK constraint rendering 2015-07-14 18:47:35 -07:00
Sam Gateau
98a3141e11 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-14 18:38:21 -07:00
Sam Gateau
440464f884 Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile 2015-07-14 18:35:11 -07:00
ZappoMan
5a927c4c90 remove dead code 2015-07-14 18:25:50 -07:00
Brad Davis
1e6c2e737a Merge pull request #5328 from ZappoMan/removeNakeGL
removing Naked GL calls
2015-07-14 18:25:38 -07:00
ZappoMan
47dad82d50 removed dead code 2015-07-14 18:09:58 -07:00
samcake
de9f97d675 Merge pull request #5327 from ZappoMan/master
Remove the NodeBounds feature
2015-07-14 18:06:07 -07:00
Sam Gondelman
6a0df442f9 emulated mouse events don't get sent back to the keyboard (can't right click and drag with sixense, etc) 2015-07-14 17:59:59 -07:00
ZappoMan
f1b85aefa9 more dead code removal: NodeBounds 2015-07-14 17:59:20 -07:00
samcake
be5ce2114d Merge pull request #5326 from ZappoMan/master
Remove some dead code
2015-07-14 17:59:13 -07:00
Sam Gondelman
f3cb25065f can't move when hydras at base, hands can deactivate individually 2015-07-14 17:36:22 -07:00
Atlante45
1db1180869 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:30:55 -07:00
Stephen Birarda
3858e6933f open packets for reading and writing 2015-07-14 17:30:01 -07:00
Stephen Birarda
3bf93063d7 remove the OctreeServerDatagramProcessor 2015-07-14 17:22:42 -07:00
Atlante45
58afe849b0 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:22:03 -07:00
Stephen Birarda
2bec2f0590 make model depend on octree for ViewFrustum 2015-07-14 17:21:46 -07:00
Atlante45
e608abeba1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:18:36 -07:00
Stephen Birarda
1450036b59 move EntityEditPacketSender method to slot 2015-07-14 17:18:28 -07:00
Stephen Birarda
c154e6cc74 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-14 17:16:42 -07:00
Atlante45
12f9b84c7f Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:16:16 -07:00
Stephen Birarda
5163354dd7 more cleanup for PacketReceiver error message 2015-07-14 17:15:18 -07:00
Stephen Birarda
aa696ca8d3 fix listener for AudioStreamStats, more verbose debug 2015-07-14 17:14:27 -07:00
Atlante45
02e1eaf452 Merge fixes 2015-07-14 17:08:36 -07:00
Atlante45
bfb9166b8e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:07:47 -07:00