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

17291 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
ecb14d261b distinguish advanced and standard settings, cleanup checkboxes 2014-09-25 18:04:25 -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
597871442e fix linux build fail 2014-09-25 17:39:53 -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
Stephen Birarda
606a25694d setup scrollspy for nav links on settings page 2014-09-25 17:18:10 -07:00
ZappoMan
fa8c5b85ff allow you to edit mass 2014-09-25 17:00:35 -07:00
Stephen Birarda
623e9e625b update to jQuery 2.1.1 2014-09-25 16:42:39 -07:00
Stephen Birarda
e8f25db6d8 update underscore to 1.7.0 2014-09-25 16:41:14 -07:00
Andrzej Kapolka
ab04fb1c2f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-25 16:39:49 -07:00
Stephen Birarda
1c899daa1c don't escape setting help to allow for html 2014-09-25 16:37:08 -07:00
Stephen Birarda
33a411b895 combine settings and setup into single tab 2014-09-25 16:32:09 -07:00
Philip Rosedale
3fd1ab40e4 remove magic number 2014-09-25 16:17:05 -07:00
Philip Rosedale
1d4b86d85b Blink first with one eye and at slightly different speeds, look back and forth exactly at eyes when receiving gaze in Oculus 2014-09-25 16:00:56 -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
Stephen Birarda
2e176589b7 initial use of a json file to describe setup options 2014-09-25 15:12:37 -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
Stephen Birarda
769586ef30 remove extra panels in domain-server setup 2014-09-25 14:23:15 -07:00
Stephen Birarda
33462f7466 handle permanent sidebar in setup page 2014-09-25 14:22:32 -07:00
Stephen Birarda
4790f517d6 add a nav panel for setup and pin to left 2014-09-25 13:42:11 -07:00
Stephen Birarda
160e96c65c Merge branch 'master' of https://github.com/highfidelity/hifi into domain-wizard 2014-09-25 12:11:29 -07:00
Philip Rosedale
693bc11868 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-25 11:59:14 -07:00
Philip Rosedale
7836fd8a85 Add world space eye locations (for making eye contact) to the oculus manager 2014-09-25 11:58:41 -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
fbfaf43646 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-24 17:16:20 -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
ZappoMan
6b8c9bba42 improved debug in entity renderer 2014-09-24 16:05:04 -07:00
ZappoMan
8d9a923add fix the collision last edited behavior correctly, delete collision sound code 2014-09-24 16:04:39 -07:00
Philip Rosedale
8e60323177 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-24 15:49:55 -07:00