Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-09 03:05:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56989 commits 6 branches 1 tag 1.1 GiB
Commit graph

56989 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Prat
06d69d04c3 TransitionStage + FadeJob compiling but not linked to entity events 2017-07-07 18:22:11 +02:00
Olivier Prat
4256a1f2a7 Preparing for merge with stage. DOESN'T COMPILE! 2017-07-07 15:16:20 +02:00
Sam Gateau
d15c4ea2d3 Merging with the stage branch 2017-07-07 15:12:40 +02:00
Sam Gateau
a8086764da REmoving warnings for unused var 2017-07-07 12:19:22 +02:00
Sam Gateau
4c1bf6af47 REmoving comments 2017-07-07 11:38:25 +02:00
Olivier Prat
5ab093dc38 Preparing to introducte TransitionStage 2017-07-07 11:01:47 +02:00
Sam Gateau
156c20d01e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-07-07 10:58:05 +02:00
Olivier Prat
69a7ec42fd Added fade state in render::Item 2017-07-07 09:16:54 +02: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
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
Stephen Birarda
6d98d20b12 cleanup bad QEventLoop::exec() OAuth handling code 2017-07-06 16:19:47 -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
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
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
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
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
ZappoMan
10341af819 Merge branch 'master' of https://github.com/highfidelity/hifi into godview 2017-07-06 09:39:33 -07:00
Dante Ruiz
258c21838e finished calibration-ui updates 2017-07-06 17:32:40 +01:00
Olivier Prat
e178e36963 Fixed compilation error 2017-07-06 17:29:14 +02:00
Andrew Meadows
4fad9d9b1a Merge pull request #10858 from jherico/trace_cores 
Additional threaded tracing of CPU cores
 2017-07-06 08:23:21 -07:00
Olivier Prat
018c0489f4 Merged with 21378 2017-07-06 16:53:47 +02:00
Sam Gateau
53ffca796f Drafting a better SHape plumber to render the items 2017-07-06 16:35:40 +02:00
David Kelly
936c21e849 remove unnecessary cacheDir member 2017-07-06 07:24:58 -07:00
Brad Davis
d91516c630 Merge pull request #10894 from jherico/acclient_fix 
Fix ACClient on Linux
 2017-07-05 18:26:15 -07:00
utkarshgautamnyu
9d2fe8da9c Update DomainServer.cpp 2017-07-05 18:02:44 -07:00
Seth Alves
c058a166d4 Merge pull request #10888 from jherico/overlay_crashes 
Trying to fix overlay crashes again
 2017-07-05 17:16:53 -07:00
David Kelly
4a22fbca1b redo cache switch 2017-07-05 17:01:31 -07:00
utkarshgautamnyu
8c96d00f14 Update DomainServerSettingsManager.cpp 2017-07-05 16:59:47 -07:00
utkarshgautamnyu
9b7a561c28 Update describe-settings.json 2017-07-05 16:56:21 -07:00
Brad Davis
2409c83d5d Fix ACClient on Linux 2017-07-05 16:53:42 -07:00
Dante Ruiz
6c15dffb9d added new glyph 2017-07-06 00:45:59 +01:00