Howard Stearns
2f27afd2e5
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-07 11:51:10 -08:00
Howard Stearns
b82b18fd2e
Merge branch 'fix-render-rate' into correct-target-frame-rate
2015-12-07 11:50:57 -08:00
Howard Stearns
72ce46af59
Mac-only.
2015-12-07 11:46:36 -08:00
Clément Brisset
42365acef5
Merge pull request #6561 from ZappoMan/cruftRemovalRedux
...
More Cruft Removal
2015-12-07 11:39:54 -08:00
Howard Stearns
8666cdd689
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-render-rate
2015-12-07 11:27:30 -08:00
Clément Brisset
390836b64e
Merge pull request #6431 from huffman/proto-received-message
...
Combine Packet and PacketList into ReceivedMessage on receiving end
2015-12-07 09:58:52 -08:00
Brad Hefta-Gaub
3240c1dbfe
Merge pull request #6577 from Atlante45/master
...
Fix UNIX warnings
2015-12-07 09:50:00 -08:00
Ryan Huffman
dd6c8cbe33
Remove verbose piggyback logging
2015-12-07 09:42:04 -08:00
Atlante45
cdf621e8d0
Remove unnecessary moveToThread to remove warning
2015-12-07 09:11:41 -08:00
Ryan Huffman
34138f07bd
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-07 08:58:47 -08:00
Ryan Huffman
c2049e5308
Fix udt-test to work with ReceivedMessage updates
2015-12-07 08:52:23 -08:00
Atlante45
f8ee377f01
Fix QOpenGL warning
2015-12-07 08:37:07 -08:00
Atlante45
18198cb6fb
Fix missing override
2015-12-07 08:36:49 -08:00
Ryan Huffman
9d47ac000e
Merge pull request #6479 from thoys/editjs-left-click
...
No more right-click-move editing in edit.js
2015-12-07 08:29:01 -08:00
Thijs Wenker
22bdc1ae84
Make it possible to use the focus-right-click-drag-camera in the edit.js script again. Still keep right-clicking ignore Toolbar and entity selection events.
2015-12-07 13:49:49 +01:00
Brad Hefta-Gaub
549059dd97
Merge pull request #6571 from imgntn/earthquakes_live
...
Earthquakes Live 1.0: Visualization of USGS Earthquake Data for Past Day
2015-12-05 19:09:05 -08:00
Howard Stearns
b008f2d35e
Merge branch 'fix-render-rate' into correct-target-frame-rate
2015-12-05 17:51:58 -08:00
James B. Pollack
378b71d701
dont spin by default
2015-12-05 17:51:55 -08:00
James B. Pollack
7859241ad3
spin the earth for fun
2015-12-05 17:43:13 -08:00
James B. Pollack
906540272e
disable collisions for now because of shapetype
2015-12-05 17:39:43 -08:00
Howard Stearns
188c477f7e
Fix render rate.
...
Depending on how the threads get assigned, the actual render rate (not just the stats) could be as little as a third of what is targetted.
That's because the code was insisting on an empty texture escrow before our update/render cycle could begin, and otherwise just waits for the next whole cycle.
On my MacbookPro, this was regularly giving a render average of 20fps instead of 60.
2015-12-05 17:32:32 -08:00
James B. Pollack
30b32765b9
make earth grabbable to show parenting
2015-12-05 17:32:02 -08:00
James B. Pollack
ade32cbf61
remove collisions and add parenting
2015-12-05 17:30:38 -08:00
James B. Pollack
a899fe0e1b
fix typo
2015-12-05 17:26:11 -08:00
James B. Pollack
945b5bd00f
cleanup
2015-12-05 17:11:27 -08:00
James B. Pollack
d518def974
poll by default
2015-12-05 17:01:54 -08:00
James B. Pollack
7fc3d0f34e
header
2015-12-05 16:58:50 -08:00
James B. Pollack
4a5b9bd523
start position
2015-12-05 16:57:09 -08:00
James B. Pollack
4999b34327
cleanup interval
2015-12-05 16:54:55 -08:00
James B. Pollack
f33f4cbcae
cleanup
2015-12-05 16:22:17 -08:00
James B. Pollack
1f2d726211
awesome stuff
2015-12-05 16:16:58 -08:00
James B. Pollack
3b6cd4c2d1
initial live earthqukes commit
2015-12-05 14:11:59 -08:00
Clément Brisset
2ace061893
Merge pull request #6564 from sethalves/fix-line-overlays
...
fix 3d line overlays
2015-12-04 17:38:15 -08:00
Clément Brisset
3c83f1be8b
Merge pull request #6566 from sethalves/fix-avatar-mixer-parents-crash
...
fix avatar-mixer parents-related crash
2015-12-04 17:03:15 -08:00
Seth Alves
7448d9f262
Merge pull request #6565 from hyperlogic/tony/thread-safe-rig-joint-getters
...
Make Avatar::getJointRotation and getJointTranslation thread-safe
2015-12-04 16:45:56 -08:00
Seth Alves
62b4eac875
fix avatar-mixer parents-related crash
2015-12-04 16:41:56 -08:00
Anthony J. Thibault
7abfc93ff9
Avatar::getJointRotation and getJointTranslation is thread-safe
...
It can be called from script with minimal blocking,
because it inspects a copy of the joint values from the Rig, which is updated atomically.
This copy occurs in Rig::updateAnimations()
2015-12-04 16:16:17 -08:00
Howard Stearns
fa0ad1fe4d
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-04 16:12:22 -08:00
Seth Alves
817f0307a0
fix 3d line overlays
2015-12-04 15:51:19 -08:00
Brad Hefta-Gaub
5bbff7534d
Merge pull request #6560 from birarda/log-handler-crash
...
don't stop a non-started timer, debug cleanup
2015-12-04 15:46:51 -08:00
Brad Hefta-Gaub
2c2813e06e
Merge pull request #6563 from howard-stearns/fix-present-rate
...
Fix present rate stats display
2015-12-04 15:27:45 -08:00
Brad Hefta-Gaub
1eb5b21e48
fix warning
2015-12-04 15:17:16 -08:00
Anthony J. Thibault
ba001ef4b0
Rig: split Poses into internal and external sets.
...
In preparation for making some accessors thread safe.
2015-12-04 15:15:18 -08:00
howard-stearns
0a9b42ad3c
Fix present rate stats display, which was counting (roughly) twice for 2D
...
display, and flickering.
2015-12-04 15:10:46 -08:00
Brad Hefta-Gaub
2a243ccd17
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemovalRedux
2015-12-04 14:58:38 -08:00
Brad Hefta-Gaub
be4bc7b2ca
going a different way, same packet version, but always send feature requests to old servers
2015-12-04 14:55:16 -08:00
Philip Rosedale
06c8235b19
Merge pull request #6544 from sethalves/distance-grab-adjustment
...
distance-hold adjustment
2015-12-04 14:34:10 -08:00
Brad Hefta-Gaub
7faf9c2f22
bump protocol version
2015-12-04 14:33:45 -08:00
Brad Hefta-Gaub
46946212cf
remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true
2015-12-04 14:24:31 -08:00
Stephen Birarda
ad4f818b21
only attempt to stop QTimer if active
2015-12-04 14:12:41 -08:00
