Commit graph

4085 commits

Author SHA1 Message Date
Howard Stearns
e84cc03bcc Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-21 11:35:42 -07:00
samcake
66087872a3 Merge pull request #5621 from highfidelity/stereo
New stereo rendering mechanism
2015-08-21 11:23:14 -07:00
Brad Davis
b8b0917d9d Attempting to fix judder issues 2015-08-21 10:01:11 -07:00
ZappoMan
a0552050b0 set vsync on startup 2015-08-21 08:23:18 -07:00
Howard Stearns
ae3e052e72 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-21 08:13:44 -07:00
Brad Davis
1e074ab81c Remove superfluous clear 2015-08-21 00:29:28 -07:00
Brad Davis
cc037c8828 Fix culling calculations in HMD with new stereo mechanism 2015-08-21 00:29:27 -07:00
Brad Davis
476e5edb32 Fixing HMD wobble 2015-08-21 00:29:26 -07:00
Brad Davis
7fb491e48c Cleanup plugin interface, break up oculus plugins 2015-08-21 00:29:25 -07:00
Brad Davis
76f236adf6 New stereo rendering implementation 2015-08-21 00:29:24 -07:00
ZappoMan
bd29fb2474 fix ifdef 2015-08-20 19:33:39 -07:00
ZappoMan
06b2a88fb6 toggle menu near top of window 2015-08-20 19:33:22 -07:00
ZappoMan
9f501d4d72 first cut at attempting to hide menu in full screen 2015-08-20 19:33:06 -07:00
ZappoMan
cd050b2e60 don't show hmd tools for direct mod HMDs 2015-08-20 09:53:58 -07:00
Brad Davis
9faf452196 Make sure that items added via plugins can be removed as well 2015-08-20 00:32:25 -07:00
ZappoMan
6a7f367e5f fix throttled rendering for the 2D display plugin 2015-08-19 21:11:48 -07:00
Stephen Birarda
42a7262707 Merge pull request #5565 from murillodigital/node-version
DO NOT MERGE - Node versioning
2015-08-19 13:32:48 -07:00
Seth Alves
537b690d60 Merge pull request #5566 from howard-stearns/recapitate
Get rid of separate head/body avatar
2015-08-19 10:46:05 -07:00
Philip Rosedale
eef556eeb2 Merge pull request #5593 from thoys/20528
CR for Job #20528 - Tool window unavailable in Windows Client.
2015-08-18 21:23:14 -07:00
Howard Stearns
c90845dfcb Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-18 15:38:14 -07:00
Howard Stearns
dc75b238a8 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
And update with current code.
2015-08-18 15:35:37 -07:00
Brad Davis
944734fed2 Remove focus highlight on delete entity 2015-08-18 13:59:39 -07:00
Thijs Wenker
44399da41c Removed the minimize button from the tool window. Close it to hide it. Fixes bug where ToolWindow hides forever. 2015-08-18 14:54:21 +02:00
Seth Alves
e29bb9183b minimize diff 2015-08-18 02:08:21 -07:00
Seth Alves
8435550fe9 only update simRate once per second 2015-08-18 02:05:50 -07:00
Seth Alves
551f0aaba3 show how many times per second Application::idle is called 2015-08-18 01:41:17 -07:00
Brad Davis
3cbbb5fb79 Fix crash on mouse click 2015-08-18 00:05:02 -07:00
Howard Stearns
9ed418f7b6 Simple frequencey decoupling. Still same thread. 2015-08-17 19:19:11 -07:00
Brad Davis
cb5f80bf78 Add highlighting of keyboard focused items 2015-08-17 17:11:26 -07:00
Brad Davis
5d65937120 Merge pull request #5583 from ZappoMan/clickToFocusWebEntity
make web entity focus click based
2015-08-17 16:57:39 -07:00
Philip Rosedale
01108bdf6b Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors
Synchronize eye joint and debugging vectors
2015-08-17 16:56:01 -07:00
ZappoMan
49cf29ce8f cleanup debugging and dead code 2015-08-17 15:57:20 -07:00
ZappoMan
47b0e2fda6 more hacking on click to focus 2015-08-17 14:02:24 -07:00
ZappoMan
b7d9dc444b more work on clicking focus 2015-08-17 13:06:32 -07:00
ZappoMan
8cf450cb67 first cut at making focus click based 2015-08-17 11:41:54 -07:00
Brad Davis
9706a44ca1 Merge pull request #5571 from ZappoMan/hmdToolsRedux
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
2015-08-14 20:11:27 -07:00
Brad Davis
dc2ddd0303 switch statement spacing 2015-08-14 17:12:00 -07:00
Howard Stearns
d28c555a79 Synchronize eye joint and debugging vectors when the other avatar is looking at me. 2015-08-14 16:47:34 -07:00
Brad Davis
db95657455 PR comments 2015-08-14 16:40:53 -07:00
ZappoMan
6a802560f2 remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd 2015-08-14 16:27:50 -07:00
Brad Davis
208e41efd1 WebEntity keyboard input with mouse hover 2015-08-14 16:18:38 -07:00
Brad Hefta-Gaub
31a49a551a Merge pull request #5556 from jherico/bart
QML framerate improvments
2015-08-14 11:11:14 -07:00
Howard Stearns
1133e053d1 Developer->Avatar->Fix Gaze menu option to not move the eyes around while we're debugging. 2015-08-14 07:33:36 -07:00
Howard Stearns
0f6c0a3117 Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate 2015-08-13 15:56:13 -07:00
Howard Stearns
2756a00638 Get default avatar url from resources. 2015-08-13 14:23:34 -07:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Howard Stearns
62941c0914 Remove dead code. 2015-08-13 12:39:30 -07:00
Brad Davis
0fa3044231 QML framerate improvments 2015-08-12 16:24:34 -07:00
David Rowe
0f56285283 Fix HMD look-at positions and lines 2015-08-11 18:54:55 -07:00
David Rowe
3e8d0ad712 Fix to use new HMD methods 2015-08-11 13:40:08 -07:00