Commit graph

30155 commits

Author SHA1 Message Date
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
Andrew Meadows
f4e77b8200 remove another dupe unit-test util 2015-08-12 14:15:49 -07:00
Andrew Meadows
6dfbf7f70a coalesce scattered dupes of unit-test utilities 2015-08-12 14:13:28 -07:00
Andrew Meadows
cae77cfd76 move GLMTestUtils.h where all tests can find it 2015-08-12 13:51:40 -07:00
Andrew Meadows
ba5346aee7 move GlmTestUtils.h to GLMTestUtils.h 2015-08-12 13:37:59 -07:00
Andrew Meadows
488f6aa7d8 fix bug in ElbowConstraint::apply() 2015-08-12 13:34:23 -07:00
Brad Hefta-Gaub
acf9933925 Merge pull request #5557 from jherico/marge
Fixing crash in vive controllers
2015-08-12 12:45:57 -07:00
Brad Davis
0ff283d09e Fixing crash in vive controllers 2015-08-12 12:24:53 -07:00
Howard Stearns
2fbcede9b2 Merge pull request #5554 from ZappoMan/aaboxOptimization
cache calculation of aabox and aacubes
2015-08-12 12:09:33 -07:00
Seiji Emery
293f146cfc added debug ui, fixed non-targetable ui boxes/labels 2015-08-12 10:44:46 -07:00
Seiji Emery
f45afe050b Added drag actions 2015-08-12 00:19:11 -07:00
ZappoMan
85603dab29 bump entity packet version 2015-08-11 23:51:07 -07:00
ZappoMan
4fe8f49d4c move origin to center of domain 2015-08-11 23:47:40 -07:00
Seiji Emery
986a821c91 cleanup 2015-08-11 22:00:53 -07:00
Seiji Emery
f247f0390c Cleanup + refactoring 2015-08-11 21:56:00 -07:00
David Rowe
8f376247f0 Fix calculation of corrected look-at position in HMD view 2015-08-11 20:25:02 -07:00
Seiji Emery
8c47c7b989 Added attachment 2015-08-11 20:12:21 -07:00
David Rowe
0f56285283 Fix HMD look-at positions and lines 2015-08-11 18:54:55 -07:00
ZappoMan
0990229c64 cache calculation of aabox and aacubes 2015-08-11 18:05:22 -07:00
Howard Stearns
a5d8125aa7 Remove obsolete AvatarMixer wire data. (Was duplicated in joint states that are also sent.) 2015-08-11 17:53:49 -07:00
Seiji Emery
bb205294b9 uiwidgets.js 2015-08-11 16:33:30 -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
Seth Alves
fedbfe8881 fix jumbled merge 2015-08-11 11:00:04 -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
Seth Alves
804c1ecf8e quiet compiler 2015-08-11 10:46:53 -07:00
David Rowe
84feaeb703 Merge branch 'master' into 20639 2015-08-11 10:33:17 -07:00
Seth Alves
b0190f00fb merge 2015-08-11 10:27:43 -07:00
Seth Alves
b25f6df7af quiet compiler 2015-08-11 10:22:56 -07:00
Seth Alves
dab5848330 quiet compiler 2015-08-11 10:21:30 -07:00
Seth Alves
d6322903a2 quiet compiler 2015-08-11 10:12:46 -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