Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 10:29:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 25 branches 0 tags 1.1 GiB
Commit graph

8902 commits

Author SHA1 Message Date
ZappoMan
a194db837f first cut at registered EntityType renderers 2014-08-05 16:06:21 -07:00
Andrzej Kapolka
4696832ec6 Compute heightfield normals from adjacent values in vertex shader. 2014-08-05 15:13:50 -07:00
Brad Hefta-Gaub
b940d082f3 Merge pull request #3254 from wangyix/pull_mode_audio_output 
Audio output switched to pull mode
 2014-08-05 13:04:40 -07:00
wangyix
212316aed6 moved connect to Audio constructor 2014-08-05 12:14:10 -07:00
ZappoMan
e9db4fd120 registration of multiple entity types: Model and Box 2014-08-05 12:10:17 -07:00
Atlante45
39a74cbc28 Few modifications to how avatars update their positions 2014-08-05 12:03:53 -07:00
Atlante45
283beab05d ModelReferential copy constructor 2014-08-05 12:03:16 -07:00
wangyix
84c517c073 tweaked starve behavior of InboundAudioStream 2014-08-05 11:57:34 -07:00
Andrzej Kapolka
c42fc15999 Use back face culling on the heightfields. 2014-08-05 11:13:15 -07:00
Andrzej Kapolka
964dc4e954 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-05 11:03:00 -07:00
wangyix
77dad6fe65 change to fix Mac linker error 2014-08-05 11:00:27 -07:00
wangyix
779e7631a1 magic number 100 changed in Audio.cpp 2014-08-05 10:27:16 -07:00
wangyix
1eaf175a92 removed disable audio output overflow check menu option 2014-08-05 10:21:53 -07:00
wangyix
748c9e2065 numAudioSamples now calculated to be device samples instead of network samples 2014-08-05 10:13:34 -07:00
Philip Rosedale
4d0474483d Merge pull request #3253 from AndrewMeadows/ragdoll 
Ragdoll Part 8: improved contact points
 2014-08-04 21:33:31 -07:00
Andrzej Kapolka
173e8af126 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-04 18:31:08 -07:00
Brad Hefta-Gaub
d662c0f414 Merge pull request #3248 from Atlante45/dde_face_tracker 
Dde face tracker
 2014-08-04 18:27:15 -07:00
wangyix
332e75453e Merge remote-tracking branch 'upstream/master' into pull_mode_audio_output 2014-08-04 17:58:31 -07:00
wangyix
2b8b15e32d made audioscope easier to see 2014-08-04 17:56:14 -07:00
Atlante45
f0af2f022e Pack/Unpack asymetry fix + added forgotten consts 2014-08-04 17:53:21 -07:00
wangyix
c42af55f2f Merge branch 'inbound_audio_stream' into pull_mode_audio_output 2014-08-04 17:41:03 -07:00
Andrew Meadows
39d3deee90 merge upstream/master into andrew/ragdoll 2014-08-04 17:37:28 -07:00
wangyix
ed3240fbad minor change to _audioOutput->setBufferSize() 2014-08-04 17:31:14 -07:00
wangyix
4355ca8328 minor member rename 2014-08-04 17:24:18 -07:00
wangyix
3fe4c29848 removed heap alloc of receivedSamples; cleaned up code 2014-08-04 17:14:26 -07:00
Andrzej Kapolka
f8afdba922 Allow configurable block sizes, merging children with different resolutions. 2014-08-04 16:56:30 -07:00
wangyix
4d7d6f1e25 changed downstream re-sampling to occur right after parsing packet 2014-08-04 16:23:17 -07:00
ZappoMan
273853ef24 more work on virtual entities 2014-08-04 16:18:24 -07:00
Atlante45
d9dde06c14 Various tweaks to referentials 2014-08-04 14:59:15 -07:00
Philip Rosedale
d552b7ca97 Merge pull request #3246 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats handling of out-of-sync seq nums
 2014-08-04 14:30:45 -07:00
Andrzej Kapolka
b1d6977112 Added simple "erase heightfield" tool. 2014-08-04 12:58:01 -07:00
Atlante45
15cbfa0715 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-04 12:45:57 -07:00
Atlante45
d1a1311979 Mode DDE tweaks 2014-08-04 12:44:23 -07:00
Atlante45
0a42968197 DDE tweaks 2014-08-04 12:40:12 -07:00
Atlante45
1a27b4b645 Merge branch 'master' of https://github.com/highfidelity/hifi into dde_face_tracker 2014-08-04 12:24:44 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
Andrzej Kapolka
9ba091f0a1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-04 11:44:24 -07:00
Andrzej Kapolka
46d4172157 Filter terrain, points, spanners by frustum intersection. 2014-08-04 11:41:56 -07:00
Atlante45
1d2cf3536b Coefficients tweaks 2014-08-04 11:20:18 -07:00
wangyix
d394c203b6 improved re-sync handling of SequenceNumberStats 
removed "duplicate" category since it's not 100% accurate
 2014-08-04 11:09:20 -07:00
Atlante45
c80cd0d71d connected blendshapes 2014-08-04 11:04:14 -07:00
Atlante45
cac3983778 Added a few blendshapes 2014-08-04 11:03:58 -07:00
Atlante45
8d1438a44c Plugged in dde face tracker 2014-08-04 10:28:52 -07:00
Atlante45
bbb52fc4aa Added dde face tracker class 2014-08-04 10:28:29 -07:00
Atlante45
38741aed73 Fixed wrong header guard 2014-08-04 10:27:29 -07:00
Philip Rosedale
5a51950771 Merge pull request #3239 from lzuwei/add_cara_face_tracker 
Reduce Jerks in head rotation when using Cara Face Tracker
 2014-08-04 07:55:33 -07:00
Philip Rosedale
69558dc574 Merge pull request #3245 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats
 2014-08-04 07:49:31 -07:00
Bennett Goble
b634f8d8c0 Merge branch 'master' into 19616 2014-08-03 14:08:09 -04:00
Bennett Goble
bd409f2de4 importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
Brad Hefta-Gaub
e9286e5700 Merge pull request #3238 from ctrlaltdavid/19824 
Code Review for Job #19824
 2014-08-01 16:35:16 -07:00
Brad Hefta-Gaub
211bed946f Merge pull request #3232 from huffman/19783 
Code Review for Job #19783
 2014-08-01 16:34:50 -07:00
Atlante45
aaf043de60 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-01 16:17:16 -07:00
Andrew Meadows
374e89817b minor optimization of MuscleConstraint::enforce() 2014-08-01 14:46:28 -07:00
Ryan Huffman
d01d605b40 Add ModelItemProperties::copyFromNewModelItem 2014-08-01 13:52:00 -07:00
Ryan Huffman
3e572cdf76 Add SpeechRecognizer to js and speechControl.js 2014-08-01 13:44:40 -07:00
Ryan Huffman
ffb178cb43 Add SpeechRecognizer 2014-08-01 13:44:06 -07:00
Atlante45
00e4e20bcb Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-01 11:22:42 -07:00
Andrew Meadows
3305f5edf9 merge upstream/master into andrew/ragdoll 2014-08-01 11:13:18 -07:00
wangyix
cdcc6ece04 fixed compile errors caused by SequenceNumberStats changes 2014-08-01 10:34:19 -07:00
wangyix
e1f905cb36 fixed >100% loss rate bug in SequenceNumberStats 2014-08-01 10:27:51 -07:00
ZappoMan
fa5a2b9a4d reset sent time gap stats on reset 2014-08-01 10:04:35 -07:00
ZappoMan
7e51ebea49 added some additional audio stats 2014-08-01 09:42:31 -07:00
Zu
4aa5fb2795 fix: comments, extra white spaces 2014-08-01 16:12:17 +08:00
Zu
779298b7dc improve: reduce animation jerks in avatar head rotation 2014-08-01 14:12:43 +08:00
David Rowe
f3b4f708a5 Add Script.load() JavaScript method 2014-07-31 21:50:07 -07:00
Thijs Wenker
fe3f1dbe83 forgot to put back one line of code 2014-07-31 22:56:47 +02:00
Thijs Wenker
11b1425196 Windows requires ws2_32.lib for LIBOVR 0.4 2014-07-31 22:51:23 +02:00
Atlante45
ee4b7664b0 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-07-31 13:39:23 -07:00
Thijs Wenker
e6571d334a Oculus SDK 0.4 support for Windows (tested with DK2 HMD) 2014-07-31 22:37:02 +02:00
Leonardo Murillo
c4751d7dd7 Merge pull request #3231 from birarda/domain-server-auth 
add some error messages to PaymentManager
 2014-07-31 13:40:56 -06:00
Andrzej Kapolka
53fc31353d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-31 12:06:01 -07:00
Andrzej Kapolka
a0886d4301 Use raw OpenGL textures rather than QOpenGLTexture, since that we're having 
issues with constants in that class.
 2014-07-31 11:55:52 -07:00
Atlante45
c65dc3fb1e Various tweaks to ModelReferentials 2014-07-31 11:55:28 -07:00
Atlante45
5fd3fd9f8f Moved MyAvatar update at the end of Application::update() to have latest data for simulation 2014-07-31 11:54:39 -07:00
Stephen Birarda
7860aa5b87 add some error messages to PaymentManager 2014-07-31 11:41:49 -07:00
Andrzej Kapolka
90ce73823a Attempting to fix the Linux build error. 2014-07-31 11:03:50 -07:00
Ryan Huffman
aa1c9d88dd Cleaup several qDebug calls and commented lines 2014-07-31 10:48:26 -07:00
Ryan Huffman
3e2bb0f168 Add more complete error handling for import/export models 2014-07-31 10:40:45 -07:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
Stephen Birarda
453c37f4b9 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-31 10:05:40 -07:00
Stephen Birarda
eadae8ed1a allow unauthenticated redemptions of signed transactions from octree server 2014-07-31 10:05:26 -07:00
Stephen Birarda
ce4336894a actually send signed transaction from PaymentManager 2014-07-31 09:26:18 -07:00
Stephen Birarda
350c759618 add a method to SignedWalletTransaction to return binary message 2014-07-31 09:18:57 -07:00
Ryan Huffman
68f1ad79d6 Update clipboard call to exportModels to not scale to tree size 2014-07-31 01:14:07 -07:00
Ryan Huffman
a39a7e2356 Update exportModels implementation 2014-07-31 01:13:17 -07:00
Brad Hefta-Gaub
d4d4069f11 Merge pull request #3225 from birarda/master 
cmake file cleanup to suppress warnings on cmake 3.0
 2014-07-30 19:20:18 -07:00
