Commit graph

7008 commits

Author SHA1 Message Date
Stephen Birarda
08d1d418f8 touchups to README for QT_CMAKE_PREFIX_PATH 2013-10-21 16:43:26 -07:00
Stephen Birarda
cb2cb05688 remove the STK library as it is no longer needed 2013-10-21 16:32:32 -07:00
Stephen Birarda
73a42fbfde remove dependency on Stk library and TwoPole effect 2013-10-21 16:30:01 -07:00
ZappoMan
f618b3a88d removed some old comments 2013-10-21 16:19:03 -07:00
Andrzej Kapolka
349f7b363a More work on custom skeletons. 2013-10-21 16:14:38 -07:00
ZappoMan
f5efe2dd7f removed some old comments 2013-10-21 16:14:34 -07:00
ZappoMan
22a1d0a699 small tweak 2013-10-21 16:07:34 -07:00
Stephen Birarda
00446076b5 remove audio injectors that are starved and not added 2013-10-21 16:04:13 -07:00
ZappoMan
1b302f60f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-21 16:03:53 -07:00
ZappoMan
b8dfc387b4 added reset settings for Old vs New voxel culling mode 2013-10-21 16:02:10 -07:00
ZappoMan
2979a8e738 better working version of hideOutOfView voxel support 2013-10-21 15:30:14 -07:00
Stephen Birarda
fbb097accb remove leftover listening mode, fix UUID push in InjectedAudioRingBuffer 2013-10-21 15:03:07 -07:00
stojce
890313b8ca - fixed aspect ratio on mirror view
- stop rendering voxel selectors on mirror view
2013-10-21 23:55:08 +02:00
ZappoMan
303f4a8ce4 improved VoxelNode delete of children 2013-10-21 14:44:46 -07:00
ZappoMan
2f423e66eb fixed long line 2013-10-21 14:43:55 -07:00
ZappoMan
f5a3fc07c4 added some debugging 2013-10-21 14:41:46 -07:00
ZappoMan
be67d6f8aa added some new debug menus 2013-10-21 14:41:07 -07:00
ZappoMan
023a521948 some debug timing and voxel stats display 2013-10-21 14:39:05 -07:00
Stephen Birarda
1b129a43b5 initial changes to allow for multiple buffers per client 2013-10-21 14:27:55 -07:00
Andrzej Kapolka
49acca3587 Fixes to load my test model. 2013-10-21 11:20:27 -07:00
Stephen Birarda
5fa5e7aa78 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-21 09:33:14 -07:00
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