Ken Cooke
86db12acae
Fix naming clash with reserved word
2015-12-07 14:03:11 -08:00
Ken Cooke
4803b3bd9f
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb
2015-12-07 13:08:21 -08:00
Ken Cooke
8683bb5002
New reverb parameters
2015-12-07 13:05:30 -08:00
Clément Brisset
0be35ec6ea
Merge pull request #6578 from hyperlogic/tony/clear-joint-data-bug-fix
...
MyAvatar.clearJointData bug fix
2015-12-07 12:18:28 -08:00
Clément Brisset
42365acef5
Merge pull request #6561 from ZappoMan/cruftRemovalRedux
...
More Cruft Removal
2015-12-07 11:39:54 -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
Atlante45
cdf621e8d0
Remove unnecessary moveToThread to remove warning
2015-12-07 09:11:41 -08:00
Anthony J. Thibault
fd4ed29405
MyAvatar.clearJointData bug fix
...
MyAvatar.setJointRotation() now works properly after MyAvatar.clearJointData()
2015-12-07 09:03:40 -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
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
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
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
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
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
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
Brad Hefta-Gaub
f44a9daa21
remove WANT_DELTA from OctreeQuery
2015-12-04 14:04:57 -08:00
Stephen Birarda
d2fdf6a04b
Merge branch 'master' of https://github.com/highfidelity/hifi into log-handler-crash
2015-12-04 13:55:57 -08:00
Brad Hefta-Gaub
f71d2d00d2
Merge pull request #6548 from jherico/threaded_present
...
Threaded present
2015-12-04 13:42:09 -08:00
Brad Hefta-Gaub
0d9d5375c7
remove optional WANT_COMPRESSION from OctreeQuery
2015-12-04 13:29:18 -08:00
Brad Davis
11917ca501
Fixing preview / vsync functionality
2015-12-04 12:46:19 -08:00
Stephen Birarda
165db97cb2
cleanup double reset debug on assignment-client restart
2015-12-04 11:50:27 -08:00
Brad Hefta-Gaub
84b98c93a1
Merge pull request #6559 from birarda/log-handler-crash
...
reset the NodeList on its own thread
2015-12-04 11:44:06 -08:00
Brad Hefta-Gaub
79d60f74ba
Merge pull request #6558 from sethalves/parents
...
fix an AC race/crash
2015-12-04 11:40:21 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub
15c4dbfb11
Merge pull request #6554 from Atlante45/warnings
...
Last of the OpenGL warnings on OS X
2015-12-04 11:24:28 -08:00
Stephen Birarda
d5f79b84fc
make the NodeList reset a blocking queued connection
2015-12-04 11:20:46 -08:00
Stephen Birarda
918342df5f
make sure the NodeList is reset on its own thread
2015-12-04 11:18:46 -08:00
Brad Hefta-Gaub
d07629489c
Merge pull request #6543 from Atlante45/pointer
...
gpu::Shader::create* return shared_ptr
2015-12-04 11:17:02 -08:00
Seth Alves
ea65ef964f
fix an AC race/crash
2015-12-04 11:13:36 -08:00
Stephen Birarda
ca84fcd7f4
parent the keepalive timer to the NL thread
2015-12-04 11:01:18 -08:00
Atlante45
528a17422d
Last of the OpenGL warnings on OS X
2015-12-04 10:33:10 -08:00
Brad Davis
c4514743d1
Fixing tests, moving some plugin container stuff to base class
2015-12-04 10:28:19 -08:00
Brad Davis
60aa93c38c
Fixing menu items in display plugins
2015-12-04 10:28:19 -08:00
Brad Davis
7262a10e62
Refactoring present thread / GL base plugin for saner context management
2015-12-04 10:28:18 -08:00
Brad Davis
d8bb9f8d18
Fixing screenshot functionality
2015-12-04 10:28:17 -08:00
Brad Davis
b9ace94ff1
Prototyping threaded present
2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
ab63f19b6a
Merge pull request #6546 from kencooke/audio-reverb
...
Reverb
2015-12-04 10:19:56 -08:00
Brad Hefta-Gaub
49a7852d76
Merge pull request #6540 from Atlante45/warnings
...
Fix warnings on OS X
2015-12-04 10:19:25 -08:00
Brad Hefta-Gaub
8b58aa706a
Merge pull request #6534 from jherico/homer
...
Windows 64 bit updates
2015-12-04 10:05:45 -08:00
Atlante45
07387ab8c0
Fix most OpenGL warnings
2015-12-04 10:01:43 -08:00
Atlante45
cb758ca6b4
Fix override warnings on XCode 7
2015-12-04 08:55:43 -08:00
Atlante45
cd26422ca0
Fix warnings on OS X
2015-12-04 08:47:06 -08:00
