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

589 commits

Author SHA1 Message Date
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
vladest
75ce8e56df Merge branch 'master' into address_dialog_focus_fix 2018-06-13 11:47:29 +02:00
vladest
11129eddde Remove extra textfield fro address ber input 2018-06-12 18:48:41 +02:00
Stephen Birarda
10e34000aa
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains 
Domain-unreachable message remaining on slow connects
 2018-06-11 10:46:55 -07:00
Dante Ruiz
5d570f030f fixing calibration 2018-06-08 11:18:52 -07:00
howard-stearns
890c97e7cb Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 12:24:27 -07:00
howard-stearns
f72f8c762b goto client-side filtering (preliminary) 2018-06-04 16:52:20 -07:00
Dante Ruiz
f5e2a6834b fixing some issues 2018-06-04 16:09:31 -07:00
David Back
6b7d9586d1 apply fixes to other file dialogs and fix tablet dialog buttons 2018-06-04 15:56:10 -07:00
Dante Ruiz
48c0b7379a fix vive configuration page 2018-06-04 15:16:11 -07:00
howard-stearns
5a1b56d573 checkpoint with goto feeds working (but without filtering) 2018-06-04 13:11:06 -07:00
Simon Walton
7d1d7f7bcd Closing the open tablet dialog - try harder 2018-05-31 18:31:53 -07:00
Wayne Chen
81eea5d8d1
Merge pull request #13213 from wayne-chen/filebrowser-case-14515 
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
 2018-05-30 10:43:58 -07:00
Wayne Chen
345138f4ff Changing showHidden property to be always true 2018-05-23 10:30:08 -07:00
Wayne Chen
e3414c320e changing property to alias to reflect folderListModel 2018-05-22 11:03:31 -07:00
Wayne Chen
1774b401c8 allowing file dialogs to show hidden files/folders via showHidden property 2018-05-22 10:24:04 -07:00
Dante Ruiz
60dd7e49ab making requested changes 2018-05-18 16:41:39 -07:00
Dante Ruiz
2a6204ca8d remove option for mouse sensivtity 2018-05-16 15:47:55 -07:00
vladest
72838f6d34 Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons 2018-05-16 17:06:31 +02:00
vladest
5127cb0ea6 Merge branch 'master' into menu-updates 2018-05-16 14:37:00 +02:00
Dante Ruiz
82422edb59 fixinig the controller settings page and have menu option on by default 2018-05-14 18:51:39 -07:00
vladest
f8ebe7e669 remoed no more used LOD dialogs. Fixed Slider properties min and max settings 2018-05-12 16:01:43 +02:00
Anthony J. Thibault
0ac12fa317 Bug fix for Vive Tracker Calibration Settings 
This issue was inadvertently introduced by the name change of the Vive display plugin.
 2018-05-10 17:56:54 -07:00
vladest
ea66e04ab8 Removed unwanted code 2018-05-02 18:58:40 +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
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data 
Get the correct device name connect to OpenVr
 2018-04-24 13:29:41 -07:00
vladest
0e28e41107 Fix various issues with SpinBox-es and Sliders 2018-04-20 19:15:29 +02:00
vladest
ab1a89a6f9 Merge branch 'master' into menu-updates 2018-04-19 21:02:30 +02:00
Dante Ruiz
a65f5f7917 making tablet changes 2018-04-18 13:06:26 -07:00
Dante Ruiz
5af1ea54d3 Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data 2018-04-16 10:10:55 -07: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