Andrzej Kapolka
|
efa22d931f
|
If we're rendering the billboard, don't render the body.
|
2014-09-26 13:48:11 -07:00 |
|
Andrzej Kapolka
|
3fe6e30632
|
Working on QR decomposition.
|
2014-09-26 13:43:28 -07:00 |
|
Stephen Birarda
|
e3a85299ce
|
fix setting parsing in AudioMixer for new format
|
2014-09-26 13:17:11 -07:00 |
|
Stephen Birarda
|
33856be29e
|
add period to help text for http password
|
2014-09-26 13:16:08 -07:00 |
|
Stephen Birarda
|
96627a8f97
|
allow authenticated access to full domain-server settings
|
2014-09-26 12:56:35 -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 |
|
Stephen Birarda
|
60258e4989
|
remove the save requires restart signal
|
2014-09-26 11:26:38 -07:00 |
|
Stephen Birarda
|
3c71d4d96e
|
add ability for domain-server to restart after setting save
|
2014-09-26 11:26:21 -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 |
|
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 |
|