Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 19:15:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15769 commits 71 branches 56 tags 1.2 GiB
Commit graph

8384 commits

Author SHA1 Message Date
Atlante45
b028b845f4 Fox audio recording not being triggerred from JS 2014-08-19 17:22:05 -07:00
Atlante45
b13604f968 JS API for recording 2014-08-19 16:43:26 -07:00
Atlante45
db8869a34d File format implementation + threading tweaks 2014-08-19 16:42:43 -07:00
Atlante45
29830916ba Fix bug introduced in CR 2014-08-18 21:06:32 -07:00
Atlante45
c113dd350e Moved members to MyAvatar 2014-08-18 16:25:38 -07:00
Atlante45
698699dea8 CR 2014-08-18 15:56:27 -07:00
Atlante45
6d567e67a9 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 15:41:19 -07:00
Clément Brisset
bec149ebb9 Merge pull request #3295 from AndrewMeadows/ragdoll 
Ragdoll Part 11: ragdoll collisions move avatar
 2014-08-18 15:38:25 -07:00
AndrewMeadows
86aa9a1dcf Merge pull request #3289 from ctrlaltdavid/19840 
Code Review for Job #19840
 2014-08-18 15:05:26 -07:00
Clément Brisset
a6f0c9bb01 Merge pull request #3288 from nivardus/19616 
Code Review for Job #19616
 2014-08-18 14:44:29 -07:00
Atlante45
1d30b52ec2 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 14:23:40 -07:00
Atlante45
52640c8482 Various tweaks and code cleanup 2014-08-18 14:23:29 -07:00
Andrew Meadows
b2d3830057 merge upstream/master into andrew/ragdoll 2014-08-18 12:56:11 -07:00
Andrew Meadows
c2f4648ad7 Merge branch 'ragdoll' of ssh://github.com/AndrewMeadows/hifi into ragdoll 2014-08-18 12:55:10 -07:00
Andrew Meadows
aa1a7307cc use Ragdoll::_accumulatedMovement to move MyAvatar 2014-08-18 12:53:34 -07:00
Andrew Meadows
7e7978de1a compute and store Ragdoll::_accumulatedMovement 2014-08-18 12:53:04 -07:00
Andrew Meadows
3e2095332f make SkeletonRagdoll::updateMuscles() protected 2014-08-18 12:50:07 -07:00
Clément Brisset
ddc67a8edb Merge pull request #3285 from AndrewMeadows/ragdoll 
Cleanup of Ragdoll API
 2014-08-18 12:36:27 -07:00
Atlante45
acb55ce65e Switched audio play back to AudioInjector out of Audio 2014-08-18 12:31:44 -07:00
Andrew Meadows
77047b0130 no NULL check on delete SkeletonModel::_ragdoll 2014-08-18 11:25:51 -07:00
AndrewMeadows
4b7208ac53 Merge pull request #3280 from huffman/19907 
Code Review for Job #19907
 2014-08-18 10:20:01 -07:00
Atlante45
47685b0e88 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-17 12:56:19 -07:00
Andrzej Kapolka
a2ec9898ad Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-15 16:34:25 -07:00
Andrzej Kapolka
668f6d3cfd Support for shadows on heightmaps. 2014-08-15 16:13:47 -07:00
Atlante45
6592a6dca2 Fix for custom URL schemes 2014-08-15 10:28:22 -07:00
Philip Rosedale
28abc6ab2a Merge pull request #3290 from ey6es/metavoxels 
Big change in the way shared borders are handled in order to fix seams between blocks.  Fixes for height/ray queries.  Minimal rectangles for deltas, switch between PNG and deflated JPG encodings.
 2014-08-15 07:57:46 -07:00
Bennett Goble
ca42aecd41 Merge branch 'master' into 19616 2014-08-14 20:52:55 -04:00
Andrzej Kapolka
05d6b628fa Alllmost ready with the big edge sharing rejiggery. 2014-08-14 17:10:45 -07:00
Atlante45
3cc18d10ae Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 16:07:38 -07:00
Clément Brisset
c01e8339b1 Merge pull request #3287 from birarda/oculus-dk2 
require presence of LibOVR for relative position from OculusManager
 2014-08-14 15:59:23 -07:00
Stephen Birarda
e3bab8bdc8 require presence of LibOVR for relative position from OculusManager 2014-08-14 15:47:03 -07:00
Atlante45
9e5b68fa9d Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 15:38:03 -07:00
Bennett Goble
e21392f553 Merge branch 'master' into 19616 2014-08-14 18:37:11 -04:00
Andrew Meadows
60d411ead5 cleanup Ragdoll API (less "ragdoll" qualifiers) 2014-08-14 14:41:51 -07:00
Andrew Meadows
46c91052c9 split SkeletonModel and Ragdoll classes apart 2014-08-14 14:29:03 -07:00
Atlante45
2981132395 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 11:39:44 -07:00
Atlante45
cd0f216419 Added Recorder and Player to Audio class 2014-08-14 11:39:36 -07:00
Atlante45
db5aeddc0f fix for joints not playing back 2014-08-14 10:58:00 -07:00
Andrew Meadows
ca4a23e532 use "visible joint positions" for MyAvatar only 2014-08-14 09:21:15 -07:00
Andrew Meadows
7852321152 merge upstream/master into andrew/ragdoll 2014-08-13 14:52:14 -07:00
Andrew Meadows
3d107cc7e5 less variability in verlet simulation loop count 2014-08-13 14:51:16 -07:00
Andrzej Kapolka
8c42a3a848 Ray query fix. 2014-08-13 11:30:05 -07:00
Andrzej Kapolka
56c6c3c972 Working on the height/ray queries. 2014-08-13 11:05:48 -07:00
Andrzej Kapolka
d00efe7f6d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-13 10:07:24 -07:00
Andrzej Kapolka
9c2d4776f9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-12 18:21:23 -07:00
Andrzej Kapolka
21d6c3c48a More work on edge rejiggery. 2014-08-12 18:21:04 -07:00
Atlante45
73a3a13c59 More recording work 2014-08-12 18:15:48 -07:00
Atlante45
792f779bbf Hooked up MyAvatar to playbacks 2014-08-12 16:16:01 -07:00
Atlante45
18ff497443 Added all relevant curves to RecordingFrames 2014-08-12 16:11:53 -07:00
Stephen Birarda
4dce4c4919 link to ws2_32.lib if LibOVR is being linked to 2014-08-12 15:23:12 -07:00