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

15957 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
0cc6f559d4 add AACube::operator<() so they can be sorted 2014-09-03 13:13:54 -07:00
Andrew Meadows
a71823353b merge upstream/master into andrew/ragdoll 2014-08-29 16:46:33 -07:00
AndrewMeadows
431d69e9d9 Merge pull request #3330 from Atlante45/rec_file_format_tweaks 
Rec file format tweaks
 2014-08-29 16:10:03 -07:00
Andrew Meadows
aeb355e3da re-enabling legacy avatar-vs-voxel collisions 
so that I don't break anything when this merges with upstream
 2014-08-29 15:53:20 -07:00
Andrew Meadows
ebcc960ec7 merge upstream/master into andrew/ragdoll 2014-08-29 15:48:40 -07:00
Atlante45
9b5b83117f CR 2014-08-29 14:25:05 -07:00
Andrew Meadows
a0eb13f6db collision logic for capsule-side-vs-cube-face 
with unit tests
 2014-08-29 14:23:00 -07:00
Andrew Meadows
00913d4422 fixes for capsuleVsAACube() with unit tests 2014-08-28 16:51:16 -07:00
Stephen Birarda
29ed1b3fcd Merge pull request #3331 from ctrlaltdavid/19961 
Code Review for Job #19961
 2014-08-28 14:30:01 -07:00
David Rowe
1d3a176f5f Rename method 2014-08-28 13:53:47 -07:00
David Rowe
85e9f8064a Simplify to use bool instead of storing domain name 2014-08-28 12:21:55 -07:00
Clément Brisset
1b5a6cf671 Merge pull request #3325 from chansensturm/audio-filter 
left/right channels of head shadow filter now have independent gain calculations
 2014-08-28 11:51:09 -07:00
Leonardo Murillo
ff2fe3fae4 Merge pull request #3329 from birarda/addresses 
handle not found errors returned for addresses from data-web
 2014-08-28 11:50:51 -07:00
Atlante45
1a131b0e29 Removed some debug + fixed some checks 2014-08-28 11:50:18 -07:00
Atlante45
a6bf9d7b90 Handle URL recordings + some safety checks 2014-08-28 11:42:39 -07:00
David Rowe
46c1a9d59a Make login dialog automatically show only once per domain visit 2014-08-28 11:25:13 -07:00
Craig Hansen-Sturm
bef0232b35 Merge pull request #3327 from Atlante45/rec_file_format_tweaks 
Looping option
 2014-08-28 11:13:10 -07:00
Craig Hansen-Sturm
3e3090f1ea coding standard 2014-08-28 11:12:17 -07:00
Atlante45
9df68dc2f1 CR 2014-08-28 10:58:07 -07:00
Stephen Birarda
cc2a35c2a8 handle not found errors returned for addresses from data-web 2014-08-28 10:54:05 -07:00
Clément Brisset
aae10e8431 Merge pull request #3326 from JeroMiya/vs2010expressInstallOrderBuildDocFix 
Added the correct install order for VS2010 C++ Express and Win 7.1 SDK
 2014-08-28 10:08:08 -07:00
Sleepy Daddy Software™
e7fe7bd021 Added the correct install order for VS2010 C++ Express and Windows 7.1 SDK. 2014-08-28 01:23:19 -04:00
Atlante45
691ace7cc6 Looping option 2014-08-27 19:05:39 -07:00
Craig Hansen-Sturm
0881959750 left/right channels of head shadow filter now have independent gain + implemented all-pass filter 2014-08-27 17:30:11 -07:00
Craig Hansen-Sturm
61a09146cd Merge pull request #3324 from Atlante45/master 
fix for crash in Audio
 2014-08-27 16:16:13 -07:00
Atlante45
2448229b46 fix for crash in Audio 2014-08-27 16:03:53 -07:00
Andrew Meadows
921c8cfec3 fix broken build for using unititialized const float 2014-08-27 12:21:15 -07:00
Andrew Meadows
f1ae0ce992 moved some functions around 2014-08-27 12:21:03 -07:00
Andrew Meadows
e133a696f5 merge andrew/ragdoll into some ShapeCollider work 2014-08-27 12:12:08 -07:00
Andrew Meadows
c6253bb51a AACube vs Sphere and Capsule collision tests 
Sphere is unit tested.
Also removed the shape collision query against Octree
 2014-08-27 12:09:41 -07:00
Brad Hefta-Gaub
e8c3125985 Merge pull request #3323 from chansensturm/wangyix-qt_stats_for_audiomixer 
Merge of Yixin's PR #3281 to head
 2014-08-27 11:14:52 -07:00
Craig Hansen-Sturm
40a5ff6b9e ZappoMan deadcode analysis applied 2014-08-27 10:56:44 -07:00
Andrzej Kapolka
8698c2a852 Merge pull request #3322 from Atlante45/master 
Make recordings playable on ACs
 2014-08-26 18:49:42 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Atlante45
b1ca1e9840 Script to play recording on ACs 2014-08-26 18:24:09 -07:00
Atlante45
465b076998 Removed debug + ignore frame 0 2014-08-26 18:19:26 -07:00
Atlante45
056cd0a4d1 extra line 2014-08-26 18:06:10 -07:00
Atlante45
41461cd322 Added option to playback from current location 2014-08-26 17:23:50 -07:00
Atlante45
dda02b5dcf Fake faceshift connection while playing back 2014-08-26 15:54:16 -07:00
Atlante45
3826ed0d69 Added setFinalPitch/Yaw/Roll to HeadData 2014-08-26 15:36:08 -07:00
Atlante45
9e686b4096 Moved lean and head rotation inside Player class 2014-08-26 14:36:46 -07:00
Atlante45
90d8626615 Fix for audio on ACs 2014-08-26 14:35:35 -07:00
Atlante45
b92ae53753 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-08-26 14:34:39 -07:00
Brad Hefta-Gaub
9b35dc784d Merge pull request #3320 from chansensturm/master 
added high-shelf and low-shelf filters, positional audio now uses high-shelf filter
 2014-08-26 13:13:10 -07:00
Craig Hansen-Sturm
47bc183439 SQUARE_ROOT_OF_TWO renamed SQUARE_ROOT_OF_TWO_OVER_TWO 2014-08-26 11:32:05 -07:00
Craig Hansen-Sturm
5f695664a6 add explicit constants inline for documebntation purposes 2014-08-26 11:26:39 -07:00
Clément Brisset
ee5765c0a4 Merge pull request #3321 from ZappoMan/fixReferentialsBug 
fix bug in referentials
 2014-08-26 10:16:08 -07:00
ZappoMan
74585bc593 fix bug in referentials 2014-08-26 10:14:28 -07:00
Atlante45
cf14af0766 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-08-25 18:54:41 -07:00
Brad Hefta-Gaub
a51cace167 Merge pull request #3319 from Atlante45/sitting_points_not_disappearing_when_switching_to_fake_domain 
fix sitting points on domain switch
 2014-08-25 18:42:19 -07:00