David Rowe
|
1fa31d3c10
|
Remove old ToolWindow code
|
2018-01-13 10:27:43 +13:00 |
|
Zach Fox
|
b2bafed2bb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-07 11:21:24 -08:00 |
|
SamGondelman
|
3274c41aeb
|
Merge remote-tracking branch 'upstream/pointers' into ui
|
2017-11-15 17:45:45 -08:00 |
|
SamGondelman
|
8730a26d20
|
use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation
|
2017-11-15 14:12:16 -08:00 |
|
Brad Davis
|
1167be4102
|
Reverting tablet API rename, cleaning up duplicated code
|
2017-11-15 11:52:55 -08:00 |
|
Brad Davis
|
d71fd151c5
|
Fixing button model exposure
|
2017-11-13 16:45:27 -08:00 |
|
SamGondelman
|
60db24f2d3
|
merge with master
|
2017-11-13 14:36:24 -08:00 |
|
SamGondelman
|
2fb1981c4a
|
merge with master
|
2017-11-13 14:34:39 -08:00 |
|
SamGondelman
|
2c0272f304
|
(mostly?) fix touch events
|
2017-11-13 12:58:31 -08:00 |
|
Elisa Lupin-Jimenez
|
119c662899
|
fixed null file path in file dialog call
|
2017-11-09 11:46:19 -08:00 |
|
SamGondelman
|
ce58b6c401
|
trying to fix HUD events, abstracting touch event logic (wip), seth's comments
|
2017-11-03 17:15:30 -07:00 |
|
druiz17
|
8a0ecf4e6f
|
propertly determine is laser intersects with HUD UI
|
2017-10-02 16:46:43 -07:00 |
|
druiz17
|
20918641f4
|
saving work
|
2017-09-29 16:48:25 -07:00 |
|
vladest
|
50ee41e095
|
Fix file loading dialogs
|
2017-09-19 22:42:15 +02:00 |
|
vladest
|
1cde504c74
|
Memleak fix. Cleanup
|
2017-09-16 22:57:26 +02:00 |
|
vladest
|
3ceeb0d83e
|
Rework all c++ calls
|
2017-09-16 22:04:53 +02:00 |
|
vladest
|
0bfa29d0d4
|
Merge branch 'master' into modal_dialogs_async
|
2017-09-14 20:21:29 +02:00 |
|
Brad Davis
|
cc3beb3d91
|
Fix potential crash on asynchronous QML loads
|
2017-09-07 09:53:21 -07:00 |
|
vladest
|
38295ab73f
|
Merge conflicts
|
2017-08-28 16:58:30 +02:00 |
|
Brad Davis
|
e817d3ced4
|
Threaded rendering & entity rendering refactor
|
2017-08-24 13:34:34 -07:00 |
|
vladest
|
a87a93d991
|
Implemented input dialog async functions
|
2017-08-16 15:35:51 +02:00 |
|
vladest
|
757af1e2e5
|
Added Save, Directory and Assets async methods
|
2017-08-15 14:44:01 +02:00 |
|
vladest
|
ac7aa609f2
|
Open file async implemented
|
2017-08-14 16:23:53 +02:00 |
|
vladest
|
b604b1bbac
|
Async file dialogs #1
|
2017-08-13 11:02:29 +02:00 |
|
vladest
|
68e9d335cd
|
Added async information and critical dialogs
|
2017-08-10 10:46:06 +02:00 |
|
vladest
|
556569819d
|
1st stage of moving to async dialogs
|
2017-08-09 14:00:19 +02:00 |
|
Brad Davis
|
6fc82bb351
|
Switch to preprocessor macro for blocking invokes to capture function information
|
2017-06-30 11:36:24 -07:00 |
|
Brad Davis
|
b52dd7b822
|
Don't use blocking connections on the main thread
|
2017-06-29 20:45:17 -07:00 |
|
Brad Davis
|
4439de240a
|
Trying to fix QtQml/QtScript crashes
|
2017-06-22 16:39:57 -07:00 |
|
Bradley Austin Davis
|
995fe11c05
|
Migrate to single QML engine
|
2017-06-05 15:14:44 -07:00 |
|
David Rowe
|
4a5f84f4b9
|
Merge branch 'master' into 21249
# Conflicts:
# libraries/audio-client/src/AudioClient.cpp
|
2017-04-26 13:24:18 +12:00 |
|
Dante Ruiz
|
8cfa03fa56
|
tablet cpp ownership
|
2017-04-21 18:26:26 +01:00 |
|
David Rowe
|
00b6b2a2c0
|
Implement desktop recordings browser dialog
|
2017-04-19 12:34:59 +12:00 |
|
David Rowe
|
dae6d6fb69
|
Stub desktop dialog to select recording to play from ATP assets
|
2017-04-18 11:43:42 +12:00 |
|
Dante Ruiz
|
4bc050e583
|
added tablet notification
|
2017-03-15 19:26:50 +01:00 |
|
Dante Ruiz
|
4a5be4238e
|
messages and file dialogs in tablet
|
2017-02-24 00:19:32 +00:00 |
|
Dante Ruiz
|
3ba605bf23
|
saving work
|
2017-02-23 00:28:30 +00:00 |
|
Anthony J. Thibault
|
432bb27119
|
The tablet Help button should be active if window is visible
|
2017-01-23 18:37:08 -08:00 |
|
Dante Ruiz
|
2fc76d64fd
|
clean up unused code and files
|
2017-01-10 09:13:46 -08:00 |
|
Dante Ruiz
|
6705846518
|
clean up round 1
|
2017-01-10 09:13:46 -08:00 |
|
Dante Ruiz
|
6c51edec77
|
added context menu to tablet
|
2017-01-10 09:13:45 -08:00 |
|
Brad Hefta-Gaub
|
dbbed462b4
|
cleanup naked qDebug() calls
|
2016-12-19 22:24:25 -08:00 |
|
howard-stearns
|
3a072b5bf9
|
tell desktop about preference changes
|
2016-11-03 12:17:28 -07:00 |
|
Howard Stearns
|
baea0f5cb0
|
create a directory chooser that works in hmd, and use it
|
2016-10-16 17:27:51 -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 |
|
Zander Otavka
|
530e17a7e5
|
Move JSON parsing for custom dialog to be sooner
|
2016-07-22 17:14:45 -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 |
|