Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-01 04:51:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17173 commits 73 branches 59 tags 1.2 GiB
Commit graph

5424 commits

Author SHA1 Message Date
Andrzej Kapolka
533d59becc Merge pull request #3499 from Atlante45/radio_js 
Stereo fix
 2014-09-26 20:04:55 -07:00
Atlante45
5a8b9082b2 Check _currentSendPosition instead of overriding 2014-09-26 19:47:26 -07:00
Atlante45
dfe70ed2e3 Initialize InjectedAudioStream with correct stereo value 2014-09-26 19:23:36 -07:00
Stephen Birarda
7c738edbd8 Merge pull request #3488 from PhilipRosedale/master 
Correct eye contact for Oculus users
 2014-09-26 15:42:03 -07:00
Philip Rosedale
2f609bb711 Merge pull request #3492 from birarda/domain-wizard 
initial re-tooling of domain-server settings for metaverse setup
 2014-09-26 15:40:44 -07:00
Philip Rosedale
3ea9923240 Merge pull request #3493 from ZappoMan/moreWorkOnCollidingEntitites 
handled multiple collisions correctly, and don't collide if fully enclosed
 2014-09-26 15:33:54 -07:00
Atlante45
6df430660d Uninitialized member 2014-09-26 15:23:17 -07:00
ZappoMan
7bea4b3123 also honor ignore collisions for voxels and avatars 2014-09-26 15:12:59 -07:00
ZappoMan
bbd476d564 handled multiple collisions correctly, and don't collide if fully enclosed 2014-09-26 14:55:05 -07:00
Stephen Birarda
3cbfad69cd fix indentation issues for merged AddressBarDialog classes 2014-09-26 14:32:59 -07:00
Stephen Birarda
e75a2d355e Merge branch 'master' of https://github.com/highfidelity/hifi into domain-wizard 2014-09-26 14:31:52 -07:00
Stephen Birarda
5b2b0c47c0 Merge pull request #3483 from stojce/20061 
Code Review for Job #20061
 2014-09-26 14:24:44 -07:00
ZappoMan
21b0e31ee1 Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites 2014-09-26 12:21:51 -07:00
Stephen Birarda
94f30fe4d9 handle password setting by not converting to double 2014-09-26 12:20:12 -07:00
Stephen Birarda
21809cc9df fix http username with no password 2014-09-26 12:09:29 -07:00
ZappoMan
2d81d7c554 add support for ignore collisions and collisions will/wont move entities 2014-09-26 11:43:56 -07:00
Philip Rosedale
7c1333dcb0 Merge pull request #3486 from ZappoMan/moreWorkOnCollidingEntitites 
Improvements to entity collisions (using shape collider)
 2014-09-26 11:25:51 -07:00
Atlante45
83ad0e4eb0 Fix mono injection 2014-09-26 11:14:27 -07:00
Stephen Birarda
e6449da890 repair a crash while overriding a config map 2014-09-26 11:10:56 -07:00
Stephen Birarda
954fbc2017 use DomainServerSettingsManager to handle simulation settings and config 2014-09-26 11:06:05 -07:00
Atlante45
a4a5d71caa Merge branch 'fix_attachment_bug_with_recording' of github.com:Atlante45/hifi into radio_js 
Conflicts:
	libraries/audio/src/AudioInjector.cpp
 2014-09-26 10:45:34 -07:00
Stephen Birarda
f47cc176b5 resolve conflicts on merge with upstream master 2014-09-26 08:33:34 -07:00
Atlante45
cf453a8953 removed _isPaused 2014-09-25 19:32:57 -07:00
Atlante45
cf925120ca Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-25 19:23:46 -07:00
Atlante45
72f5b9b77b code cleanup 2014-09-25 19:19:03 -07:00
Atlante45
f50b42fd16 Read new Sound() arg 2014-09-25 19:15:16 -07:00
Philip Rosedale
f66f565f53 update stDev (standard deviation) class to coding standard 2014-09-25 18:14:02 -07:00
Atlante45
453869c8e9 Stereo flag + specific resample in Sound class 2014-09-25 18:12:11 -07:00
Atlante45
7f4ece2be1 Resize ringbuffer of injected stereo stream 2014-09-25 17:54:53 -07:00
Atlante45
7dc07a1c51 Compute correct number of bytes to send when stereo 2014-09-25 17:54:11 -07:00
ZappoMan
fa8c5b85ff allow you to edit mass 2014-09-25 17:00:35 -07:00
stojce
6a3bc8f255 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-25 23:57:19 +02:00
ZappoMan
c880f00a14 make sure to scale default octree shape collision to meters 2014-09-25 14:54:06 -07:00
ZappoMan
ddf7e5604a Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites 2014-09-25 14:51:43 -07:00
Stephen Birarda
a684191cf1 change the default config path to system config path 2014-09-25 14:50:07 -07:00
ZappoMan
2f0a9b517f make sphere entities use sphere shape for better collisions 2014-09-25 14:49:52 -07:00
ZappoMan
9cd76983a2 swith to using shape collider instead of spheres 2014-09-25 14:35:20 -07:00
Andrzej Kapolka
7de108f493 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-25 11:22:19 -07:00
AndrewMeadows
697c7f6a61 Merge pull request #3481 from ZappoMan/collidingEntities 
First cut at colliding entities
 2014-09-25 09:38:50 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub
9878cdd476 Merge pull request #3477 from Atlante45/removed_recording_compressed_data 
Changed recording file format
 2014-09-25 09:26:02 -07:00
Brad Hefta-Gaub
712f88baa3 Merge pull request #3476 from birarda/xbox-controller 
add script support for general SDL controllers
 2014-09-25 09:25:08 -07:00
ZappoMan
eda168a6d9 first cut at shape collisions 2014-09-24 19:51:37 -07:00
ZappoMan
9cc1fe35db only do collisions on entities moving toward each other 2014-09-24 18:22:28 -07:00
ZappoMan
2cfa14d5ad changed to only collide with moving entities 2014-09-24 18:06:08 -07:00
ZappoMan
4b52fddffd collions with voxels and avatars 2014-09-24 17:37:56 -07:00
Atlante45
75dc26c9ff Slider can moved when recording paused or stoped 2014-09-24 16:19:47 -07:00
ZappoMan
8d9a923add fix the collision last edited behavior correctly, delete collision sound code 2014-09-24 16:04:39 -07:00
ZappoMan
10865944f0 removed some debug 2014-09-24 15:44:09 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00