Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 20:10:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
56921 commits 71 branches 56 tags 1.2 GiB
Commit graph

56921 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
29baca20e3 Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-07 09:10:47 -07:00
Seth Alves
fc8b7c7cc5 Merge pull request #10904 from druiz17/window-root-spam 
fixed log spamming from windowRoot.qml in toolbar mode
 2017-07-07 07:17:08 -07:00
Seth Alves
81cc46beb4 Merge pull request #10909 from jherico/overlay_crashes 
Fixing overlay crashes, for real
 2017-07-07 07:11:52 -07:00
Seth Alves
baf63181d2 Merge pull request #10900 from hyperlogic/bug-fix/pucks-in-desktop 
Can now use chest, hips, shoulder & feet pucks in desktop mode.
 2017-07-06 19:53:44 -07:00
Seth Alves
ddabe940d6 dry up some code 2017-07-06 18:42:00 -07:00
Seth Alves
801c45898f dry up some code 2017-07-06 18:41:11 -07:00
Seth Alves
57ba2c5cd6 add invalidateJointIndicesCache method 2017-07-06 18:16:41 -07:00
Seth Alves
ef4a04b9cf code style 2017-07-06 18:01:58 -07:00
Brad Davis
f8b76d65ab Fixing overlay crashes, for real 2017-07-06 18:01:26 -07:00
Seth Alves
ab8d9f4885 check for faux joints before heading into code that needs to lock 2017-07-06 18:00:11 -07:00
Seth Alves
a543b957ef fix a race 2017-07-06 17:45:57 -07:00
Seth Alves
fc61fcf494 coding style 2017-07-06 17:40:41 -07:00
Seth Alves
15d379cc5a coding style 2017-07-06 17:36:28 -07:00
Seth Alves
4505b8cedf Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-06 17:35:11 -07:00
Seth Alves
0d3412bd97 Merge branch 'faster-getters-on-avatar-for-scripts' of github.com:sethalves/hifi into faster-getters-on-avatar-for-scripts 2017-07-06 17:35:07 -07:00
Stephen Birarda
d22b146370 Merge pull request #10845 from birarda/bug/domain-cookie-restart 
fix for OAuth OPTIONS firing every XHR 302
 2017-07-06 17:22:03 -07:00
Seth Alves
2e88eca2b9 oopsy crazy 2017-07-06 16:33:37 -07:00
Stephen Birarda
6d98d20b12 cleanup bad QEventLoop::exec() OAuth handling code 2017-07-06 16:19:47 -07:00
Seth Alves
62b7ba6446 Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-06 16:01:42 -07:00
Seth Alves
5645870f0a Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-06 16:00:52 -07:00
Seth Alves
e03b902a15 change when joint cache is copied 2017-07-06 15:42:24 -07:00
druiz17
b4182fe7ac Merge pull request #10899 from druiz17/calibration-update-2.0 
Updates to the Calibration UI
 2017-07-06 14:24:45 -07:00
utkarshgautamnyu
d961a0c4ad Merge pull request #10887 from highfidelity/bug/5950 
Bug/5950
 2017-07-06 14:04:38 -07:00
Seth Alves
0ac8f6efa3 cache the jointnames and indexes from FBXGeometry for out-of-thread access 2017-07-06 14:02:59 -07:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only 
disable user activity logger in DS/AC/ac-client
 2017-07-06 14:01:49 -07:00
Dante Ruiz
b0130896d1 fixed spamming from windowRoot.qml 2017-07-06 22:01:08 +01:00
Zach Fox
8945b75cda Merge pull request #10903 from zfox23/PAL_fixAdminColumn 
Ensure admins see PAL admin column
 2017-07-06 13:38:10 -07:00
Seth Alves
18b7e6aecd Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-06 13:22:37 -07:00
Seth Alves
24c8267030 in Rig joint accessors, if on the Rig's thread use internalPoseSet, else use external 2017-07-06 13:22:14 -07:00
Dante Ruiz
1fcb3b32d6 fixed letter cap 2017-07-06 20:55:19 +01:00
utkarshgautamnyu
d5c88bc6de Merge branch 'master' into bug/5950 2017-07-06 12:52:13 -07:00
Seth Alves
0374d24b15 Merge pull request #10901 from druiz17/goto-keyboard-fix 
Fixed the keyboard not showing  up for goto in HMD mode
 2017-07-06 12:46:13 -07:00
Stephen Birarda
29d7784fef Merge pull request #10895 from highfidelity/bug/5976 
Bug/5976
 2017-07-06 12:43:15 -07:00
Zach Fox
a5c7324ec5 Ensure admins see PAL admin column 2017-07-06 12:15:44 -07:00
Dante Ruiz
2d876377d5 keyboard know disappears when you click of the address line 2017-07-06 20:04:44 +01:00
Stephen Birarda
bdcdff3dbc force _isSet to be set before isSet() called 2017-07-06 12:01:08 -07:00
Dante Ruiz
de5802418f fixed some keybaord logic 2017-07-06 19:27:48 +01:00
Clément Brisset
4f8b5b7c8a Merge pull request #10607 from ZappoMan/godview 
god view app
 2017-07-06 11:27:24 -07:00
Dante Ruiz
4e3dba1767 goto HMD keyboard fix 2017-07-06 19:12:52 +01:00
Seth Alves
e9bdbd7715 Merge branch 'calvin' of github.com:samcake/hifi into faster-getters-on-avatar-for-scripts 2017-07-06 11:09:38 -07:00
Anthony J. Thibault
eb486c8f47 comments 2017-07-06 11:03:03 -07:00
Anthony J. Thibault
4e9b8c1ef9 updated comments 2017-07-06 11:01:59 -07:00
Anthony J. Thibault
dee9769be3 Can now use chest, hips, shoulder & feet pucks in desktop mode. 
* Fixed bug where head puck would sometimes not work properly when other vive trackers were enabled.
* Fixed calibration to work in sensor space instead of avatar space, this was necessary because
  the sensor to world matrix is unreliable when in desktop mode.
 2017-07-06 10:54:03 -07:00
Anthony J. Thibault
8c15d1bab9 delete-trailing-whitespace 2017-07-06 10:54:02 -07:00
Dante Ruiz
9e4b5693c7 fixed merge conflicts 2017-07-06 18:49:46 +01:00
ZappoMan
c3c9df0cd0 restore old camera state 2017-07-06 10:41:46 -07:00
anshuman64
e384f6d1b7 Merge pull request #10866 from druiz17/vive-in-desktop 
Allowing Vive controllers and trackers to be used in desktop mode
 2017-07-06 10:40:56 -07:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
Dante Ruiz
6e1f9d275c chnaged default head offset 2017-07-06 17:54:06 +01:00
David Kelly
1ccf0da7d8 Merge pull request #10897 from davidkelly/dk/cacheSwitchFix 
redo cache switch
 2017-07-06 09:53:01 -07:00