Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 10:51:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49250 commits 73 branches 59 tags 1.2 GiB
Commit graph

222 commits

Author SHA1 Message Date
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
David Rowe
9b270834dd Merge branch 'master' into 21089 2016-11-16 08:51:48 +13:00
David Rowe
1eeec2a3a1 Fix up script injection methods 2016-11-15 10:24:38 +13:00
David Rowe
e7d9f98ca4 Get script injection working in new marketplaces window 2016-11-15 09:23:51 +13:00
howard-stearns
4d18a3cc3d expose menu enablement to javascript 2016-11-10 15:01:06 -08:00
David Rowe
5eff7c9e15 Merge branch 'master' into 21089 2016-11-10 14:42:21 +13:00
Dante Ruiz
4b087a2718 fixed unable to remove menus from vrmenu context 2016-11-08 12:03:53 -08:00
Dante Ruiz
7f355c48b1 saving work progress 2016-11-08 12:03:53 -08:00
David Rowe
d33ac21aaa Merge branch 'master' into 21089 2016-11-08 08:23:10 +13:00
Clément Brisset
00a94bdd6d Merge pull request #8974 from huffman/feat/help-select-xbox-tab 
Update help window to auto select xbox or vive controller tab on availability of device
 2016-11-03 14:42:23 -07:00
howard-stearns
3a072b5bf9 tell desktop about preference changes 2016-11-03 12:17:28 -07:00
David Rowe
8ccf645d1c Make script event bridge available to OverlayWindow 2016-11-02 21:41:06 +13:00
Ryan Huffman
16d91833e8 Add optional url query to InfoView 2016-11-01 13:43:32 -07:00
Ryan Huffman
5b58e8ae97 Fix ConnectionHandler not handling connected-but-need-auth condition 2016-10-24 10:44:33 -07:00
Stephen Birarda
18523558f7 move HFWebEngineProfile back to interface/networking 2016-10-18 20:04:11 -07:00
Stephen Birarda
9f2627d31d Merge pull request #8828 from birarda/web-engine-interceptor 
move HF access token to authorization header
 2016-10-18 17:24:58 -07:00
Stephen Birarda
f8e0d7ad88 move QWebEngine classes to ui library 2016-10-18 12:53:32 -07:00
Stephen Birarda
b4b5c648c2 use a QWebEngineProfile request interceptor for auth in HTTP header 2016-10-17 11:34:37 -07:00
Howard Stearns
baea0f5cb0 create a directory chooser that works in hmd, and use it 2016-10-16 17:27:51 -07:00
Howard Stearns
3a294e77d4 Merge pull request #8745 from huffman/feat/new-help-window 
Update the help window
 2016-10-07 10:01:47 -07:00
David Rowe
1a745094e2 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
 2016-10-06 09:29:09 +13:00
David Kelly
621e3fc000 Expose triggerOption to scripts, plus _physicsEnabled 
Now any menu item can be triggered.  Plus you can do a
Window.isPhysicsEnabled to detect when we are done loading assets and
such.  Whee!
 2016-09-30 09:06:17 -07:00
David Rowe
5e842843c6 Set alphabetic/numeric keyboard per field entered 2016-09-30 11:54:32 +13:00
David Rowe
2344d15dbc Raise and lower keyboard for HTML fields in Marketplace window 2016-09-28 16:41:01 +13:00
Brad Davis
20deae3242 Working on Qt 5.6 compatibility 2016-09-06 17:35:04 -07:00
Brad Davis
617633b85c Moving to custom context creation 2016-08-29 11:21:54 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Brad Davis
f819e98d94 Fix menu so that functions indirectly triggered by menu scanning don't inherit the menu group 2016-08-12 22:28:40 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
Zander Otavka
43bbe790d6 Add atp support to qml 2016-08-08 15:12:17 -07:00
Anthony J. Thibault
713bee84c3 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-03 14:06:43 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00
Seth Alves
cc7322a0de Merge pull request #8334 from ctrlaltdavid/21015 
refresh file dialog when directory content changes
 2016-08-03 08:11:40 -07:00
Brad Hefta-Gaub
193f0bbb99 Merge pull request #8345 from ctrlaltdavid/web-window-signals 
add OverlayWebWindow resized, moved, and closed signals
 2016-08-02 18:41:49 -07:00
Zander Otavka
38ba54e481 Fix confirm dialog 2016-08-02 16:04:54 -07:00
David Rowe
31ac7a2812 Add OverlayWebWindow resized, moved, and closed signals 2016-08-02 12:40:01 +12:00
David Rowe
800c2b9ec0 Refresh file dialog when directory content changes 2016-07-30 11:21:40 +12:00
Andrew Meadows
5ce681154d Merge pull request #8301 from AlexanderOtavka/asset-browser-ui 
Asset browser ui
 2016-07-26 15:04:10 -07:00
Brad Hefta-Gaub
43064807d1 Merge pull request #8292 from jherico/webui 
Fix some UI elements triggered by WebViews
 2016-07-23 13:47:04 -07:00
Zander Otavka
530e17a7e5 Move JSON parsing for custom dialog to be sooner 2016-07-22 17:14:45 -07:00
Brad Davis
faba1a4b4e Fix UI elements triggered by WebViews 2016-07-21 15:13:07 -07:00
Zander Otavka
acf4539f4f Return a JSON string from QML instead of JS object 
Idk why QML can't return a JS object, but it can't.  Strings work, so I
use a string.
 2016-07-19 13:21:08 -07:00
Zander Otavka
c27e1d6fdb Polish dialog behavior and spacing 2016-07-15 17:35:55 -07:00
Zander Otavka
71f62c02fc Add basic implementation of customPrompt 
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
 2016-07-15 17:35:55 -07:00
Brad Davis
882139ebcf Allow scripts to override the navigation focus state set by QML dialogs 2016-07-14 12:10:46 -07:00
Ryan Huffman
575d693a3c Change default InfoView window width from 720 to 1024 2016-07-09 04:22:48 -07:00
Brad Davis
1f451269cd Allow scripts to receive a visibility changed signal from their windows 2016-06-30 13:22:01 -07:00