Clément Brisset
8c1e7fb0b5
Merge pull request #3086 from birarda/master
...
add HTTPS request debugging to domain-server
2014-06-27 10:56:35 -07:00
Philip Rosedale
6e79fbdbdd
Merge pull request #3085 from Atlante45/sit_on_a_model
...
Sit on a model
2014-06-27 10:52:57 -07:00
Stephen Birarda
8edc4bf9d1
add HTTPS request debugged to domain-server
2014-06-27 10:38:39 -07:00
Atlante45
43de421284
Merge branch 'master' of https://github.com/highfidelity/hifi into sit_on_a_model
2014-06-27 10:07:02 -07:00
Atlante45
4281168fe9
Hide seat once you are seated
2014-06-27 10:03:50 -07:00
Atlante45
baf4a82269
Fix crash occuring when geometry not yet available
2014-06-27 09:56:03 -07:00
Atlante45
aad666be62
more sitting work
2014-06-27 09:48:27 -07:00
Stephen Birarda
ee2b5c2e3e
Merge pull request #3084 from birarda/master
...
fix place lookup for new APIs
2014-06-27 09:37:27 -07:00
Stephen Birarda
bb44d8b478
fix place lookup for new APIs
2014-06-27 09:36:47 -07:00
Philip Rosedale
e47fb5750b
Merge pull request #3083 from birarda/master
...
initial pass at settings in the domain-server passed down to audio-mixer
2014-06-27 09:26:01 -07:00
Stephen Birarda
3ae46bc60d
switch audio-mixer to pull settings from domain-server via JSON request
2014-06-26 17:32:56 -07:00
Stephen Birarda
3f70402e63
fix odd encoding in settings URL
2014-06-26 16:58:51 -07:00
Stephen Birarda
95d266b305
initial setup of settings request from domain-server
2014-06-26 16:55:22 -07:00
Atlante45
e41d3f407b
Removed nested lock
2014-06-26 16:40:59 -07:00
Stephen Birarda
731690e358
add querying for settings that affect a specific type
2014-06-26 16:29:44 -07:00
Stephen Birarda
ab50432ead
use underscorejs templating for queued assignments
2014-06-26 15:45:31 -07:00
Stephen Birarda
e56f4aba0a
use underscorejs for nodes table template
2014-06-26 15:40:10 -07:00
Stephen Birarda
c21b202b63
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-26 13:24:04 -07:00
Clément Brisset
6312222eed
Merge pull request #3081 from binaryking/19801
...
Code Review for Job #19801
2014-06-26 13:00:11 -07:00
Atlante45
0b0cbdf340
Merge branch 'master' of https://github.com/highfidelity/hifi into sit_on_a_model
2014-06-26 11:35:29 -07:00
Mohammed Nafees
6be4633a97
Merge remote-tracking branch 'upstream/master' into 19801
2014-06-26 23:48:11 +05:30
Clément Brisset
463ac9cc74
Merge pull request #3078 from PhilipRosedale/master
...
Improved toy ball, JS calls for palm position, concertCamera.js
2014-06-26 11:03:48 -07:00
Clément Brisset
cd53b727d0
Merge pull request #3080 from AndrewMeadows/bug-fix
...
fix for avatar models with multiple roots
2014-06-26 10:54:03 -07:00
Philip Rosedale
64c89df5c1
Added another concert view
2014-06-26 10:52:37 -07:00
AndrewMeadows
dba9d33f86
Merge pull request #3075 from huffman/19644
...
Code Review for Job #19644
2014-06-26 09:39:20 -07:00
Andrew Meadows
0d18f2fbab
fix for avatar models with multiple roots
2014-06-26 09:12:44 -07:00
Stephen Birarda
5cd2dc594f
only post changed values to settings.json, fix for bool values
2014-06-26 08:45:12 -07:00
Philip Rosedale
c72e41dcd2
added Oculus angular velocity, moved sit icon up
2014-06-25 22:27:54 -07:00
Clément Brisset
96e81d5596
Merge pull request #3079 from ey6es/metavoxels
...
Basic congestion control on TCP model, with tests; fixed errors in, added tests for SpanList.
2014-06-25 18:34:07 -07:00
Andrzej Kapolka
014ea2a36f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-25 18:22:33 -07:00
Clément Brisset
e7d3e244fb
Merge pull request #3076 from ey6es/master
...
Fixes for uninitialized variable warnings, disabled strict aliasing to allow safe type punning (and avoid warnings).
2014-06-25 18:18:58 -07:00
Andrzej Kapolka
f828b0c466
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-25 16:57:07 -07:00
Andrzej Kapolka
5effcd24ff
Only increase/decrease rate when we want to send more/have sent more than the
...
minimum, respectively.
2014-06-25 16:56:02 -07:00
Stephen Birarda
13169fa664
replace handlebars with underscore for templating
2014-06-25 16:35:44 -07:00
Andrzej Kapolka
705445ce62
Basic congestion control using TCP-esque strategy.
2014-06-25 15:48:46 -07:00
Philip Rosedale
93b131d520
Fix build warning from wrong init order
2014-06-25 15:41:47 -07:00
Philip Rosedale
72f9346543
Merge pull request #3077 from ctrlaltdavid/19790
...
Code Review for Job #19790
2014-06-25 15:29:28 -07:00
Philip Rosedale
9af2b2b4dc
removed commented code
2014-06-25 15:24:21 -07:00
Philip Rosedale
58d460da09
option to turn on/off string hair
2014-06-25 15:14:17 -07:00
Stephen Birarda
4188a4eab1
change unattenuated zone placeholder and offer method to grab JSON settings
2014-06-25 14:16:24 -07:00
Stephen Birarda
6519d4028a
populate the settings page correctly with existing values
2014-06-25 13:55:32 -07:00
Andrzej Kapolka
6480c678d2
Disable strict aliasing for safe type punning, fix potentially uninitialized
...
variable warning.
2014-06-25 13:46:13 -07:00
Andrzej Kapolka
41b01dbaed
Fix warning and simplify encodeRandomOrder.
2014-06-25 13:00:17 -07:00
Atlante45
cce6132a07
Add sitting points to the model properties display
2014-06-25 11:50:30 -07:00
Atlante45
a8c3501bdd
Keep sitting points updated
2014-06-25 11:49:36 -07:00
Atlante45
1d7d970ff6
Added sitting points to modelItem
2014-06-25 11:48:48 -07:00
Andrzej Kapolka
8999fcef17
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-25 11:42:55 -07:00
Andrzej Kapolka
ae1422e0cb
Reset the write position when we hear of packet loss (up to once per round
...
trip time).
2014-06-25 11:42:02 -07:00
Stephen Birarda
f8dccad6ec
enable persisting of posted settings to a JSON file
2014-06-25 11:20:09 -07:00
David Rowe
e92ad86282
Clear script engine errors once they have been reported
...
So that an error is not repeatedly reported to the console and log file.
Also consistently report filename.
And scripts included after one in error will now be run.
2014-06-25 10:51:18 -07:00
