Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 12:36:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
45668 commits 71 branches 56 tags 1.2 GiB
Commit graph

99 commits

Author SHA1 Message Date
howard-stearns
747c43d065 basic user story card 2016-08-11 16:43:29 -07:00
Zander Otavka
3c30743d0d Remove url change debug info for WebView 2016-08-02 16:48:39 -07:00
James B. Pollack
ea1c21e685 resolve merge 2016-07-24 18:51:00 -07:00
James B. Pollack
8acb30da8e add permissions bar 2016-07-24 16:54:00 -07:00
Zander Otavka
5394c092d0 Fix bug with dropdown 2016-07-20 13:07:45 -07:00
Zander Otavka
c27e1d6fdb Polish dialog behavior and spacing 2016-07-15 17:35:55 -07:00
James B. Pollack
c3c9c0cb10 update so HTML5 media apis work again 2016-07-13 14:37:41 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769 
CR for Job #20769 - Touchscreen camera input for Interface
 2016-07-11 14:24:52 -07:00
Brad Davis
86f8b57841 Highlight controls based on activeFocus, not focus 2016-06-30 15:16:28 -07:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
Brad Davis
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -07:00
David Rowe
3780b18cc0 Fix a QML error 2016-06-09 15:15:32 +12:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
David Rowe
e1d885004f Fix carat in drop-down boxes 2016-05-18 13:59:13 +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
3b34b908d7 Tweak level-up and home buttons 2016-05-13 17:39:15 +12:00
David Rowe
d798e562fc Update scrollbar in tree view to match table scrollbar 
Used in Running Scripts and Asset Browser dialogs.
 2016-05-12 17:18:30 +12:00
David Rowe
c29b82e24d Restyle file selection dialog 
First pass
 2016-05-12 17:08:28 +12:00
David Rowe
88207b727b Style directory and navigation controls "as is" 2016-05-10 15:45:10 +12:00
David Rowe
16874baf5f Use UI Toolkit border styles for various dialogs 
File > Help...
File > About Interface
Settings > Avatar Settings > Browse
Go To button (directory.js)
Examples button (examples.js)
 2016-04-28 11:14:39 +12:00
David Rowe
7b9e6b52fb Merge branch 'master' into 20872 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-04-22 13:19:47 +12:00
David Rowe
6c5335cfa7 Replace button with icon and text 2016-04-21 15:17:06 +12:00
David Rowe
43f843f731 Retrofit updated margins and spacing to QML dialogs 2016-04-13 16:39:52 +12:00
David Rowe
b33d28852b Merge branch 'master' into 20872 2016-04-13 13:11:26 +12:00
Zach Pomerantz
1df2fc7809 Disable qml gradient for AMD for ContentSection 2016-04-11 13:59:08 -07:00
David Rowe
3f62702ff0 Add search icon to entity list filter 2016-04-07 13:38:00 +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
Triplelexx
11af0a421b Merge branch 'master' into 20769 2016-04-03 22:57:55 +01:00
David Rowe
13ab854a9d Reduce space between collapsed sections 
In settings dialogs as well as entities editor.
 2016-03-31 15:02:16 +13:00
David Rowe
382b05e00b Make expand/collapse icon larger 2016-03-31 13:13:13 +13:00
David Rowe
28d0fc677c Update UIT QML control 2016-03-30 12:19:26 +13:00
David Rowe
9280443425 Merge branch 'master' into 20855 2016-03-25 09:06:20 +13:00
David Rowe
51728d14a7 Miscellaneous improvements to Attachments dialog 2016-03-24 21:17:36 +13:00
Stephen Birarda
34fb06a7bd changes to attachments dialog from contractor 2016-03-23 13:52:47 -07:00
David Rowe
42b606c09d Merge branch 'master' into 20855 2016-03-22 18:51:07 +13:00
timemarkov
160b4e7ba2 Implement new design of attachment dialog 2016-03-18 12:11:00 +01:00
David Rowe
7ed30048a4 Set up files for restyling tool window frame 2016-03-18 16:27:13 +13:00
Atlante45
07d2213628 Remove debug 2016-03-15 09:14:22 -07:00
Atlante45
9b8b1d41e3 Edit in place 2016-03-15 09:14:22 -07:00
Stephen Birarda
8e2b06a8e5 use an explicit selection model for treeview 2016-03-10 18:32:18 -08:00
Stephen Birarda
9a2b2b4c16 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-09 12:16:46 -08:00
Seth Alves
efdef52081 Merge pull request #7269 from ctrlaltdavid/20822 
Restyle bookmark dialogs
 2016-03-09 07:31:15 -08:00
David Rowe
973fa28d3f Fix case of RalewaySemiBold font name 2016-03-09 13:32:37 +13:00
Atlante45
0bed46d43a Fix typos and file browser directory 2016-03-08 13:24:36 -08:00
Atlante45
320bd2b4d4 Reset ContentSection scheme 2016-03-08 13:13:45 -08:00
Atlante45
d0e29846f4 Add GlyphButton 2016-03-08 13:13:45 -08:00
Atlante45
6fecb4e1d1 Window fixup 2016-03-08 13:13:45 -08:00
Atlante45
82d6d3ff01 Small fix to buttons color 2016-03-08 13:13:45 -08:00
David Rowe
e5188108a1 Fix width of delete bookmark drop-down 2016-03-08 15:21:15 +13:00