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
David Rowe
ad7167c67a
Merge branch 'master' into 20602
2015-07-23 11:22:05 -07:00
Atlante45
dce1fc6855
SendQueue first draft
2015-07-23 11:18:52 -07:00
ZappoMan
720f6ec529
completely remove six sense lasers
2015-07-23 11:17:22 -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
ZappoMan
f4ec09a48b
move renderLaserPointers() into a draw item
2015-07-23 10:42:22 -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
3350d638dd
always use the _viewFrustum for caluclating the pick ray, not the _displayViewFrustum which can be the mirror
2015-07-23 09:29:27 -07: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
Atlante45
b364553ea5
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-07-22 17:20:00 -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
ZappoMan
71eeecc7f6
Revert "Instrument the inter-idle time and tweaking the timeout setting"
...
This reverts commit 0c88972f09
2015-07-22 16:53:56 -07:00
Philip Rosedale
a02822c376
Merge pull request #5389 from huffman/fix-billboard-face-camera
...
Fix face-camera functionality for BillboardOverlay
2015-07-22 16:28:11 -07:00
Stephen Birarda
791953740b
Merge pull request #5391 from AndrewMeadows/bohrium
...
fix crash for convex hull of co-planar points
2015-07-22 16:08:01 -07:00
Andrew Meadows
bf3ff8daea
fix crash for convex hull of co-planar points
2015-07-22 15:06:10 -07:00
Stephen Birarda
f35004d85c
Merge pull request #10 from birarda/atp
...
add udt::Socket, leverage in LimitedNodeList
2015-07-22 14:49:35 -07:00
Ryan Huffman
9e2eb7fdbd
Fix face-camera functionality for BillboardOverlay
2015-07-22 14:49:20 -07:00
Stephen Birarda
2c965eee91
fix ugly deref of matchingPeer
2015-07-22 14:42:44 -07:00
Stephen Birarda
5bed3502ef
fix order of ctors and assignment operators
2015-07-22 14:15:17 -07:00
Stephen Birarda
67294d3a23
rename nodesToKill to nodesToShutdown
2015-07-22 13:55:22 -07:00
Stephen Birarda
d22219a1f2
make myServer pointer an OctreeServer* again, it's not checked
2015-07-22 13:54:39 -07:00
Stephen Birarda
55b4784a02
avoid entity-server node/octree deadlock on shutdown
2015-07-22 13:52:49 -07:00
Brad Hefta-Gaub
f86c064059
Merge pull request #5387 from samcake/punk
...
Moving GL initialization to GLBackend and cleaning the gpu::Context in Application
2015-07-22 11:50:32 -07:00
Stephen Birarda
023f3b8134
fix sequence number read in PacketReceiver
2015-07-22 11:34:30 -07:00
Sam Gateau
f70553ec95
Fixing merge
2015-07-22 11:31:46 -07:00
Stephen Birarda
4a11bdc22e
indentation and spacing fixes
2015-07-22 11:26:28 -07:00
Stephen Birarda
12e684bea1
fix identation for NLPacket move ctor
2015-07-22 11:21:31 -07:00
Stephen Birarda
3fbda89f1d
copy version in Packet move ctor/assignment
2015-07-22 11:17:50 -07:00
Brad Davis
3407fd48a8
Merge pull request #5363 from PhilipRosedale/master
...
Birds will die if abandoned, ability to fly with birds
2015-07-22 14:13:27 -04:00
