Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 11:20:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76087 commits 72 branches 59 tags 1.2 GiB
Commit graph

629 commits

Author SHA1 Message Date
Bradley Austin Davis
fc51b93691 Fix OSX build 2018-08-03 16:15:58 -07:00
Brad Davis
d6bcdcde3f Fix DISABLE_QML behavior 2018-08-03 14:58:11 -07:00
Bradley Austin Davis
8e9c1e5c0a Fix out of date comment 2018-08-03 11:38:39 -07:00
Alexander Ivash
5a2506e94f FB16831 qml-related warnings in log 
fix is based on exposing C++ objects to QML before root object is created (as root object might already require C++ objects)
 2018-08-03 17:10:41 +03:00
SamGondelman
8a9c27ed92 Merge remote-tracking branch 'upstream/master' into destroy 2018-08-01 16:07:48 -07:00
Brad Davis
4b317a84d8 Don't allow Web surfaces created by non-client scripts to access files 2018-08-01 15:12:45 -07:00
SamGondelman
7954865141 trying to fix dependency shutdown 2018-07-05 14:34:37 -07:00
Thijs Wenker
3a32472b0b added test / more docs 2018-07-04 02:49:20 +02:00
Thijs Wenker
3f6793b462 - center default native window 
- close button destroys window by default unless Desktop.CLOSE_BUTTON_HIDES flag is set
 2018-07-03 18:42:39 +02:00
Thijs Wenker
7390983721 introduce scriptable presentationMode instead of automatic mode switching windows 2018-07-03 16:49:49 +02:00
Thijs Wenker
c6e264edac fix OSX build (Clang errors) for QA 2018-06-29 19:16:35 +02:00
Thijs Wenker
5029767493 InteractiveWindow scripting API 2018-06-28 19:04:08 +02:00
John Conklin II
8c516e1ca8
Merge pull request #13480 from birarda/bug/go-to-before-clear-master 
move AddressManager to NodeList thread, make AccountManager safer
 2018-06-27 15:58:56 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
David Rowe
764e00d9cf Stop desktop app window's QML source from running when window is closed 2018-06-20 15:48:40 +12:00
Andrew Meadows
5a3350950b check pointer validity before dereference 2018-06-15 11:43:52 -07:00
Simon Walton
2d9a5c62c1 Clean-up for compiler warnings 2018-06-01 10:02:41 -07:00
Simon Walton
c277cc7574 Fix minor error 2018-05-31 18:39:25 -07:00
Simon Walton
7d1d7f7bcd Closing the open tablet dialog - try harder 2018-05-31 18:31:53 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c 
JSDoc fixes
 2018-05-24 16:44:55 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Liv
40ff3f966f
Merge pull request #13165 from ctrlaltdavid/21872-b 
JSDoc stubs for various APIs
 2018-05-18 09:11:55 -07:00
David Rowe
33ba559bb4 Show all OverlayWebWindows properties and functions together 2018-05-18 08:02:02 +12:00
Gabriel Calero
8741c5e6a4 Make haptic pulse duration configurable in VirtualPadDevice 2018-05-17 11:37:13 -03:00
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b 
# Conflicts:
#	interface/src/ui/Snapshot.h
 2018-05-17 20:11:14 +12:00
David Rowe
145d73aa76 OverlayWebWindow JSDoc fixes 2018-05-17 19:18:00 +12:00
Gabriel Calero
5afc9c6df3 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-16 12:45:17 -03:00
vladest
5127cb0ea6 Merge branch 'master' into menu-updates 2018-05-16 14:37:00 +02:00
David Rowe
a1de44310f tabletInterface API JSDoc 2018-05-15 10:02:38 +12:00
David Rowe
c97d7c9d73 Expand and fix ToolbarProxy and ToolbarButtonProxy JSDoc stubs 2018-05-14 10:43:38 +12:00
David Rowe
71355840b9 Expand OverlayWindow and OverlayWebWindow JSDoc stubs 2018-05-14 09:57:35 +12:00
David Rowe
9fdce4df65 OverlayWindow and OverlayWebWindow API JSDoc stubs 2018-05-13 16:38:38 +12:00
David Rowe
46ebb0457e Toolbars API JSDoc stubs 2018-05-13 10:56:21 +12:00
David Rowe
11f984f05b OffscreenFlags API JSDoc stubs 2018-05-12 15:08:41 +12:00
Cristian Luis Duarte
f30908fb26 Android - Remove delay starting Home + Change default joystick flag 2018-05-10 18:21:33 -03:00
vladest
1794113f37 Check global switch as well 2018-05-06 12:51:59 +02:00
vladest
ac413c8854 Tablet opening notification sound settings added 2018-05-06 09:41:10 +02:00
Gabriel Calero
1330132a32 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-04 18:35:51 -03:00
Gabriel Calero
868b58e66d Un-expose Application from javascript. Restore displayplugin deactivation when goes to background 2018-05-04 18:01:01 -03:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d 
List which contexts each namespace and class is available in
 2018-05-03 01:29:14 -07:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
Gabriel Calero
3a1bfefc22 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-02 10:09:56 -03:00
John Conklin II
250aa3ab43
Merge pull request #13027 from jherico/fix/web_crash2 
Some fixes for QML surfaces
 2018-05-01 12:39:46 -07:00
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging 
Quiet logging
 2018-04-27 14:59:38 -07:00
