Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 20:36:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17090 commits 69 branches 56 tags 1.2 GiB
Commit graph

17090 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
5b2b0c47c0 Merge pull request #3483 from stojce/20061 
Code Review for Job #20061
 2014-09-26 14:24:44 -07:00
AndrewMeadows
7f7861671e Merge pull request #3471 from ctrlaltdavid/20055 
Code Review for Job #20055
 2014-09-26 14:00:33 -07:00
AndrewMeadows
7223cf8d2a Merge pull request #3490 from ZappoMan/moreWorkOnCollidingEntitites 
add support for ignore collisions and collisions will/wont move entities
 2014-09-26 14:00:01 -07:00
Andrzej Kapolka
2426df9e1d Merge pull request #3491 from ey6es/master 
If we're rendering the billboard, don't render the body.
 2014-09-26 13:48:57 -07:00
Andrzej Kapolka
efa22d931f If we're rendering the billboard, don't render the body. 2014-09-26 13:48:11 -07:00
ZappoMan
21b0e31ee1 Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites 2014-09-26 12:21:51 -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
Philip Rosedale
60d6a0bf0d Merge pull request #3489 from Atlante45/radio_js 
AudioInjector stereo fix
 2014-09-26 11:25:13 -07:00
Philip Rosedale
3abf92092b Merge pull request #3474 from Atlante45/fix_attachment_bug_with_recording 
Play/Pause + interactive slider bar
 2014-09-26 11:24:48 -07:00
Atlante45
83ad0e4eb0 Fix mono injection 2014-09-26 11:14:27 -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
David Rowe
c0419c61f4 Fix missing constructor initialization 2014-09-26 09:15:17 -07:00
David Rowe
aa9511c263 Position Rift camera at avatar model's mid-eye location 2014-09-25 22:49:12 -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
Atlante45
3baa992bc3 Fixed radio model 2014-09-25 18:56:37 -07:00
Atlante45
11a5358a6e Adapted radio.js to new funciton calls 2014-09-25 18:12:30 -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
Philip Rosedale
2a4489d221 Merge pull request #3485 from ey6es/metavoxels 
Improved CSG edit behavior for dual contour surfaces, use cubic texture coordinate generation.
 2014-09-25 17:26:43 -07:00
ZappoMan
fa8c5b85ff allow you to edit mass 2014-09-25 17:00:35 -07:00
Andrzej Kapolka
ab04fb1c2f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-25 16:39:49 -07:00
Brad Hefta-Gaub
7879da440a Merge pull request #3487 from Atlante45/default_penumbra_filter_to_true 
Default penumbra filter to true
 2014-09-25 15:58:13 -07:00
stojce
5610cfeb34 CR fixes 2014-09-26 00:57:56 +02:00
Atlante45
fee01f2c73 Fixed unknow function 2014-09-25 15:26:13 -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
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
84630a8f74 Merge pull request #3484 from huffman/20024 
Code Review for Job #20024
 2014-09-25 09:33:58 -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
stojce
b7b059dc43 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-25 08:10:39 +02: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
Philip Rosedale
646abfaf4c Merge pull request #3480 from Atlante45/radio_js 
Make radio show up in front of you
 2014-09-24 17:14:34 -07:00
Atlante45
2766b6a4d7 Make radio show up in front of you 2014-09-24 17:12:49 -07:00
Philip Rosedale
fcc5eb9d0a Tuning of audio-driven mouths and brows to look better and not stay open 2014-09-24 16:37:55 -07:00
Atlante45
2ba946f47e Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-24 16:20:30 -07:00
Atlante45
75dc26c9ff Slider can moved when recording paused or stoped 2014-09-24 16:19:47 -07:00