Ryan Huffman
01737e18b2 Update LocalModelOverlay to work prorperly with translations 2014-07-30 19:06:10 -07:00
Ryan Huffman
43f61b4718 Add localmodels overlay type 2014-07-30 18:38:42 -07:00
Ryan Huffman
521bf6023e Implement pasteModels in Clipboard 2014-07-30 18:38:09 -07:00
Ryan Huffman
051bbd5d34 Add LocalModelsOverlay 2014-07-30 18:34:22 -07:00
Ryan Huffman
06294b403b Add pasteModels 2014-07-30 18:31:58 -07:00
Andrzej Kapolka
f2a72aa5a9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-30 18:17:28 -07:00
Stephen Birarda
631977bac2 setup a SignedTransaction from PaymentManager 2014-07-30 18:15:20 -07:00
Andrzej Kapolka
c3c2265ddd Hide the unset (black) bits. 2014-07-30 18:14:11 -07:00
Stephen Birarda
ef58453fda turn off verbose octree packet debug 2014-07-30 18:10:11 -07:00
Stephen Birarda
db25cd9d2c call PaymentManager when an OctreeEditPacketSender needs to pay 2014-07-30 18:07:08 -07:00
Brad Hefta-Gaub
d6e6cfd585 Merge pull request #3216 from wangyix/inbound_audio_stream 
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
 2014-07-30 18:00:17 -07:00
Stephen Birarda
9c1dd7c4a4 fix call to connect in Application 2014-07-30 17:35:49 -07:00
Stephen Birarda
99daa062c0 trigger domainSettingsReceived slot when connected to domain 2014-07-30 17:35:33 -07:00
Stephen Birarda
363cef6d8a move satoshi costs to VoxelEditPacketSender 2014-07-30 17:33:37 -07:00
wangyix
7281eca5a4 fixed inj crash; added statcDesired to MixedAudioStream 2014-07-30 17:20:05 -07:00
Atlante45
1138a3a275 Added referentials to AvatarData 2014-07-30 16:50:25 -07:00
Atlante45
bc77630c5b Extanded FBXService + moved ModelReferential 2014-07-30 16:49:04 -07:00
wangyix
24be668d36 added check before pushAudioToOutput to prevent starvecount buildup 2014-07-30 15:47:49 -07:00
wangyix
636b6d3307 Merge branch 'pull_mode_audio_output' into inbound_audio_stream 2014-07-30 15:37:18 -07:00
wangyix
daeb2a898d added staticDesiredJitterBufferFrames feature; AudioMixer crashing 
moved some callbacks from Application::updateAvatar() to
Application::update()
 2014-07-30 15:35:40 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
Andrzej Kapolka
82e442c115 Working on heightfield transmission, merging. 2014-07-30 14:54:38 -07:00
Stephen Birarda
6275dd68ab Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-30 14:15:22 -07:00
Stephen Birarda
4be8a92e52 remove explicit requirement of LibOVR source file in OculusManager 2014-07-30 14:15:14 -07:00
wangyix
a2945eaa96 qaudiooutput overflow check enabled by default 2014-07-30 12:52:35 -07:00
wangyix
efd4b7ad67 switched upstream/downstream stats; added menu item to disable injected stats 2014-07-30 12:04:03 -07:00
wangyix
81e5419287 added CTRL+A shortcut to display audio stats 2014-07-30 11:43:33 -07:00
wangyix
2b77a72aba changed Mac downstream ringbuffer to 100 frames 2014-07-30 11:13:15 -07:00
wangyix
30c17067a1 moved pushAudioOutput to handleAudioInput 2014-07-30 11:02:10 -07:00
Philip Rosedale
f0b64c11bc Merge pull request #3221 from lzuwei/add_cara_face_tracker 
Add cara face tracker
 2014-07-29 20:22:21 -07:00
Andrzej Kapolka
ff01d4b80d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-29 19:14:08 -07:00
Andrzej Kapolka
1ea9b0ccbc Working on heightfield encoding. 2014-07-29 19:13:43 -07:00
Zu
1e719f1a88 fixed: restyled code for better readability 2014-07-30 10:04:20 +08:00
Zu
113a173577 fix: update code style to conform to hifi convention 2014-07-30 09:30:55 +08:00
Atlante45
9b3cdacf08 Removed microthreading in favor of lazy computation 2014-07-29 18:28:33 -07:00
Zu
dcd7b81426 Merge branch 'master' into add_cara_face_tracker 2014-07-30 08:45:44 +08:00
wangyix
ecfd5c2757 default max frames over desired changed to 10 2014-07-29 17:37:59 -07:00
Andrzej Kapolka
496f4a184e Translation, etc. 2014-07-29 17:36:52 -07:00
wangyix
bcf9a3c20c changed default max frames over desired in client to 20 2014-07-29 17:17:10 -07:00
ZappoMan
76ae4c9721 quiet logs 2014-07-29 16:54:21 -07:00
Andrew Meadows
67b9c185eb formatting and minor tweaks to constraint strengths 2014-07-29 16:48:34 -07:00
Andrew Meadows
34628aef3b separate muscle constraints from joint constraints 2014-07-29 16:47:54 -07:00
Andrzej Kapolka
436727dfdb Added scale field, fixed height/color extraction. 2014-07-29 16:33:36 -07:00
Atlante45
8cd59ab5de Forward declaration of RotationExtractor 2014-07-29 16:08:15 -07:00
Andrzej Kapolka
6824479762 Progress on rendering heightfield buffers. 2014-07-29 16:06:35 -07:00
Atlante45
42ba3ea338 CR lost _transformChanged 2014-07-29 15:59:53 -07:00
wangyix
d49970d010 maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
Atlante45
7800ffbf2e Make _rotation extraction asynchronous by default in computeTransform 2014-07-29 15:55:47 -07:00
Atlante45
897481d557 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation 2014-07-29 15:39:35 -07:00
Philip Rosedale
fdead9802e Merge pull request #3222 from Atlante45/sit_js_fix 
Sit js fix
 2014-07-29 15:26:51 -07:00
Andrzej Kapolka
2a7847c5b3 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-29 14:28:14 -07:00
Andrzej Kapolka
d04eb6261e More work on heightfields. 2014-07-29 14:27:51 -07:00
wangyix
71c23eac1e added TimeWeightedAvg to InboundAudioStream 
_maxFramesOverDesired hardcoded right now
 2014-07-29 13:51:46 -07:00
Atlante45
75dfb87c8e Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation 2014-07-29 13:47:24 -07:00
Atlante45
8354763e36 CR 2014-07-29 13:35:13 -07:00
ZappoMan
3667eadff0 some various fixes 2014-07-29 13:34:08 -07:00
Atlante45
0bad10b09c Add isLoaded to Overlays 2014-07-29 13:25:42 -07:00
Atlante45
28d4efbad6 Don't display anything if overlays not loaded 2014-07-29 13:15:09 -07:00
wangyix
a3b44a6a73 downstream silent packets seem to be working 2014-07-29 10:08:55 -07:00
Philip Rosedale
1ba8922f0b Merge pull request #3218 from ey6es/metavoxels 
Various metavoxel improvements relating to threading and VBO-based rendering.
 2014-07-29 09:59:55 -07:00
David Rowe
ccf37c6c17 Fix text displayed on Window.form() directory button 2014-07-28 21:53:00 -07:00
ZappoMan
378b555046 fix entity server name and sending to servers when voxels not enabled 2014-07-28 21:21:54 -07:00
Zu
4016f8ca44 Merge branch 'master' into add_cara_face_tracker 2014-07-29 12:21:40 +08:00
Zu
cce962fb16 added: smile, surprise, anger to blendshapes 
fix: roll, yaw direction
added: source comments
removed: debug print outs
 2014-07-29 11:07:04 +08:00
Brad Hefta-Gaub
8e1d4eb0a6 Merge pull request #3210 from Atlante45/add_start_stop_animation_for_scripted_avatar 
Add start stop animation for scripted avatar
 2014-07-28 19:43:58 -07:00
Andrzej Kapolka
aeee369286 Working on heightfield implementation. 2014-07-28 19:10:59 -07:00
Atlante45
6183c4d97e Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation 2014-07-28 16:51:09 -07:00
wangyix
4825457f4d silent audio packet type generalized 2014-07-28 16:49:53 -07:00
Atlante45
fb670275c2 Don't recompute unchaged transform 2014-07-28 16:42:16 -07:00
Andrzej Kapolka
cc909e2286 Fixed spelling error. 2014-07-28 16:24:49 -07:00
Andrzej Kapolka
3ac4bb6ddd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-28 16:24:43 -07:00
Andrzej Kapolka
e05884d4a3 Simpler rendering. 2014-07-28 16:18:16 -07:00
ZappoMan
42911b5618 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-28 15:22:42 -07:00
ZappoMan
fbfd63c429 fix build to work if Qxmpp is not available 2014-07-28 15:17:33 -07:00
wangyix
d0a1d732c9 updated preferences UI "samples" to "frames" 2014-07-28 14:18:22 -07:00
wangyix
ed9bfdc503 these didn't commit for some reason 2014-07-28 14:08:45 -07:00
wangyix
145b7f8a0e got Preferences jitter buffer frames override working 2014-07-28 14:05:17 -07:00
ZappoMan
805a88b73b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/editModels.js
	interface/src/entities/EntityTreeRenderer.h
	libraries/models/src/ModelsScriptingInterface.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-28 13:39:35 -07:00
wangyix
6fc5c74c0b renamed ringbuffer variables to audiostream 2014-07-28 13:08:53 -07:00
wangyix
32dbc6cbdb renamed audioringbuffer classes to audiostream 2014-07-28 11:52:05 -07:00
wangyix
9bbd055404 added stdev method of jitter calc to InboundAudioStream 2014-07-28 11:41:08 -07:00
Atlante45
3c7375daad Removed unused variable 2014-07-28 10:17:04 -07:00
Brad Hefta-Gaub
f438ae2ddb Merge pull request #3215 from Atlante45/master 
Fix the double entries in models' browsers
 2014-07-28 08:51:49 -07:00
Brad Hefta-Gaub
8b43ddc426 Merge pull request #3212 from birarda/select-library 
standardization of hints used to find external libraries
 2014-07-28 08:51:15 -07:00
Philip Rosedale
acecc17001 Merge pull request #3214 from AndrewMeadows/ragdoll 
Ragdoll Part 6: muscle constraints for driving Ragdoll and also damped velocity integration for verlet simulation
 2014-07-28 08:40:21 -07:00
Andrew Meadows
dd515f6bb9 fix bad variable name 2014-07-28 07:06:36 -07:00
David Rowe
49e0d07ac8 Add directory picker button option to JavaScript Window.form() 2014-07-25 20:32:44 -07:00
Andrzej Kapolka
4f5448f529 Basic rendering working again. 2014-07-25 18:19:50 -07:00
Andrzej Kapolka
57ca606491 Various kinds of progress towards generic rendering. 2014-07-25 16:59:48 -07:00
Atlante45
1849ec8e07 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels_zFighting 
Conflicts:
	examples/editVoxels.js
 2014-07-25 16:39:39 -07:00
