Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-04 10:20:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
55879 commits 74 branches 59 tags 1.2 GiB
Commit graph

253 commits

Author SHA1 Message Date
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
howard-stearns
6a1dd235c9 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-24 12:49:54 -07:00
Brad Davis
a095da31fd Fix initial visibility of QML windows from scripts 2016-06-24 11:48:55 -07:00
howard-stearns
f8391f0062 fix reticle bugs 2016-06-23 16:51:15 -07:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
Brad Davis
1f2f9da019 fix keys getting stuck 2016-05-22 23:34:45 -07:00
Brad Hefta-Gaub
ac15097f47 Merge pull request #7834 from huffman/feat/user-agent-plugins 
Add system information to UserAgent in AccountManager requests
 2016-05-19 11:53:14 -07:00
Zach Pomerantz
87b102ae0f Fix -Wunused-result from invokeResult 2016-05-18 18:19:44 -07:00
Zach Pomerantz
2c9b0f7233 Rm failing VrMenu assertion 2016-05-18 17:31:47 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Brad Hefta-Gaub
de17834dd1 Merge pull request #7740 from ctrlaltdavid/20887 
Don't display "Reveal Scripts Folder" control in HMD mode
 2016-04-22 13:04:07 -07:00
David Rowe
a7b82e8cae Decouple ui and shared libraries 2016-04-22 12:58:47 +12:00
Brad Hefta-Gaub
0f966e934e Merge pull request #7728 from ctrlaltdavid/20887 
Add link in Running Scripts that opens scripts folder
 2016-04-21 16:01:52 -07:00
David Rowe
9c9bca546c Add button that opens scripts directory window 2016-04-21 11:52:03 +12:00
howard-stearns
0544bcaacd Simpler cross-platform solution, with comments. 2016-04-20 15:02:41 -07:00
David Rowe
8f6cfb72ea Fix QML warnings at shutdown 2016-04-16 15:23:41 +12:00
Brad Davis
dfc1d896cd Fix shutdown crash 2016-04-12 11:49:55 -07:00
Brad Davis
4b02e8437c Fix menu items created by plugins 2016-04-12 11:15:06 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Brad Davis
7827c0f6f6 Suppress key release events for presses that were absorbed by QML 2016-04-08 17:09:11 -07:00
Brad Hefta-Gaub
cef599eaed Merge pull request #7586 from zzmp/log/failed-menu 
Log failed MenuUserData::forObject
 2016-04-06 19:44:05 -07:00
Zach Pomerantz
91126037e0 Fix showDesktop SIGNAL 2016-04-05 14:59:54 -07:00
Zach Pomerantz
6bcfeccdd8 Log failed MenuUserData::forObject 2016-04-05 14:59:52 -07:00
Brad Davis
ca67c7335f Fix passing of simple string message types from QML to scripts 2016-04-01 11:04:01 -07:00
Brad Davis
27406f5b21 Add texture stress test 2016-03-31 15:13:04 -07:00
Brad Davis
5343dfef24 PR feedback on 7480 2016-03-28 10:19:38 -07:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
Brad Davis
a43fde0803 Build a better event bridge 2016-03-24 11:01:06 -07:00
Brad Davis
8bbabf186f Fix async issues related to JS / QML object lifetimes 2016-03-24 09:38:54 -07:00
Brad Hefta-Gaub
8c290ea6b9 Merge pull request #7390 from Atlante45/feat/udp-flood-protection 
Server side bandwidth dial
 2016-03-23 11:47:41 -07:00
Brad Davis
28f25489f8 Fix occasional crash on creating overlay tool windows 2016-03-21 19:17:31 -07:00
Atlante45
6d2498b4f2 Remove debug print 2016-03-21 14:50:18 -07:00
Brad Davis
798d2a73db Merge pull request #7326 from ZappoMan/toggleOverlay 
Various Overlay, Menu, and Away Mode bug fixes
 2016-03-13 11:44:19 -07:00
