Stephen Birarda
6dba431084
initial version of the control packet class
2015-07-24 11:38:51 -07:00
Stephen Birarda
dd8d75b38f
Merge branch 'protocol' of github.com:birarda/hifi into atp
2015-07-23 17:14:50 -07:00
Stephen Birarda
839001dd8c
Merge branch 'protocol' of github.com:birarda/hifi into protocol
2015-07-23 17:14:14 -07:00
Stephen Birarda
407c9d2571
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2015-07-23 17:13:53 -07:00
Stephen Birarda
d938f31fab
fix for write of sourceID and verificationHash
2015-07-23 17:10:40 -07:00
Stephen Birarda
b68c7fd92a
first adjustment in NLPacket after type is known
2015-07-23 16:59:08 -07:00
Stephen Birarda
069dff0793
fix bugs from movement of type/version to NLPacket
2015-07-23 16:40:35 -07:00
Brad Davis
2ac6304752
Merge pull request #5404 from ZappoMan/renderBug
...
Fix rendering of primitive objects on Windows
2015-07-23 19:10:54 -04:00
Howard Stearns
e59304ae74
Merge pull request #5406 from huffman/variadic-print
...
Update script print() to be variadic
2015-07-23 18:03:37 -05:00
Stephen Birarda
2f03075750
repairs to type/version header write
2015-07-23 15:57:31 -07:00
ZappoMan
8007fba909
add type to shader include
2015-07-23 15:37:56 -07:00
Ryan Huffman
396bb613f8
Avoid creating a new variable in js print
2015-07-23 15:32:40 -07:00
Ryan Huffman
5f33ac5459
Update script print() to be variadic
2015-07-23 15:30:54 -07:00
Stephen Birarda
862c788aec
move payload adjustments to Packet
2015-07-23 15:27:32 -07:00
Seth Alves
849715953d
Merge pull request #5405 from AndrewMeadows/bohrium
...
fix for underdamped avatar rotation momentum
2015-07-23 15:26:49 -07:00
Stephen Birarda
df47f1dd0b
add a BasePacket class for headerless packets
2015-07-23 15:20:37 -07:00
ZappoMan
e6262de864
CR feedback
2015-07-23 14:56:52 -07:00
Andrew Meadows
b26f4b0c8d
fix for underdamped avatar rotation momentum
2015-07-23 14:49:15 -07:00
ZappoMan
1177ffd439
more hacking
2015-07-23 14:12:52 -07:00
ZappoMan
96e83e3ed4
remove gl_FrontMaterial
2015-07-23 14:11:28 -07:00
Stephen Birarda
e5955e39b7
fix QDebug signature for Node
2015-07-23 14:06:40 -07:00
Stephen Birarda
19d0bf403c
change NLPacket create signature for new headers
2015-07-23 14:06:10 -07:00
ZappoMan
9496b6c024
more hacking
2015-07-23 13:56:59 -07:00
Stephen Birarda
9e7fb9ae16
shuffle Packet headers, use static enum for PacketType
2015-07-23 13:56:47 -07:00
ZappoMan
5774af0856
more hacking
2015-07-23 13:38:08 -07:00
ZappoMan
a0666d5e99
testing windows render bug
2015-07-23 13:17:12 -07:00
ZappoMan
91d317f964
testing windows render bug
2015-07-23 12:42:55 -07:00
Stephen Birarda
aa08bee69f
initial work to make sequence # and bitfield lead all packets
2015-07-23 11:59:37 -07:00
samcake
fecb0e3675
Merge pull request #5398 from ZappoMan/removeTextureRescale
...
remove rescaling of textures
2015-07-23 11:22:38 -07:00
samcake
805e7326e0
Merge pull request #5396 from ZappoMan/deadCodeRemoval
...
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 11:11:35 -07:00
Brad Hefta-Gaub
ea7238f17b
Merge pull request #5400 from jherico/homer
...
Preserve normals buffer during lighting resolution
2015-07-23 09:53:51 -07:00
Stephen Birarda
67ca8b2347
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2015-07-23 09:51:44 -07:00
Bradley Austin Davis
f19800f0de
Don't overwrite the normals buffer when copying the resolved lighting back to the primary FBO
2015-07-23 12:37:58 -04:00
ZappoMan
06b6c49b9a
remove rescaling of textures
2015-07-23 08:56:59 -07:00
Brad Hefta-Gaub
0ec5dea532
Merge pull request #5397 from huffman/fix-model-entity-list
...
Fix model entity not showing up in list on creation
2015-07-23 08:54:25 -07:00
Ryan Huffman
c17a603714
Fix model entity not showing up in list on creation
2015-07-23 08:42:29 -07:00
ZappoMan
bd6534a991
remove deprecated renderBatch()
2015-07-23 08:35:03 -07:00
Brad Hefta-Gaub
e729a87328
Merge pull request #5393 from ctrlaltdavid/20632
...
WL#20632 - Remove unused postLighting variable from code
2015-07-23 08:24:09 -07:00
Brad Hefta-Gaub
a27a2f601b
Merge pull request #5395 from huffman/fix-ray-picking
...
Fix ray picking working intermittently
2015-07-23 08:15:15 -07:00
ZappoMan
c2113ea96b
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 07:42:58 -07:00
Brad Hefta-Gaub
36f63e488c
Merge pull request #5388 from birarda/assignment-deadlock
...
avoid entity-server node/octree deadlock on shutdown
2015-07-23 06:17:55 -07:00
Ryan Huffman
198b6cfa88
Fix ray picking working intermittently
...
Ray picking relies on the Application's viewFrustum which was being set
to both the main camera and mirror camera for their respective pass
while rendering. This makes sure the viewFrustum only ever holds the
main camera. Application::_displayViewFrustum still gets updated to
the current camera while rendering.
2015-07-23 06:17:08 -07:00
Brad Hefta-Gaub
4236c866e7
Merge pull request #5394 from birarda/bisect-touch
...
stop gap for touch event lag at low framerates
2015-07-23 06:15:47 -07:00
Stephen Birarda
7cee5f3ce5
don't reset the idleTimer if the interval hasn't changed
2015-07-22 18:05:04 -07:00
Stephen Birarda
db5e8c72ee
force event processing up to a certain max time
2015-07-22 17:59:07 -07:00
David Rowe
11078d0d02
Get Developer > Avatar > Show Collision Bounding Shapes working again
...
Note: Currently doesn't display well because alpha isn't working.
2015-07-22 17:50:56 -07:00
David Rowe
3362358dcd
Remove unused postLighting variable from Avatar and MyAvatar
...
Fixes Leap and Hydra laser pointers not displaying.
Enables:
- Avatar billboard display
- Avatar collision bounding shape display
- Hand information display
2015-07-22 17:50:55 -07:00
David Rowe
b515b163fb
Remove dead code from Head
2015-07-22 17:50:54 -07:00
Stephen Birarda
785ae190ca
add back send posted touch events
2015-07-22 17:49:27 -07:00
Stephen Birarda
f3fd5c9847
Merge pull request #5392 from ZappoMan/master
...
Revert "Instrument the inter-idle time and tweaking the timeout setting"
2015-07-22 17:12:27 -07:00