Atlante45
b5dd9141a3 Fix the double entries in models' browsers 2014-07-25 16:12:40 -07:00
Ryan Huffman
d777e4be53 Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
	interface/src/scripting/WindowScriptingInterface.h
 2014-07-25 15:53:36 -07:00
Andrew Meadows
d3ba00770f merge upstream/master into andrew/ragdoll 2014-07-25 15:34:32 -07:00
Andrew Meadows
b8b1df5799 MuscleConstraints for ragdoll; velocity for verlet points 2014-07-25 15:24:44 -07:00
Andrew Meadows
c8405d192d create MuscleConstraint for driving ragdolls 2014-07-25 15:24:14 -07:00
wangyix
fd9d7baa06 updated Agent with audiostream; added initial packets discard to audiostream 2014-07-25 15:14:10 -07:00
wangyix
f7e043f52d cleaned up code 2014-07-25 14:52:39 -07:00
wangyix
a9d26b3934 fixed repeat-popping in audiomixer 2014-07-25 12:58:10 -07:00
Clément Brisset
f5dbc54b1c Merge pull request #3208 from binaryking/19701 
Code Review for Job #19701
 2014-07-25 12:09:14 -07:00
Clément Brisset
53b345d4cd Merge pull request #3209 from AndrewMeadows/ragdoll 
Ragdoll Part 5: send visible transforms when using ragdoll
 2014-07-25 11:50:15 -07:00
Atlante45
72a31ec8fc Removed magic number to use DEFAULT_NEAR/FAR_CLIP 2014-07-25 10:56:44 -07:00
AndrewMeadows
73ec862474 Merge pull request #3207 from PhilipRosedale/master 
Velocity filter head position for less jitter in camera
 2014-07-25 09:50:21 -07:00
wangyix
059007c99c cleaned up code (removed old code that was commented out) 2014-07-25 09:43:08 -07:00
Zu
1bc6d4bf0f fix: tuned the roll and pitch jitter, round to nearest 1 dp instead of whole number 2014-07-25 18:05:17 +08:00
Zu
98bb995aba added: noise filtering to reduce rotation jitter 2014-07-25 17:32:04 +08:00
Zu
2d921924bf added: Cara Face Tracker 
added: decode cara udp packets
added: head rotation
added: hook into hifi interface
 2014-07-25 16:52:29 +08:00
Philip Rosedale
a5d6b2282e Merge pull request #3201 from wangyix/master 
moved audio stats to own overlay; audio stats now reset when audiomixer is killed;
 2014-07-24 21:40:43 -07:00
Philip Rosedale
9a83be618a Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine 
ScriptEngine now inherit from QScriptEngine
 2014-07-24 21:38:13 -07:00
David Rowe
eecdc2dc7b Increase initial width of the edit fields in JavaScript Window.form() 2014-07-24 19:00:41 -07:00
Philip Rosedale
e272d0be75 Merge pull request #3203 from Atlante45/laser_pointer_js 
Laser pointer js
 2014-07-24 17:28:08 -07:00
Atlante45
9ca00b55a5 Spelling 2014-07-24 17:19:49 -07:00
wangyix
473cbf2afe client audio now updated with stream class; seems fine for now 2014-07-24 17:15:46 -07:00
David Rowe
040254a119 Add optional Cancel button to JavaScript Window.form() 2014-07-24 17:04:02 -07:00
Stephen Birarda
5bc42b9d1c add back the lost QXMPP_STATIC definition 2014-07-24 17:02:30 -07:00
Andrzej Kapolka
605b3282e7 Working on render bits. 2014-07-24 17:01:15 -07:00
Stephen Birarda
6fdd64c9fc change to new style of signal slot connection for XmppClient 2014-07-24 16:52:18 -07:00
Stephen Birarda
d1b050dea8 remove extra wrapping HAVE_QXMPP if 2014-07-24 16:17:34 -07:00
Stephen Birarda
bcdfc9dd78 fix HAVE_QXMPP wrappings in XmppClient 2014-07-24 16:16:39 -07:00
Stephen Birarda
5cbd1492f2 more Cmake cleanup to grab externals 2014-07-24 15:09:41 -07:00
Stephen Birarda
1d78427e6a only override root dir for interface externals if they don't exist 2014-07-24 14:09:49 -07:00
Andrzej Kapolka
5bd3d1fe20 Working on renderer attribute. 2014-07-24 13:16:18 -07:00
Andrew Meadows
2ddca4fbf9 split independent classes out of Ragdoll files 2014-07-24 09:50:16 -07:00
Andrew Meadows
1d124ebc61 fix comments 2014-07-24 08:49:41 -07:00
Andrew Meadows
2aaa628a67 send visible joint state when colliding as ragdoll 2014-07-24 08:42:34 -07:00
Mohammed Nafees
99ba0c6641 Merge remote-tracking branch 'upstream/master' into 19701 2014-07-24 20:28:23 +05:30
Philip Rosedale
a1b74c5272 remove unused code 2014-07-23 23:07:37 -07:00
Philip Rosedale
5aecbe690d made calculateAverageEyePosition private, changed to getEyePosition() where used outside head 2014-07-23 22:56:59 -07:00
Philip Rosedale
00fdc37822 add velocity filtering to eyePosition to reduce camera jitter from faceshift 2014-07-23 22:45:50 -07:00
Andrzej Kapolka
0da46a5bc5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-23 18:20:34 -07:00
Andrzej Kapolka
27f88e9f80 Progress on threading. 2014-07-23 18:20:00 -07:00
Andrew Meadows
924cc600b0 merge upstream/master into andrew/ragdoll 2014-07-23 18:03:09 -07:00
AndrewMeadows
509b86f092 Merge pull request #3205 from birarda/select-library 
lowercase the SIXENSE_ROOT_DIR
 2014-07-23 18:01:23 -07:00
Philip Rosedale
f05855dcc2 Merge pull request #3199 from ey6es/master 
Fix for shadows in close-up inset mirror.
 2014-07-23 17:49:55 -07:00
Clément Brisset
279a107272 Merge pull request #3200 from thoys/feature-multiple-JS-cursors 
Feature multiple js cursors
 2014-07-23 17:46:56 -07:00
Stephen Birarda
4cf27a0099 check in sixense not Sixense 2014-07-23 17:44:38 -07:00
Andrew Meadows
7f2eb88fc2 merge upstream/master into andrew/ragdoll 2014-07-23 17:01:43 -07:00
Andrew Meadows
559188cace parent-relative linear slaving of verlet shapes 2014-07-23 17:00:17 -07:00
Andrew Meadows
72c7498454 add JointState::getDistanceToParent() 2014-07-23 16:56:40 -07:00
wangyix
e2f957d6dc added InboundAudioStream class 2014-07-23 16:46:23 -07:00
wangyix
a36c9e872e merged with upstream 2014-07-23 15:36:37 -07:00
wangyix
3abd383cd3 cleaned up code more 2014-07-23 15:26:49 -07:00
Atlante45
0d039b1cdb Fixed invokeMethod bug + removed debug 2014-07-23 14:38:37 -07:00
wangyix
663cbb76dd removed seq num reset from Audio::reset() 2014-07-23 14:37:11 -07:00
wangyix
3ac4dfa333 gg 2014-07-23 14:28:32 -07:00
Atlante45
e1365a2927 Forgot one change 2014-07-23 14:19:47 -07:00
wangyix
06ed8e4b63 fixed some typos in audio stats; cleaned up code 2014-07-23 13:47:03 -07:00
wangyix
bd8b7eb710 minor spacing issue 2014-07-23 12:44:16 -07:00
wangyix
142bda3ed4 fixed audio stats typos 2014-07-23 12:43:26 -07:00
wangyix
5eaa57b3ad removed more warnings about unused vars 2014-07-23 12:10:25 -07:00
wangyix
ba4403b063 audio stats look good on Mac now 2014-07-23 11:18:25 -07:00
wangyix
5b0b484727 finished new audio stats (looks good on Windows) 2014-07-23 11:00:48 -07:00
Thijs Wenker
9d5c81bd67 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-23 16:59:23 +02:00
Thijs Wenker
b6cb19c2f6 FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors) 2014-07-23 16:55:59 +02:00
David Rowe
09d52251ef Fix merge 2014-07-22 20:38:44 -07:00
Andrzej Kapolka
bbd977777a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-22 19:24:02 -07:00
Andrzej Kapolka
9cf0d6c851 Fix for shadows in close-up inset mirror. 2014-07-22 19:19:13 -07:00
Andrzej Kapolka
02bf76240a Multiply local light colors by material diffuse reflectance. 2014-07-22 18:30:28 -07:00
Andrzej Kapolka
34dfbbedde Merge pull request #3196 from PhilipRosedale/master 
Tweaks to world and avatar lights, add angular acceleration to hair
 2014-07-22 18:16:20 -07:00
Andrzej Kapolka
4f87524821 Switched back to using uniforms for light parameters, as using the fixed 
function state killed my frame rate.  Also cleaned up some of the location
tracking.
 2014-07-22 18:03:13 -07:00
wangyix
d9692e4af4 changed a > to >= in handleAudioInput; added audio input buffer latency to stats; 2014-07-22 17:34:35 -07:00
Philip Rosedale
4f52098da1 tuning tweaks to world and avatar lights 2014-07-22 20:23:23 -04:00
Philip Rosedale
176473b5ba Merge branch 'master' of https://github.com/worklist/hifi 2014-07-22 19:29:42 -04:00
AndrewMeadows
07ce6c9a64 Merge pull request #3192 from ey6es/master 
Fixes for local lights.
 2014-07-22 16:24:17 -07:00
Stephen Birarda
56efa46812 repair for Visage find module base includes 2014-07-22 15:56:22 -07:00
Andrzej Kapolka
d4904f976a Missed the local light stats. 2014-07-22 15:50:08 -07:00
Andrzej Kapolka
aa145c8d20 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-22 15:40:42 -07:00
Andrzej Kapolka
cfc77cd99a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-22 15:24:01 -07:00
wangyix
c8ac1732ec removed audio stats from old location 2014-07-22 14:53:45 -07:00
Stephen Birarda
5c955ca656 fix faceshift definition 2014-07-22 14:48:51 -07:00
Andrzej Kapolka
c085d09835 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-22 14:48:18 -07:00
Andrzej Kapolka
c31dd4df5f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-22 14:46:43 -07:00
Stephen Birarda
19618182a3 don't show Faceshift option if not present 2014-07-22 14:40:53 -07:00
Stephen Birarda
f325500d14 repairs to stubbed faceshft constructor 2014-07-22 14:38:41 -07:00
wangyix
1b2dc2cbe1 added central audio stats including pipeline latency; old stats still there 2014-07-22 14:21:53 -07:00
Leonardo Murillo
6f0f6488d5 Merge pull request #3182 from birarda/select-library 
dynamic selection of debug and release libraries for externals
 2014-07-22 15:17:48 -06:00
