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

288 commits

Author SHA1 Message Date
Howard Stearns
24b08bd25d Change "about" blockchain from Elements to EOS 2019-03-08 13:59:16 -08:00
Clement
61be5a3cc4 Enable "Add To World" Asset Browser button for glTF 2019-01-22 17:01:06 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
Wayne Chen
2f07a0eb5d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-11 20:01:19 -08:00
Zach Fox
4cc5fc755f Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY' 2018-12-07 11:42:03 -08:00
Wayne Chen
2a77a29f8a
Delete LoginScreenDialog.qml 2018-12-04 17:07:03 -08:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
Wayne Chen
b8d8710604 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-19 09:02:16 -08:00
Howard Stearns
8e1785bd90 security settings post-oculus-store wording 2018-11-15 15:59:52 -08:00
Wayne Chen
c85b840db0 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-14 14:47:56 -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
Wayne Chen
ea325acef9 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-12 10:28:03 -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
Wayne Chen
f66326fc4d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-08 15:51:24 -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
Wayne Chen
51586625e7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-07 12:02:38 -08:00
Wayne Chen
7c2dd973b7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-06 15:34:34 -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
Wayne Chen
2dd20de1bd Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-05 09:13:25 -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
Wayne Chen
f62c8ae87a overlay HMD implementation 2018-10-31 15:26:49 -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
35eb857ea6 adding non-working login screen 2018-10-09 16:30:47 -07: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