Commit graph

21168 commits

Author SHA1 Message Date
Atlante45
4278407137 Account for avatar scale in Hand(Data) get/set
When using localToWorld/WorldToLocal type functions
2015-01-26 16:48:33 -08:00
Stephen Birarda
3ceadf31b3 Merge pull request #4165 from murillodigital/ice-monitoring
Check just for http availability
2015-01-26 14:30:33 -08:00
Stephen Birarda
976c3b633b remove extra library links for android LibOVR 2015-01-26 13:26:26 -08:00
Stephen Birarda
4679f7f858 cleanup linking of oculus mobile sdk 2015-01-26 13:26:08 -08:00
ZappoMan
d9835701b0 added comment 2015-01-26 12:48:57 -08:00
ZappoMan
81185cfe56 removed some debugging 2015-01-26 12:46:22 -08:00
ZappoMan
08fbcbaf40 tweaks for debugging 2015-01-26 12:38:02 -08:00
Brad Hefta-Gaub
d207304db0 Merge pull request #4166 from ctrlaltdavid/20279
Temporarily re-enable audio selection on Windows
2015-01-26 12:08:53 -08:00
ZappoMan
a1ec44b8e0 add developer menu item to disable sending physics updates 2015-01-26 12:05:57 -08:00
David Rowe
9aaa3a6fe4 Temporarily re-enable audio selection on Windows
This is to test current behavior on different users' PCs before
re-enabling permanently.
2015-01-26 11:48:44 -08:00
Leonardo Murillo
d26804e68c Check just for http availability 2015-01-26 13:45:14 -06:00
Stephen Birarda
c269ee6b94 include ovr mobile sdk and test it 2015-01-26 11:32:24 -08:00
ZappoMan
73b9c06ec0 added some debugging 2015-01-26 11:13:30 -08:00
Stephen Birarda
4198d1d5ca disable output starve detection on android 2015-01-26 10:07:24 -08:00
ZappoMan
f85774c687 adding some debugging 2015-01-26 09:45:33 -08:00
Andrzej Kapolka
23f9c799dd Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-23 18:20:14 -08:00
Andrzej Kapolka
34110b6745 Partial subdivision implementation. 2015-01-23 18:19:45 -08:00
Andrew Meadows
18e0a91ea8 Merge pull request #4158 from ZappoMan/fixGlitches
fix last simulated and last updated to correctly be sent over the wire
2015-01-23 16:45:27 -08:00
ZappoMan
de75eec877 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches 2015-01-23 16:23:56 -08:00
Philip Rosedale
ba65112463 Merge pull request #4159 from Atlante45/master
Request blocking calls
2015-01-23 16:08:23 -08:00
Atlante45
7a1300d66c Request blocking calls 2015-01-23 16:05:06 -08:00
ZappoMan
9a0576adfb remove setting last simulated in setLastEdited() because it may cause problems 2015-01-23 15:54:26 -08:00
ZappoMan
9cc61e90f7 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches
Conflicts:
	libraries/entities/src/EntityItem.cpp
2015-01-23 15:01:35 -08:00
Brad Hefta-Gaub
494c189094 Merge pull request #4157 from AndrewMeadows/isentropic
client-side kinematic motion for non-physical objects
2015-01-23 15:00:01 -08:00
Andrew Meadows
1ad5f9c7db merge upstream/master into andrew/isentropic
Conflicts:
	libraries/physics/src/ObjectMotionState.cpp
2015-01-23 14:04:26 -08:00
Stephen Birarda
98a470aa35 add wording to windows for soxr guide 2015-01-23 14:02:43 -08:00
Stephen Birarda
25ee7874ae fix instructions to source setenv script 2015-01-23 14:01:09 -08:00
Andrzej Kapolka
bc0fa0ed24 Push granularity option down the line in preparation for selectively
increasing resolution.
2015-01-23 13:58:51 -08:00
Stephen Birarda
24059f49fb fix eabi for openssl and cp for tbb 2015-01-23 13:57:27 -08:00
ZappoMan
c01d2d657c added comment 2015-01-23 13:55:12 -08:00
ZappoMan
fa485d21b7 added comment 2015-01-23 13:52:28 -08:00
Stephen Birarda
1baef08ffd add instructions for soxr, clarify for tbb 2015-01-23 13:42:52 -08:00
ZappoMan
3c38a9eb53 add last simulated to the protocal 2015-01-23 13:32:38 -08:00
Andrew Meadows
b34189115d Merge branch andrew/isentropic 2015-01-23 13:21:45 -08:00
Andrew Meadows
36c20c24fe fix for velocity in units of domain size 2015-01-23 13:20:12 -08:00
Andrew Meadows
f2bcdfa2b4 update _lastSimulated for kinematic motion 2015-01-23 13:10:41 -08:00
Stephen Birarda
5b81fa27fc fix for DEFAULT_NODE_AUTH_URL 2015-01-23 13:05:02 -08:00
Stephen Birarda
a3b92e05da support 44.1 for the note 4 2015-01-23 11:48:23 -08:00
Andrew Meadows
eefd32b42b remove KinematicController classes 2015-01-23 11:04:02 -08:00
Andrew Meadows
d173afaa70 add support for non-physical kinematic movement 2015-01-23 11:01:46 -08:00
Stephen Birarda
86c0cbe4a8 fix comment in Android manifest, move to Address 2015-01-23 10:24:28 -08:00
Stephen Birarda
39d9d99045 fix for local loop resample 2015-01-23 10:02:03 -08:00
ZappoMan
31f72107da remove support for old pre-entity svo files 2015-01-23 09:26:48 -08:00
Stephen Birarda
871d688db9 handle input to output resampling 2015-01-23 09:23:46 -08:00
Andrew Meadows
3a1c99b5e5 Merge pull request #4153 from PhilipRosedale/master
Paddle ball game, first version
2015-01-23 08:05:59 -08:00
Andrew Meadows
5672403900 Merge pull request #4154 from huffman/win-dpi-fixes
Update runningScriptsWidgets px -> pt
2015-01-23 08:05:24 -08:00
Andrew Meadows
cce763858e Merge pull request #4147 from ey6es/master
Fixed bug with normal selection, incremental improvements to stitching.
2015-01-23 08:04:10 -08:00
Andrzej Kapolka
b8a15f0726 Another tweak. 2015-01-22 22:04:10 -08:00
Andrzej Kapolka
c124dffd6a Another slight improvement. 2015-01-22 21:26:08 -08:00
Andrzej Kapolka
e65090bab9 Another slight stitching improvement. 2015-01-22 21:08:48 -08:00