Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 08:32:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57241 commits 75 branches 59 tags 1.2 GiB
Commit graph

57241 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Atlante45
1d07ab70f0 Fix warnings 2017-07-06 10:56:09 -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
Seth Alves
645cfce828 Merge branch 'master' of github.com:highfidelity/hifi into atp-client 2017-07-06 10:45:34 -07: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
Andrew Meadows
2299bb7718 supply minimum shape rather than null 2017-07-06 10:37:44 -07:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
Zach Fox
ee86638c4e Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-06 09:58:00 -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
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
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
Atlante45
9a1d38384d Remove unecessary loops 2017-07-05 17:43:09 -07:00
Atlante45
20a633eb89 Check struct sizes at compile time 2017-07-05 17:42:59 -07:00
Seth Alves
98ac2ccb90 rearrange code so authed connection works better 2017-07-05 17:36:25 -07:00
Seth Alves
f7131027e0 if user has provided login credentials, wait for the keypair to be ready before proceeding 2017-07-05 17:26:15 -07:00
Zach Fox
8c36e5c69f Merge pull request #10893 from zfox23/spectatorCamera_instructions 
Spectator Camera preview instructions
 2017-07-05 17:23:17 -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
Atlante45
95abbd0ad4 Prevent Interface from trying to send packets bigger than an MTU 2017-07-05 17:08:04 -07:00
Seth Alves
d62b0ffb3b Merge branch 'acclient_fix' of github.com:jherico/hifi into atp-client 2017-07-05 17:03:16 -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
Atlante45
7e9ce5a58b Don't overflow during AvatarData::toByteArray 2017-07-05 16:15:18 -07:00
Zach Fox
39bdc20b4f On checkbox language change 2017-07-05 16:13:36 -07:00
Seth Alves
3916e3ec61 Merge branch 'master' of github.com:highfidelity/hifi into atp-client 2017-07-05 15:50:57 -07:00
Seth Alves
55b7c2d767 avoid doing a lot of work during mouse-move event-handlers 2017-07-05 15:50:05 -07:00
Chris Collins
d6ecad34f4 Merge pull request #10885 from highfidelity/RC-46-HOTFIX 
Build 46.1 Hotfix: Fixing the bug appearing on NVidia driver 384.76
 2017-07-05 15:10:43 -07:00
Zach Fox
f6583a1b87 Use correct text color for checkboxes 2017-07-05 14:46:59 -07:00
Zach Fox
0af53bb4a5 Instructions and cool static :) 2017-07-05 14:46:59 -07:00
Zach Fox
aea5779ed6 When a display texture isn't set, show preview instructions 2017-07-05 14:46:58 -07:00