stojce
7a0d828364
Merge branch 'master' of https://github.com/worklist/hifi into 19433
2013-10-21 17:46:28 +02:00
stojce
b45525ae21
Mirror View initial setup
2013-10-21 08:28:38 +02:00
ZappoMan
b0bfba3043
Merge pull request #1090 from PhilipRosedale/master
...
Faceshift only notifies log on first fail to connect
2013-10-20 21:28:30 -07:00
stojce
a746174a3b
Merge branch 'master' of https://github.com/worklist/hifi into 19433
2013-10-20 14:35:17 +02:00
stojce
4ba071adba
Revert "render mirror box"
...
This reverts commit 63533e66c1
2013-10-20 14:32:22 +02:00
Philip Rosedale
e1dc69ff5d
Merge pull request #1093 from stojce/19437
...
Code Review for Job #19437
2013-10-19 19:19:27 -07:00
stojce
652892522e
Merge branch 'master' of https://github.com/worklist/hifi into 19437
2013-10-19 09:06:41 +02:00
Andrzej Kapolka
7ddac20c62
Allow more bones. The model I'm testing with has about 60.
2013-10-18 19:18:48 -07:00
Andrzej Kapolka
871f97bd81
The Blender FBX has models that are also meshes.
2013-10-18 19:06:56 -07:00
Andrzej Kapolka
b294f5b13e
Fix for weird links in Blender exports.
2013-10-18 18:43:07 -07:00
Andrzej Kapolka
b3384d0869
More fixes for text FBXs.
2013-10-18 18:23:08 -07:00
Andrzej Kapolka
a6a4ceebe4
Just check the last entry for the type.
2013-10-18 18:03:28 -07:00
Andrzej Kapolka
ec17b80b52
Adapt to the *other* kind of cluster.
2013-10-18 17:54:54 -07:00
Andrzej Kapolka
ea50d6f22e
Forgot these guys.
2013-10-18 17:49:34 -07:00
Stephen Birarda
b3909da5f0
audio injector requires two UUIDs
2013-10-18 17:37:25 -07:00
Stephen Birarda
4fe2e25bf0
add a stream identifier back to the audio injector
2013-10-18 17:36:59 -07:00
Philip Rosedale
f518fdc3aa
Merge pull request #1091 from birarda/assignment
...
continued STUN requests for keepalive, propagate socket changes
2013-10-18 17:33:51 -07:00
Philip Rosedale
7ac9a87ad4
Merge pull request #1092 from birarda/master
...
fix for Qt 5.1.1 preferences bug
2013-10-18 17:33:40 -07:00
Stephen Birarda
7da1f5a235
add AudioMixerClientData to hold vector of PositionalAudioRingBuffer
2013-10-18 17:32:53 -07:00
Andrzej Kapolka
7e174093e4
Factoring the FBX model code out to a shared base class.
2013-10-18 17:26:03 -07:00
Stephen Birarda
76197712d7
Merge branch 'master' of github.com:worklist/hifi into assignment
2013-10-18 16:34:50 -07:00
Stephen Birarda
b6c4599a55
cleaup some unecessary defaults in Menu
2013-10-18 16:10:03 -07:00
Stephen Birarda
bdfc7fdb64
fix for preferences bug on 5.1.1
2013-10-18 16:07:05 -07:00
Stephen Birarda
0dd16cfc1e
debug a STUN reponse that only changes port
2013-10-18 15:27:35 -07:00
Stephen Birarda
32680bbaad
continued STUN requests for keepalive, propagate socket changes
2013-10-18 15:05:16 -07:00
Philip Rosedale
bf842f01ba
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-18 14:37:49 -07:00
Philip Rosedale
e43758a115
Faceshift fail to connect only notifies log once
2013-10-18 14:36:57 -07:00
Andrzej Kapolka
b84a5679dd
Fixed merge error.
2013-10-18 14:31:56 -07:00
Andrzej Kapolka
591cf98821
Merge branch 'master' of https://github.com/worklist/hifi into ossome
...
Conflicts:
interface/src/renderer/FBXReader.cpp
2013-10-18 14:30:50 -07:00
Andrzej Kapolka
8c85c5cb5e
Merge pull request #1089 from ey6es/master
...
Added support for RotationOffset, which the Lulu model uses.
2013-10-18 14:27:38 -07:00
Andrzej Kapolka
58b4139dbc
Added support for RotationOffset, which the Lulu model uses.
2013-10-18 14:26:42 -07:00
Andrzej Kapolka
cd902c5e85
More work on importing the version of FBX exported by Blender.
2013-10-18 14:09:12 -07:00
Leonardo Murillo
8d8278daef
Merge pull request #1088 from birarda/assignment
...
add a DELETE method to civetweb to delete assignment by UUID
2013-10-18 10:52:33 -07:00
Stephen Birarda
7ca0a26c18
rename method to add assignments back to queue
2013-10-18 10:44:39 -07:00
Stephen Birarda
0d69349ba9
fix prefixed constants
2013-10-18 10:39:23 -07:00
Stephen Birarda
f6c9c57585
cleanup checking of request method, clarify that node is being deleted
2013-10-18 10:33:22 -07:00
Stephen Birarda
d85c0bb88a
add a DELETE method to civetweb to delete assignment by UUID
2013-10-18 10:25:35 -07:00
ZappoMan
10b7110218
Merge pull request #1087 from birarda/assignment
...
fix a crash in AudioMixer with active socket but no linked data
2013-10-18 10:09:38 -07:00
Stephen Birarda
fc36e38d1c
fix a crash in AudioMixer with active socket but no linked data
2013-10-18 10:03:02 -07:00
Stephen Birarda
766430c618
Merge pull request #1086 from birarda/assignment
...
trivial change to Agent to trigger re-deploy
2013-10-18 09:53:40 -07:00
Stephen Birarda
9c950d4c23
trivial change to Agent to trigger re-deploy
2013-10-18 09:53:23 -07:00
Stephen Birarda
c59e0f336d
Merge pull request #1085 from birarda/master
...
fix UNIX build buster for starfield, audio-mixer crash
2013-10-18 09:40:46 -07:00
Stephen Birarda
acbd664cab
fix audio send to wrong socket
2013-10-18 09:34:38 -07:00
Stephen Birarda
2fcdd708cb
fix for audio-mixer crash with node from DS
2013-10-18 09:28:36 -07:00
Stephen Birarda
1965ff286b
fix unix build buster for starfield
2013-10-18 09:16:55 -07:00
Philip Rosedale
cdcd4f9915
Merge pull request #1084 from birarda/master
...
fix missing link to starfield implementation files
2013-10-18 09:02:44 -07:00
Stephen Birarda
1ddc52252a
fix missing link to starfield implementation files
2013-10-18 09:01:44 -07:00
Philip Rosedale
53ffff2718
Merge pull request #1083 from lordwaym/mod-starfield
...
Starfield modification to randomly generate stars
2013-10-18 07:01:12 -07:00
Lord Waymaster
25d5b38f5f
Starfield modification to randomly generate stars
...
Starfield now generates stars at startup rather than load them from the
server - approx. 50msec to load 50,000 stars.
STAR_COLORIZATION const in Generator.cpp is used to defined how
colorful the stars should be.
STARFIELD_NUM_STARS and STARFIELD_SEED sets the number of stars and the
random number seed used to generate the starfield.
2013-10-17 23:24:03 -07:00
ZappoMan
ca7225e525
fix reset of VoxelSystem on eraseAllVoxels()
2013-10-17 18:45:52 -07:00
