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
Brad Davis
4b5c71e16d
Merge fixes
2015-08-08 13:37:46 -07:00
Brad Davis
caf93d1aff
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
2015-08-08 13:18:13 -07:00
David Rowe
051a398fa2
Merge branch 'master' into 20639
2015-08-07 18:26:56 -07:00
SamGondelman
b77de1b598
added fists to toybox
2015-08-07 18:07:14 -07:00
David Rowe
90637272c5
Add WebWindow setPosition() method
2015-08-07 17:38:41 -07:00
Andrew Meadows
331c8c0967
Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements
...
Improvements to FloatingUIPanels.
2015-08-07 17:21:51 -07:00
SamGondelman
23fea1f221
working on toybox script, squeezeHands, and default mappings
2015-08-07 16:59:50 -07:00
ericrius1
4fbd6f6337
removed old PacketHeaders.h file, updated udt version
2015-08-07 16:42:10 -07:00
ericrius1
6a4e2728ee
deleted old packet headers file
2015-08-07 16:29:57 -07:00
ericrius1
19e645fc65
fixed the way colors are handled to work with new core profile changes
2015-08-07 16:26:52 -07:00
ericrius1
205a2d53b6
no longer returning early on NaN
2015-08-07 16:15:51 -07:00
David Rowe
b54c2526c1
Fix rendering own look-at vectors in HMD mode
...
Vectors now originate at user's physical eyeballs rather than at user
avatar's eye separation.
2015-08-07 16:13:25 -07:00
Andrew Meadows
c0d287f48d
Merge pull request #5527 from ZappoMan/lod
...
change LOD dialog to no longer reset when you close the dialog box
2015-08-07 16:10:24 -07:00
Andrew Meadows
48c5a227a7
Merge pull request #5528 from ZappoMan/removeBrokenShadows
...
remove shadow menu items
2015-08-07 16:09:00 -07:00
Brad Hefta-Gaub
7a59688521
Merge pull request #5531 from ctrlaltdavid/find-scale-assert
...
Add temporary debug info for tracking down invalid scale value assert
2015-08-07 16:02:55 -07:00
Bradley Austin Davis
cd6667303e
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-07 15:32:33 -07:00