Andrzej Kapolka
be028c2b01 Fixes for local lights. 2014-07-22 14:13:51 -07:00
wangyix
f7381c70bc starvcount and notmixedcount also reset when audiomixer is killed 2014-07-22 11:09:47 -07:00
wangyix
847bc28990 Audio stats now reset when AudioMixer is killed 2014-07-22 10:27:26 -07:00
Philip Rosedale
b7663b93e3 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-22 11:05:01 -04:00
Andrzej Kapolka
0ddd3e650c More point bits (trying a different tack). 2014-07-21 19:00:13 -07:00
Brad Hefta-Gaub
01ebefbffd Merge pull request #3189 from wangyix/master 
Made Audio.cpp always push a whole number of frames to the audio output; added audio input buffer stats to interface
 2014-07-21 17:46:42 -07:00
wangyix
f6ef61e76a fixed some typos 2014-07-21 17:15:08 -07:00
wangyix
0bcc13aec9 made Audio always push a whole number of frames to the audio output 2014-07-21 17:12:03 -07:00
Philip Rosedale
87659741b5 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-21 16:11:09 -07:00
wangyix
621f0725cc added input ring buffer stats to interface 2014-07-21 15:39:33 -07:00
Brad Hefta-Gaub
fb097c77b5 Merge pull request #3186 from wangyix/master 
made Audio::_ringBuffer size 10 frames for non-Windows builds; improved interface downstream audio framesAvailable stat; disable QAudioOutput overflow check by default
 2014-07-21 14:50:15 -07:00
Andrzej Kapolka
dd7f3703e1 More work on point rendering. 2014-07-21 14:48:54 -07:00
wangyix
05ea5f8d21 changed menu item name for QAudioOutput overflow check 2014-07-21 14:32:44 -07:00
wangyix
603974c8a2 separated ringbuffer and outputbuffer avg framesAvailable stats in interface 2014-07-21 14:27:09 -07:00
Atlante45
029160a60a Merge branch 'master' of https://github.com/highfidelity/hifi into laser_pointer_js 2014-07-21 14:12:17 -07:00
AndrewMeadows
854ca4bc66 Merge pull request #3185 from Barnold1953/OculusOverlay 
Add hydra lasers for menu picking.
 2014-07-21 13:54:07 -07:00
wangyix
a70eb12245 made Audio::_ringbuffer 10 frames for nonWindows; 
fixed/separated framesAvailable stats for _ringBuffer and _audioOutput;
made QAudioOutput overflow check disabled by default
 2014-07-21 13:21:31 -07:00
Mohammed Nafees
17d827b66d Show script instance with script name in Running Scripts Widget 2014-07-22 01:23:05 +05:30
barnold1953
03bc3a9ff8 Added checkable menu option for laser toggle 2014-07-21 12:35:46 -07:00
Philip Rosedale
8460cecf7a Merge branch 'master' of https://github.com/worklist/hifi 2014-07-21 12:28:15 -07:00
barnold1953
98babe1751 Working hydra lazers when not in oculus 2014-07-21 12:17:13 -07:00
Andrzej Kapolka
4ff3222609 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-21 11:26:55 -07:00
ZappoMan
7c5a77ddfe revert back the largest capacity of the client ring buffer back to the smaller default value 2014-07-21 10:29:51 -07:00
ZappoMan
30aee70346 latest work 2014-07-21 09:18:21 -07:00
Stephen Birarda
b9807dcc4c Merge branch 'master' of https://github.com/highfidelity/hifi into select-library 2014-07-21 08:57:24 -07:00
barnold1953
16fd8f224c Imrpoved repeat texture method, its almost finished 2014-07-18 21:42:20 -07:00
Andrzej Kapolka
38f3f80398 More work on point rendering. 2014-07-18 18:51:01 -07:00
Stephen Birarda
a370156720 add a note for OS X users to use homebrew 2014-07-18 15:39:21 -07:00
Atlante45
35caef1882 Added pointing behaviour 2014-07-18 15:39:12 -07:00
Atlante45
f8772e10a1 Changed enum names 2014-07-18 15:38:36 -07:00
barnold1953
c6bda4bf16 Moved sixense laser stuff to MyAvatar 2014-07-18 15:26:18 -07:00
Stephen Birarda
10ed33cb38 further patching to conditionally build without Faceshift 2014-07-18 14:34:15 -07:00
Stephen Birarda
b2a99edb2e fix conditional builds without Faceshift 2014-07-18 14:27:20 -07:00
Stephen Birarda
e060693856 remove faceshift from repository, make external dependency 2014-07-18 13:54:44 -07:00
Andrzej Kapolka
cda1a7f32a Working on optimized point rendering. 2014-07-18 12:27:51 -07:00
Andrzej Kapolka
1d6f4295c3 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-18 11:45:02 -07:00
Stephen Birarda
9e83040fb4 more find module standardization and cleanup 2014-07-18 10:20:12 -07:00
Stephen Birarda
e619393ac0 link to GLEW_LIBRARIES instead of GLEW_LIBRARY in interface CMakeLists 2014-07-18 10:12:52 -07:00
Stephen Birarda
b0864b01de cleanup the FindPrioVR module and fix GLUT include 2014-07-18 10:05:58 -07:00
Philip Rosedale
c1832bed9c Merge branch 'master' of https://github.com/worklist/hifi 2014-07-17 18:31:52 -07:00
Philip Rosedale
2cee5992a0 Merge pull request #3183 from Atlante45/js_s3_browse 
Js s3 browse
 2014-07-17 18:31:30 -07:00
Atlante45
c07ba9fec5 Added browser as a tool 2014-07-17 17:50:56 -07:00
Stephen Birarda
cb384ac01b final repairs to LibOVR for multiple include folders 2014-07-17 17:24:47 -07:00
Atlante45
7ab8b5a843 Added S3 browser 2014-07-17 17:12:54 -07:00
Stephen Birarda
3fad0e6ac8 cleanup qxmpp find module, use select_library_confgurations 2014-07-17 16:49:17 -07:00
Stephen Birarda
68f9334628 cleanup Faceplus and Faceshift find modules, fix for OVR stitched include 2014-07-17 16:37:10 -07:00
Stephen Birarda
ffb0ea30f8 Merge branch 'master' of https://github.com/highfidelity/hifi into select-library 2014-07-17 16:12:24 -07:00
Philip Rosedale
2972bc7b45 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-17 16:04:21 -07:00
Philip Rosedale
e8539d0006 Merge pull request #3181 from birarda/master 
foundation of support for signed transactions from interface
 2014-07-17 16:03:28 -07:00
Philip Rosedale
1b265f3adb Merge pull request #3180 from AndrewMeadows/ragdoll 
Ragdoll Part4: ragdoll shapes follow target joints, visible joints follow ragdoll shapes
 2014-07-17 16:00:02 -07:00
Stephen Birarda
45f4e033f3 fix the LibOVR find module to grab a util header 2014-07-17 15:55:10 -07:00
Stephen Birarda
e7269e809e allow use of debug/release leapmotion library with select_library_configurations 2014-07-17 15:41:47 -07:00
Stephen Birarda
03a052d89c add debug/release linking to sixense via select_library_configurations 2014-07-17 15:27:55 -07:00
Stephen Birarda
074d7f40bb add dynamic selection of debug or release for oculus libraries 2014-07-17 15:10:32 -07:00
Stephen Birarda
cebd379b68 don't pass OpenSSL libraries as string 2014-07-17 14:47:45 -07:00
Stephen Birarda
5cad6edb38 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 14:06:11 -07:00
Brad Hefta-Gaub
437e3efbc2 Merge pull request #3179 from wangyix/quick_audio_PR 
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
 2014-07-17 11:44:05 -07:00
Stephen Birarda
45ae9f614d add dialog to Menu to insert wallet private key 2014-07-17 11:43:30 -07:00
Stephen Birarda
0c8c4a2cf9 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 11:08:35 -07:00
Andrew Meadows
b22652f441 merge upstream/master into andrew/ragdoll 2014-07-17 10:52:27 -07:00
Andrew Meadows
783cde7376 minor tweak to rate at which ragdoll shapes follow joints 2014-07-17 10:51:17 -07:00
Andrew Meadows
25840cad49 fix bug in mixVisibleRotationDelta() 
was using a non-visible rotation
 2014-07-17 10:33:11 -07:00
ZappoMan
0c7afc39ca refactoring EntityItemID management and id assignment to be part of EntityItemID class instead of EntityItem class 2014-07-17 10:24:32 -07:00
Philip Rosedale
92cd82c290 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-17 10:00:50 -07:00
Brad Hefta-Gaub
87ff6b9012 Merge pull request #3178 from Atlante45/activity_logger_on_off_option 
Activity logger on off option
 2014-07-17 08:53:47 -07:00
Brad Hefta-Gaub
d8d6d08958 Merge pull request #3145 from samcake/19734 
19734 - Leapmotion support
 2014-07-17 08:45:55 -07:00
Andrzej Kapolka
28dbb60e7e Working on post-visit callback. 2014-07-16 19:14:38 -07:00
Atlante45
6cb5483c21 Added send data option to prefs 2014-07-16 17:56:29 -07:00
Andrzej Kapolka
64c3a623f4 Working on point buffer building. 2014-07-16 17:56:22 -07:00
wangyix
8763b39393 changed format label string a bit 2014-07-16 17:30:18 -07:00
Philip Rosedale
6bd3e99569 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-16 17:26:56 -07:00
Stephen Birarda
cb9a2c615e use OpenSSL to create signed wallet transaction using hard-code key 2014-07-16 15:44:49 -07:00
wangyix
6764ace8eb droppable silent packets are added for dropped packets; 
_currentJitterBufferFrames replaced with moving average of frames
available.  Downstream framesAvailable stat now includes the frames in
QAudioOutput as well as the ringbuffer.
 2014-07-16 14:41:24 -07:00
Stephen Birarda
74a107f9f4 initial rev of SignedWalletTransaction that creates a message 2014-07-16 12:26:24 -07:00
Atlante45
5dca794322 On/Off for activity logger 2014-07-16 12:22:27 -07:00
Brad Hefta-Gaub
8a1484ce68 Merge pull request #3174 from wdings23/fix_new_avatar_light 
Fix new avatar light
 2014-07-16 12:03:21 -07:00
