Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-06 18:09:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
58670 commits 69 branches 57 tags 1.2 GiB
Commit graph

99 commits

Author SHA1 Message Date
Dante Ruiz
3c862c34b2 disable reload default scripts by default 2017-07-20 21:15:00 +01:00
Zach Fox
dbb48cd1aa Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-07 16:03:04 -07:00
Dante Ruiz
6c15dffb9d added new glyph 2017-07-06 00:45:59 +01:00
Zach Fox
a1dfbc91da Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-22 10:27:52 -07:00
Zach Fox
a4a4ba817f Fixup merge - whoops 2017-06-22 10:27:28 -07:00
Dante Ruiz
2e329602f7 minimize diff 2017-06-21 01:13:45 +01:00
Dante Ruiz
b7286db523 fixed merge conflict 2017-06-21 01:10:54 +01:00
Zach Pomerantz
1bf16c4318 update fonts 2017-06-19 14:41:00 -07:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Zach Pomerantz
858b980c16 add qml Separator 2017-06-12 15:18:16 -04:00
Dante Ruiz
70ba344f1b finished openvr ui 2017-06-07 00:25:08 +01:00
Dante Ruiz
f0f10f74c6 inpput configutration stub 2017-06-03 00:30:00 +01:00
David Kelly
e0a1422345 pal selection changes 2017-04-06 12:07:51 -07:00
David Kelly
4d6886d1f4 cr feedback, plus changed 'People' to 'Connections' in a couple places 2017-04-03 17:03:14 -07:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master" 
This reverts commit b5ba4a109d.
 2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -07:00
Vladyslav Stelmakhovskyi
6d9e7de6dc Implemented AssetBrowser in Tablet view 2017-03-06 21:45:55 +01:00
Dante Ruiz
58c1a2fb99 Merge branch 'master' into menuFix 2017-03-02 00:55:18 +00:00
David Kelly
e7c8085bc8 switch to using glyph button 2017-02-27 12:44:23 -07:00
Dante Ruiz
afd56bbbbe fixed qml font path issue for desktop and tablet 2017-02-17 00:01:12 +00:00
Seth Alves
b57803057d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 06:38:44 -08:00
Faye Li Si Fi
126bfba512 fix tablet menu scrolling issue 2017-01-17 16:40:12 -08:00
Zach Fox
2f176f50fa Another checkpoint 2017-01-16 10:44:54 -08:00
Zach Fox
b7e95a3486 Updates from Alan 2017-01-12 14:14:28 -08:00
Zach Fox
083bf95917 Fix PAL scrollbar; add helper popup to ADMIN tab 2017-01-04 16:25:13 -08:00
Zach Fox
1eea3ed27d No more semicolons; tons of improvements 2016-12-21 12:48:26 -08:00
David Rowe
9fa4a20e55 Fix Asset Browser dialog 2016-08-18 09:37:26 +12:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
David Rowe
1c4eed640f Fix up file browser resize handle and outlining 2016-05-25 13:10:26 +12:00
David Rowe
17d41dd7b9 HiFi glyphs font file update with fixed up/down carats 
Update QML and HTML spinboxes accordingly.
 2016-05-18 13:25:11 +12:00
David Rowe
14c733cd6e Make columns sortable 2016-05-14 17:19:18 +12:00
David Rowe
c29b82e24d Restyle file selection dialog 
First pass
 2016-05-12 17:08:28 +12:00
David Rowe
57fae3fc51 Add FiraSans-Regular font 2016-05-12 09:28:25 +12:00
David Rowe
43f843f731 Retrofit updated margins and spacing to QML dialogs 2016-04-13 16:39:52 +12:00
David Rowe
4e3cdf6569 Update Running Scripts' search to have rounded ends and a search icon 2016-04-07 12:32:27 +12:00
David Rowe
382b05e00b Make expand/collapse icon larger 2016-03-31 13:13:13 +13:00
David Rowe
ef4d67008b Style x, y, z fields 2016-03-28 11:45:50 +13:00
David Rowe
b9ec5f39d9 Style color RGB fields 2016-03-27 22:12:10 +13:00
David Rowe
7e7e421efa Tidy some QML 2016-03-22 19:33:57 +13:00
David Rowe
42b606c09d Merge branch 'master' into 20855 2016-03-22 18:51:07 +13:00
David Rowe
3fa678a652 Style tabs and background 2016-03-19 14:52:40 +13:00
timemarkov
160b4e7ba2 Implement new design of attachment dialog 2016-03-18 12:11:00 +01:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
David Rowe
3deb30d699 Remove no longer need font type 2016-03-12 13:06:29 +13:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
David Rowe
e175c19754 Style checkbox for menu items 2016-03-11 15:51:27 +13:00
David Rowe
fb0f97264c Style HMD menu items 2016-03-11 15:24:35 +13:00