David Rowe
f7dc5480b7
Fix #include path for OSX/Linux
2015-08-10 20:20:51 -07:00
David Rowe
80e296edd0
Merge branch 'master' into 20639
2015-08-10 19:25:12 -07:00
David Rowe
8b326414ac
Start eye tracker streaming such that don't block Interface
...
Start method is called in a separate thread.
2015-08-10 19:19:29 -07:00
Brad Hefta-Gaub
34f6699fb7
Merge pull request #5547 from jherico/marge
...
PLUGINS - Retina display issues
2015-08-10 15:39:25 -07:00
Andrew Meadows
a1d8a97675
Merge pull request #5546 from sethalves/fix-protocol-version
...
missed this in the last commit -- bump protocol version
2015-08-10 15:21:52 -07:00
Bradley Austin Davis
61ecee93b8
Fix mis-positioning of QML elements when moving from retina to non-retina display
2015-08-10 15:18:49 -07:00
Seth Alves
7403929323
missed this in the last commit -- bump protocol version
2015-08-10 15:15:54 -07:00
Andrew Meadows
80b36f9f12
fix typo
2015-08-10 15:11:00 -07:00
Seth Alves
b26d6d2b9c
Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization
...
Renderable model entity item optimizations
2015-08-10 15:10:12 -07:00
Seth Alves
74287c3cf5
Merge pull request #5482 from ericrius1/polyLineInProgress
...
Added PolyLine Entity and painting scripts to demonstrate its functionality (WARNING: protocol change) Test this please
2015-08-10 14:57:52 -07:00
Andrew Meadows
75ab6a00aa
add unit tests for RotationConstraints
2015-08-10 14:48:46 -07:00
Andrew Meadows
43bf4a85d2
add RotationConstraint and friends
2015-08-10 14:48:22 -07:00
Andrew Meadows
f9a4b82edd
add swing-twist decomposition util with unit-tests
2015-08-10 14:47:15 -07:00
Andrew Meadows
4a8baafdd2
fix QCOMPARE_WITH_ABS_ERROR for floats
2015-08-10 14:45:57 -07:00
Andrew Meadows
6db47e773f
removing ShapeColliderTests.*
2015-08-10 14:35:36 -07:00
ericrius1
59d5f61af4
incremented protocol number
2015-08-10 14:20:46 -07:00
Seth Alves
889e1edeaf
Merge pull request #5544 from howard-stearns/restore-eye-joint-rotations
...
Restore eye joint rotations
2015-08-10 14:19:37 -07:00
ericrius1
8e7398ac7d
small comment change
2015-08-10 13:41:30 -07:00
David Rowe
8e93ee654e
Merge branch 'master' into 20639
2015-08-10 13:25:24 -07:00
David Rowe
81d8edae5f
Add missing 5 point calibration
2015-08-10 13:23:14 -07:00
David Rowe
e7beb544f6
Log successfully loading eye tracker calibration
2015-08-10 13:22:46 -07:00
David Rowe
658434e020
Automatically save and restore eye tracker calibration
...
Automatically saves and restores just a single calibration so that user
doesn't have to manually save or load, which isn't very convenient to do
with an HMD on.
2015-08-10 13:20:42 -07:00
David Rowe
4f3c4a5312
Tidy up handling of eye tracker streaming
2015-08-10 12:52:47 -07:00
Howard Stearns
88505c180d
Merge branch 'master' of https://github.com/highfidelity/hifi into restore-eye-joint-rotations
2015-08-10 12:34:59 -07:00
Howard Stearns
964d04d24f
Restore correct space for eye joint rotations.
...
Also, do not correct for camera position on my avatar. (That will be done by zero or one receivers.)
2015-08-10 12:34:01 -07:00
Philip Rosedale
e39b6de8fc
Merge pull request #5543 from larsnaesbye/master
...
Whitespace correction in reduced complexity notification
2015-08-10 12:17:41 -07:00
ericrius1
c9ad8e6e10
fixed comment formatting.
2015-08-10 12:10:27 -07:00
Lars Næsbye Christensen
8aa7002ab8
Simple whitespace correction
...
Added a space to make the reduced complexity notification look better.
2015-08-10 21:07:08 +02:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
Brad Davis
59dc6c9cca
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 11:47:54 -07:00
Andrew Meadows
5acd1e7d58
Merge pull request #5467 from sethalves/polyvox
...
Polyvox improvements (Warning: protocol change)
2015-08-10 11:12:10 -07:00
ericrius1
c299d77c92
fixed implicit double to float casting and incorrect header author attribution
2015-08-10 10:57:53 -07:00
ZappoMan
ae958dd42d
Merge branch 'master' of https://github.com/highfidelity/hifi into RenderableModelEntityItemOptimization
2015-08-10 09:59:45 -07:00
Brad Hefta-Gaub
d33c9e734b
Merge pull request #5538 from jherico/marge
...
Automatically show HMD tools when switching an HMD plugin
2015-08-09 17:54:16 -07:00
ZappoMan
668778cfd9
optimize JointState::setRotationInConstrainedFrameInternal() to short cut cases where targetRotation matches previous targetRotation
2015-08-09 16:55:43 -07:00
ZappoMan
942958c4f1
only setJointState() if animation frame actually changed
2015-08-09 16:07:56 -07:00
Bradley Austin Davis
56e73ef807
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-09 12:28:44 -07:00
Brad Davis
57408c4338
Automatically show HMD tools when switching an HMD plugin
2015-08-09 12:14:29 -07:00
Brad Hefta-Gaub
862be9a1f0
Merge pull request #5535 from nivardus/include-qdatastream-qt5.5
...
Qt 5.5 Compilation: Add QDataStream include
2015-08-08 22:03:36 -07:00
Brad Hefta-Gaub
986827aefe
Merge pull request #5537 from jherico/plugins
...
PLUGINS - Decouple Application and plugin definitions, cleanup container usage
2015-08-08 19:12:11 -07:00
Bradley Austin Davis
bfd0362bd8
Fixing mac build
2015-08-08 18:00:08 -07:00
Brad Davis
5515b9d8ee
Decouple Application and plugin definitions, cleanup container usage
2015-08-08 17:51:16 -07:00
Brad Hefta-Gaub
a79095dcec
Merge pull request #5536 from jherico/plugins
...
PLUGINS - Fix crash on startup on mac
2015-08-08 15:30:08 -07:00
Bradley Austin Davis
2878950dbe
Fix crash on startup on mac
2015-08-08 15:26:38 -07:00
Brad Hefta-Gaub
74e79f15d8
Merge pull request #5534 from jherico/plugins
...
PLUGINS - Merge fixes
2015-08-08 14:44:33 -07:00
Brad Davis
751db23bc8
Fixing naming, and improving viewport handling
2015-08-08 14:19:43 -07:00
Bennett Goble
d5691b1196
Add QDataStream include to DomainServerWebSessionData.cpp
...
Fixes compilation error with Qt 5.5.0, QDataStream >> QSet
2015-08-08 17:17:29 -04:00
Brad Davis
639a0822fe
Fixing aspect ratio
2015-08-08 14:08:41 -07:00
Brad Davis
ba498e8f33
Fixing plugin construction after removing OVR dependency from interface
2015-08-08 14:02:26 -07:00
Brad Davis
ccc4a59992
Cleanup and PR comments
2015-08-08 13:54:37 -07:00
