Anthony J. Thibault
cc7a6ada38
Merge branch 'master' into out-of-body-experience
2016-10-05 17:16:39 -07:00
Brad Hefta-Gaub
6f86ce8d3b
Merge pull request #8683 from jherico/oglplus_b_gone2
...
Remove all usage of oglplus
2016-10-05 09:59:42 -07:00
Brad Davis
d3d3aa587c
Remove oglplus usage from OpenVR
2016-10-02 11:44:33 -07:00
Anthony J. Thibault
eccd01e88f
Merge remote-tracking branch 'upstream/master' into out-of-body-experience
2016-09-29 16:36:25 -07:00
Anthony J. Thibault
f9a1a21b2c
apply linearMoveBlend to idleToWalk transition to reduce foot sliding
2016-09-26 14:24:01 -07:00
howard-stearns
39d352e1a7
display location/connection status in address bar when it doesn't have
...
focus
2016-09-26 11:27:50 -07:00
Anthony J. Thibault
0a72805874
Tuned transition from idle to back to reduce foot sliding
2016-09-26 10:41:16 -07:00
Anthony J. Thibault
203ff95849
Animation tuning to reduce foot sliding.
...
* Navigation walk speed has been reduced
* Tuned IdleToWalk timescale and interp time to reduce foot sliding
* Tuned fwd, back and lateral characteristicSpeeds to better match the
animations. This reduces foot sliding when moving forward and backward.
* Reduced rig state machine hysteresis to 1/60th of a second.
2016-09-26 09:59:50 -07:00
howard-stearns
c4ed84f9a6
remove obsolete file
2016-09-22 16:49:38 -07:00
howard-stearns
17549348b4
less busy hotspotting, and make use of restricted feed (by protocol)
2016-09-22 16:48:16 -07:00
Howard Stearns
8e9b743515
rollover images
2016-09-21 19:15:01 -07:00
Howard Stearns
660343f8c6
Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling
2016-09-21 16:31:50 -07:00
howard-stearns
41b20dc69d
single feed with snapshot and concurrency, no radio buttons, mini-card
...
has two hotspots that bring up different kinds of cards, and anywhere
else on the minicard takes you "there".
2016-09-21 16:00:29 -07:00
Brad Hefta-Gaub
8f5c5ebf0e
improved disabled preview wording
2016-09-19 18:19:35 -07:00
Brad Hefta-Gaub
41bbfcd578
Merge pull request #8603 from sethalves/quiet-logging
...
categorize some qDebugs
2016-09-15 18:09:11 -07:00
Seth Alves
4470338663
catagorize some qDebugs
2016-09-14 21:39:45 -07:00
howard-stearns
db20a8ceef
fix 1319
2016-09-14 11:20:09 -07:00
David Rowe
fe8b3b4d0d
Merge branch 'master' into 21040
2016-09-13 09:12:47 +12:00
David Rowe
44282499c5
New glyph for "has transparent"
2016-09-10 14:37:09 +12:00
Brad Hefta-Gaub
ad8a832c86
Merge pull request #8582 from howard-stearns/open-browser-and-close
...
Handle window.open/close in Web content.
2016-09-08 21:17:40 -07:00
Brad Hefta-Gaub
b56ad737d4
Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation
...
Web Entities Virtual Keyboard + Event Bridge support
2016-09-08 18:36:46 -07:00
Anthony J. Thibault
d38625ce2a
Coding standard fix for JS portions of QML.
...
Semicolons at end of line.
2016-09-08 18:16:32 -07:00
Brad Hefta-Gaub
3d54600843
Merge pull request #8513 from Atlante45/feat/network-port
...
Add settings to change local port
2016-09-08 18:10:32 -07:00
Anthony J. Thibault
3574267382
Fix for keyboard on facebook share pop-up
...
It was a div tag with "contenteditable"="true" attribute.
2016-09-08 18:00:45 -07:00
Anthony J. Thibault
f7516c2b07
code convention and eslint on createGlobalEventBridge.js
2016-09-08 13:52:19 -07:00
howard-stearns
ebf280fd6f
Handle window.open requests from web pages in WebView following QT upgrade.
...
Handle window.close requests in the browser.
2016-09-08 13:06:33 -07:00
howard-stearns
b918e1ec51
fix system toolbar following upgrade to QT 5.6
2016-09-08 11:32:12 -07:00
Anthony J. Thibault
ebb4c0990b
Removed local copy of qtwebchannel.js, use qt resource version instead
2016-09-07 17:14:33 -07:00
Anthony J. Thibault
69bda0de83
Shift key resets after first alpha key.
2016-09-07 13:49:47 -07:00
Anthony J. Thibault
41e0b8732f
fix for occasional crash when deleting web entity
2016-09-07 10:59:16 -07:00
Anthony J. Thibault
dc0d0c2d5c
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 09:49:55 -07:00
Anthony J. Thibault
774509ba9e
Changed punctuation button to &123
2016-09-06 17:41:56 -07:00
SamGondelman
8a4d48ca8d
set browserProfile now that Qt bug is fixed
2016-09-06 17:38:47 -07:00
SamGondelman
038aba20e4
disable dropshadows if unsupported (OSX and AMD cards)
2016-09-06 17:36:57 -07:00
SamGondelman
9903e464d8
fix error in FileDialog.qml
2016-09-06 17:36:53 -07:00
SamGondelman
98cb3cc366
updated build instructions
2016-09-06 17:36:52 -07:00
Anthony J. Thibault
73315e3390
Punctuation mode now works
2016-09-06 17:07:41 -07:00
Anthony J. Thibault
28162915fd
Re-styled keyboard, now with working shift key
2016-09-06 15:21:58 -07:00
Anthony J. Thibault
71520a661a
WIP checkpoint of keyboard shift key support
2016-09-06 13:39:07 -07:00
Atlante45
a8de6f0a57
Add settings to change local port
2016-09-06 10:18:42 -07:00
Andrew Meadows
0a55afda69
Merge pull request #8554 from elisa-lj11/marketplaces_html
...
Include a marketplace status bar and access to "marketplace" of marketplaces
2016-09-02 17:12:05 -07:00
elisa-lj11
2f07ba87af
Renamed isZipped for more clarity on checking for non-fbx files
2016-09-02 16:48:55 -07:00
Anthony J. Thibault
a54c3bf8c0
support for backspace, carriage return, space and period.
2016-09-02 16:23:46 -07:00
Brad Davis
91bfa7677c
Updating stats display for threaded rendering
2016-09-02 14:41:49 -07:00
Anthony J. Thibault
bcc0d27819
more reliable keyboard raise/lower
2016-09-02 12:50:31 -07:00
Anthony J. Thibault
0128d7c61b
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-02 12:16:25 -07:00
Anthony J. Thibault
3d5e8fc213
First pass of keyboard raising and lowering
2016-09-02 12:15:30 -07:00
Anthony J. Thibault
442f6207fb
Added raiseAndLowerKeyboard detector, streamlined EventBridge for web entities.
2016-09-02 11:17:08 -07:00
Anthony J. Thibault
21bf931559
eventBridge for web entities.
2016-09-01 16:32:06 -07:00
Anthony J. Thibault
823420ae0a
Working web entity keyboard
...
* Missing many keys
* Does not dynamically appear and disappear
2016-08-31 17:57:13 -07:00
