Commit graph

21197 commits

Author SHA1 Message Date
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
Stephen Birarda
8544fccd84 use soxr resampling for loopback and output 2015-01-22 16:50:42 -08:00
Ryan Huffman
0e6f2d7252 Update runningScriptsWidgets px -> pt 2015-01-22 16:22:36 -08:00
Stephen Birarda
0440576dc2 use libsoxr for input to network resampling 2015-01-22 16:04:57 -08:00
Andrzej Kapolka
c1c9f698df Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-22 14:55:37 -08:00
Andrzej Kapolka
805d5ace13 Another slight stitching improvement. 2015-01-22 14:55:14 -08:00
Stephen Birarda
e488e841b7 Merge pull request #4151 from murillodigital/ice-monitoring
Adding http monitoring for ICE server
2015-01-22 14:26:49 -08:00
Stephen Birarda
102f076412 look for soxr and not redundant libsoxr 2015-01-22 14:09:29 -08:00
Stephen Birarda
c82ac27104 fix a typo in RtMidi find module 2015-01-22 14:06:53 -08:00
Stephen Birarda
aa6e1607e2 add libsoxr for audio resampling 2015-01-22 14:06:05 -08:00
Andrew Meadows
355759d3d4 Merge pull request #4152 from ZappoMan/fixGlitches
Fix glitches in bullets and multiple viewers
2015-01-22 13:49:00 -08:00
Philip Rosedale
59f79fd436 Add handedness choice, default to right handed 2015-01-22 13:42:19 -08:00
Leonardo Murillo
001d689646 Fixing includes 2015-01-22 15:37:58 -06:00
ZappoMan
d34764bd55 fix whitespace diff 2015-01-22 13:33:59 -08:00
Leonardo Murillo
162c2f031b Remove https unneeded crust 2015-01-22 15:33:37 -06:00
ZappoMan
6a9a6968f2 debugging stutter 2015-01-22 13:32:57 -08:00
ZappoMan
c6ad1462e6 debugging stutter 2015-01-22 13:31:59 -08:00
ZappoMan
838a549abe debugging stutter 2015-01-22 13:31:09 -08:00
ZappoMan
14c7dc8eb9 debugging stutter 2015-01-22 13:13:18 -08:00
Leonardo Murillo
5efc046316 Adding http monitoring for ICE server 2015-01-22 15:03:13 -06:00
Philip Rosedale
45a84895e1 Paddle ball game, first version 2015-01-22 12:44:07 -08:00
Stephen Birarda
21ecaafea9 don't force system include of GLM 2015-01-22 11:38:34 -08:00