Stephen Birarda
|
f1c6d26ed1
|
don't explicitly require LibOVR for android build
|
2015-01-28 11:20:25 -08:00 |
|
Stephen Birarda
|
d420674edd
|
apply orientation change to listening position for audio
|
2015-01-27 14:50:02 -08:00 |
|
Stephen Birarda
|
54660dd1a2
|
resolve conflicts on merge with upstream master
|
2015-01-27 14:24:48 -08:00 |
|
Ryan Huffman
|
7ececd793a
|
Fix failing QMetaObject::invokeMethod call
|
2015-01-27 13:59:46 -08:00 |
|
Andrew Meadows
|
e2ffe00c38
|
Merge pull request #4172 from huffman/fix-image-overlay-rescale
Fix image overlay rescale
|
2015-01-27 13:07:15 -08:00 |
|
Brad Hefta-Gaub
|
a46fda3749
|
Merge pull request #4174 from huffman/delete-entity
Update deleteEntity to obey entity locked property
|
2015-01-27 13:05:05 -08:00 |
|
Andrew Meadows
|
6b6e846378
|
Merge pull request #4177 from ZappoMan/fixGlitches
Some physics improvements
|
2015-01-27 13:02:11 -08:00 |
|
Andrew Meadows
|
f2f054f689
|
Merge pull request #4161 from ey6es/master
Partial implementation of "granularity" setting for metavoxel tools.
|
2015-01-27 12:52:32 -08:00 |
|
ZappoMan
|
23892ab1e7
|
fixed comments
|
2015-01-27 11:38:14 -08:00 |
|
ZappoMan
|
94e04e2d7d
|
removed extra whitespace
|
2015-01-27 11:34:46 -08:00 |
|
ZappoMan
|
b1586d4f90
|
move debug into ifdef
|
2015-01-27 11:29:17 -08:00 |
|
ZappoMan
|
45dbff67f8
|
more hacking
|
2015-01-27 11:15:33 -08:00 |
|
Ryan Huffman
|
9fd352e1dc
|
Break long lines in TextureCache.h/cpp
|
2015-01-27 10:27:05 -08:00 |
|
Ryan Huffman
|
f65640a593
|
Update EntityTree.cpp to not delete entity when locked
|
2015-01-27 10:24:54 -08:00 |
|
Ryan Huffman
|
86f7c28ee9
|
Update EntityScriptingInterface::deleteEntity to not delete when known entity is locked
|
2015-01-27 10:24:28 -08:00 |
|
Ryan Huffman
|
1f6932bdcb
|
Update TextureCache to store original image dimensions (pre-scale)
|
2015-01-27 08:09:20 -08:00 |
|
ZappoMan
|
83d1cc911a
|
hacking
|
2015-01-26 19:38:24 -08:00 |
|
Atlante45
|
f84f6e9b66
|
Restore joints state on stopAnimation
|
2015-01-26 19:12:18 -08:00 |
|
ZappoMan
|
02c0700db3
|
support for skipping forward on new edit packets from server
|
2015-01-26 17:25:06 -08:00 |
|
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 |
|
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 |
|
ZappoMan
|
a1ec44b8e0
|
add developer menu item to disable sending physics updates
|
2015-01-26 12:05:57 -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 |
|
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 |
|
Andrew Meadows
|
1ad5f9c7db
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/physics/src/ObjectMotionState.cpp
|
2015-01-23 14:04:26 -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 |
|
ZappoMan
|
c01d2d657c
|
added comment
|
2015-01-23 13:55:12 -08:00 |
|
ZappoMan
|
fa485d21b7
|
added comment
|
2015-01-23 13:52:28 -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
|
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 |
|
Stephen Birarda
|
8544fccd84
|
use soxr resampling for loopback and output
|
2015-01-22 16:50:42 -08:00 |
|
Stephen Birarda
|
0440576dc2
|
use libsoxr for input to network resampling
|
2015-01-22 16:04:57 -08:00 |
|
Stephen Birarda
|
102f076412
|
look for soxr and not redundant libsoxr
|
2015-01-22 14:09:29 -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 |
|