Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 20:26:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17264 commits 6 branches 1 tag 1.1 GiB
Commit graph

17264 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
2c8d8decb8 remove focus from advanced toggle when clicked 2014-09-26 09:46:55 -07:00
Stephen Birarda
507621ca3a add toggle for advanced settings 2014-09-26 09:27:33 -07:00
Stephen Birarda
7d14408adc badge the list-group-item when settings have changed 2014-09-26 09:15:48 -07:00
David Rowe
c0419c61f4 Fix missing constructor initialization 2014-09-26 09:15:17 -07:00
Stephen Birarda
13f2ea33ad symlink the web directory instead of direct copy for DS 2014-09-26 08:48:00 -07:00
Stephen Birarda
f47cc176b5 resolve conflicts on merge with upstream master 2014-09-26 08:33:34 -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
Stephen Birarda
ba929626c2 fix for undefined placeholder values 2014-09-25 18:25:16 -07:00
Stephen Birarda
697ae900dc handle basic vs advanced settings 2014-09-25 18:14:18 -07:00
Philip Rosedale
f66f565f53 update stDev (standard deviation) class to coding standard 2014-09-25 18:14:02 -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
Stephen Birarda
9a56e72079 fix for values grabbed from settings 2014-09-25 18:08:22 -07:00
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