vladest
de4f34aacb
Add resizable flag. Use the flag for Create only
2017-09-15 21:49:38 +02:00
David Kelly
7550374f8f
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet
2017-09-13 04:49:13 -07:00
David Kelly
187ed71a8a
more cleanup, plus now keyfile associated with user directly
2017-09-12 10:55:27 -07:00
anshuman64
996277b34c
Merge pull request #11335 from vladest/menu_fix
...
Make sure root item is created before lambda gets called for desktop …
2017-09-11 12:47:40 -07:00
vladest
34c1cb6579
Typos and naming fixes
2017-09-11 19:42:05 +02:00
Chris Collins
47a9337aa7
Merge pull request #11323 from jherico/mac_fixes
...
Mac fixes
2017-09-11 09:10:50 -07:00
vladest
dfaa8761e5
Make sure root item is created before lambda gets called for desktop loader
2017-09-10 20:08:40 +02:00
Bradley Austin Davis
eb8b892571
Various Mac fixes
2017-09-07 14:45:35 -07:00
Brad Davis
cc3beb3d91
Fix potential crash on asynchronous QML loads
2017-09-07 09:53:21 -07:00
beholder
c62f9007e9
7196 Mouse pointer no longer visible in HMD mode
...
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.
The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
2017-09-03 15:20:59 +03:00
David Kelly
988ee8c8d1
fix image provider, couple other things
2017-08-30 15:23:54 -07:00
Zach Fox
271fcbf8b4
Merge pull request #11271 from davidkelly/dk/securityImageIssue
...
security image shows up in every qml engine now
2017-08-30 10:52:48 -07:00
David Kelly
72b15b4223
fix comment
2017-08-29 20:28:57 -07:00
druiz17
2a97257698
Merge pull request #11140 from ElderOrb/case6788
...
6788: You can deselect your current view mode
2017-08-29 17:15:51 -07:00
David Kelly
a2b1cfc7ac
security image shows up in every qml engine now
2017-08-29 17:06:57 -07:00
beholder
a0a43ebf26
show checkbox or radiobutton dependently on exclusiveGroup presence
2017-08-29 23:23:16 +03:00
beholder
cbbe03cee7
6788: You can deselect your current view mode
2017-08-25 02:33:11 +03:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Howard Stearns
188cbee781
Merge pull request #11212 from howard-stearns/asynchronous-commerce-2
...
Asynchronous Ledger Interactions with Server
2017-08-18 15:40:24 -07:00
howard-stearns
bd37679b65
working
2017-08-18 14:03:40 -07:00
howard-stearns
3d401129fb
checkpoint
2017-08-18 10:03:00 -07:00
Elisa Lupin-Jimenez
6c2bf63392
Back button works
2017-08-10 17:51:19 -07:00
Elisa Lupin-Jimenez
da5bb03187
Trying to add in a back button
2017-08-10 16:34:37 -07:00
Seth Alves
186035dc5d
adjust various things that cause a crash-on-exit on Linux
2017-08-06 11:57:55 -07:00
vladest
a439cc1837
Make connection to tablet shown signal more consistent, eliminates missed signals
2017-08-03 20:58:44 +02:00
vladest
b049b0f415
Merge conflicts
2017-08-03 19:43:42 +02:00
vladest
638eeede43
Merge conflict
2017-08-02 20:07:06 +02:00
Dante Ruiz
05f1caab01
better solution to help and blank tablet issues
2017-08-02 16:35:58 +01:00
vladest
2d4396ac8e
Merge branch 'master' into fix_toolbar_apps_switch
2017-08-02 16:34:49 +02:00
vladest
4330e31212
Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create
2017-08-02 16:32:09 +02:00
Dante Ruiz
cca29e849b
fix issue of tablet begin blank when switching between HMD and Desktop mode
2017-08-01 23:18:42 +01:00
vladest
e30e0b1a5f
Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption
2017-07-31 16:45:21 +02:00
vladest
bb7110d81b
Desktop Running scripts window now closed and as soon as Tablet opened, it will show Running Script. TODO: make Tablet opens automatically
2017-07-30 19:22:54 +02:00
vladest
0333849aa8
Merge branch 'master' into fix_menu_landscape
2017-07-29 11:44:58 +02:00
Stephen Birarda
17dd028ec7
make Paths available to desktop and tablet QML context
2017-07-28 14:23:18 -07:00
Brad Davis
3d0c13915a
Fix tablet button crash
2017-07-28 11:20:57 -07:00
vladest
45934cb53e
Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode
2017-07-28 18:04:29 +02:00
Brad Hefta-Gaub
9b3be6d164
Merge pull request #10808 from humbletim/21400
...
WL 21400 -- Setting that lets you switch from cursor to reticle
2017-07-27 13:16:58 -07:00
Dante Ruiz
fdfeab77eb
made requested changes
2017-07-19 16:28:16 +01:00
Dante Ruiz
06a69c8bd7
fixed another tablet stuck on help screen
2017-07-18 20:27:55 +01:00
Andrew Meadows
99aad77e53
Merge pull request #10954 from jherico/qml_crashes_again
...
Still trying to address QML crashes
2017-07-17 10:21:23 -07:00
druiz17
3b112450f0
Merge pull request #10959 from druiz17/bug/wrong-tablet-state
...
Fix tablet scripting interface setting its internal state to home when switching between toolbar and tablet mode
2017-07-14 14:31:04 -07:00
Dante Ruiz
e07b067d7b
fixed tablet getting in the wrong state
2017-07-12 21:09:54 +01:00
Brad Davis
0e9f8cc103
Still trying to address QML crashes
2017-07-12 11:04:33 -07:00
Seth Alves
3670a04d8e
switch bare pointers to AudioInjector objects to be QSharedPointers
2017-07-11 14:24:58 -07:00
Dante Ruiz
75e1b265d5
comment out code that causes a crash on launch from fresh install
2017-07-10 17:48:53 +01: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
9c37b28ba0
Remove tool window logic
2017-06-30 10:58:19 -07:00
Brad Davis
8372d73fec
Additional thread safety
2017-06-30 09:15:06 -07:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
