Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:16:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28504 commits 25 branches 0 tags 1.1 GiB
Commit graph

28504 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
48f23a6eaf Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-15 11:29:41 -07:00
Stephen Birarda
8b5026a817 cleanup some warnings 2015-07-15 11:20:55 -07:00
Ryan Huffman
12d5ec89d1 Merge branch 'packet-tests' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/udt/Packet.h
 2015-07-15 11:04:32 -07:00
Stephen Birarda
f0e07d424d Merge branch 'atp' into packet-tests 2015-07-15 11:02:52 -07:00
Stephen Birarda
ca3285b0e4 add a comment for getPayloadCapacity() 2015-07-15 11:02:42 -07:00
Stephen Birarda
95f401fa0f add comments to Packet methods 2015-07-15 11:00:33 -07:00
Thijs Wenker
c24c6ad39f Fixes chess game (pieces were dieing as soon as you dropped them) 2015-07-15 19:56:01 +02:00
Seth Alves
3bc182730a build separate debug and release versions of polyvox library 2015-07-15 10:52:38 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -07:00
Ryan Huffman
3b8a335c8c Fix bytesLeftToRead 2015-07-15 10:51:40 -07:00
ZappoMan
6b06987700 remove dead code for magnifier 2015-07-15 10:48:07 -07:00
Ryan Huffman
44c99ef89a Replace bytesAvailable with bytesLefToRead 2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Seth Alves
a71c5cae5f build separate debug and release versions of polyvox library 2015-07-15 10:33:22 -07:00
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