Anthony J. Thibault
0459479c2b
NeuronPlugin: Added external project for Neuron SDK
...
Now builds on windows with actual Neuron SDK.
Can to TCP server on localhost, and receive joint data.
Will debug draw joint 6, (left foot?)
2015-12-21 18:30:15 -08:00
Anthony J. Thibault
dcde640acd
Stub Perception Neuron input plugin
2015-12-21 10:06:36 -08:00
Brad Hefta-Gaub
f55445bb88
Merge pull request #6707 from jherico/webengine
...
Fixing QML based web view crash.
2015-12-18 18:19:36 -08:00
Brad Davis
ae6cf131f5
Fixing crash bug
2015-12-18 17:19:06 -08:00
Brad Davis
6098c4a1d6
Revert "Revert "Migrate QML based web views to Qt WebEngine""
...
This reverts commit 1f3adeb666
2015-12-18 17:18:46 -08:00
Brad Davis
baf2d5acb7
Merge pull request #6705 from highfidelity/revert-6651-webengine
...
Revert "Migrate QML based web views to Qt WebEngine"
2015-12-18 17:09:44 -08:00
Brad Davis
1f3adeb666
Revert "Migrate QML based web views to Qt WebEngine"
2015-12-18 17:09:38 -08:00
Brad Hefta-Gaub
868d10651a
Merge pull request #6651 from jherico/webengine
...
Migrate QML based web views to Qt WebEngine
2015-12-18 14:56:35 -08:00
Brad Davis
88b88a3306
Fixing warnings
2015-12-18 14:32:35 -08:00
Brad Hefta-Gaub
bfa0652100
Merge pull request #6700 from AndrewMeadows/angular-velocity-is-a-vector
...
protect against NaN in measure of hydra angularVelocity
2015-12-18 14:29:23 -08:00
Andrew Meadows
aa3d1c6e4c
Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix
...
ModelEntityItem: Fix for incorrect animations with preTranslations
2015-12-18 14:16:35 -08:00
Andrew Meadows
eb3210071e
Merge pull request #6664 from hyperlogic/tony/idle-to-walk-transition
...
Improved idle to walk forward transition
2015-12-18 13:59:03 -08:00
Andrew Meadows
4e76e9e50b
prevent nan values in measure of angularVelocity
2015-12-18 13:51:14 -08:00
Eric Levin
2e4df5f859
Merge pull request #6692 from ctrlaltdavid/20758
...
Update particlesTest.js per current particles implementation
2015-12-18 13:35:19 -08:00
Brad Davis
16dd24f3d8
Removing unused LGPL JS file
2015-12-18 13:02:45 -08:00
Brad Hefta-Gaub
bfecf68a2e
Merge pull request #6696 from AndrewMeadows/angular-velocity-is-a-vector
...
angular velocity is a vector
2015-12-18 12:29:56 -08:00
Brad Davis
08a087c5aa
PR comments
2015-12-18 11:19:01 -08:00
Andrew Meadows
d6541e9ee7
angular velocity is a vector, not a quaternion
2015-12-18 11:06:58 -08:00
Brad Davis
3446229bd8
Merge pull request #6693 from ZappoMan/fixWarnings
...
fix warnings
2015-12-18 00:38:12 -08:00
Brad Hefta-Gaub
a7824a06d0
fix Assignment copy constructor warning
2015-12-17 18:51:27 -08:00
Brad Hefta-Gaub
0b781a3589
fix warnings
2015-12-17 18:39:05 -08:00
David Rowe
9a7c0cb182
Typo noticed in passing
2015-12-18 15:12:03 +13:00
David Rowe
c3e3af7c8c
Document effect of Bezier interpolation on particle radius simulation
2015-12-18 15:11:43 +13:00
David Rowe
e2ecc388ca
Indicate particle properties that (temporarily) aren't working
2015-12-18 15:10:47 +13:00
David Rowe
5aef309b8a
Get particles in particlesTest.js emitting again
2015-12-18 15:09:36 +13:00
Andrew Meadows
1bb6ddb99f
Merge pull request #6676 from sethalves/dejitter-hold-action
...
Dejitter hold action
2015-12-17 14:29:39 -08:00
Brad Davis
5088eec2a2
Move directory web UI into the overlay
2015-12-17 12:23:39 -08:00
Brad Davis
82c865af2c
Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine
2015-12-17 12:20:38 -08:00
Seth Alves
b80fa1c806
code review
2015-12-17 11:46:41 -08:00
Ryan Huffman
3da5cf1fe5
Merge pull request #6684 from birarda/read-type-assert
...
fix reading of empty or malformed packets
2015-12-17 11:26:47 -08:00
Seth Alves
f3adb8a2f7
fix offset math in hold action
2015-12-17 11:16:59 -08:00
Seth Alves
eb173815f5
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-17 11:08:05 -08:00
Stephen Birarda
06e9731fe4
don't attempt to read an empty or malformed packet
2015-12-17 11:07:36 -08:00
Seth Alves
aabc544d6c
Merge pull request #6683 from birarda/shtml-content-type
...
serve SHTML files with HTML MIME type
2015-12-17 11:05:34 -08:00
Stephen Birarda
08f42c08d9
use a ternary for single assignment
2015-12-17 10:54:32 -08:00
Stephen Birarda
286b984d6f
serve SHTML files with HTML MIME type
2015-12-17 10:48:33 -08:00
Clément Brisset
40272faa3f
Merge pull request #6679 from hyperlogic/tony/particle-system-invalidated-iterator-fix
...
ParticleEffectEntityItem: fix for invalid iterator increment
2015-12-17 09:43:39 -08:00
Seth Alves
32fb4decd5
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-17 07:32:52 -08:00
Brad Hefta-Gaub
0db0ef89d7
Merge pull request #6674 from murillodigital/master
...
Unifying Windows PR and Release installer pipeline
2015-12-16 20:42:13 -08:00
Brad Hefta-Gaub
275b35ef60
Merge pull request #6670 from Atlante45/ac-race
...
Fix entity server race
2015-12-16 20:21:56 -08:00
Brad Davis
343d31b38f
Merge pull request #6677 from AlessandroSigna/overlays
...
Fix to remove a VS warning
2015-12-16 20:12:27 -08:00
Anthony J. Thibault
2eecb61da5
Prefer erase over repeated pop_front calls
2015-12-16 19:08:31 -08:00
Anthony J. Thibault
3b1ba67a88
ModelEntityItem: Fix for incorrect animations with preTranslations
...
ModelEntities that were playing animations on models with local pivot offsets were not working correctly.
Specifically, the windmill animation in the demo domain.
We now compose a matrix containing all of the FBX's preTranslation, preRotation and postTranformations.
2015-12-16 17:08:22 -08:00
Anthony J. Thibault
1b08563079
ParticleEffectEntityItem: fix for invalid iterator increment
...
Was causing an assert in debug, due to calling ++ on an invalid iterator.
In release this might lead to memory corruption.
2015-12-16 16:56:49 -08:00
Brad Davis
fa5bab08b1
Support web content inside QML
2015-12-16 16:25:38 -08:00
Atlante45
2c8be15e66
Unnecessary shutdown (Already shutting down)
2015-12-16 15:56:22 -08:00
Seth Alves
5f9bdcb2aa
fix lock type
2015-12-16 15:52:20 -08:00
Seth Alves
ea202c5271
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-16 15:44:44 -08:00
AlessandroSigna
364a70bb46
Fix to avoid MVS warning
2015-12-16 15:41:27 -08:00
Seth Alves
d7affcf811
keep track of palm rotation vs avatar as well as palm translation
2015-12-16 15:41:27 -08:00
