Brad Hefta-Gaub
2fb2307bf8
Merge pull request #5805 from highfidelity/revert-5800-marge
...
Revert "Fix over-calculation of cluster matrices"
2015-09-14 21:46:01 -07:00
Brad Hefta-Gaub
70fcdbf2fd
Revert "Fix over-calculation of cluster matrices"
2015-09-14 21:20:11 -07:00
Brad Hefta-Gaub
e92d195030
tweak
2015-09-14 21:18:36 -07:00
Brad Hefta-Gaub
54a45f3173
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029
more work on script engine
2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae
more work on proper threading of ScriptEngine
2015-09-14 20:26:04 -07:00
Brad Hefta-Gaub
096a6cb4b9
Merge pull request #5800 from jherico/marge
...
Fix over-calculation of cluster matrices
2015-09-14 19:38:01 -07:00
Brad Davis
7a843b3610
Merge pull request #5798 from AndrewMeadows/minor-ik-tuning
...
minor tuning of IK behavior
2015-09-14 18:55:31 -07:00
Anthony J. Thibault
90f46ba2c8
Added hand state machines to AnimGraph.
...
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
2015-09-14 18:54:12 -07:00
Brad Davis
d7a850d7be
Merge pull request #5638 from MarcelEdward/hifi-3DConnexion-cmake-fix
...
Hifi 3 d connexion cmake fix
2015-09-14 18:53:39 -07:00
MarcelEdward
c1ddf5fc32
Update Find3DConnexionClient.cmake
2015-09-15 03:22:44 +02:00
MarcelEdward
8a71b31af0
Update Find3DConnexionClient.cmake
2015-09-15 03:06:07 +02:00
Sam Gateau
45dc5be53d
DeferredTransform buffer working for the deferred rendering in mono
2015-09-14 17:48:15 -07:00
Stephen Birarda
a27e0e7cc7
remove an unused alias
2015-09-14 17:18:22 -07:00
Stephen Birarda
84ab4fd585
force minimum for p_hrc time_point values
2015-09-14 17:16:42 -07:00
Andrew Meadows
d74628720f
fix bug using unitialized std::vector elements
2015-09-14 17:14:04 -07:00
Andrew Meadows
75ec142827
fix animation-tests
2015-09-14 16:42:57 -07:00
Brad Davis
35e4440c4f
Don't do an O(N^2) operation on cluster matrices
2015-09-14 16:09:13 -07:00
Stephen Birarda
2385331075
Merge pull request #5799 from huffman/move-assert
...
Move assert in asset request
2015-09-14 16:07:47 -07:00
Sam Gateau
00688172dd
work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes
2015-09-14 15:49:05 -07:00
Ryan Huffman
b0ffb50fdf
Move assertion in AssetRequest below error checking
...
If the request had an error then there is no reason the assertion should
be true.
2015-09-14 15:48:11 -07:00
Philip Rosedale
15e3678eab
Merge pull request #5793 from kencooke/master
...
bugfix for audio pops at startup
2015-09-14 15:31:23 -07:00
MarcelEdward
c3ecbd15f8
Update Find3DConnexionClient.cmake
2015-09-15 00:30:49 +02:00
MarcelEdward
64a8f7ebb4
Update 3DConnexionClient.h
2015-09-15 00:30:11 +02:00
MarcelEdward
9b70605381
Update readme.txt
2015-09-15 00:29:12 +02:00
MarcelEdward
a53d244d33
Create ConnexionClientAPI.h
2015-09-15 00:28:17 +02:00
MarcelEdward
96f20957c3
Create ConnexionClient.h
2015-09-15 00:27:45 +02:00
Brad Hefta-Gaub
18fbf896f1
first cut at moving entity scripts into ScriptEngine
2015-09-14 15:13:43 -07:00
Andrew Meadows
a72199a7df
minor IK tuning
2015-09-14 14:44:17 -07:00
Seth Alves
d874c9b382
snip out tractor beam
2015-09-14 14:20:49 -07:00
Seth Alves
f4aad05621
reduce radius of hand-intersects-object test. fix lifetime of laser line
2015-09-14 14:07:16 -07:00
Ryan Huffman
15b809bd16
Merge pull request #5795 from birarda/phrc
...
fix high resolution timing for VS2012 in networking
2015-09-14 13:49:20 -07:00
Stephen Birarda
d82fd9a6ed
Merge pull request #5797 from huffman/fix-assert
...
Fix assert in AssetResourceRequest
2015-09-14 13:40:13 -07:00
Ryan Huffman
f3b513866a
Fix assert in AssetResourceRequest
2015-09-14 13:39:14 -07:00
Stephen Birarda
8308dbf4a3
Merge pull request #5787 from huffman/cleanup-asset-requests-on-node-kill
...
DO NOT MERGE: Cleanup asset requests on node kill
2015-09-14 13:08:01 -07:00
Ken Cooke
505e11f60a
Merge branch 'master' of https://github.com/kencooke/hifi
2015-09-14 12:29:00 -07:00
Sam Gateau
3690d5a4c2
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-14 12:28:59 -07:00
Sam Gateau
6c63dc0444
work in progress
2015-09-14 12:28:33 -07:00
samcake
0b3e78abed
Merge pull request #5796 from jherico/marge
...
Fixing differing highlights between left and right eyes in stereo modes
2015-09-14 12:28:18 -07:00
Ken Cooke
a818ed5377
Merge branch 'master' of https://github.com/kencooke/hifi
2015-09-14 12:28:16 -07:00
Ryan Huffman
29d26a1f9a
Fix namespace issues std:: template specialization
2015-09-14 12:17:36 -07:00
Ken Cooke
b245e8245a
Merge branch 'master' of https://github.com/kencooke/hifi
2015-09-14 12:09:44 -07:00
Ken Cooke
6fe30e7156
Style fix, and use size_t instead of unsigned int.
2015-09-14 12:06:13 -07:00
Ryan Huffman
42d21e4dc1
Update AssetClient's node killed handling to check if node is asset server first
2015-09-14 11:56:47 -07:00
Ryan Huffman
e87fcb78cd
Add proper cleanup of AssetRequest in AssetResourceRequest
2015-09-14 11:34:51 -07:00
Brad Davis
1bb15e28d6
Fixing differing highlights between left and right eyes in stereo modes
2015-09-14 11:24:28 -07:00
Ryan Huffman
b8c1c279c6
Update AssetRequest::State enum to use camelcase
2015-09-14 11:22:55 -07:00
Ryan Huffman
6468046c68
Update AssetClient callbacks to return whether a response was received
2015-09-14 11:22:34 -07:00
Stephen Birarda
302fd923b8
Merge branch 'master' of https://github.com/highfidelity/hifi into phrc
2015-09-14 11:21:37 -07:00
Stephen Birarda
f7f54010f5
fixes for portable hrc class on win
2015-09-14 11:21:25 -07:00