Brad Davis
6640313256 Fix memory leak in QML surfaces 2018-04-27 08:10:22 -07:00
Brad Davis
4db83230ce Fix bad virtual cast on qml surface destruction 2018-04-27 08:09:31 -07:00
Gabriel Calero
8923c16b08 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-04-23 17:04:06 -03:00
David Rowe
6a2b7244eb Interim JSDoc for Tablet 2018-04-23 11:06:17 +12:00
Seth Alves
6fc02638d7 control verbose logging with a menu-item in developer menu 2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7 remove some uncatagorized logging, suppress some categories by default 2018-04-20 16:08:57 -07:00
Gabriel Calero
adfbaac18f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-19 19:40:00 -03:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018 
Discovery: April 2018 (Huge PR; see description)
 2018-04-17 15:11:50 -07:00
Gabriel Calero
e3b94b163c Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-16 14:55:16 -03:00
Sam Gateau
3ac4a1db2d
Merge pull request #12850 from SimonWalton-HiFi/early-trace 
Enable Interface tracing from earliest execution point
 2018-04-16 10:24:55 -07:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
John Conklin II
008c7be369
Merge pull request #12787 from druiz17/fix-offscreen-windows 
hide desktop windows when switching into HMD mode
 2018-04-13 12:17:15 -07:00
Gabriel Calero
aaaa17be7b Merge branch 'android_goto_splash' of https://github.com/gcalero/hifi into android_goto_splash 2018-04-12 18:00:05 -03:00
Gabriel Calero
476e1cf7ae Adjust UI with pixel perfect precision. Support devices with on-screen bars. 2018-04-12 17:59:38 -03:00
Cristian Luis Duarte
b031c1c070 Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash 2018-04-12 14:32:07 -03:00
Gabriel Calero
865e3a05f1 Move jump button to the right. Adjust position of buttons 2018-04-11 19:33:43 -03:00
John Conklin II
7a905ed420
Merge pull request #12777 from ctrlaltdavid/21813 
Fix Window API position and size reporting
 2018-04-11 13:48:21 -07:00
Zach Fox
b9d0360ea2 Finally fix the grey security pic bug! 2018-04-10 16:00:53 -07:00
Simon Walton
9b6306601a Merge Clement's PR12700 diffs for early trace start 2018-04-10 13:13:46 -07:00
Cristian Luis Duarte
ffb8b0a60e Android fly - Use new asset and screen position 2018-04-04 18:19:01 -03:00
Dante Ruiz
09ced24710 hide desktop windows when switching into HMD mode 2018-04-04 11:05:25 -07:00
David Rowe
a3c8b2792d Fix Window.geometryChanged() values for moving and resizing window 2018-04-04 09:42:05 +12:00
Cristian Luis Duarte
1ea056a8a9 Android - Initial Jump button implementation 2018-04-03 16:07:40 -03:00
Sam Gondelman
c59d29f4ee
Merge pull request #12623 from SamGondelman/android 
Android: Fix corruption on startup
 2018-03-12 15:03:07 -07:00
Ken Cooke
c9e253ab14
Merge pull request #12621 from ctrlaltdavid/21791 
Fix CPU and GPU not throttling when Interface minimized from maximized
 2018-03-12 14:43:47 -07:00
SamGondelman
4bef033d6f cleanup, don't compress rcc file to fix corruption 2018-03-12 13:05:03 -07:00
David Rowe
3001225cb7 Fix CPU and GPU not throttling when Interface minimized from maximized 2018-03-12 15:49:20 +13:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
Cristian Luis Duarte
bde2ba9272 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:02:23 -03:00
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading 
Improve font loading via QRC instead of file path
 2018-03-02 14:22:17 -08:00
Gabriel Calero
01699e26a5 Fix QML debug info: print last QML loaded file instead of Desktop.qml 2018-03-02 18:04:36 -03:00
Zach Fox
67034274fa Improve font loading by using QRC instead of relative paths 2018-02-28 17:59:37 -08:00
Cristian Luis Duarte
9acb83632c Android - Make joystick move up when showing the bottom bar 2018-02-28 18:52:13 -03:00
Cristian Luis Duarte
55d52f92df Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows) 2018-02-28 15:55:50 -03:00
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13:00
Gabriel Calero
1dfdc0ce1b Hide the selection cursor (android only) 2018-02-27 16:25:04 -03:00
Brad Davis
6254e2b569 PR feedback 2018-02-27 09:11:40 -08:00
Brad Davis
b9387f2a21 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-26 13:18:14 -08:00
vladest
77ef0e05a1 Search main window by checking object name 2018-02-26 13:43:50 +01:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes 
Android ui fixes
 2018-02-22 18:28:18 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
David Rowe
c88f9a059d Fix up JSDoc comment blocks in TabletScriptingInterface 2018-02-23 10:39:46 +13:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
Gabriel Calero
f2ce3d0268 Fix focus hack. Add QML debug info 2018-02-21 20:10:03 -03:00
John Conklin II
92249a2bee
Merge pull request #12396 from ElderOrb/double-connection-fix 
fix 4x 'fromQml' slots execution
 2018-02-21 09:01:47 -08:00
MiladNazeri
331b253ba0
Merge pull request #12386 from cain-kilgore/21668 
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
 2018-02-16 06:57:03 -08:00
Alexander Ivash
beb595266d fix 4x 'fromQml' slots execution 
note: per discussion with Austion & Seth, TabletRoot should be the only entity sending 'sendToScript' signals to C++
 2018-02-15 21:45:35 +03:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml 
Migrating QML rendering off the main thread
 2018-02-12 15:32:33 -08:00
Cain Kilgore
d1ecc85fb3 Merge branch 'master' of https://github.com/highfidelity/hifi into 21668 2018-02-12 23:19:20 +00:00
Cain Kilgore
5048bf16cb Fixed Async Prompts/Assets/Dialogs 2018-02-12 23:01:19 +00:00