Stephen Birarda
e417e7670b
cleanup DomainServer debug during config parsing
2014-04-08 14:07:31 -07:00
Stephen Birarda
9ca864bb50
don't parse excluded types from config variant map
2014-04-08 14:05:26 -07:00
Stephen Birarda
9a9939c11a
repairs for assignment parsing from command line and JSON
2014-04-08 14:03:42 -07:00
Stephen Birarda
c2ff438182
add a CL + JSON settings reader
2014-04-08 13:37:07 -07:00
Stephen Birarda
080b0d7221
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-04-08 10:28:14 -07:00
Brad Hefta-Gaub
db1a622040
Merge pull request #2612 from Atlante45/fix_editVoxels_inspect_conflict
...
Fix for editVoxels/inspect conflict
2014-04-08 07:24:51 -10:00
Brad Hefta-Gaub
2988239aed
Merge pull request #2615 from ey6es/master
...
Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).
2014-04-08 07:20:00 -10:00
Brad Hefta-Gaub
aad3085e08
Merge pull request #2611 from AndrewMeadows/avatar-speed
...
fix for sometimes slow avatar
2014-04-08 06:54:21 -10:00
Brad Hefta-Gaub
881383a5f2
Merge pull request #2609 from AndrewMeadows/avatar-interaction
...
More details in JS collision events
2014-04-08 06:52:04 -10:00
Brad Hefta-Gaub
247d8bc540
Merge pull request #2571 from birarda/ds-web
...
put servers alphabetically first in node list
2014-04-08 06:32:59 -10:00
Andrzej Kapolka
fa05a48270
Provide a means of supplying the joint mappings in the FST file so that agent
...
scripts can address joints by name. Closes #2526 .
2014-04-07 17:55:36 -07:00
Andrew Meadows
bf0eb69e2c
fix for sometimes slow avatar
2014-04-07 16:28:55 -07:00
Atlante45
56b0583600
Fix for editVoxels/inspect conflict
2014-04-07 14:42:35 -07:00
Andrzej Kapolka
0011276b0b
Added back the download stats, which got lost in a merge.
2014-04-07 14:19:17 -07:00
Stephen Birarda
02e2135a2e
allow setting of expected DTLS cert hostname from AC
2014-04-07 12:52:26 -07:00
Stephen Birarda
86a0b715f3
verify DTLS certificate to ensure trust before handshaking
2014-04-07 11:36:32 -07:00
Stephen Birarda
0f92e02da7
add the hifi root CA trusted cert to source
2014-04-07 11:19:06 -07:00
Stephen Birarda
a6641aa95b
respect the DTLS MTU for domain server list sending
2014-04-07 10:48:58 -07:00
Andrew Meadows
84d7e39d72
merge upstream/master into avatar-interaction
2014-04-07 10:05:25 -07:00
Andrew Meadows
d902580d6f
Add Collision metatype to JS script system
2014-04-07 10:03:10 -07:00
Stephen Birarda
69504b0a9d
proper cleanup of CA credentials on DTLSClientSession side
2014-04-07 09:47:51 -07:00
Stephen Birarda
efcf506383
resolve conflicts on merge with upstream master
2014-04-07 09:32:08 -07:00
Stephen Birarda
5adcf68752
sort nodes on DS page by their uptime
2014-04-07 09:08:51 -07:00
Stephen Birarda
97a919a0c2
Merge branch 'master' of https://github.com/highfidelity/hifi into ds-web
2014-04-07 08:45:51 -07:00
Andrzej Kapolka
72d09a5cbe
Merge pull request #2605 from AndrewMeadows/say-no-to-warnings
...
removing a warning about hidden virtual override
2014-04-04 16:00:57 -07:00
Stephen Birarda
45d796e8f3
allow re-handshake in NodeList after domain refresh
2014-04-04 15:56:02 -07:00
Andrzej Kapolka
10288bce35
Merge pull request #2604 from AndrewMeadows/oculus-with-thrust
...
fix #2567 thrust + oculus doesn't change body rotation
2014-04-04 15:19:44 -07:00
Andrzej Kapolka
1f3a5d09d9
Merge pull request #2593 from Atlante45/display_models_metadata
...
Display models metadata
2014-04-04 15:18:18 -07:00
Andrew Meadows
403ad5e984
removing a warning about hidden virtual override
2014-04-04 15:18:12 -07:00
Andrew Meadows
01c42c741c
fix #2567 thrust + oculus doesn't change body rot
2014-04-04 14:46:54 -07:00
Andrzej Kapolka
468a4b79fd
Merge pull request #2603 from ey6es/master
...
Increase the rate at which we increase detail and put a limit on the LOD
2014-04-04 14:41:17 -07:00
Andrzej Kapolka
3a125db1f8
Increase the rate at which we increase detail and put a limit on the LOD
...
multiplier so that it never takes more than about five seconds to return to
default detail. Also, since there seems to be a weird issue where OS X
throttles the frame rate to 30 fps (independent of our own throttling), use
that as the lower adjustment range.
2014-04-04 14:31:30 -07:00
Stephen Birarda
c015fdd212
leverage a DummyDTLSSession to not require cleanup of DTLSSession for cookies
2014-04-04 11:42:14 -07:00
Stephen Birarda
b40dd6a31a
say bye and de-init DTLS session from DomainServer
2014-04-04 11:17:50 -07:00
Stephen Birarda
fd8e32190e
perform cleanup of GnuTLS structures across targets
2014-04-04 11:08:53 -07:00
Stephen Birarda
85933545cd
add GnuTLS init to Application
2014-04-04 10:59:58 -07:00
Stephen Birarda
e2224e0f0c
cleanup node silence timing and use for DTLS timeouts
2014-04-04 10:56:04 -07:00
Stephen Birarda
c840904642
output a message when handshake has completed with a client
2014-04-04 10:44:15 -07:00
Andrew Meadows
5e2b8bb2c3
connect SIGNAL to SIGNAL to avoid forwarding slot
2014-04-04 10:43:06 -07:00
Andrew Meadows
f6c98a1cc2
fix bug in gun.js: unplayed target delete sound
2014-04-04 10:40:55 -07:00
Clément Brisset
a57002038b
Merge pull request #2601 from Atlante45/error_or_success_model_upload_msg
...
Error or success model upload msg
2014-04-04 10:16:42 -07:00
Stephen Birarda
efd176f93c
complete check in and heartbeat via DTLS
2014-04-04 09:56:57 -07:00
Stephen Birarda
7b6ce77690
add processing of DTLS datagrams to domain-server
2014-04-04 09:20:40 -07:00
Atlante45
eb8cf15942
Merge branch 'error_or_success_model_upload_msg' of https://github.com/Atlante45/hifi into error_or_success_model_upload_msg
2014-04-03 16:19:41 -07:00
Atlante45
ba4ccc22ef
Changed FstReader name to ModelUploader
2014-04-03 16:19:33 -07:00
Atlante45
9166dea02e
Changed FstReader name to ModelUploader
2014-04-03 16:16:58 -07:00
Atlante45
3bb6d9b3b3
Added call back to model upload.
2014-04-03 16:07:25 -07:00
Leonardo Murillo
f25a8c5948
Merge pull request #2600 from Atlante45/master
...
Changed FstReader categories to place models in the right dirs
2014-04-03 14:06:59 -06:00
AndrewMeadows
4a98f9f159
Merge pull request #2485 from kordero/19498
...
Code Review for Job #19498
2014-04-03 12:58:47 -07:00
Atlante45
d15e12da77
Changed FstReader categories to place models in the right dirs
2014-04-03 12:25:50 -07:00
