Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 21:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13595 commits 25 branches 0 tags 1.1 GiB
Commit graph

13595 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
b6b148cd9f resolve conflicts on merge with upstream master 2014-06-06 11:31:16 -07:00
Stephen Birarda
f6011b65d7 fix input loudness for a stereo source 2014-06-06 11:26:04 -07:00
Stephen Birarda
ae2f6a3cb6 complete piping of stereo audio through mixer 2014-06-06 10:55:04 -07:00
Stephen Birarda
681ce247d6 tweak resample to handle 48 to 24 stereo, add stereo/mono byte 2014-06-06 10:27:59 -07:00
Stephen Birarda
7da091d2b4 initial hooks for stereo audio 2014-06-06 10:15:09 -07:00
Brad Hefta-Gaub
3646a7a61d Merge pull request #2992 from PhilipRosedale/master 
Left and Right hands have clasping animations in squeezeHands.js
 2014-06-05 17:20:59 -07:00
Andrzej Kapolka
ff306e5675 Merge pull request #2991 from ey6es/master 
Temporarily disable enum streamers, which are crashing on Windows startu...
 2014-06-05 17:08:31 -07:00
Andrzej Kapolka
83c2938c2e Temporarily disable enum streamers, which are crashing on Windows startup. 2014-06-05 17:05:57 -07:00
Andrzej Kapolka
981d0eb36e Merge pull request #2990 from AndrewMeadows/bug-fix 
fix for broken windows build with PrioVR libs
 2014-06-05 17:04:58 -07:00
Philip Rosedale
6bef0c1a6a both left and right hands in animation 2014-06-05 17:03:58 -07:00
Andrew Meadows
c689d826f4 fix for broken windows build with PrioVR libs 
The Model API changed but this code path was not updated.
 2014-06-05 15:48:18 -07:00
Clément Brisset
02452819c3 Merge pull request #2988 from AndrewMeadows/ragdoll 
RagDoll Part 1: basic data structure
 2014-06-05 14:44:36 -07:00
Andrzej Kapolka
8abcacd433 Merge pull request #2989 from ey6es/master 
That'll teach me not to wait for the PR build.
 2014-06-05 12:28:47 -07:00
Andrzej Kapolka
8d908a12a3 Fix build. 2014-06-05 12:28:02 -07:00
Andrzej Kapolka
c2d4113768 Merge pull request #2986 from Barnold1953/OculusOverlay 
Hemisphere Oculus Overlay
 2014-06-05 12:19:23 -07:00
barnold1953
f0f7d0c55f Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2014-06-05 12:17:09 -07:00
Andrew Meadows
4eb801b8e9 merge upstream/master into andrew/ragdoll 2014-06-05 11:32:18 -07:00
Andrew Meadows
1b2cd2e144 adding RagDoll scaffold 2014-06-05 11:07:35 -07:00
barnold1953
4e699c0f84 Fixed coding standard and build error 2014-06-05 10:34:06 -07:00
Philip Rosedale
3cc67f5229 Merge pull request #2984 from ZappoMan/octreeWireformatImprovements 
Octree wireformat improvements checkpoint
 2014-06-04 21:58:08 -07:00
Philip Rosedale
b59b26d87b Merge pull request #2985 from ey6es/metavoxels 
Pulled in fixes for delta-encoding from "deltatars," added support for version-resilient streaming of Qt enums/flags.
 2014-06-04 21:23:46 -07:00
Brad Hefta-Gaub
7f3630a990 Merge pull request #2981 from wangyix/master 
added MovingPercentile for filtering bad clockskew values for Node
 2014-06-04 19:45:17 -07:00
Andrzej Kapolka
fd2893bf6d Get rid of the log calls entirely; use the same code that we use for the ID 
streamer.
 2014-06-04 18:23:31 -07:00
Andrzej Kapolka
37382304f7 Perhaps this will avoid the ambiguity in Windows. 2014-06-04 17:41:36 -07:00
Andrzej Kapolka
9ec2a5aec1 Avoid ambiguous call to log on Windows. 2014-06-04 17:39:42 -07:00
Andrzej Kapolka
97dd90507b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-04 17:37:33 -07:00
Andrzej Kapolka
47c71e2d3a Merge pull request #2983 from PhilipRosedale/master 
Added squeezeHands.js for open/close hand animation with controller trigger
 2014-06-04 17:35:43 -07:00
Andrzej Kapolka
52092d7092 Merge pull request #2982 from AndrewMeadows/inertia 
cleanup: JointState::_transform is now in model-frame
 2014-06-04 17:34:29 -07:00
barnold1953
84cd200617 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-04 17:33:04 -07:00
Andrzej Kapolka
54a5bc3a49 More enum stuff, with tests. 2014-06-04 17:24:43 -07:00
barnold1953
e60c671c05 Switched Oculus UI to hemisphere. Added curved semicircle UI 2014-06-04 17:24:20 -07:00
wangyix
124bd88b01 added tests for MovingPercentile 2014-06-04 17:23:44 -07:00
Philip Rosedale
864db25f4f remove unused variables causing warning 2014-06-04 15:43:33 -07:00
ZappoMan
b74676de0d add more tests for decode 2014-06-04 15:33:22 -07:00
ZappoMan
152d99d810 removed some old debug code and updated a comment 2014-06-04 15:23:17 -07:00
Philip Rosedale
8bce7127aa support for both hands, but no script for now in the left one 2014-06-04 15:19:49 -07:00
ZappoMan
c7a502e2c9 removed empty file 2014-06-04 15:18:11 -07:00
Philip Rosedale
e8fa75b4f3 Added squeezeHands.js 2014-06-04 15:17:17 -07:00
ZappoMan
2066dbcec7 cleanup 2014-06-04 15:16:51 -07:00
wangyix
5251057ed6 MovingPercentile moved else to same line as } 2014-06-04 15:13:16 -07:00
ZappoMan
10f7eae7a0 implemented decode 2014-06-04 14:56:13 -07:00
wangyix
0da6374e19 MovingPercentile .size() consistency 2014-06-04 14:31:58 -07:00
Andrew Meadows
7807388b08 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-06-04 14:28:23 -07:00
wangyix
e2d3fcc518 changed MovingPercentile to use QList 2014-06-04 14:24:23 -07:00
Andrew Meadows
e1cb88471f add a comment 2014-06-04 14:19:45 -07:00
ZappoMan
78d3f1454c more operators 2014-06-04 14:19:35 -07:00
Andrew Meadows
f19b562e88 add JointState::setRotation(rotModelFrame) 2014-06-04 14:17:39 -07:00
Andrew Meadows
212ac13802 setRotation -> setJointRotationFromBindFrame 2014-06-04 14:10:28 -07:00
Andrew Meadows
323fa70cf3 remove last of "InModelFrame" qualifiers 2014-06-04 14:03:29 -07:00
Andrew Meadows
ccfd620c84 setJointPositionInModelFrame -> setJointPosition 2014-06-04 13:56:37 -07:00