Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-07 07:59:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73145 commits 70 branches 57 tags 1.2 GiB
Commit graph

621 commits

Author SHA1 Message Date
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter 
Quality Improvements to Avatars driven by Vive Trackers
 2018-10-25 08:51:59 -07:00
David Back
9df8ea35bb Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 13:28:35 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
David Back
e8bda1793f Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-22 15:12:45 -07:00
John Conklin II
e40a021339
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles 
Better imports for controls and styles
 2018-10-22 11:50:09 -07:00
Ryan Huffman
9d13902cd3 Improve paramater names in model dialog window 2018-10-20 11:26:12 -07:00
Ryan Huffman
f1258e4445 Add a 'grabbable' option to the new-model dialog 2018-10-19 16:42:45 -07:00
Alexander Ivash
a4987e494a update imports 2018-10-18 21:05:20 +03: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 Back
50becb5c37 merge particle explorer into properties, resurrect sliders, other tidying/fixes 2018-10-16 12:39:34 -07:00
Anthony Thibault
7777f3edd0 Added OutOfRangeDataStrategy parameter to Controller Settings 
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.

* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
  In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results.  This is the default.
 2018-10-09 10:51:02 -07:00
David Rowe
868a3a9219 Tweak vertical spacing 2018-09-28 15:42:48 +12:00
David Rowe
4813f4d042 Show/hide jumping & flying checkbox depending on movement mode 2018-09-28 13:02:27 +12:00
David Rowe
5ab22a1f40 Change play area option text for Oculus 2018-09-27 17:07:42 +12:00
Dante Ruiz
ff52639bc3 fix update 2018-09-14 14:10:36 -07:00
Dante Ruiz
4eb5c9714b fix snapshot settings 2018-09-14 12:59:28 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
John Conklin II
9c546fc780
Merge pull request #13957 from ElderOrb/FB18024 
fix keyboard collapsing in VR/goto
 2018-09-10 13:09:28 -07:00
Alexander Ivash
7058b07aea FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized 2018-09-07 12:41:39 +03:00
David Rowe
8420afd143 Fix title not not going back to "Settings" upon Save or Cancel 2018-09-06 14:00:33 +12:00
David Rowe
a7099025dc Fix up some Settings dialogs' titles 2018-09-06 11:15:14 +12:00
David Rowe
960bf00e12 Modify look of HMD mode Settings dialogs' titles 2018-09-06 11:02:24 +12:00
David Rowe
398724de73 Make Save in HMD settings dialogs return to previous dialog 
Same as Cancel key does.
 2018-09-06 10:23:45 +12:00
David Rowe
f144308334 Make tablet menu page title navigation go back a level 2018-08-31 16:58:59 +12:00
Wayne Chen
6cdcae3349 switching address syntax, updating redirection domain 2018-08-29 16:11:51 -07:00
David Rowe
c29c9f98c1 Make Cancel in HMD settings dialogs return to Settings dialog 2018-08-28 11:15:57 +12:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184 2018-08-16 02:08:47 +03:00
Alexander Ivash
5ba68cbfac remove attachments menu item / dialogs / related components 2018-08-11 00:50:32 +03:00
Zach Fox
c0e2b3a240 Happening Now -> Featured 2018-08-09 11:49:29 -07:00
Zach Fox
af9dc8acca Turn on only for Annoucements 2018-08-07 11:51:38 -07:00
Zach Fox
4cee6b720a Implement auto-scrolling on Places cards (TODO for Connections) 2018-08-07 11:50:38 -07:00
Dante Ruiz
9bebd1e623 making changes 2018-08-03 18:11:55 -07:00
MuteTab
97e5d65592 Added conditional check for VR vs non-VR menu. 2018-07-19 14:30:06 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
Thijs Wenker
eea95161ab Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows 2018-07-06 20:06:50 +02:00
Alexander Ivash
fb1a2037e3 move specifying custom properties for preferences dialog from C++ to QML (per Dante's request) 2018-07-06 21:00:55 +03:00
Alexander Ivash
2c07aa787f allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request) 2018-07-06 21:00:54 +03:00
Seth Alves
c0e1e9c23a
Merge pull request #13353 from vladest/address_dialog_focus_fix 
Remove extra textfield fro address bar input
 2018-07-06 09:00:00 -07:00
Thijs Wenker
c583c07d9c Merge branch 'feat/create/interactive-window' into feat/create/native-windows 
# Conflicts:
#	scripts/system/libraries/entityList.js
#	scripts/system/particle_explorer/particleExplorerTool.js
 2018-07-03 18:47:38 +02:00
Dante Ruiz
603ab87c47 fix configuration page 2018-07-02 14:38:16 -07:00
vladest
0f1312ab9b Merge branch 'master' into address_dialog_focus_fix 2018-06-29 19:41:26 +02:00
Thijs Wenker
7fe9365a76 create app - native windows 2018-06-28 19:12:03 +02:00
r3tk0n
f36ba49fbd
Update TabletGeneralPreferences.qml 
Fixed a typo
 2018-06-27 16:30:38 -07:00
r3tk0n
d6684e5ef7 Re-add mouse sensitivity option to tablet. 2018-06-27 16:23:40 -07:00
vladest
41dad71634 Merge branch 'master' into address_dialog_focus_fix 2018-06-17 12:27:03 +02:00
John Conklin II
2655dd77b6
Merge pull request #13368 from zfox23/MS15501_CreateModelKeyboard 
MS15501: Fix keyboard in Create -> Model in HMD
 2018-06-15 15:34:02 -07:00
John Conklin II
7057e00583
Merge pull request #13298 from danteruiz/fix-vive-configuration-page 
Controller Confguration Page fixes
 2018-06-14 11:07:26 -07:00
Dante Ruiz
dc28e8f03f fixing error 2018-06-13 18:24:06 -07:00
Dante Ruiz
eb01b50e6f making code review changes 2018-06-13 17:58:10 -07:00
Zach Fox
6b59b5b53c MS15501: Fix keyboard in Create -> Model in HMD 2018-06-13 13:23:43 -07:00