Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 19:00:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73983 commits 25 branches 0 tags 1.1 GiB
Commit graph

270 commits

Author SHA1 Message Date
Howard Stearns
8e1785bd90 security settings post-oculus-store wording 2018-11-15 15:59:52 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
Zach Fox
8d325d8dd9 Actually fix MS19803: Replace missing imports 2018-11-09 15:02:57 -08:00
Zach Fox
1ce6079c5a Remove extra as 2018-11-09 11:26:18 -08:00
Zach Fox
142dfab9ac CR round 1 2018-11-08 10:05:57 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
Alexander Ivash
a3dfc873b7 rsolve rebase conflict 2018-11-06 14:21:14 +05:30
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
Zach Fox
515ff016a4 Fix seven bugs 2018-11-05 13:03:34 -08:00
Zach Fox
0a15e94fe4 New colors 2018-11-01 13:27:31 -07:00
Zach Fox
162a08b993 Restore certain images 2018-10-31 16:14:26 -07:00
Zach Fox
d4e9a70564 Almost there 2018-10-31 16:12:16 -07:00
Zach Fox
41a0d09389 First pass 2018-10-31 15:31:51 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -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
David Rowe
ab47e16be1 Fix up titles and leading white space of some dev menu tablet dialogs 2018-09-06 14:35:08 +12:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184 
Add Support for Managing Avatar Entities to the Avatar App
 2018-08-22 10:20:04 -07:00
Alexander Ivash
5ba68cbfac remove attachments menu item / dialogs / related components 2018-08-11 00:50:32 +03:00
David Back
8db0711b5b set grabbable user data in addModelEntity, pass grabbable from asset browser 2018-08-08 16:33:47 -07:00
r3tk0n
c80ab0d237 Re-added mouse sensitivity settings to General Preferences dialog. 2018-06-27 16:10:07 -07:00
David Rowe
0161015746 Fix setting avatar attachment joint 2018-06-11 15:31:42 +12:00
Dante Ruiz
2a6204ca8d remove option for mouse sensivtity 2018-05-16 15:47:55 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -07:00
vladest
e2a8ee2a4c Fixed About date format. Increased space between logo and build info 2018-05-15 20:02:29 +02:00
vladest
a6ef459723 Open browser within Interface 2018-05-15 16:07:32 +02:00
vladest
fee3cc0aca Implemented backend for About dialog 2018-05-15 15:49:20 +02:00
vladest
58f04121b7 Correct link colors 2018-05-15 06:22:10 +02:00
vladest
2a3004079e About UI 2018-05-14 23:22:06 +02: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
vladest
3296ae0db8 Merge branch 'master' into menu-updates 2018-04-26 22:21:40 +02:00
vladest
0e28e41107 Fix various issues with SpinBox-es and Sliders 2018-04-20 19:15:29 +02:00
vladest
c402cb2c19 Fix Desktop double windows 2018-04-17 19:51:43 +02:00
vladest
6d53512c6c Merge 2018-04-15 15:24:16 +02:00
Seth Alves
46a741be7b
Merge pull request #12068 from vladest/move_to_qqc2 
Move to qqc2
 2018-04-12 11:26:55 -07:00
Alexander Ivash
814cfa4587 fix TabletAssetServer 2018-03-30 00:09:28 +03:00
vladest
001b6d23ff Merge branch 'master' into move_to_qqc2 2018-03-28 20:16:26 +02:00
John Conklin II
586fb4829c
Merge pull request #12637 from druiz17/fix-asset-server-qml 
Fix asset server qml sorting
 2018-03-28 09:35:53 -07:00
Dante Ruiz
ad9ca0da20 fix tablet version 2018-03-27 16:03:06 -07:00
vladest
096b56395e Fix crash on startup 2018-03-27 18:22:56 +02:00
Dante Ruiz
00fa5cfd06 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-13 10:08:00 -07:00
Dante Ruiz
f521a129b6 fixing issues 2018-03-13 10:07:34 -07:00
Alexia Mandeville
8c9c7248d4 Reorganize of menu action items as well as QML categories 2018-03-12 12:52:12 -07:00
vladest
fe5d7463fe Merge branch 'master' into move_to_qqc2 2018-03-10 14:42:51 +01:00
Zach Fox
2b137f94a6
Merge pull request #12596 from zfox23/fixFontsAgain 
Fix font loading for MacOS via completely different font loading method
 2018-03-09 09:49:56 -08:00
Zach Fox
d0cc64f63d Fix font loading for MacOS via different font loading method 2018-03-08 11:19:49 -08:00
vladest
148faa3a93 Merge branch 'master' into move_to_qqc2 2018-03-04 14:16:21 +01:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00