Commit graph

46824 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
8e14770d56 Merge pull request #8581 from howard-stearns/fix-system-toolbar
fix system toolbar following upgrade to QT 5.6
2016-09-08 18:10:12 -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
Zach Pomerantz
e785c0cdf8 add test for audio jitter 2016-09-08 17:50:11 -07:00
Zach Pomerantz
7b8f616099 add audiostream (jitter) logging 2016-09-08 17:23:56 -07:00
Seth Alves
8c45c115b8 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-08 17:02:40 -07:00
Seth Alves
ecb0669972 try to keep far grab from getting stuck if the entity is brought very near to the grab-point 2016-09-08 17:02:29 -07:00
Seth Alves
0f98c51d89 distance-grabbed things collide with static entities 2016-09-08 16:13:22 -07:00
Seth Alves
d4faf69beb don't cripple interface with log-spam 2016-09-08 15:42:42 -07:00
Zach Pomerantz
2a2673d898 bring audio starve check to standard 2016-09-08 15:26:09 -07:00
Atlante45
006780fe8e Indentation 2016-09-08 14:29:43 -07:00
Zach Pomerantz
d7643ef2a0 fix audio client starve detection 2016-09-08 14:25:33 -07:00
Clément Brisset
4437b1b5d6 Merge pull request #8573 from Atlante45/master
Fix toolBar.js relative path
2016-09-08 14:22:18 -07:00
Anthony J. Thibault
f7516c2b07 code convention and eslint on createGlobalEventBridge.js 2016-09-08 13:52:19 -07:00
Seth Alves
d939f03f8f Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-08 13:52:12 -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
Anthony J. Thibault
594640f8b4 coding standard fixes 2016-09-08 11:53:23 -07:00
howard-stearns
b918e1ec51 fix system toolbar following upgrade to QT 5.6 2016-09-08 11:32:12 -07:00
Brad Davis
dbedb896f8 Fix overlays when scaling resolution 2016-09-08 11:21:43 -07:00
Brad Hefta-Gaub
a40a9f1d73 Merge pull request #8575 from kencooke/neon_optimization
Added ARM NEON optimized audio sample rate conversion
2016-09-08 09:58:47 -07:00
Seth Alves
9e99cc1f78 fix mod.js 2016-09-08 07:35:52 -07:00
David Rowe
28cfca993f Add and wire up "search in view" JavaScript API stub 2016-09-08 14:58:48 +12:00
David Rowe
a4b5f5395d Add "in view" button 2016-09-08 12:56:41 +12:00
Anthony J. Thibault
ebb4c0990b Removed local copy of qtwebchannel.js, use qt resource version instead 2016-09-07 17:14:33 -07:00
Seth Alves
9c96ffc9cb don't show grab-point spheres if controller poses aren't valid 2016-09-07 16:31:02 -07:00
David Rowe
7d6ab77c16 Merge branch 'master' into 21040 2016-09-08 11:30:19 +12:00
Seth Alves
746d0cd91c get various hand lasers to all line up with grab-point sphere 2016-09-07 16:10:37 -07:00
Anthony J. Thibault
69bda0de83 Shift key resets after first alpha key. 2016-09-07 13:49:47 -07:00
Seth Alves
b45181ea92 don't back up pick-ray from hand 2016-09-07 13:32:26 -07:00
Seth Alves
624cc655dd disable code that backs-up in time to pick release velocity 2016-09-07 13:24:53 -07:00
Anthony J. Thibault
7b4b98971e Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 12:49:13 -07:00
Anthony J. Thibault
9f0550ea7e Raised dpi of WebTablet to fit 480 width keyboard 2016-09-07 10:59:54 -07:00
Anthony J. Thibault
41e0b8732f fix for occasional crash when deleting web entity 2016-09-07 10:59:16 -07:00
Seth Alves
47f92cb166 Merge branch 'grab-point-adjustments' of github.com:sethalves/hifi into grab-point-adjustments 2016-09-07 09:55:34 -07:00
Seth Alves
9ee27ed7d4 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-07 09:55:22 -07:00
Seth Alves
332c2127b4 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-07 09:53:26 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
Brad Hefta-Gaub
3824c1e196 Merge pull request #8469 from kencooke/low-latency-audio
Low-latency audio
2016-09-07 09:49:09 -07:00
Seth Alves
5303488f52 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-07 09:40:51 -07:00
David Rowe
db30e36b3b Implement expand/collapse action to show/hide table columns 2016-09-07 19:11:53 +12:00
David Rowe
b372f82f78 Ensure that the expand/collapse icon is always visible 2016-09-07 17:09:56 +12:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
David Rowe
dba3efd857 Add expand/collapse extra info toggle icon to entities table header 2016-09-07 15:04:27 +12:00
Leonardo Murillo
54af969bbf Merge pull request #8405 from SamGondelman/qt5.6
Update to Qt 5.6.1
2016-09-06 19:30:16 -06:00
Anthony J. Thibault
774509ba9e Changed punctuation button to &123 2016-09-06 17:41:56 -07:00
Brad Davis
9d057233c6 Fixing rebase 2016-09-06 17:40:48 -07:00
Marko Kudjerski
da5f7912b5 fixed Info.plist setup for Components.app 2016-09-06 17:40:47 -07:00
SamGondelman
62edaf0ec9 commit for marko to look at later 2016-09-06 17:40:46 -07:00