Thijs Wenker
|
a97524f954
|
Merge branch 'master' of https://github.com/worklist/hifi into 20638
|
2015-08-12 15:26:53 +02:00 |
|
Seth Alves
|
6ce4820b9f
|
Merge pull request #5552 from jherico/homer
Fixing bad success macro for the Oculus SDK on windows
|
2015-08-11 14:21:10 -07:00 |
|
Brad Davis
|
3595f6a8a0
|
Fixing bad success macro for the Oculus SDK on windows
|
2015-08-11 14:06:35 -07:00 |
|
samcake
|
0a8a43f8bd
|
Merge pull request #5539 from jherico/homer
Breaking up transfers and draw calls
|
2015-08-11 12:12:48 -07:00 |
|
Brad Davis
|
f539e95e53
|
Fixing includes
|
2015-08-11 12:02:40 -07:00 |
|
Bradley Austin Davis
|
e94cff594d
|
Working on breaking up transfers and draws
|
2015-08-11 12:02:39 -07:00 |
|
Brad Hefta-Gaub
|
b726769f15
|
Merge pull request #5402 from highfidelity/plugins
New plugins architecture
|
2015-08-11 11:11:27 -07:00 |
|
Seth Alves
|
cbe38d5fa5
|
Merge pull request #5533 from ctrlaltdavid/20637
CR for 20637 - Add WebWindow setPosition() method
|
2015-08-11 11:03:14 -07:00 |
|
Brad Hefta-Gaub
|
35d6528d08
|
Merge pull request #5550 from jherico/marge
PLUGINS - Cleaning up HMD tools
|
2015-08-11 10:46:59 -07:00 |
|
Howard Stearns
|
60b74af2a8
|
Merge pull request #5549 from ctrlaltdavid/fix-hmd-lean
Fix avatar lean forwards and sideways per HMD movements
|
2015-08-11 09:31:22 -07:00 |
|
Howard Stearns
|
295d655eec
|
Merge pull request #5545 from AndrewMeadows/chlorine
rotation constraints in preparation for inverse kinematics
|
2015-08-11 09:19:16 -07:00 |
|
Andrew Meadows
|
8e82e48f76
|
remove more std::max/min favor of glm utilities
|
2015-08-11 08:17:54 -07:00 |
|
Andrew Meadows
|
23c92662ee
|
relaxed error, more rigor for using fabsf()
|
2015-08-10 23:09:11 -07:00 |
|
Andrew Meadows
|
a38c1c82d1
|
use glm::clamp() instead if std::max() and min()
|
2015-08-10 23:08:36 -07:00 |
|
Andrew Meadows
|
4655bd21dd
|
added some comments to clarify algorithm
|
2015-08-10 23:08:10 -07:00 |
|
Bradley Austin Davis
|
7694c1c0a6
|
Cleaning up HMD tools
|
2015-08-10 21:39:36 -07:00 |
|
Brad Davis
|
19d31938d3
|
Merge remote-tracking branch 'upstream/master' into plugins
|
2015-08-10 21:25:35 -07:00 |
|
David Rowe
|
2c1ba9b6b1
|
Fix avatar lean forwards and sideways per HMD movements
|
2015-08-10 21:25:18 -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 |
|
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 |
|
Thijs Wenker
|
6ee6785977
|
Merge branch 'master' of https://github.com/worklist/hifi into 20638
|
2015-08-10 11:15:17 +02: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 |
|