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

20593 commits

Author SHA1 Message Date
ZappoMan
d352163d77 fix no audio device from previously removed audio device 2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub
035a9e898f Merge pull request #10684 from howard-stearns/avatar-whitelist 
avatar whitelist
 2017-06-15 08:45:16 -07:00
druiz17
347f020b04 Merge pull request #10692 from jherico/fix_tablet_crash 
Fix crash on exit when tablet is open
 2017-06-15 08:15:02 -07:00
Andrew Meadows
becb968a75 Merge pull request #10685 from ctrlaltdavid/21327-b 
Use HMD roll angle to turn while flying or walking in HMD
 2017-06-14 16:56:29 -07:00
David Rowe
16bebdd409 Rename identifiers 2017-06-15 09:20:55 +12:00
David Rowe
55e0082792 Code review 2017-06-15 09:10:08 +12:00
Brad Davis
7a6df850c5 Fix crash on exit when tablet is open 2017-06-14 13:22:53 -07:00
Howard Stearns
87f3ce7699 reset avatar on domain change if the last domain imposed something on us 2017-06-13 19:30:01 -07:00
David Rowe
be2bcb1c13 Turn with head roll in HMD when walking or flying 2017-06-14 12:20:46 +12:00
David Rowe
05f19d54f4 Add HMD roll control JavaScript API 2017-06-14 11:55:04 +12:00
Zach Fox
37e72f25a3 Make the PAL's tab background color white 2017-06-13 16:04:14 -07:00
Brad Davis
db8bdbc0a6 Merge pull request #10659 from samcake/orange 
simple Render Engine refactors coming from the Spectator Cam project
 2017-06-12 20:31:07 -07:00
Brad Hefta-Gaub
0a84a75bde Merge pull request #10650 from jherico/web_event_handlers 
Simplify eventBridge mechanism exposing functionality to web pages
 2017-06-12 19:23:01 -07:00
Seth Alves
aeaddd23c7 Merge pull request #10658 from seefo/fb5087 
Resolved FB5087
 2017-06-12 17:25:05 -07:00
Brad Hefta-Gaub
347742be1b Merge pull request #10601 from birarda/mannequin-avatar 
Update default avatar to baked mannequin
 2017-06-12 16:42:37 -07:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Andrew Meadows
321e307c9f Merge pull request #10609 from 1P-Cusack/21317 
WL21317 helper functions for getting into avatar coordinate space
 2017-06-12 11:18:29 -07:00
seefo
cb5a114145 Fixed Ubuntu warning 2017-06-12 10:47:55 -07:00
Chris Collins
4b6c13bc1f Merge pull request #10646 from ZappoMan/debugAudioProblems 
Fix for no-audio on clean install
 2017-06-10 11:32:42 -10:00
samcake
bb38938534 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-09 14:34:25 -07:00
Stephen Birarda
8bc7ce6357 put back defaultAvatar_full.fst mode to 644 2017-06-09 13:55:57 -07:00
ZappoMan
6fe20f90a3 add better debugging for audio problems 
use OS default device if settings have no values
 2017-06-09 13:36:12 -07:00
seefo
0343d4e443 Resolved FB5087 2017-06-09 13:33:46 -07:00
Seth Alves
3f425a5f02 Merge pull request #10649 from sethalves/fix-head-puck-broken-eyes 
Fix head puck broken eyes
 2017-06-09 12:50:53 -07:00
Seth Alves
5b62c9e83b try again to get forward not-looking-at-anyone gaze to work right 2017-06-09 10:45:04 -07:00
seefo
dc02e34782 Resolved FB#5009 2017-06-09 10:23:53 -07:00
Seth Alves
197fb620d4 Merge branch 'master' of github.com:highfidelity/hifi into fix-head-puck-broken-eyes 2017-06-09 09:28:07 -07:00
Chris Howe
08d93173f0 Minor code feedback changes, moving test scripts to developer/tests. 2017-06-09 11:07:56 -04:00
Anthony Thibault
e3c342aa77 Merge pull request #10595 from hyperlogic/feature/spine-spline 
Spline IK target support
 2017-06-08 18:09:55 -07:00
Seth Alves
485df396ef Merge pull request #10628 from jherico/qt59 
Fixes for Qt 5.9 compatibility
 2017-06-08 16:51:08 -07:00
Anthony J. Thibault
8334dff610 compute rotation from derivative of spline 
This should fix bad rotation values for the spine during bowing/touching toes.
 2017-06-08 15:00:12 -07:00
Seth Alves
ce4c3e1601 fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-08 13:55:30 -07:00
Seth Alves
3b47142592 fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-08 10:28:38 -07:00
samcake
3664655512 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-07 17:43:50 -07:00
howard-stearns
9cf027a68c pr feedback 2017-06-07 16:44:13 -07:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
howard-stearns
9b5b352bc7 Merge branch 'do-not-get-stuck-in-floor' of https://github.com/howard-stearns/hifi into do-not-get-stuck-in-floor 2017-06-07 16:21:08 -07:00
Seth Alves
69520ff3db pull from upstream, code review 2017-06-07 10:28:02 -07:00
Seth Alves
b1c7c251ac Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-07 10:09:46 -07:00
Brad Hefta-Gaub
e5ac3eeea7 Merge pull request #10548 from NeetBhagat/21255 
On Oculus Rift on/off, switch automatically to/from desktop mode
 2017-06-06 18:05:56 -07:00
samcake
bac66ee4c7 Introducing the renderview task 2017-06-06 18:00:41 -07:00
David Kelly
06527ac0a2 Merge pull request #10611 from davidkelly/dk/4873 
protect _text member of Text3DOverlay with mutex
 2017-06-06 16:50:57 -07:00
Bradley Austin Davis
fc6a278217 Fixing dangling thread issues, consolidating thread management 2017-06-06 15:02:16 -07:00
Brad Davis
171d3212fe Merge pull request #10623 from jherico/qml_engine_singleton 
Migrate to single QML engine
 2017-06-06 15:00:43 -07:00
Stephen Birarda
0ccd0d3fd6 Merge pull request #10621 from highfidelity/stable 
Merge Stable back into Master
 2017-06-06 10:39:03 -07:00
NeetBhagat
c3621d7c32 Resolved two issues: 
1) While in HMD mode -> open Tablet -> Click Desktop.  Desktop mode will be on.
2) Menu sync problem while switching modes.
 2017-06-06 22:31:14 +05:30
Chris Howe
8166fec0e0 Minor changes based on code review feedback 
See https://worklist.net/21317,
https://github.com/highfidelity/hifi/pull/10609 and
https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197
 2017-06-06 12:11:57 -04:00
NeetBhagat
ae9a928740 Merge branch 'master' into 21255 
# Conflicts:
#	interface/src/Application.cpp
 2017-06-06 19:06:50 +05:30
Howard Stearns
3de243b093 Include the radius of the sphere at the avatar's feet. 2017-06-05 18:48:11 -07:00
Seth Alves
20c9228050 Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller 2017-06-05 15:53:23 -07:00