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
Thijs Wenker
e9922b6db9
windows default device fix:
...
- fixed tabs>spaces
- doesn't require atlbase anymore, so works on visual studio express
2014-04-07 18:50:13 +02: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
Thijs Wenker
4335ba7b5a
windows default device fix
2014-04-07 17:01:24 +02:00
Andrzej Kapolka
404b804b2f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-04 16:41:43 -07:00
Andrzej Kapolka
2d535f3b86
Removed debugging code.
2014-04-04 16:36:58 -07:00
Andrzej Kapolka
d2b0cc43dd
Extent tweaks.
2014-04-04 16:32:14 -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
1c822542c1
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-04 15:29:13 -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
Atlante45
a0e70d0d2a
Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system
2014-04-04 14:53: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
Andrzej Kapolka
a2b94aa433
Working on render modes.
2014-04-04 14:22:01 -07:00
Andrzej Kapolka
550a8fdb99
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-04 13:00:51 -07:00
Andrzej Kapolka
a0c7e4d3cc
Working on model rendering modes.
2014-04-04 11:45:03 -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
Andrzej Kapolka
38022d2440
Fix for voxelizing models.
2014-04-04 00:33:33 -07:00
Andrzej Kapolka
1bf19111dc
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-03 23:57:30 -07:00
Andrzej Kapolka
dfaa98cc34
Blend when setting.
2014-04-03 23:51:49 -07:00
Andrzej Kapolka
d706e23012
Basic voxelization.
2014-04-03 23:47:31 -07:00
Atlante45
d3ce2c7640
Added undo/redo support to the client
2014-04-03 16:51:08 -07:00
Atlante45
42f47f5db2
Some alphabetical cleaning
2014-04-03 16:48:56 -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
Lucas Crisman
793179dc72
Merge branch 'master' of git://github.com/worklist/hifi into 19498
...
Conflicts:
interface/src/Application.cpp
2014-04-03 16:24:32 -03:00
Andrzej Kapolka
061d7719d4
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-03 11:55:50 -07:00
