Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 04:56:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44355 commits 74 branches 59 tags 1.2 GiB
Commit graph

92 commits

Author SHA1 Message Date
Brad Davis
37e9f66639 Additional toolbar work 2016-06-20 15:41:21 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Bradley Austin Davis
33e9caa636 Simplify overlay conductor, menu interation 2016-06-15 17:24:39 -07:00
Bradley Austin Davis
175dbb8924 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-14 09:48:56 -07:00
Brad Hefta-Gaub
7da29daf9d Merge pull request #8036 from ctrlaltdavid/20955 
Fix image2d overlay color property
 2016-06-13 19:21:59 -07:00
Brad Davis
472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	scripts/system/controllers/handControllerGrab.js
 2016-06-10 10:43:09 -07:00
David Rowe
5352bd4b76 Fix height of Load Defaults button 2016-06-09 17:15:17 +12:00
Howard Stearns
bf48099286 Merge pull request #8032 from jherico/pin-button 
Add a constant hud toggle button to the UI
 2016-06-08 10:33:11 -07:00
Brad Davis
ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-06-07 21:51:47 -07:00
David Rowe
f9d6a7ba8d Fix image2d overlay color property 2016-06-08 14:04:02 +12:00
Brad Davis
ba61491ee6 PR feedback 2016-06-07 15:33:00 -07:00
Brad Davis
b9ee0c087e Add a constant hud toggle button to the UI 2016-06-07 13:45:23 -07:00
David Rowe
b6af46cac9 Add "Load Defaults" button to Running Scripts dialog 
And rename "Stop All" to "Remove All".
 2016-06-07 11:30:07 +12:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
David Rowe
504516b627 Merge branch 'master' into 20917 2016-05-24 08:03:54 +12:00
Brad Hefta-Gaub
00bd3b2e8a remove more dead code 2016-05-20 13:43:08 -07:00
David Rowe
17b3101ca5 Merge branch 'master' into 20917 2016-05-20 18:50:01 +12:00
Atlante45
38f74c1843 Remove the last of the glow level 2016-05-14 14:49:31 -07:00
David Rowe
b6fcb77d6f Update Running Scripts list to use updated QML table control 2016-05-12 17:16:56 +12:00
Brad Hefta-Gaub
4ab7b660d4 fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
Brad Hefta-Gaub
f4e4f217e8 Merge pull request #7642 from ctrlaltdavid/20872 
Further restyling of edit.js
 2016-04-22 13:46:26 -07: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
a7b82e8cae Decouple ui and shared libraries 2016-04-22 12:58:47 +12:00
David Rowe
266e4c998b Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD 2016-04-22 12:29:22 +12:00
David Rowe
6c5335cfa7 Replace button with icon and text 2016-04-21 15:17:06 +12:00
David Rowe
9c9bca546c Add button that opens scripts directory window 2016-04-21 11:52:03 +12:00
David Rowe
43f843f731 Retrofit updated margins and spacing to QML dialogs 2016-04-13 16:39:52 +12:00
David Rowe
f7f5443a44 Merge branch 'master' into 20872 
Conflicts:
	examples/html/entityProperties.html
 2016-04-12 15:40:35 +12:00
David Rowe
e37e46d34a Disable arrow keys being able to move between HTML form fields 
Moving between form fields with arrow keys makes it to easy to make
unintended changes to adjacent fields.
 2016-04-08 10:30: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
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
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
timemarkov
160b4e7ba2 Implement new design of attachment dialog 2016-03-18 12:11:00 +01:00
David Rowe
48d4316714 Fix typo 2016-03-17 09:34:21 +13:00
Atlante45
5a0beec1f5 Replace old drag&drop with new UI 2016-03-09 11:47:31 -08:00
Atlante45
ded449072f Rename window 2016-03-08 13:13:45 -08:00
Atlante45
784f669998 First draft Assets Manager 2016-03-08 13:13:45 -08:00
David Rowe
1eb6fa425c Fix up Running Scripts dialog 2016-03-03 20:09:50 +13:00
David Rowe
4d53dee29c Rename section control 2016-03-02 19:46:26 +13:00
David Rowe
e79427bb3b Make some settings dialogs have collapsible sections 2016-03-02 19:41:50 +13:00
David Rowe
16fbf60bae Update preferences dialog titles to match menu items 2016-03-02 11:52:58 +13:00
David Rowe
a25702535b Style snapshots section 2016-02-26 14:01:57 +13:00
David Rowe
d255ad3805 Improve property naming 2016-02-26 10:17:36 +13:00
David Rowe
09029e4edd Change name of dialog to match menu item 2016-02-25 20:37:54 +13:00
David Rowe
10efbd996f Update General Settings dialog to use new window frame style 2016-02-25 20:26:36 +13:00
Brad Hefta-Gaub
1699e4a396 Merge pull request #7131 from ctrlaltdavid/20805 
Restyle the Running Scripts dialog
 2016-02-24 13:45:40 -08:00
David Rowe
bac703b29e Adjust height of Running Scripts now that fonts are consistently sized 2016-02-24 12:36:46 +13:00
Brad Hefta-Gaub
71262c3e64 cleaner QML rejection of mouse messages 2016-02-23 11:14:16 -08:00
Brad Hefta-Gaub
2db25690f1 detect when mouse is over QML overlays or 2D JS Overlays 2016-02-23 10:14:44 -08:00