Brad Hefta-Gaub
a6af882f2d Merge pull request #3176 from Atlante45/fix_edit_properties 
Fix edit properties
 2014-07-16 12:02:22 -07:00
Atlante45
60f242118e Code cleanup 2014-07-16 11:52:12 -07:00
Atlante45
f960b4fff3 new windows JS interface 2014-07-16 11:32:18 -07:00
Stephen Birarda
29504325d0 add a tweaked FindOpenSSL module and link and include it in interface 2014-07-16 10:52:53 -07:00
TonyPeng
7aae85833b Take out getter for avatar's hash key. 2014-07-16 10:08:49 -07:00
TonyPeng
7e23ca1738 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_new_avatar_light 2014-07-16 09:46:15 -07:00
TonyPeng
317a08fc60 Draw local light stats. 2014-07-16 09:44:05 -07:00
Andrew Meadows
3ad4a2e170 more stability when fingers follow ragdoll 2014-07-16 09:32:46 -07:00
Andrew Meadows
922912b784 merge upstream/master into andrew/ragdoll 
Conflicts:
	interface/src/Menu.h
 2014-07-16 09:00:36 -07:00
Andrew Meadows
0667cb6e5f add constraints between child joints of same parent 2014-07-16 08:54:28 -07:00
Andrew Meadows
b59ea6f8b4 whitespace formatting 2014-07-16 08:53:20 -07:00
Andrew Meadows
509445d1a2 add JointState::getPositionInParentFrame() 2014-07-16 08:52:21 -07:00
Andrzej Kapolka
3be00b972d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-15 18:11:54 -07:00
TonyPeng
90d56bc108 Use the number of local lights to update new avatars instead of checking hashes. 2014-07-15 16:10:13 -07:00
Philip Rosedale
8fb5ca44d4 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-15 14:47:28 -07:00
ZappoMan
5869039bf3 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 14:26:07 -07:00
Brad Hefta-Gaub
fc28279afe Merge pull request #3170 from wdings23/master 
Allow script to set light properties for all the avatars
 2014-07-15 14:07:26 -07:00
Andrzej Kapolka
1f5922fa67 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-15 11:55:47 -07:00
ZappoMan
000785a531 fixed some warnings 2014-07-15 10:45:24 -07:00
ZappoMan
0068428c7c fixed some warnings 2014-07-15 10:41:29 -07:00
TonyPeng
4cea4d2838 Resolve upstrem conflict 2014-07-15 10:33:22 -07:00
ZappoMan
1eb472c43a Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 10:05:06 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -07:00
Andrzej Kapolka
60e8c12d4b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-15 09:25:36 -07:00
TonyPeng
28854363d4 Coding standard 2014-07-15 09:20:33 -07:00
Brad Hefta-Gaub
dcd3110266 Merge pull request #3166 from wangyix/quick_audio_PR 
Made audio timegap stats more readable with varying units; Fixed AudioMixer NaN error on WIndows;
 2014-07-15 08:28:48 -07:00
wangyix
1047ec7c87 merge with upstream 2014-07-14 16:25:26 -07:00
Andrew Meadows
ecc83e9559 add getRotationInParentFrame() 2014-07-14 16:01:25 -07:00
Andrew Meadows
b8fb5e0298 namechange FromBindFrame ==> InBindFrame 2014-07-14 15:33:05 -07:00
Andrew Meadows
00544aa975 add JointState::_positionInParentFrame 2014-07-14 15:18:34 -07:00
Andrzej Kapolka
e32bab5b04 Beginnings of some metavoxel scriptability, to create some test landscapes. 2014-07-14 14:32:55 -07:00
Leonardo Murillo
6bf06989db Adding place/user go to logging 2014-07-14 15:24:47 -06:00
TonyPeng
1aa20dff60 Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager. 2014-07-14 13:59:57 -07:00
Philip Rosedale
db73d8d2f4 add body angular acceleration 2014-07-14 12:23:00 -07:00
AndrewMeadows
64ff5f6ecf Merge pull request #3165 from AlericInglewood/master 
Compiler warnings fixes.
 2014-07-14 11:10:48 -07:00
Andrew Meadows
456a3c3739 cleanup Leapmotion initialization removes warning 
about unused variable
 2014-07-14 09:26:42 -07:00
Andrew Meadows
85bfcf0eea remove warnings about signed/unsigned comparison 2014-07-14 09:15:24 -07:00
Andrew Meadows
8ffc3aa73d merge upstream/master into andrew/thermonuclear (AKA samcake/19734) 
Conflicts:
	interface/src/Application.cpp
 2014-07-14 09:10:27 -07:00
Philip Rosedale
4b7ba08932 code review fix 2014-07-14 08:53:10 -07:00
Philip Rosedale
2d4194cae5 fixes per review, clap animation requires double-tap to start 2014-07-13 23:33:02 -07:00
Aleric Inglewood
bd212c26d0 Fix initializer list order (avoiding compiler warning). 
This patch fixes the compiler warning:

In file included from /opt/highfidelity/hifi/hifi/interface/src/Application.h:45:0,
                 from /opt/highfidelity/hifi/hifi/interface/src/Audio.cpp:42:
/opt/highfidelity/hifi/hifi/interface/src/Audio.h: In constructor ‘Audio::Audio(int16_t, QObject*)’:
/opt/highfidelity/hifi/hifi/interface/src/Audio.h:268:30: warning: ‘Audio::_interframeTimeGapStats’ will be initialized after [-Wreorder]
/opt/highfidelity/hifi/hifi/interface/src/Audio.h:259:9: warning:   ‘int Audio::_starveCount’ [-Wreorder]
/opt/highfidelity/hifi/hifi/interface/src/Audio.cpp:63:1: warning:   when initialized here [-Wreorder]

by fixing the initializer list of class Audio.

