Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 14:12:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
54682 commits 76 branches 59 tags 1.2 GiB
Commit graph

54682 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
0e1ef75d5b fix comment wording 2017-05-10 16:18:26 +01:00
Dante Ruiz
571f0d5951 made requested changes 2017-05-10 16:14:29 +01:00
Dante Ruiz
fbbfe18e2a Merge branch 'master' of github.com:highfidelity/hifi into vive-head-input 2017-05-10 00:10:38 +01:00
Dante Ruiz
bb4c0d972d head routed through the vive input plugin 2017-05-10 00:10:26 +01:00
Chris Collins
a302c220f4 Merge pull request #10424 from AndrewMeadows/fix-mouth-movement 
Fix avatar mouth movement when driven by audio loudness
 2017-05-09 16:09:05 -07:00
Zach Fox
8c2851b996 Merge pull request #10425 from zfox23/PAL_FixConnectionsDrift 
Enable the PAL to update data about a single connection
 2017-05-09 16:01:45 -07:00
Zach Pomerantz
a7895d42d3 Merge pull request #10414 from zzmp/fix/audio-underrun 
Fix crackle in local audio
 2017-05-09 18:54:51 -04:00
David Kelly
93296bb6d8 Merge pull request #10423 from davidkelly/dk/typoInHandshakeScript 
fix typo in handshake script
 2017-05-09 15:53:56 -07:00
anshuman64
b796d8e484 Merge pull request #10412 from druiz17/config-pucks 
Moved the puck configuration to actions into the vive controller plugin
 2017-05-09 15:29:51 -07:00
Zach Fox
cf3c10c5b1 Fix the bugs, add the feature 2017-05-09 14:40:41 -07:00
Dante Ruiz
2ee71d3002 Merge branch 'config-pucks' into vive-head-input 2017-05-09 22:36:21 +01:00
Dante Ruiz
f90bfd0c9e Merge branch 'master' of github.com:highfidelity/hifi into config-pucks 2017-05-09 22:35:13 +01:00
Zach Pomerantz
219062b76a Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-underrun 2017-05-09 17:32:24 -04:00
Dante Ruiz
53e254152d fixed puck location 2017-05-09 22:30:29 +01:00
Zach Pomerantz
45feee38b2 Merge pull request #10269 from zzmp/fix/audio-bg-join 
Cleanup Audio background threads on shutdown
 2017-05-09 17:23:36 -04:00
Andrew Meadows
2be6d19dfe always call Head::simulate() for Avatar in view 2017-05-09 14:00:18 -07:00
Zach Pomerantz
c478f1a752 synchronously fill injector buffer on underrun 2017-05-09 16:34:42 -04:00
David Kelly
5b33e0233c fix typo in handshake script 2017-05-09 13:27:42 -07:00
Dante Ruiz
b70d26d10b Merge branch 'master' of github.com:highfidelity/hifi into vive-head-input 2017-05-09 21:12:20 +01:00
Howard Stearns
713ddd5cef Merge pull request #10408 from davidkelly/dk/updatePalForProfileUrl 
Use new images in api/v1/users response json
 2017-05-09 12:01:47 -07:00
Seth Alves
902fd2b215 Merge pull request #10421 from sethalves/fix-obj-mtl-loader-hang 
fix OBJ model load hang
 2017-05-09 11:46:36 -07:00
Dante Ruiz
c362ba9164 better calibration event 2017-05-09 19:13:47 +01:00
Seth Alves
48c78584c3 fix a bug that could cause OBJ models with external mtl references to hang the loading thread 2017-05-09 11:09:39 -07:00
Dante Ruiz
d688b60282 no magic numbers 2017-05-09 18:02:12 +01:00
Dante Ruiz
bce9e9ea82 made requested chnages 2017-05-09 17:51:30 +01:00
David Kelly
d40984b475 Merge pull request #10384 from davidkelly/dk/minorHandshakeImprovement 
Some minor handshake improvements
 2017-05-09 09:14:31 -07:00
Andrew Meadows
e92e710cdc Merge pull request #10413 from humbletim/fix_lookat_regression 
Fix lookAt eye snapping
 2017-05-09 08:51:10 -07:00
Ken Cooke
a96a89f9f6 Merge pull request #10320 from kencooke/audio-wasapi-qt562 
Update WASAPI audio plugin for Qt5.6.2
 2017-05-09 07:57:23 -07:00
humbletim
29b1ac3572 optimizations per feedback 2017-05-08 21:50:24 -04:00
humbletim
68ca0d921e use assert rather than whole if block 2017-05-08 21:34:55 -04:00
humbletim
42d1498d20 call Model::updateRig (not Parent::updateRig) 2017-05-08 21:19:18 -04:00
Andrew Meadows
2835a73c6b Merge pull request #10071 from AndrewMeadows/walk-up-steps 
avatar can walk up steps
 2017-05-08 18:17:16 -07:00
Ken Cooke
807a6d5831 Bugfix: new threading changes in the Qt5.7.1 plugin were causing deadlock 2017-05-08 18:03:50 -07:00
Ken Cooke
746ae6dfd3 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-wasapi-qt562 2017-05-08 17:56:19 -07:00
Zach Pomerantz
73a3bf413b update local audio thread name 2017-05-08 20:14:09 -04:00
Zach Pomerantz
b6f652e0ea use network period multiple for local audio buffer 2017-05-08 20:05:14 -04:00
Zach Pomerantz
defc3c1c4f Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join 2017-05-08 19:55:10 -04:00
Dante Ruiz
c3d57459d5 minimize diff 3.0 2017-05-09 00:32:47 +01:00
Dante Ruiz
03ba3f5944 minimize diff 2.0 2017-05-09 00:31:13 +01:00
Dante Ruiz
00546c55bb minimize diff 2017-05-09 00:30:06 +01:00
Dante Ruiz
2d3eb7ba07 Merge branch 'master' of github.com:highfidelity/hifi into config-pucks 2017-05-09 00:28:09 +01:00
Dante Ruiz
23c3a75116 finally fixed rotation issue 2017-05-09 00:27:30 +01:00
Thijs Wenker
6da925a626 Merge pull request #10410 from huffman/fix/sphinx-copyright 
Update copyright in sphinx scripts
 2017-05-09 01:03:58 +02:00
Ryan Huffman
773e4346f9 Update copyright in sphinx scripts 
These were meant to be updated before the PR was merged, but I
overlooked it.
 2017-05-08 15:59:29 -07:00
Ryan Huffman
b7af9e20c9 Merge pull request #10211 from Delamare2112/InteractionJS 
Just the interaction JS scripts
 2017-05-08 15:54:16 -07:00
humbletim
ef0e32643d update refactored logic to match previous application behavior 2017-05-08 18:53:47 -04:00
Ryan Huffman
e670037198 Adjust copyright on Limitless Sphinx script 2017-05-08 15:49:42 -07:00
anshuman64
f10535d991 Merge pull request #10395 from ctrlaltdavid/21319 
Fix browser "back" button in tablet snapshot and goto "i" pages
 2017-05-08 14:51:18 -07:00
David Rowe
116175cf9f Fix going back from Twitter password recovery page 2017-05-09 09:03:48 +12:00
David Rowe
c8328e9b9f Merge branch 'master' into 21319 2017-05-09 08:04:27 +12:00