Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 23:43:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29926 commits 25 branches 0 tags 1.1 GiB
Commit graph

29926 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
6a0a08eafb Consolidate identical code paths 2015-08-12 15:25:34 -07:00
David Rowe
7298fa7e2c Log successful start of eye tracker streaming 2015-08-12 15:22:24 -07:00
David Rowe
9fe1aaf182 Disable saving / loading eye tracker calibrations so can use old SDK 2015-08-12 15:21:06 -07:00
David Rowe
8f376247f0 Fix calculation of corrected look-at position in HMD view 2015-08-11 20:25:02 -07:00
David Rowe
0f56285283 Fix HMD look-at positions and lines 2015-08-11 18:54:55 -07:00
David Rowe
c060af0de5 Merge branch 'master' into 20639 2015-08-11 14:55:17 -07: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
David Rowe
3e8d0ad712 Fix to use new HMD methods 2015-08-11 13:40:08 -07:00
David Rowe
e6473fc8b9 Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
 2015-08-11 12:34:28 -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
David Rowe
84feaeb703 Merge branch 'master' into 20639 2015-08-11 10:33:17 -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
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