Note that I omitted _audioMixerAvatarStreamAudioStats() - which is a default constructor
that is called anyway (it's the default!) and therefore doesn't belong in the initializer list.
 2014-07-13 17:10:39 +02:00
Philip Rosedale
b0e44be1c0 merge fix 2014-07-11 20:26:58 -05:00
Philip Rosedale
d493b92d7b tweaked defaults 2014-07-11 20:23:59 -05:00
Philip Rosedale
0b3e41a541 remove wind from hair, fix gravity 2014-07-11 19:58:13 -05:00
Philip Rosedale
b86890033c Moved hair to separate class 2014-07-11 19:35:17 -05:00
Andrew Meadows
9b7fc9de95 merge upstream/master into andrew/bispinor 2014-07-11 16:09:22 -07:00
Andrew Meadows
d832f5bec8 fix menu config of visible stats 2014-07-11 16:08:37 -07:00
wangyix
82e9aa8bb7 made stats easier to read; reverted injected stream deletion conditions 2014-07-11 16:08:15 -07:00
wangyix
90c931ea45 removed Audio.cpp initialization list warning; updated Injector removal conditions 2014-07-11 15:07:50 -07:00
Andrzej Kapolka
21a1f4772c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-11 12:42:25 -07:00
Brad Hefta-Gaub
56a6cb9184 Merge pull request #3160 from Atlante45/sitting_improvments 
Sitting improvments
 2014-07-11 11:48:42 -07:00
Brad Hefta-Gaub
a94e077a75 Merge pull request #3153 from wangyix/quick_audio_PR 
Added more stats to AudioStreamStats; Added template classes RingBufferHistory and MovingMinMaxAvg
 2014-07-11 11:42:55 -07:00
samcake
f4ebb175c6 Fix bad casting syntax 
- Reverse the casting that i added to stop warning, works on windows
but not on mac :(
 2014-07-11 11:35:42 -07:00
Atlante45
7ad90ac7bb When visible is false, don't render billboards/models overlays 2014-07-11 11:29:58 -07:00
Andrzej Kapolka
7af4e4e261 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-11 11:25:15 -07:00
Andrzej Kapolka
222869bf53 Merge pull request #3157 from wdings23/master 
2 local lights as default
 2014-07-11 11:24:48 -07:00
Atlante45
22bcb7d7e7 Billboard overlays disply grey square while image is loading 2014-07-11 11:22:06 -07:00
samcake
4adbb19258 Update MotionTracker.h 
- FIx the bad parenthesis
 2014-07-11 11:10:18 -07:00
Atlante45
bd7b17a787 Added subimage to Billboards overlays 2014-07-11 10:50:11 -07:00
wangyix
c5e0da0477 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-11 10:18:49 -07:00
Andrzej Kapolka
af3af15084 Comment, formatting fix. 2014-07-10 18:11:51 -07:00
barnold1953
97165cadcc Removed unneeded variable 2014-07-10 17:34:10 -07:00
barnold1953
1781a2d125 fixed unused variable warning 2014-07-10 17:30:43 -07:00
TonyPeng
df7f3073dc 2 local lights as default 2014-07-10 17:18:49 -07:00
wangyix
6c85caaa54 updated Stats for new AudioStreamStats format 2014-07-10 17:03:53 -07:00
barnold1953
4bf74c1b65 Fixed more ubuntu compiler warnings 2014-07-10 16:59:57 -07:00
barnold1953
e658ce8fb9 Fixed ubuntu compiler warning 2014-07-10 16:57:46 -07:00
barnold1953
71634b4c8d Fixed windows compiler warning 2014-07-10 16:56:04 -07:00
wangyix
a7ef7647ed application stats tracking and packing updated; 2014-07-10 16:54:26 -07:00
samcake
c66560c1c0 Fix C++11 usage 
- replace all the auto keyword by the proper type
kept the auto line in todo for reference :)

- silent a few warnings
 2014-07-10 16:45:12 -07:00
barnold1953
18c5ebce9e Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-10 16:42:36 -07:00
barnold1953
4bfd393d02 Proper scaling for oculus UI using avatar scale 2014-07-10 16:42:00 -07:00
Andrew Meadows
7e4efa6c73 Skeleton gets custom update for visible transforms 2014-07-10 16:21:12 -07:00
Andrew Meadows
b012c0a008 update visible transforms right before render 2014-07-10 16:19:27 -07:00
Andrew Meadows
fb287f71e8 add more methods for processing visible transforms 2014-07-10 16:17:55 -07:00
Andrew Meadows
2046608fa8 enforce alphabetical sort of Menu option strings 2014-07-10 16:16:54 -07:00
Andrzej Kapolka
d858e20af2 For now, tie the metavoxel LOD threshold to the avatar LOD parameter. 2014-07-10 16:02:53 -07:00
Andrzej Kapolka
817b50c7b8 Show upload/download stats for all reliable messages, not just reliable delta 
downloads.
 2014-07-10 15:34:45 -07:00
Andrzej Kapolka
e55a0fbc9c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-10 14:39:42 -07:00
barnold1953
8bc9214445 Added helper scaling function to Avatar. 2014-07-10 14:37:04 -07:00
barnold1953
fc21f7bbac Removed outdated and incorrect getFingerTipPosition() 2014-07-10 14:21:17 -07:00
wangyix
b4c9e51011 Audio now periodically sends downstream audio stats to audiomixer 2014-07-10 14:14:29 -07:00
AndrewMeadows
afa0f19995 Merge pull request #3152 from AlericInglewood/19854 
Code Review for Job #19854
 2014-07-10 12:57:05 -07:00
barnold1953
45421ffb0e Made palm ball and disk properly use avatar scale 2014-07-10 12:06:36 -07:00
wangyix
35419eb939 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-10 11:56:35 -07:00
Andrew Meadows
ad6a219a60 fix bug: remove redundant _skeleton.simulate() 2014-07-10 11:08:15 -07:00
Andrew Meadows
fdd9acb477 bug fix: bad logic for early exit 2014-07-10 10:55:41 -07:00
barnold1953
4d591de762 Applied low velocity filter to palm tip position 2014-07-10 10:52:15 -07:00
barnold1953
baf825789e Made Oculus UI radius not a magic number 2014-07-10 10:28:56 -07:00
Aleric Inglewood
d555017fb4 Coding style fix. 2014-07-10 19:25:00 +02:00
Aleric Inglewood
d1b9611040 Remove debug output lines. 2014-07-10 18:52:38 +02:00
wangyix
0d83b9a6f6 tidied up code 2014-07-10 09:51:01 -07:00
Brad Hefta-Gaub
21e7833938 Merge pull request #3150 from AndrewMeadows/inertia 
rename: ParentFrame --> ConstrainedFrame
 2014-07-09 18:35:25 -07:00
Brad Hefta-Gaub
635cb380f2 Merge pull request #3151 from ctrlaltdavid/19860 
Code Review for Job #19860
 2014-07-09 18:35:01 -07:00
ZappoMan
3c4f5f88d0 checkpoint on virtual entities 2014-07-09 18:24:31 -07:00
wangyix
7fcf149f70 removed if randFloat 2014-07-09 18:14:58 -07:00
wangyix
01f10024ae all stats added, needs testing; created PacketStreamStats struct 2014-07-09 18:13:33 -07:00
barnold1953
a785ceb3da Restored UI fade animation 2014-07-09 17:33:41 -07:00
Andrzej Kapolka
dbd7ec18b0 Show some stats on the client (node counts under LOD, reliable delta download 
progress).
 2014-07-09 17:15:05 -07:00
barnold1953
004db004a6 Dynamically resize lasers so they always end on UI 2014-07-09 17:03:09 -07:00
Andrew Meadows
8fa7bf4fa0 rename: ParentFrame --> ConstrainedFrame 2014-07-09 16:43:46 -07:00
barnold1953
56ff74dd56 Removed ApplicationOverlay::resize() 2014-07-09 16:39:05 -07:00
barnold1953
6e92beeb1c Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2014-07-09 16:32:02 -07:00
barnold1953
8147f2cd91 Fixed some magnification window bugs 2014-07-09 16:30:00 -07:00
barnold1953
090f1fd852 Fixed bug with 3rd person UI ray picking 2014-07-09 16:09:06 -07:00
Andrzej Kapolka
af6704a83c Merge pull request #3134 from wdings23/light_and_haze 
Added local lights to avatar. Added haze to voxel.
 2014-07-09 16:07:20 -07:00
samcake
c6e308bc87 fixes after first review 
- lots of cleaning of the syntax to respect the coding standard

- Fixed the device tracker singleton for clean destruction

- introduced the Factory for the Leapmotion itstead of a naked
constructor
 2014-07-09 15:52:57 -07:00
David Rowe
f2d49fa6a1 Rename focus indicators menu item and default to off 2014-07-09 15:12:29 -07:00
Andrew Meadows
f463099d16 add "simulate" stat name to Avatar::simulate() 2014-07-09 14:31:47 -07:00
Andrew Meadows
6ffa09f9e6 modified scope of devices stats 2014-07-09 13:58:54 -07:00
TonyPeng
ef4b95c6e0 Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays. 2014-07-09 13:27:42 -07:00
Andrew Meadows
3d6752ad90 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-07-09 12:52:00 -07:00
barnold1953
a2225da13d Code cleanup 2014-07-09 12:11:06 -07:00
wangyix
a8cf199256 added format labels in interface for new audio stats 2014-07-09 12:08:41 -07:00
TonyPeng
56eadcb0dc Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays. 2014-07-09 12:05:34 -07:00
barnold1953
e64f34a257 Separated mouse and controller pointers 2014-07-09 12:03:32 -07:00
wangyix
d03d3ef817 new auidostreamstats displayed in interface, domain page stats updated 2014-07-09 11:59:50 -07:00
Andrew Meadows
d26585728b Improved stat accumulation and context names 2014-07-09 11:53:53 -07:00
Philip Rosedale
7bcd7e03a4 Merge pull request #3147 from Barnold1953/master 
Fixed full screen mirror mode for non oculus
 2014-07-09 11:41:56 -07:00
David Rowe
527f6b2a3f Fix User Interface menu item string 2014-07-09 11:32:38 -07:00
barnold1953
862f311306 Fixed full screen mirror mode for non oculus 2014-07-09 11:29:33 -07:00
David Rowe
603ca02ef9 Default UI to "on" 2014-07-09 11:21:16 -07:00
barnold1953
d044af1400 Made it so you can only select in a 180 degree radius with oculus 2014-07-09 11:12:02 -07:00
Aleric Inglewood
801be7edee Stop QMenuBar to steal keyboard focus when pressing Alt key in Linux. 2014-07-09 13:55:38 +02:00
Ryan Huffman
874b542c0c Add import/export/paste model functionality to editModels.js 2014-07-09 04:13:53 -07:00
samcake
d6104e5d48 Final cleaning, ready to publish 
- Removed the LEapmotion sdk from the external folder and validated that
it can be installed in the "HIFI_LIB_DIRS", fixed the
FIndLeapmotion.cmake for that

- Cleared the HandTracker class not needed

Ready for publish !
 2014-07-09 01:02:56 -07:00
samcake
3ecaaa5a85 After HIfi visit, Fix skinning from javascript 
- Understood the skinning mechanism from an absolute transform in model
space that need to use a call to
//JointState::setRotationFromBindFrame(rotation, priority);

- This is not available from the javascript MyAvatar interface yet

- now require LeapMOtion SDK2.0.3 to support arms
 2014-07-08 23:57:37 -07:00
Clément Brisset
3f24feeb1d Merge pull request #3143 from PhilipRosedale/master 
Add Low Velocity Filter for hand movement as menu option
 2014-07-08 23:22:46 -07:00
Clément Brisset
2003dc41df Merge pull request #3138 from ctrlaltdavid/19836 
Code Review for Job #19836
 2014-07-08 23:16:32 -07:00
Philip Rosedale
f8185dec75 removed some debug logs 2014-07-08 22:26:11 -07:00
Philip Rosedale
c50d9ae3e4 Hand low velocity filter as a menu option 2014-07-08 22:22:27 -07:00
David Rowe
305623d8a7 Add option to hide focus indicators 2014-07-08 21:37:08 -07:00
David Rowe
51f7e8904d Integrate UI toggling menu item and Hydra UI toggling 
They work together and both fade the UI in / out.
 2014-07-08 21:04:30 -07:00
David Rowe
1e7a18e625 Guard _framebufferObject deletion 2014-07-08 21:02:32 -07:00
barnold1953
b5a9f50ae7 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-08 17:15:35 -07:00
barnold1953
f8fdd2d11f Minor adjustments 2014-07-08 17:15:11 -07:00
barnold1953
87ad87e10f Actual stereoscopic 3D UI. Looks better now. 2014-07-08 16:25:21 -07:00
Andrzej Kapolka
e579be82a2 Merge pull request #3137 from PhilipRosedale/master 
Better clapping and hand squeezing scripts, started new hair class to hold vertlet hair
 2014-07-08 14:20:03 -07:00
Andrzej Kapolka
7163db7586 Merge pull request #3136 from birarda/master 
use compiler default C++ standard library on OS X, tweak RtMidi find module
 2014-07-08 14:16:22 -07:00
ZappoMan
e800d5457b Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-08 13:02:31 -07:00
wangyix
df1b4107fd moved qAudioOutput buffer overflow debug option to existing audio menu 2014-07-08 13:01:05 -07:00
TonyPeng
e212f9f42e Change fog start to use default value. 2014-07-08 12:48:01 -07:00
barnold1953
0ce7b178b0 Made Oculus UI framebuffer resize when window resizes 2014-07-08 12:47:41 -07:00
samcake
f179b0e9ca Merge remote-tracking branch 'origin/master' into 19734 
Conflicts:
	cmake/modules/FindLeapMotion.cmake
	interface/CMakeLists.txt
	interface/src/devices/Leapmotion.h
 2014-07-08 12:43:32 -07:00
TonyPeng
4e04cecd8c Use glFog for haze (better performance). 2014-07-08 12:28:44 -07:00
wangyix
6ee52e97c8 added dev menu option to disable _audioOutput overflow check 2014-07-08 12:23:43 -07:00
Stephen Birarda
8c5979813f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-08 12:17:15 -07:00
Stephen Birarda
d1afe127c3 updates to RtMidi find module to look for static or dynamic lib 2014-07-08 12:06:43 -07:00
Philip Rosedale
e75b9dc832 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-08 11:43:45 -07:00
barnold1953
cc63f706a7 Functional sixense "laser" oculus selection mode. 2014-07-08 11:43:24 -07:00
samcake
4302accafd Improve the LeapMotion support 
- fixed a bug on indexing the bones of the hand in the update of the
LEapmotion

- Still struggling with the correct joint assignment in the javascript,
visiting HIFI later today
 2014-07-08 11:37:11 -07:00
wangyix
2e73ac8bc1 changed Audio.cpp to not overflow _audioOutput buffer, and 2 other things 
added _consecutiveNotMixedCount to prevent premature injector stream
deletion;  made silent-frame drop only occur in dynamic jitter buffer
mode
 2014-07-08 11:16:39 -07:00
TonyPeng
34e973c516 Merge branch 'master' of https://github.com/highfidelity/hifi into light_and_haze 
Merge in from highfidelity.
 2014-07-08 10:37:46 -07:00
AndrewMeadows
e34f592a83 Merge pull request #3132 from birarda/master 
fix stubbing of MIDIManager if HAVE_RTMIDI not defined
 2014-07-08 10:36:05 -07:00
Stephen Birarda
e33b07819c wrap a missed midi method 2014-07-08 10:24:21 -07:00
Clément Brisset
4f756c31f2 Merge pull request #3133 from huffman/19819 
Code Review for Job #19819
 2014-07-08 10:07:26 -07:00
Stephen Birarda
286d50f4f2 fix if/endif in MIDIManager header 2014-07-08 09:55:03 -07:00
Stephen Birarda
171660ded7 fix stubbing of MIDIManager if HAVE_RTMIDI not defined 2014-07-08 09:52:50 -07:00
TonyPeng
94e81da557 Added local lights to avatar. Added haze to voxel. 2014-07-08 09:44:28 -07:00
ZappoMan
a4b7673a2c some more virtual entity work 2014-07-07 14:29:03 -07:00
Ryan Huffman
c509ae9ffd Merge branch 'master' of git://github.com/highfidelity/hifi into 19828 2014-07-07 13:49:26 -07:00
Ryan Huffman
df6bbd2944 Fix goTo* dialog bug with chat on Mac OSX 
If chat was open, when pressing enter on Mac OSX the operation would not go through and
would focus on the chat window.  There seems to be a  deeper issue, but
it was decided to go with the simple solution of making these dialog
windows not of `Sheet` type.
 2014-07-07 13:47:31 -07:00
ZappoMan
3145d150f3 more work on virtual entities, unit tests passing woot 2014-07-07 12:56:32 -07:00
Andrzej Kapolka
f7f9dfd26e Merge pull request #3128 from Atlante45/replace_qnetworkaccessmanager 
Downgrade of NetworkAccessManager
 2014-07-07 12:21:45 -07:00
Stephen Birarda
dd8f7e81b1 update the interface icon 2014-07-07 11:46:57 -07:00
Atlante45
a225df63f6 Removed deprecated moveToThread() 2014-07-07 11:40:03 -07:00
Andrzej Kapolka
21ba9bf410 Because attempting to compile the new voxel texture shader causes my system 
(Ubuntu LTS, Intel graphics) to hang, change it to compile lazily when
activated.
 2014-07-07 11:22:17 -07:00
samcake
f5c690cc8d Add Leapmotion support for Apple build 
- Add LEapmotion support in the CMake files
- fix a template syntax in DeviceHEader not compiling on mac
- add a missing #ifdef protection in Leapmotion
 2014-07-07 09:32:46 -07:00
samcake
d56ab21192 Clean file formating 
- Clean the classes declaration and body for
DeviceTracker
MotionTracker
ControllerScriptingInterface / InputController
Leapmotion

- final bug remaining in the LeapOfFaith..js
THe orientation assigned to the skeleton joints doesn't work even though
all looks good.
 2014-07-07 09:24:23 -07:00
samcake
abacefa723 Merge remote-tracking branch 'upstream/master' into 19734 
Conflicts:
	interface/CMakeLists.txt
	interface/src/avatar/SkeletonModel.cpp
 2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13 Merge branch 'master' of https://github.com/highfidelity/hifi into 19734 2014-07-05 18:10:59 -07:00
David Rowe
2ad2b6cd1c Resize the overlay framebuffer when the application window is resized 2014-07-03 18:23:37 -07:00
David Rowe
97ca6d70fa Fixed performance timer scope 2014-07-03 17:15:46 -07:00
David Rowe
8b04a9c8b6 Add toggle for user interface display 
- "/" toggles UI (incl. stats if displayed); menu View > User Interface
- "%" = toggle status; menu View > Stats
- Acts on normal, 3DTV, and Oculus display.
 2014-07-03 16:19:05 -07:00
barnold1953
ba997334ff Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-03 16:10:26 -07:00
barnold1953
bf2959675f First pass at laser oculus UI pointer 2014-07-03 16:09:54 -07:00
Philip Rosedale
3280691491 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-03 15:54:29 -07:00
Brad Hefta-Gaub
db5abbc363 Merge pull request #3124 from Atlante45/replace_qnetworkaccessmanager 
Fixed invokeMethod unable to find method + fixed children in different t...
 2014-07-03 14:54:11 -07:00
Clément Brisset
a7be28b547 Merge pull request #3123 from AndrewMeadows/ragdoll 
return to default pose after hydra disconnect
 2014-07-03 14:49:26 -07:00
Atlante45
8e1b8334a1 Fixed invokeMethod unable to find method + fixed children in different thread 2014-07-03 14:46:17 -07:00
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -07:00
Andrew Meadows
662136f01c reset timer as optimization 2014-07-03 14:13:27 -07:00
Andrew Meadows
0f7859bf83 fix return to default pose after hydra disconnect 2014-07-03 14:09:14 -07:00
Philip Rosedale
a25c08a1b7 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-03 14:08:19 -07:00
Andrew Meadows
843a4db650 rotation offset for hydra controllers 2014-07-03 13:50:27 -07:00
Clément Brisset
4798cad1e5 Merge pull request #3121 from ZappoMan/animationFrameIndex 
adds JavaScript API for getting the current animationDetails (state) for avatar animations
 2014-07-03 13:45:27 -07:00
Brad Hefta-Gaub
b8071d8050 Merge pull request #3113 from birarda/master 
initial pass at MIDI input for scripting
 2014-07-03 13:40:25 -07:00
ZappoMan
8755e2d42e CR feedback 2014-07-03 13:38:52 -07:00
Brad Hefta-Gaub
dbdce32b68 Merge pull request #3107 from wangyix/master 
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
 2014-07-03 13:32:31 -07:00
Stephen Birarda
15619b5a98 don't require RtMidi if it isn't present 2014-07-03 13:30:14 -07:00
wangyix
94c0c15c76 fixed more small bugs with AudioRingBuffer constructor 2014-07-03 12:06:18 -07:00
ZappoMan
a53d007c33 add support for getting current animation details for running avatar animations 2014-07-03 11:59:18 -07:00
Stephen Birarda
6038c33fe6 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 11:12:19 -07:00
wangyix
507518f16d removed numFramesCapacity from being exposed everywhere 2014-07-03 11:11:56 -07:00
Atlante45
6b88724578 Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-03 10:30:39 -07:00
Atlante45
20cdc0e3ca Fix wrong slot names in ModelBrowser 2014-07-03 10:30:21 -07:00
Andrew Meadows
8c8a29f477 merge upstream/master into andrew/ragdoll 2014-07-03 09:27:52 -07:00
Stephen Birarda
f1e2ba1267 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 09:25:03 -07:00
Andrew Meadows
55dd2a4835 re-enable gravity effect on arm IK 2014-07-03 09:10:23 -07:00
ZappoMan
2c5209d1e7 virtual entities checkpoint 2014-07-03 09:07:11 -07:00
Andrew Meadows
356a29c2fb add AngularConstraint::softClamp() for hands 2014-07-03 08:40:34 -07:00
Brad Hefta-Gaub
67910a5ba2 Merge pull request #3115 from Barnold1953/OculusSDK 
3DTV UI overlay + Oculus fixes
 2014-07-02 21:45:34 -07:00
Brad Hefta-Gaub
1b29b7c120 Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback 
Removed json callback
 2014-07-02 21:45:19 -07:00
Brad Hefta-Gaub
da87ac4105 Merge pull request #3112 from Atlante45/replace_qnetworkaccessmanager 
Replace QNetworkAccessManager by Wrapper
 2014-07-02 21:41:08 -07:00
Atlante45
69533c25c2 Fix script not being loaded at startup 2014-07-02 17:54:21 -07:00
Philip Rosedale
257dc56168 Merge pull request #3111 from noirsoft/master 
Implementing improved perlin noise
 2014-07-02 17:20:10 -07:00
barnold1953
b6a626c928 Removed comment 2014-07-02 17:18:12 -07:00
barnold1953
edcf4d04f8 Fixed bug when switching from normal view to oculus 2014-07-02 17:05:06 -07:00
barnold1953
ee30a446e9 Fixed 3rd person camera for non oculus 2014-07-02 16:45:05 -07:00
barnold1953
a859094d4a Clickable 3D UI in 3DTV 2014-07-02 16:40:02 -07:00
Atlante45
106e5b578b Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-02 16:06:41 -07:00
Atlante45
45db5e2c40 Removed Xcode warnings 2014-07-02 15:57:11 -07:00
Clément Brisset
1f92d57230 Merge pull request #3103 from AlericInglewood/19827 
Code Review for Job #19827
 2014-07-02 15:53:57 -07:00
Clément Brisset
ae6b4def32 Merge pull request #3108 from huffman/19800 
Code Review for Job #19800
 2014-07-02 15:46:56 -07:00
Philip Rosedale
1a3becc123 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-02 15:26:19 -07:00
Philip Rosedale
ec1f909210 Merge pull request #3109 from AndrewMeadows/ragdoll 
stable arm IK without constraints
 2014-07-02 15:26:10 -07:00
Stephen Birarda
73312ecc5f add the PitchWheel constant to the MIDIManager class 2014-07-02 15:07:49 -07:00
Atlante45
1ac38c9884 Switched call to setCache to invokeMethod 2014-07-02 14:31:19 -07:00
Atlante45
6e02561d96 Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-02 14:08:57 -07:00
Chris Oates
c79c5df295 Fixing up #define / #if pair so that permutation table change can be turned of by setting #defined variable to 0 instead of having to comment it out. 2014-07-02 13:50:47 -07:00
Chris Oates
2d9a42c07a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 13:12:37 -07:00
Chris Oates
e903b1659a Implemented Improved Perlin Noise in existing "textured voxels" option. 
TextureCache.cpp: modified so that permutation texture contains known permutation of 0..255 rather than random set of values. Does not noticeably affect visuals.
perlin_modulate.frag: implementation of improved noise, per 2002 SIGGRAPH paper, including "turbulence" summation.
 2014-07-02 13:09:16 -07:00
Andrew Meadows
9f5f79b2e3 merge andrew/ragdoll into andrew/bispinor 
improved IK merged into AngularConstraint work

Conflicts:
	interface/src/renderer/JointState.cpp
	interface/src/renderer/JointState.h
 2014-07-02 11:37:17 -07:00
Atlante45
598c1cb516 Switched Sound to NetworkAccessManager 2014-07-02 11:27:55 -07:00
Andrew Meadows
f5debdb930 merge upstream/master into andrew/bispinor 2014-07-02 11:23:42 -07:00
ZappoMan
84101fce2c naming cleanup and organizational tweaks 2014-07-02 11:22:56 -07:00
Atlante45
14a2bbb454 Switched SnapshotShareDialog to NetworkAccessManager 2014-07-02 11:22:29 -07:00
Andrew Meadows
b018c1c4a5 Add copy ctor for JointState 
create AngularConstraint for joints that need them (but not used yet)
 2014-07-02 11:22:07 -07:00
Atlante45
9bcd4e7ac8 Switched ScriptEditorWidget to NetworkAccessManager 2014-07-02 11:21:54 -07:00
Atlante45
602015be66 Switched ScriptModel to NetworkAccessManager 2014-07-02 11:21:26 -07:00
Ryan Huffman
70121357be Update JSONCallbackParameters to take params in constructor 2014-07-02 11:12:06 -07:00
Atlante45
da0021cc8e Switch ModelsBrowser to NetworkAccessManager 2014-07-02 10:53:30 -07:00
Atlante45
f6221abb71 Switch ModelUploader to NetworkAccessManager 2014-07-02 10:52:08 -07:00
Andrew Meadows
8b3af0b9cb merge upstream/master into andrew/say-no-to-warnings 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	libraries/audio/src/AudioRingBuffer.cpp
 2014-07-02 10:37:30 -07:00
Atlante45
6489151578 Switch ImageOverlay to NetworkAccessManager 2014-07-02 10:28:26 -07:00
Stephen Birarda
55d8b763c5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 09:42:32 -07:00
Andrew Meadows
6e5d77f0fc merge upstream/master into andrew/ragdoll 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2014-07-02 09:41:13 -07:00
Andrew Meadows
49d54dd6f0 Add Model::inverseKinematics() for stable hand IK 
(removed constraint enforcement which was causing problems,
will add that back later)
 2014-07-02 09:33:51 -07:00
Brad Hefta-Gaub
2df851dcfc Merge pull request #3106 from ctrlaltdavid/19823 
Code Review for Job #19823
 2014-07-02 09:06:01 -07:00
barnold1953
67ecde7d31 Made tree editor voxel world stationary and not crash 2014-07-01 21:39:19 -07:00
Ryan Huffman
f0c013960d Remove unnecessary qDebug 2014-07-01 20:05:30 -07:00
Ryan Huffman
ccc638d8c1 Merge branch 'master' of git://github.com/highfidelity/hifi into 19800 2014-07-01 20:03:54 -07:00
Ryan Huffman
83349e0e53 Rename UserLocationsWindow to UserLocationsDialog 2014-07-01 20:03:05 -07:00
Ryan Huffman
aa08577c73 Fix long line 2014-07-01 17:59:59 -07:00
Ryan Huffman
a9e352981a Fix cleanup of resources for UserLocations* 2014-07-01 17:59:49 -07:00
Atlante45
ab15a1487e Switched BillboardOverlay to NetworkAccessManaqer 2014-07-01 17:44:38 -07:00
Atlante45
c5a997a567 Switched Application to NetworkAccessManager 2014-07-01 17:43:25 -07:00
samcake
35977fbb0f After HIFI visit 
Trying to improve the orientation coming from the leap

Shwo and tell to team of the current LeapMotion integration
 2014-07-01 17:35:06 -07:00
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -07:00
wangyix
a5943e3608 made AudioRingBuffer frames capacity variable 2014-07-01 16:24:31 -07:00
Brad Hefta-Gaub
d8a5f59511 Merge pull request #3104 from Atlante45/model_and_billboard_overlays 
Model and billboard overlays
 2014-07-01 15:52:25 -07:00
Atlante45
d63ad86db0 Removed unnecessary function 2014-07-01 15:37:52 -07:00
Ryan Huffman
e7e7bef506 Add error string on rename failure 2014-07-01 15:37:10 -07:00
Ryan Huffman
9953fd6d2b Update MyLocations to not send rename request if unchanged 2014-07-01 15:29:13 -07:00
Atlante45
12ebfd92d1 Memory leak 2014-07-01 15:12:31 -07:00
Atlante45
19be406b1a Added billboards overlays 2014-07-01 15:09:30 -07:00
wangyix
3730be9804 nacked edit packets are not resent if NACKs are disabled in menu 2014-07-01 14:03:26 -07:00
Atlante45
e9826250cb CR 2014-07-01 12:57:39 -07:00
Philip Rosedale
227dab937c Merge branch 'master' of https://github.com/worklist/hifi 2014-07-01 12:48:02 -07:00
Atlante45
958367f579 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 
Conflicts:
	interface/src/devices/OculusManager.cpp
 2014-07-01 12:45:42 -07:00
Atlante45
547431d52e Coding Standard -- static_cast 2014-07-01 12:43:28 -07:00
Atlante45
09cf01e097 ModelOverlay functionnal + bounding box 2014-07-01 12:42:56 -07:00
barnold1953
af30dc2722 Updated oculus readme.txt for windows users 2014-07-01 12:33:54 -07:00
barnold1953
1a1050cb06 Added back _raiseMirror usage for mirror mode. 2014-07-01 12:31:48 -07:00
wangyix
fd051310da prune missing set before constructing nack packets; 
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
 2014-07-01 12:01:51 -07:00
Stephen Birarda
f389e3a6da resolve conflicts on merge with upstream master 2014-07-01 11:02:25 -07:00
Stephen Birarda
de463642c0 add the ModWheel property to the MIDIManager 2014-07-01 11:00:17 -07:00
Brad Hefta-Gaub
df51d26625 Merge pull request #3094 from wangyix/seqNumberStats 
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
 2014-07-01 10:54:35 -07:00
wangyix
99fd1c7106 changed numSamplesNeedToStartPlayback calculation in Audio.cpp 2014-07-01 10:44:07 -07:00
Brad Hefta-Gaub
a88c92ea17 Merge pull request #3099 from Barnold1953/OculusSDK 
Oculus SDK Upgrade
 2014-07-01 10:43:39 -07:00
barnold1953
80bfb0766b Fixed warnings 2014-07-01 10:28:40 -07:00
Stephen Birarda
5ba4a4dbb5 initial pass of MIDI implementation that bubbles events to JS 2014-07-01 09:53:18 -07:00
samcake
a8b875d32e Merge remote-tracking branch 'origin/LeapMotion' into 19734 2014-07-01 03:20:26 -07:00
samcake
3ce455aba4 Support for LeapMotion and worklist 19734 
-  Introduce the DeviceTracker class  to abstract all the possible
devices
- Introduce the MotionTracker ( a DeviceTracker ) that contains a
transform tree of joints
- Add Leapmotion class as a MotionTracker and the support for the
Leapmotion sdk in external
- Add InputController as the abstraction of a MotionTracker/Joint for
Javascript
 2014-07-01 03:15:26 -07:00
samcake
fe03743163 Revert "Revert "Add LeapMotion SDK support"" 
This reverts commit 8ce145085b3783782fafd051becbb0e339d5dfa1.
 2014-07-01 03:15:23 -07:00
samcake
6b549a5269 Revert "Add LeapMotion SDK support" 
This reverts commit 291c446c28.
 2014-07-01 03:15:21 -07:00
Ryan Huffman
50b13c99a7 Update UserLocationsWindow derive from QDialog 2014-06-30 22:44:10 -07:00
Ryan Huffman
bfde24fe12 Update MyLocations sort order 2014-06-30 22:37:32 -07:00
Ryan Huffman
a566f90820 Update User Location update/delete to not work simultaneously 2014-06-30 22:37:13 -07:00
Ryan Huffman
15d60df420 Update User Locations window to update name when it changes on update 2014-06-30 22:25:00 -07:00
Ryan Huffman
51e42221be Update menu to toggle User Locations Menu 2014-06-30 22:24:27 -07:00
Atlante45
2015861e13 Fixed spelling mistake 2014-06-30 20:10:53 -07:00
Atlante45
7c797449ab Comments + connectedDevice 2014-06-30 19:02:43 -07:00
Andrew Meadows
9ca1bfdfe5 add AngularConstraint.* with some unit tests 
more unit tests to follow
 2014-06-30 18:05:22 -07:00
Andrzej Kapolka
0075bb89c4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-30 18:02:56 -07:00
wangyix
f51a77ce45 reset the incoming audio seq stats in Application::nodeKilled when audiomixer is killed 2014-06-30 18:00:29 -07:00
Atlante45
1a2fd4483b Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 2014-06-30 17:54:34 -07:00
Atlante45
d102795314 Added application version to logger 2014-06-30 17:18:49 -07:00
barnold1953
1cd2066e79 Added option to disable glow effect for 10fps boost for oculus 2014-06-30 17:13:47 -07:00
Atlante45
f33ad8a100 Adding logger calls 2014-06-30 17:10:17 -07:00
wangyix
7a6b20fd84 added downstream audio stats to stats overlay 2014-06-30 17:01:22 -07:00
barnold1953
2727328729 Removed unneeded menu option 2014-06-30 16:46:25 -07:00
barnold1953
de0e65eb03 Restored glow effect 2014-06-30 16:26:50 -07:00
Clément Brisset
1fd830f53c Merge pull request #3098 from ctrlaltdavid/19803 
Code Review for Job #19803
 2014-06-30 16:15:51 -07:00
wangyix
f2dfa6b978 fixed warnings 2014-06-30 16:10:58 -07:00
barnold1953
e51eb34f05 Fixed build errors when libovr is not present 2014-06-30 15:14:21 -07:00
Atlante45
e9dffc0681 Removed testing code 2014-06-30 14:31:39 -07:00
Atlante45
ff8694d5c5 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 2014-06-30 14:30:17 -07:00
Atlante45
0d18debd1b Moved UserActivityLogger to networking 2014-06-30 14:27:07 -07:00
wangyix
c789f3c6b9 merge with upstream 2014-06-30 14:13:34 -07:00
barnold1953
5a2d2bba8f Updated readme.txt 2014-06-30 12:42:43 -07:00
Andrzej Kapolka
110f90df0e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-30 12:42:02 -07:00
David Rowe
e8e9d6464b Fix running scripts scrollbar and add scrollbar to list of all scripts 2014-06-30 12:41:01 -07:00
wangyix
d2f86278b2 modified AudioStreamStats to per-stream with seq stats 
added AudioStreamStats info to interface overlay stats
 2014-06-30 12:31:58 -07:00
Ryan Huffman
123773a8e3 Add default background color and initialize property 2014-06-30 12:20:05 -07:00
Ryan Huffman
cda88bf4af Add backgroundColor to TextOverlay 2014-06-30 12:06:32 -07:00
barnold1953
ef57970510 Comments and code cleanup 2014-06-30 11:50:42 -07:00
barnold1953
6e954e7f53 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-06-30 11:44:49 -07:00
barnold1953
ffab329af4 Made camera line up with eyes in mirror mode 2014-06-30 11:39:33 -07:00
barnold1953
d109ef6fe1 Proper mirror and third person mode in Oculus 2014-06-30 11:33:22 -07:00
wangyix
de3c1ebf0f changed class name to AudioStreamStats, reverted ScriptEngine packing back to QDataStream 2014-06-30 09:42:22 -07:00
Andrew Meadows
57c17eb972 remove unecessary clearRagdollConstraintsAndPoints() 2014-06-30 09:18:31 -07:00
Andrew Meadows
f33728b615 guarantee that ragdoll is clear before initialized 2014-06-30 09:13:42 -07:00