Stephen Birarda
|
aa6e1607e2
|
add libsoxr for audio resampling
|
2015-01-22 14:06:05 -08:00 |
|
Stephen Birarda
|
25016ef157
|
have RenderingClient handle returned audio frames
|
2015-01-21 14:10:29 -08:00 |
|
Stephen Birarda
|
a3529e745b
|
fix warning and compile with Multimedia
|
2015-01-21 13:28:18 -08:00 |
|
Stephen Birarda
|
343b09c855
|
remove AudioClient dependency on Recorder
|
2015-01-21 13:21:37 -08:00 |
|
Stephen Birarda
|
e34fb66be7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-01-21 12:41:20 -08:00 |
|
Stephen Birarda
|
1a87fa93f4
|
output signals from AudioClient for I/O bytes
|
2015-01-21 12:33:20 -08:00 |
|
Stephen Birarda
|
707973f1e5
|
solve collision in PositionGetter with AddressManager
|
2015-01-21 12:05:12 -08:00 |
|
Stephen Birarda
|
d2af9a2911
|
have Application pass audio pos/orientation to AudioClient
|
2015-01-21 12:03:11 -08:00 |
|
Stephen Birarda
|
e28ca27ccd
|
add a position and orientation getter for AudioClient
|
2015-01-21 11:55:12 -08:00 |
|
Stephen Birarda
|
0eced09f1d
|
intial removal of Audio to audio-client
|
2015-01-21 11:49:06 -08:00 |
|
Brad Hefta-Gaub
|
08e8694ae1
|
Merge pull request #4139 from AndrewMeadows/bispinor
lower cost when failing to add entity to physics engine
|
2015-01-20 18:17:35 -08:00 |
|
Stephen Birarda
|
466ea12d0f
|
turn off verbose HTTP request debug
|
2015-01-20 15:44:14 -08:00 |
|
Stephen Birarda
|
94a9bf52fa
|
handle gvr-interface address lookup
|
2015-01-20 14:38:33 -08:00 |
|
Stephen Birarda
|
b4d6a44fc2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-01-20 11:15:54 -08:00 |
|
Stephen Birarda
|
cd23876afc
|
fix QHttpMultiPart destroy from AccountManager
|
2015-01-20 11:00:08 -08:00 |
|
Stephen Birarda
|
a66888939c
|
add some debugging for domain switch
|
2015-01-20 10:51:11 -08:00 |
|
Stephen Birarda
|
483d072709
|
handle override path from address bar
|
2015-01-20 10:47:57 -08:00 |
|
Andrzej Kapolka
|
f7f480cee4
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-01-19 21:54:07 -08:00 |
|
Andrzej Kapolka
|
35bd1cda89
|
I believe this should fix some problems with flickering/crashing on edits:
don't reapply properties that we've already read (thus clearing cached data,
stepping on other threads, etc.)
|
2015-01-19 21:52:56 -08:00 |
|
Andrew Meadows
|
e4f29412d5
|
cheaper failure adding entity to physics engine
|
2015-01-19 18:11:14 -08:00 |
|
Andrew Meadows
|
171fead347
|
remove log about failure to add to physics engine
|
2015-01-19 15:55:53 -08:00 |
|
Andrzej Kapolka
|
f8f9c25d38
|
Back to JPG compression for heightfield colors.
|
2015-01-19 14:59:28 -08:00 |
|
Brad Hefta-Gaub
|
215e3b732e
|
Merge pull request #4134 from ey6es/metavoxels
Big ol' metavoxel update. Mostly the switch to "stack" representation for dual contour data, but also includes some heightfield fixes.
|
2015-01-19 14:06:02 -08:00 |
|
Brad Hefta-Gaub
|
33152904bc
|
Merge pull request #4133 from birarda/master
add debugging for AddressManager connect to domain
|
2015-01-19 13:25:48 -08:00 |
|
Andrzej Kapolka
|
eb320f37c7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2015-01-19 12:41:21 -08:00 |
|
Stephen Birarda
|
60bdd206eb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-01-19 12:35:22 -08:00 |
|
Andrzej Kapolka
|
ed287e9bb2
|
This function isn't used, either.
|
2015-01-19 12:16:06 -08:00 |
|
Andrzej Kapolka
|
422e4fb85d
|
Use the closest point on an approximative sphere, rather than the center of
the node, to determine the LOD distance.
|
2015-01-19 12:12:31 -08:00 |
|
Andrzej Kapolka
|
8d4707a874
|
Removed unused function.
|
2015-01-19 11:53:53 -08:00 |
|
Stephen Birarda
|
10be0ee984
|
resolve conflicts on merge with upstream master
|
2015-01-19 10:26:56 -08:00 |
|
Stephen Birarda
|
990ca8397e
|
add extra debugging for AddressManager connect to domain
|
2015-01-19 10:23:05 -08:00 |
|
Andrzej Kapolka
|
2ed6835426
|
Use alpha channel to indicate holes when importing terrain images.
|
2015-01-18 16:30:46 -08:00 |
|
Andrzej Kapolka
|
a9f7533477
|
Set/erase brushes.
|
2015-01-18 16:20:55 -08:00 |
|
Andrzej Kapolka
|
61cbafadd4
|
More corner cases.
|
2015-01-18 00:18:35 -08:00 |
|
Andrzej Kapolka
|
9edb3e84cb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2015-01-17 20:17:49 -08:00 |
|
Andrzej Kapolka
|
5bb441b6ef
|
Added a "voxelize" brush for debugging.
|
2015-01-17 20:17:28 -08:00 |
|
Andrzej Kapolka
|
3dbbbb72b0
|
Fixes for deltas when root hasn't changed, range updates.
|
2015-01-16 16:49:22 -08:00 |
|
Andrzej Kapolka
|
2497b2fe39
|
If there's no directly intersecting spanner, find the closest heightfield that
we can project onto.
|
2015-01-16 15:41:08 -08:00 |
|
Andrew Meadows
|
840acecbe6
|
merge upstream/master into andrew/bispinor
Conflicts:
libraries/physics/src/EntityMotionState.cpp
|
2015-01-16 15:22:06 -08:00 |
|
Andrew Meadows
|
d5efc375d9
|
Merge pull request #4128 from ZappoMan/master
fix double targets and freezing bullets
|
2015-01-16 14:37:22 -08:00 |
|
Andrew Meadows
|
d5119b3532
|
merge upstream/master into andrew/bispinor
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/physics/src/EntityMotionState.h
libraries/physics/src/ObjectMotionState.cpp
libraries/physics/src/PhysicsEngine.cpp
libraries/physics/src/PhysicsEngine.h
|
2015-01-16 14:36:27 -08:00 |
|
Andrzej Kapolka
|
45b36b383c
|
More progress on stitching, etc.
|
2015-01-16 14:32:15 -08:00 |
|
ZappoMan
|
9a60896a40
|
fix double targets and freezing bullets
|
2015-01-16 14:24:50 -08:00 |
|
Philip Rosedale
|
1ff90bec5d
|
Merge pull request #4124 from AndrewMeadows/inertia
support for simple kinematic motion
|
2015-01-16 13:33:44 -08:00 |
|
Andrzej Kapolka
|
b6c843497d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2015-01-16 11:56:04 -08:00 |
|
Andrew Meadows
|
7c9419aa4e
|
fix non-bullet build
|
2015-01-16 10:34:52 -08:00 |
|
Sam Gateau
|
afb6175d60
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-01-16 10:32:56 -08:00 |
|
Sam Gateau
|
6b55b4ff82
|
No more Magic numbers and fixing the code path for linux
|
2015-01-16 10:26:51 -08:00 |
|
Andrew Meadows
|
2427fa68cd
|
remove unnecessary Bullet #include
|
2015-01-16 10:06:39 -08:00 |
|
Sam Gateau
|
8634d86167
|
Adding ambient sphere in the lighting equation and menu to control te presets
|
2015-01-16 09:43:21 -08:00 |
|