Commit graph

48557 commits

Author SHA1 Message Date
David Rowe
b723f3d92e Fix Web tablet screen size 2016-12-05 10:03:30 +13:00
David Rowe
71de106594 Tidying 2016-12-04 15:14:47 +13:00
David Rowe
b84bcaf629 Highlight Web overlay with focus 2016-12-04 13:42:12 +13:00
David Rowe
38e6c8075c Direct keyboard input to Web overlay when has focus 2016-12-04 12:28:44 +13:00
David Rowe
7f76792a9b Refactoring 2016-12-03 21:42:57 +13:00
David Rowe
c6f19b1c4e Add missing entity hover signal 2016-12-03 20:37:47 +13:00
David Rowe
e8ef710fd3 Add mouse hover handling to Web overlay 2016-12-03 20:36:55 +13:00
David Rowe
6dbb7129e6 Add mouse press, move, and release handling to Web overlay 2016-12-03 17:09:09 +13:00
David Rowe
0134709e2c Fix Web 3D overlay ray intersection then comment out for performance
Per Image3DOverlay.
2016-12-02 18:50:01 +13:00
David Rowe
0136534954 Use overlay instead of entity to display tablet Web content 2016-12-01 21:32:57 +13:00
David Rowe
a75d0b3fe8 Merge branch 'master' into 21089 2016-11-30 14:50:51 +13:00
Brad Hefta-Gaub
881e0cba11 Merge pull request #9117 from samcake/red
Potentially address the crash when no vertex format is specified
2016-11-29 09:23:43 -08:00
Howard Stearns
030f0d7103 Merge pull request #9114 from howard-stearns/bubble-state
bubble state
2016-11-28 12:16:39 -08:00
samcake
803a399bb6 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-11-28 11:58:17 -08:00
Brad Hefta-Gaub
6f0377eda0 Merge pull request #9113 from hyperlogic/feature/neuron-prefs
Added preferences for the Perception Neuron plugin.
2016-11-28 08:58:00 -08:00
David Kelly
1b26d51292 Merge pull request #9110 from howard-stearns/capture-original-location-in-snapshots
Capture original location in snapshots
2016-11-28 08:55:47 -08:00
samcake
54543935be Merge pull request #8560 from samcake/hdr
Introducing Clustered Lighting and improve Lighting performances
2016-11-23 17:34:40 -08:00
samcake
1974ded050 Potentially address the crash when no vertex format is specified 2016-11-23 16:37:06 -08:00
Brad Hefta-Gaub
9f689b1b69 Merge pull request #9116 from highfidelity/stable
Merge Hotfix back into master.
2016-11-23 15:30:29 -08:00
howard-stearns
bf0f56c138 null guard 2016-11-23 15:27:24 -08:00
howard-stearns
9e45b0ca28 Merge branch 'master' of https://github.com/highfidelity/hifi into capture-original-location-in-snapshots 2016-11-23 15:12:45 -08:00
samcake
d806b088a9 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-23 15:05:52 -08:00
Brad Davis
6e3ad7a983 Merge pull request #9115 from jherico/fix_camera
Fix camera in render perf test
2016-11-23 14:44:57 -08:00
howard-stearns
b37feb20de signal from ignoreNodesInRadius 2016-11-23 11:23:06 -08:00
howard-stearns
00b94860cf Merge branch 'master' of https://github.com/highfidelity/hifi into bubble-state 2016-11-23 11:02:12 -08:00
howard-stearns
4e0c6e5d0f handle empty snapshot text data more broadly (and at the same time, don't
lie from parseSnapshotData).
2016-11-23 11:00:31 -08:00
samcake
9478f242d8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-23 10:35:32 -08:00
howard-stearns
95b5211c00 Merge branch 'master' of https://github.com/highfidelity/hifi into capture-original-location-in-snapshots 2016-11-23 10:31:50 -08:00
Brad Davis
f2118614da Fix camera in render perf test 2016-11-23 10:30:52 -08:00
howard-stearns
8b9efb461e bubble state 2016-11-23 10:22:24 -08:00
Chris Collins
5359468b91 Merge pull request #9112 from highfidelity/RC-28-HOTFIX
Beta Release 28 Hotfix - Windows 7 audio fix
2016-11-23 10:15:03 -08:00
Anthony J. Thibault
cbf514a738 PreferenceDialogs now preserve the sort order of their showCategories.
Specifically, this was to fix the issue with the Neuron plugin preferences being
the top section in the General Preferences dialog, now it is the last.
2016-11-23 10:11:28 -08:00
Anthony J. Thibault
9b0ce556e7 Added preferences for the Perception Neuron plugin.
By default this plugin is disabled.
The server address and port number are also configurable.
2016-11-23 10:10:00 -08:00
Brad Hefta-Gaub
8b9c6a45e1 Merge pull request #9111 from highfidelity/stable
Stable to master
2016-11-22 22:00:32 -08:00
Ken Cooke
b24c81e334 Refactor the audio device format detection. Only use the native format when Qt can correctly determine it. 2016-11-22 20:56:17 -08:00
Chris Collins
8246e3be4b Merge pull request #9109 from samcake/red
Fix the bad binding for polyline
2016-11-22 17:32:04 -08:00
howard-stearns
414371d1fc record starting href/domainId, not ending 2016-11-22 16:13:08 -08:00
howard-stearns
2c9046742e allow movement during .gif recording 2016-11-22 16:02:01 -08:00
samcake
3d0b557af6 Fix the bad binding for polyline 2016-11-22 13:01:02 -08:00
samcake
d764eebc79 removing dead code 2016-11-22 12:10:56 -08:00
Brad Hefta-Gaub
1970deab92 Merge pull request #9107 from kencooke/audio-win7-fix
Audio fix for Windows 7
2016-11-22 11:31:34 -08:00
howard-stearns
5188de924f allow for SnapshotReview dialog to be up during a change of href for all
media capture
2016-11-22 11:09:43 -08:00
samcake
c494479290 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-22 10:16:08 -08:00
samcake
dfc0b7beac adressed reveiw comments 2016-11-22 10:15:49 -08:00
David Kelly
dcda5d50a0 Merge pull request #9106 from howard-stearns/animate-suggestions-when-available
animate suggestions when available
2016-11-22 09:24:48 -08:00
Ken Cooke
d69d77d0ee Refactor the audio device format detection. Only use the native format when Qt can correctly determine it. 2016-11-21 21:36:17 -08:00
David Kelly
811fc0afbe Merge pull request #9096 from howard-stearns/location-cleanup
location cleanup to make people more aware of their sandbox placename
2016-11-21 17:33:34 -08:00
howard-stearns
81786bf819 animate suggestions when available 2016-11-21 16:46:10 -08:00
howard-stearns
2beed7e70b proper include_actions for 'places' tab. 2016-11-21 16:22:02 -08:00
Brad Hefta-Gaub
d93e1dd5d0 Merge pull request #9103 from huffman/fix/verbose-ac-searcher-logging
Add AC Audio searcher for tutorial
2016-11-21 14:30:50 -08:00