David Rowe
9da64e540d Add shortcut keys to HMD menu 2016-03-12 12:53:16 +13:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
Brad Hefta-Gaub
18f5b14e7a make all toggle menu items work properly through Menu scripting interface 2016-03-11 11:45:29 -08:00
Brad Davis
6d090895b7 Don't crash on QML menu creation failure 2016-03-09 14:48:20 -08:00
Brad Davis
d428f3b96f Working on crash bugs 2016-03-09 14:00:05 -08:00
Brad Davis
6e24b66b38 Fix edit.js upload button 2016-03-09 12:21:31 -08:00
Seth Alves
efdef52081 Merge pull request #7269 from ctrlaltdavid/20822 
Restyle bookmark dialogs
 2016-03-09 07:31:15 -08:00
David Rowe
10e4e5e3a7 Use OffscreenUI icon enum instead of QMessageBox icon enum 2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444 Add ability to have icons in query dialogs 
Add icon to bookmark dialogs' titles.
 2016-03-09 10:45:14 +13:00
Brad Hefta-Gaub
50eb07d465 Merge pull request #7221 from jherico/threaded_compositing2 
Migrate composition of the overlay and pointer to the present thread
 2016-03-08 10:22:02 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
Brad Davis
4e1f78b585 Allow message passing from a script to a QML window 2016-03-04 13:11:08 -08:00
Brad Hefta-Gaub
6b427e59ae show the overlays when the context menu is shown 2016-02-26 10:12:23 -08:00
Brad Davis
4074ba172d Fix window confirmation dialog 2016-02-23 20:37:25 -08:00
Brad Davis
b63e4b9d1f Address shutdown crash 2016-02-23 18:15:29 -08:00
Brad Davis
160a107bbd Auto-unhide the desktop when showing or raising a window 2016-02-22 19:36:00 -08:00
Brad Hefta-Gaub
0d873c7732 consolidate all calls to QCursor::pos() and QCursor.setPosition() to use common ControllerScriptingInterface 2016-02-15 16:11:25 -08:00
Brad Davis
28f3e8ba9c Don't leave user data pointers around in objects after deletion 2016-02-12 12:07:23 -08:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Bradley Austin Davis
dc0e038535 Add drive selection to the file dialog 2016-02-04 13:51:43 -08:00
Bradley Austin Davis
64597f9d9f Fixing save dialog issues saving new files 2016-02-04 13:32:52 -08:00
Bradley Austin Davis
60d97c45af Support save file dialog 2016-02-03 14:51:10 -08:00
Bradley Austin Davis
0a99086617 Moving to QML based dialogs 2016-02-03 14:51:02 -08:00
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -08:00
Bradley Austin Davis
2c26b32341 Make QML based tool-windows close properly 2016-02-02 12:00:58 -08:00
Brad Davis
c80193635b Update input dialog to support choice selection 2016-01-28 21:19:21 -08:00
Brad Davis
1324525ecc Make file dialog compatible with QFileDialog::getOpenFile 2016-01-28 15:50:57 -08:00
Brad Davis
940b095013 Removing menu logspam 2016-01-26 16:59:37 -08:00
Brad Davis
5f38c5265c Fixing potential crash in dialog popups 2016-01-26 16:59:19 -08:00
Brad Davis
bbefafcb07 Break up preferences dialogs 2016-01-23 23:11:41 -08:00
Brad Davis
208d7c3cfc Killing the old preferences dialog 2016-01-22 19:24:38 -08:00
Brad Davis
858bbbf987 Adding OffscreenUI API for QInputDialog functionality 2016-01-22 17:31:03 -08:00
Brad Davis
c7186590ea Support for directory browsing 2016-01-22 17:30:09 -08:00
Brad Davis
89b8eb2efa Fix initial keyboard focus problems 2016-01-22 13:41:06 -08:00
Brad Davis
3e7f29a0aa Support debug mode for QML UI in debug builds 2016-01-21 15:15:16 -08:00