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

101 commits

Author SHA1 Message Date
David Rowe
b865e9bc8c Fix laser intersection with HUD overlay dialogs 
Also fixes dialog resize outline being drawn in the wrong position
(desktop and HMD).
 2020-11-23 16:02:32 +13:00
David Rowe
cfde36c9f5 Fix up scrollbars and separators 2020-01-23 11:25:48 +13:00
Wayne Chen
1ce7d8a31c dev feedback 2018-12-13 13:47:07 -08:00
Wayne Chen
8e075c2a7c fixing login qml/using HMD position for overlay 2018-11-07 14:05:06 -08:00
Wayne Chen
51586625e7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-07 12:02:38 -08:00
Alexander Ivash
27bb8a0de7 rename stylues-uit => stylesUit & controls-uit => controlsUit 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
 2018-11-06 14:21:14 +05:30
Wayne Chen
03c39eb92f more wip 2018-10-31 07:45:55 -07:00
Wayne Chen
331b09c8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-24 09:16:24 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
Wayne Chen
84001ae208 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-22 17:59:33 -07:00
Alexander Ivash
740123b853 rename stylues-uit => stylesUit & controls-uit => controlsUit 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
 2018-10-18 21:05:20 +03:00
Wayne Chen
e254324dbd Merging more files 2018-10-01 16:47:10 -07:00
Wayne Chen
72851acd8b adding spacer/close button pos 2018-10-01 16:44:01 -07:00
Wayne Chen
e7616c7d34 added logging + activity logging 2018-09-10 15:06:14 -07:00
Wayne Chen
695f6a8f16 Merging changes, modifying close button 2018-09-07 12:05:28 -07:00
Wayne Chen
d9495275cc adding cancel button and signed in checkbox 2018-09-07 11:22:31 -07:00
vladest
617b49fe14 Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode 2018-05-01 21:22:48 +02:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801 
HMD API JSDoc
 2018-04-16 11:12:26 -07:00
Seth Alves
46a741be7b
Merge pull request #12068 from vladest/move_to_qqc2 
Move to qqc2
 2018-04-12 11:26:55 -07:00
David Rowe
7a9e3388fa Merge branch 'master' into 21801 2018-04-12 09:48:51 +12:00
Alexander Ivash
557b7ded66 fix for closed query dialogs auto-reopening (FB13962 Import Entity URL Dialogue Box Will not Disappear) 
Signed-off-by: Alexander Ivash <elderorb@gmail.com>
 2018-04-06 03:00:44 +03:00
vladest
70ce1b2bf7 Fix invalid scrolling detection 2018-03-28 21:48:44 +02:00
David Rowe
1bcb9738f0 Miscellaneous fixes noticed in passing 2018-03-28 12:26:08 +13:00
vladest
e0593b7799 Use Flickable instead of ScrollView 2018-03-24 15:32:46 +01:00
vladest
387be7415f WIP: do not push 2018-03-14 19:00:19 +01:00
vladest
d41dd1b18d Merge branch 'master' into move_to_qqc2 2018-03-13 19:28:51 +01:00
vladest
fe5d7463fe Merge branch 'master' into move_to_qqc2 2018-03-10 14:42:51 +01:00
Gabriel Calero
109fa1d832 Add the url of each qml as on-screen debug info 2018-03-07 17:18:37 -03:00
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
vladest
698a224bb0 Next attempt to fix ghosted scroll bars 2018-03-06 16:13:46 +01:00
Brad Davis
8bfc610cfb Merge remote-tracking branch 'upstream/master' into android 2018-03-05 11:48:58 -08:00
vladest
94e070eae2 Try to fix incorrectly visible scrollbars on Mac 2018-03-04 15:14:49 +01:00
vladest
b7f146fd47 Fix clipping issues in scrolling window 2018-02-27 16:27:08 +01:00
vladest
931696322f Fixed stucked mouse pointer in QQC2 toolbar mode 2018-02-25 08:58:05 +01:00
Gabriel Calero
2d4bb3bad3 Change color to QML debug info 2018-02-21 20:23:54 -03:00
Gabriel Calero
f2ce3d0268 Fix focus hack. Add QML debug info 2018-02-21 20:10:03 -03:00
vladest
05fab77189 Merge branch 'master' into move_to_qqc2 2018-02-21 11:57:19 +01:00
Alexander Ivash
2eb8ebcdbc FB11508 - toolbar slowly sides downward 2018-02-16 20:22:16 +03:00
vladest
4e38b3bace Started working on ComboBox. Add background for scroll bar 2017-11-20 20:35:41 +01:00
vladest
f991379c9c Fix scroll bar 2017-11-20 17:02:34 +01:00
vladest
b21f66f666 Port PlaySampleSound to QQC2. Fix crash on press down key in scroll window 2017-11-19 20:09:07 +01:00
vladest
41f338e6ad Port ScrollingWindow and TabletDebugWindow 2017-11-18 20:18:17 +01:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01:00
druiz17
f2ad61934b fix toolbar from completely dispearing 2017-10-19 14:02:21 -07:00
druiz17
36912f1cd4 fixed toolbar disapearing after reloading default scripts 2017-10-18 16:03:32 -07:00
Cain Kilgore
583b0c521e Open 2017-10-10 03:40:48 +01:00
Cain Kilgore
e9f4dee56d WL 21562 - Fix the error in the Asset Browser 2017-10-10 03:39:13 +01:00
druiz17
8a0ecf4e6f propertly determine is laser intersects with HUD UI 2017-10-02 16:46:43 -07:00
Dante Ruiz
835b23832f some modal clean up 2017-02-25 00:40:38 +00:00
Dante Ruiz
4a5be4238e messages and file dialogs in tablet 2017-02-24 00:19:32 +00:00