Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 19:40:23 +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
Andrew Meadows
1bc88a0224 merge upstream/master into andrew/ragdoll 2014-08-21 09:58:58 -07:00
AndrewMeadows
ff9f079704 Merge pull request #3308 from Atlante45/record_feature 
Record feature Scripted UI
 2014-08-21 09:56:02 -07:00
Andrew Meadows
328167464f Merge branch '19908' of github.com:huffman/hifi into huffman-19908 
Conflicts:
	interface/src/Menu.cpp
 2014-08-21 09:21:24 -07:00
Andrew Meadows
bc1276944c merge upstream/master into andrew/ragdoll 2014-08-21 08:21:36 -07:00
Andrew Meadows
080c191727 namechange updateConstraint() -> buildConstraint() 2014-08-21 08:20:31 -07:00
Atlante45
022109a249 Added timestamps to the scripted UI 2014-08-20 19:36:56 -07:00
Andrzej Kapolka
72500630b0 Basic splatting. 2014-08-20 19:26:06 -07:00
ZappoMan
17426a1c71 removed tons of debugging 2014-08-20 17:47:16 -07:00
Andrew Meadows
7e4c72445e JS scripts set joint animation priorities 2014-08-20 17:14:59 -07:00
ZappoMan
ef86d86234 split out entity rendering into subclasses, improved rendering of models 2014-08-20 15:49:50 -07:00
Atlante45
4922592cfa Debug tweaks 2014-08-20 15:21:33 -07:00
Andrzej Kapolka
416d9bac2e Working on texture rendering. 2014-08-20 14:48:02 -07:00
Andrew Meadows
a01d3781d9 simplified SkeletonModel::maybeUpdateLeanRotation() 2014-08-20 12:48:52 -07:00
Clément Brisset
c76afe7d4a Merge pull request #3298 from PhilipRosedale/master 
First cut of Spacebar-to-fly with Oculus and Faceshift, stabilize Faceshift head jittering
 2014-08-20 10:16:25 -07:00
Philip Rosedale
5e94070aa0 Merge pull request #3304 from huffman/19864 
Add AppKit as a dependency in interface CMakeLists.txt
 2014-08-19 22:31:54 -07:00
Ryan Huffman
6b1671c598 Add AppKit as a dependency in interface CMakeLists.txt 2014-08-19 22:17:09 -07:00
Philip Rosedale
8e958b49c0 Merge pull request #3303 from Atlante45/record_feature 
Record feature JS API + File Format
 2014-08-19 21:25:18 -07:00
Philip Rosedale
c68ed81691 fixes per code review 2014-08-19 20:54:08 -07:00
Philip Rosedale
8e024982d5 Merge pull request #3301 from huffman/19864 
Code Review for Job #19864
 2014-08-19 20:48:30 -07:00
Ryan Huffman
3d940469de Increase display name drawing distance 2014-08-19 19:41:31 -07:00
Ryan Huffman
42de56381a Update blue audio sphere name and angle to draw at 2014-08-19 19:40:27 -07:00
Ryan Huffman
3b7260c434 Fix blue audio sphere not showing correctly 2014-08-19 19:22:11 -07:00
Ryan Huffman
8bc5f86666 Add Audio Sphere menu option 2014-08-19 19:21:53 -07:00
Atlante45
72c60ee69c Remove used variable 2014-08-19 19:01:50 -07:00
Andrzej Kapolka
7cf7f188f8 Yet more texture bits. 2014-08-19 18:55:18 -07:00
Atlante45
c21d1a41e5 Removed debug messages 2014-08-19 18:30:14 -07:00
Andrew Meadows
8c4f0968d8 remove unused JointState::setRotation() method 2014-08-19 17:33:06 -07:00
Andrew Meadows
1a8a2d9156 Add Avatar submenu to main menu for non-debug stuff 2014-08-19 17:26:01 -07:00
Atlante45
b028b845f4 Fox audio recording not being triggerred from JS 2014-08-19 17:22:05 -07:00
Atlante45
b13604f968 JS API for recording 2014-08-19 16:43:26 -07:00
Atlante45
db8869a34d File format implementation + threading tweaks 2014-08-19 16:42:43 -07:00
Philip Rosedale
d685e5c8b9 Added roll strafe, pitch ascend, more tuning movement 2014-08-19 16:05:01 -07:00
Andrzej Kapolka
3136e4df76 More texture progress. 2014-08-19 15:28:15 -07:00
Andrzej Kapolka
a9c4ce2a6a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-19 14:21:42 -07:00
Andrzej Kapolka
e854656a7f Rather than using a boolean to indicate "colorness," use a different class. 
More texture bits.
 2014-08-19 14:20:47 -07:00
Ryan Huffman
284c4d8ac0 Merge branch 'master' of github.com:highfidelity/hifi into 19864 
Conflicts:
	interface/CMakeLists.txt
 2014-08-19 11:59:53 -07:00
Andrew Meadows
f511fe2657 Ragdoll cannot assume skeleton's rootIndex is 0 
some Models have extra "joints" not part of the normal skeleton
 2014-08-19 11:31:50 -07:00
Philip Rosedale
8fe1457776 removed unneeded audio and light stats from main stats screen 2014-08-19 10:14:13 -07:00
Philip Rosedale
1d13a6c05d Stabilize face shift head camera movement with velocity filtering 2014-08-19 09:37:11 -07:00
Philip Rosedale
9d44f5e4f7 measure face shift frame time rather than use constant 2014-08-19 08:18:19 -07:00
Philip Rosedale
7b86f668a6 Add SPACE to scripting JS, change reset to apostrophe 2014-08-18 23:22:55 -07:00
Philip Rosedale
8d2433382a Merge branch 'master' of https://github.com/worklist/hifi 2014-08-18 21:32:48 -07:00
Philip Rosedale
39b370979c JS calls for head motion/rotation that allow avatar flying with head movement 2014-08-18 21:32:40 -07:00
Atlante45
29830916ba Fix bug introduced in CR 2014-08-18 21:06:32 -07:00
Andrzej Kapolka
23a4c21ce1 Only allow heightfield brushes on heightfield attributes. 2014-08-18 18:29:19 -07:00
Andrzej Kapolka
5b8ff07449 Working on heightfield textures. 2014-08-18 18:21:48 -07:00
Atlante45
c113dd350e Moved members to MyAvatar 2014-08-18 16:25:38 -07:00
Atlante45
698699dea8 CR 2014-08-18 15:56:27 -07:00
Atlante45
6d567e67a9 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 15:41:19 -07:00
Clément Brisset
bec149ebb9 Merge pull request #3295 from AndrewMeadows/ragdoll 
Ragdoll Part 11: ragdoll collisions move avatar
 2014-08-18 15:38:25 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
 2014-08-18 15:16:35 -07:00
AndrewMeadows
86aa9a1dcf Merge pull request #3289 from ctrlaltdavid/19840 
Code Review for Job #19840
 2014-08-18 15:05:26 -07:00
Clément Brisset
a6f0c9bb01 Merge pull request #3288 from nivardus/19616 
Code Review for Job #19616
 2014-08-18 14:44:29 -07:00
Atlante45
1d30b52ec2 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 14:23:40 -07:00
Atlante45
52640c8482 Various tweaks and code cleanup 2014-08-18 14:23:29 -07:00
Andrew Meadows
b2d3830057 merge upstream/master into andrew/ragdoll 2014-08-18 12:56:11 -07:00
Andrew Meadows
c2f4648ad7 Merge branch 'ragdoll' of ssh://github.com/AndrewMeadows/hifi into ragdoll 2014-08-18 12:55:10 -07:00
Andrew Meadows
aa1a7307cc use Ragdoll::_accumulatedMovement to move MyAvatar 2014-08-18 12:53:34 -07:00
Andrew Meadows
7e7978de1a compute and store Ragdoll::_accumulatedMovement 2014-08-18 12:53:04 -07:00
Andrew Meadows
3e2095332f make SkeletonRagdoll::updateMuscles() protected 2014-08-18 12:50:07 -07:00
Clément Brisset
ddc67a8edb Merge pull request #3285 from AndrewMeadows/ragdoll 
Cleanup of Ragdoll API
 2014-08-18 12:36:27 -07:00
Atlante45
acb55ce65e Switched audio play back to AudioInjector out of Audio 2014-08-18 12:31:44 -07:00
Andrew Meadows
77047b0130 no NULL check on delete SkeletonModel::_ragdoll 2014-08-18 11:25:51 -07:00
AndrewMeadows
4b7208ac53 Merge pull request #3280 from huffman/19907 
Code Review for Job #19907
 2014-08-18 10:20:01 -07:00
Atlante45
47685b0e88 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-17 12:56:19 -07:00
Andrzej Kapolka
a2ec9898ad Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-15 16:34:25 -07:00
Andrzej Kapolka
668f6d3cfd Support for shadows on heightmaps. 2014-08-15 16:13:47 -07:00
Atlante45
6592a6dca2 Fix for custom URL schemes 2014-08-15 10:28:22 -07:00
Philip Rosedale
28abc6ab2a Merge pull request #3290 from ey6es/metavoxels 
Big change in the way shared borders are handled in order to fix seams between blocks.  Fixes for height/ray queries.  Minimal rectangles for deltas, switch between PNG and deflated JPG encodings.
 2014-08-15 07:57:46 -07:00
Ryan Huffman
7d11994cce Add cursor hiding to gracefulControls.js 2014-08-14 22:37:23 -07:00
Bennett Goble
ca42aecd41 Merge branch 'master' into 19616 2014-08-14 20:52:55 -04:00
Andrzej Kapolka
05d6b628fa Alllmost ready with the big edge sharing rejiggery. 2014-08-14 17:10:45 -07:00
Atlante45
3cc18d10ae Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 16:07:38 -07:00
Clément Brisset
c01e8339b1 Merge pull request #3287 from birarda/oculus-dk2 
require presence of LibOVR for relative position from OculusManager
 2014-08-14 15:59:23 -07:00
wangyix
7a8a8684d6 fixed crash when audioscope frame size is reduced 2014-08-14 15:56:13 -07:00
Stephen Birarda
e3bab8bdc8 require presence of LibOVR for relative position from OculusManager 2014-08-14 15:47:03 -07:00
Atlante45
9e5b68fa9d Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 15:38:03 -07:00
Bennett Goble
e21392f553 Merge branch 'master' into 19616 2014-08-14 18:37:11 -04:00
Andrew Meadows
60d411ead5 cleanup Ragdoll API (less "ragdoll" qualifiers) 2014-08-14 14:41:51 -07:00
Andrew Meadows
46c91052c9 split SkeletonModel and Ragdoll classes apart 2014-08-14 14:29:03 -07:00
Atlante45
2981132395 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 11:39:44 -07:00
Atlante45
cd0f216419 Added Recorder and Player to Audio class 2014-08-14 11:39:36 -07:00
Atlante45
db5aeddc0f fix for joints not playing back 2014-08-14 10:58:00 -07:00
Andrew Meadows
ca4a23e532 use "visible joint positions" for MyAvatar only 2014-08-14 09:21:15 -07:00
Ryan Huffman
bf9e887cee Fix SpeechRecognizer in CMakeLists 2014-08-13 16:16:11 -07:00
Ryan Huffman
a2e7c9b75c Update build for speechRecognizer 2014-08-13 14:53:26 -07:00
Andrew Meadows
7852321152 merge upstream/master into andrew/ragdoll 2014-08-13 14:52:14 -07:00
Andrew Meadows
3d107cc7e5 less variability in verlet simulation loop count 2014-08-13 14:51:16 -07:00
Andrzej Kapolka
8c42a3a848 Ray query fix. 2014-08-13 11:30:05 -07:00
wangyix
014346094b fixed compile error with LIBOVR 2014-08-13 11:28:41 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
Andrzej Kapolka
56c6c3c972 Working on the height/ray queries. 2014-08-13 11:05:48 -07:00
wangyix
f34f0a719b fixed lastPopOutput null ptr errors for frame loudness check 2014-08-13 10:26:01 -07:00
Andrzej Kapolka
d00efe7f6d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-13 10:07:24 -07:00
Andrzej Kapolka
9c2d4776f9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-12 18:21:23 -07:00
Andrzej Kapolka
21d6c3c48a More work on edge rejiggery. 2014-08-12 18:21:04 -07:00
Atlante45
73a3a13c59 More recording work 2014-08-12 18:15:48 -07:00
Atlante45
792f779bbf Hooked up MyAvatar to playbacks 2014-08-12 16:16:01 -07:00
Atlante45
18ff497443 Added all relevant curves to RecordingFrames 2014-08-12 16:11:53 -07:00
Stephen Birarda
4dce4c4919 link to ws2_32.lib if LibOVR is being linked to 2014-08-12 15:23:12 -07:00
Stephen Birarda
4bf7bbe0df if enable VR mode is re-checked then attempt to re-connect to Oculus 2014-08-12 15:20:04 -07:00
Stephen Birarda
00087e81d8 remove a line of debug that shouldn't have made its way in 2014-08-12 14:44:49 -07:00
Stephen Birarda
a8e17e19a4 resolve conflicts on merge with upstream master 2014-08-12 14:43:30 -07:00
Stephen Birarda
1b5c229dd6 Merge pull request #3273 from PhilipRosedale/master 
Fix bug with first person camera being laggy when flying
 2014-08-12 14:42:07 -07:00
Philip Rosedale
9933c011d7 Remove filtered eye position from head 2014-08-12 14:31:40 -07:00
Leonardo Murillo
e12cf9015f Merge pull request #3271 from birarda/take-out-the-trash 
allow CL specific that an optional external be required
 2014-08-12 14:30:17 -07:00
Philip Rosedale
a68af15b82 DDE Face tracker tweaks to start adding long term averaging 2014-08-12 14:26:14 -07:00
Stephen Birarda
75aedae300 integration of positional tracking with DK2 2014-08-12 14:12:13 -07:00
wangyix
7f53ae0e4f fixed warnings 2014-08-12 12:22:13 -07:00
Andrzej Kapolka
ee01d85b5e Attempting to remove some number magic. 2014-08-12 12:01:07 -07:00
Andrzej Kapolka
2c0f8ff57e Working on rejiggering the heightfield tiles. 2014-08-12 10:56:15 -07:00
wangyix
8565e93ba4 more test code (10% drop both directions) 2014-08-12 10:50:34 -07:00
ZappoMan
76308738e0 added pruning support, some cleanup 2014-08-12 07:16:32 -07:00
Thijs Wenker
4ff7ff61e8 OSX compatibility with SDK 0.4.1 2014-08-12 13:25:22 +02:00
Thijs Wenker
87abc6b66a Merge branch 'master' of https://github.com/worklist/hifi 2014-08-12 13:17:32 +02:00
Philip Rosedale
0e72c6a0b6 Merge pull request #3269 from ey6es/metavoxels 
Script access for heightfield heights, ray intersection against heightfields, basic color and height brush tools.
 2014-08-12 00:40:14 -07:00
David Rowe
fbaeeef014 Merge branch 'master' into 19840 
Resolved conflicts in editModels.js
 2014-08-11 20:59:37 -07:00
Ryan Huffman
cb76e3ead0 Merge branch 'master' of github.com:highfidelity/hifi into 19907 2014-08-11 18:44:31 -07:00
Ryan Huffman
4852fcc034 Add red border to main window when not connected to domain 2014-08-11 18:43:49 -07:00
Ryan Huffman
0296d0deeb Add domain connection status to window title 2014-08-11 18:43:26 -07:00
wangyix
a31d53544b repetition-with-fade seems good; continue testing 2014-08-11 17:58:01 -07:00
wangyix
e276d15ed4 repetition-with-fade implemented; testing interface crash 2014-08-11 16:25:43 -07:00
ZappoMan
466b4c5e40 add some basic support for coming to a rest on the ground plane in case of downward gravity 2014-08-11 14:52:19 -07:00
Andrew Meadows
2918feddf0 reduce acceptable error for ragdoll simulation 2014-08-11 14:51:42 -07:00
Andrzej Kapolka
ffe87ad8c6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-11 14:32:24 -07:00
Atlante45
96ee9e3f75 Work on Recording structure 2014-08-11 13:54:36 -07:00
AndrewMeadows
0650169c25 Merge pull request #3270 from chansensturm/audio-filter 
Added support for biquad, parametric, and multi-band filter eq
 2014-08-11 12:22:40 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
Atlante45
33d646d92d Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-11 10:43:49 -07:00
Stephen Birarda
cadfaab770 fix order now that I know my ABCs 2014-08-11 09:58:21 -07:00
Stephen Birarda
2469d958d6 include CoreFoundation for Audio.cpp defaultAudioDeviceForMode 2014-08-11 09:57:13 -07:00
Stephen Birarda
405e79fe6d allow command line specification that an external be required 2014-08-11 09:51:36 -07:00
AndrewMeadows
e5c2a099b8 Merge pull request #3268 from birarda/take-out-the-trash 
cmake (in)sanity
 2014-08-11 09:15:38 -07:00
Craig Hansen-Sturm
481108ecd1 added support for biquad, parametric, and multi-band filter eq 2014-08-10 22:47:27 -07:00
Ryan Huffman
23a760dfcf Add exstra functionality to script Window interface 2014-08-09 23:30:48 -07:00
Ryan Huffman
87358002bd Add MyAvatar::setVelocity 2014-08-09 23:30:14 -07:00
wangyix
7a063b8bc8 scope seems to be working now using networkSamples 2014-08-08 18:16:25 -07:00
wangyix
fea97f8fe8 added networkSamples buffer to MixedProcessedAudioStream 2014-08-08 17:17:30 -07:00
ZappoMan
275a5c4a47 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-08 15:13:55 -07:00
ZappoMan
b7767b7971 get referentials compiling with new Entity ID changes 2014-08-08 15:12:57 -07:00
wangyix
a2d66b9a8f fixed audio scope; added parseSilentPacketStreamProperties() 2014-08-08 14:55:38 -07:00
Bennett Goble
46007e2c56 Merge branch 'master' into 19616 2014-08-08 17:38:53 -04:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
Atlante45
5b4a3bd5f5 Recording ground work 2014-08-08 14:26:16 -07:00
Atlante45
9abfb0f503 Added Recorder suite 2014-08-08 14:25:55 -07:00
Andrzej Kapolka
18256a657e Removed unused uniform. 2014-08-08 14:25:02 -07:00
Andrzej Kapolka
b7910cfe74 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-08 14:20:38 -07:00
Andrzej Kapolka
468a3d4d67 Bump up the packet version. 2014-08-08 14:18:32 -07:00
Andrzej Kapolka
768410ca0b A couple comments, let right mouse button decrease height. 2014-08-08 14:14:35 -07:00
Andrzej Kapolka
e24ff0130f Basic color/height painting. 2014-08-08 14:10:44 -07:00
Stephen Birarda
d5b1bee13c resolve conflicts on merge with upstream master 2014-08-08 13:48:32 -07:00
Stephen Birarda
2badf9ab1a don't quote linked ZLIB and OpenSSL libs for interface 2014-08-08 13:42:07 -07:00
wangyix
0dfe0b1f2a merged with master 2014-08-08 13:32:27 -07:00
Stephen Birarda
a99b19d28a make Qt5 and ZLIB required finds, add OpenSSL to interface 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
e4d01d269c use shared dependency linking macro in hifi projects 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
1a71d655b9 more cmake cleanup to remove ROOT_DIR passing 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
892e30c5e1 get past assignment-client build after cmake auditing 2014-08-08 13:17:53 -07:00
Stephen Birarda
9a50532b1f bubble up sub dependencies to link_hifi_library 2014-08-08 13:17:52 -07:00
Stephen Birarda
45afce48f7 remember old session UUID in AvatarHashMap to work around ghosting 2014-08-08 13:14:03 -07:00
wangyix
63624fae7d cleaned up code, fixed typos 2014-08-08 11:40:48 -07:00
Andrzej Kapolka
b7b1b018ee No need to use a texture for the cursor; we can just use a fragment shader. 2014-08-08 11:24:57 -07:00
Andrew Meadows
2286eae64a head connects to neck during ragdoll simulation 2014-08-08 10:53:38 -07:00
Andrew Meadows
05318acc7f don't make shapes for joints with zero radius 2014-08-08 08:37:28 -07:00
Andrew Meadows
bcb0cb2c3c fix bug: variable should be float rather than int 2014-08-08 08:26:25 -07:00
Andrew Meadows
5de762361a remove cleanup of Model::_jointStates tree 
the cleanup causes crashes and broken models
 2014-08-08 08:20:42 -07:00
Andrzej Kapolka
6930174a9e Hide the cursor when the mouse pointer is hidden. 2014-08-07 18:30:33 -07:00
Andrzej Kapolka
0fc34a47aa Show heightfield cursor. 2014-08-07 18:19:58 -07:00
Ryan Huffman
9127ac24a0 Move speechRecognizer to Menu 2014-08-07 17:45:27 -07:00
Ryan Huffman
3e456b0ec9 Update speech recognizer to fully turn off when disabling 2014-08-07 17:45:01 -07:00
Andrew Meadows
9a55252587 remove extraneous roots from Model::_jointStates 2014-08-07 17:02:28 -07:00
ZappoMan
6f479a1026 convert IDs to UUIDs 2014-08-07 17:02:11 -07:00
wangyix
1153a76ab1 new option knobs added, no new behavior yet 2014-08-07 16:37:36 -07:00
Andrzej Kapolka
4e1886dfcb Divided when I should have multiplied. 2014-08-07 15:04:55 -07:00
Andrzej Kapolka
8de2dd9485 Working on ray intersection testing. 2014-08-07 14:38:47 -07:00
Andrew Meadows
bb33266635 merge upstream/master into andrew/ragdoll 2014-08-07 14:37:10 -07:00
Andrew Meadows
94da63006c VerletPoint::_mass is now private 
We set the mass of other avatars artificially high
so they are less movable.
 2014-08-07 14:35:32 -07:00
ZappoMan
cd4ea4b34f more animation work 2014-08-07 13:13:37 -07:00
Andrew Meadows
0f784a9cc5 add other ragdolls to simulation 2014-08-07 13:09:05 -07:00
wangyix
357ba92181 working towards more dials for InboundAdioStream 2014-08-07 12:41:09 -07:00
Andrew Meadows
87350ad2d0 ragdoll simulation now in model-relative frame 
(same rotation as world-frame, but translated to MyAvatar origin)
 2014-08-07 11:45:06 -07:00
Andrzej Kapolka
5a1456712f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-07 11:35:41 -07:00
Andrew Meadows
db1d6c8b49 MyAvatar's ragdoll is the main simulation ragdoll 2014-08-07 09:23:05 -07:00
Andrzej Kapolka
acb973d245 Working on ray intersection testing. 2014-08-06 19:41:25 -07:00
Andrzej Kapolka
62e6493456 Started on heightfield brush tool, added simple query for heightfield height 
(accessible from scripts).
 2014-08-06 17:09:22 -07:00
AndrewMeadows
2653b33b67 Merge pull request #3257 from Atlante45/referentials 
Referentials
 2014-08-06 14:12:18 -07:00
ZappoMan
b7b89dcbec move glow effect to property of all entities, add tools for editing boxes 2014-08-06 12:29:09 -07:00
Atlante45
de8c7fb204 Fix avatar not fading out 2014-08-06 12:14:36 -07:00
Andrew Meadows
cb8c0792b2 make main ragdoll and entity special 
also addded some logic (unused) to add ragdolls of other avatars
 2014-08-06 10:43:56 -07:00
Atlante45
fe8839b4b8 CR 2014-08-06 10:40:55 -07:00
ZappoMan
ebe7182ab6 get models actually rendering again 2014-08-06 10:25:44 -07:00
ZappoMan
e540bef672 more hacking on rendering of virtual entities 2014-08-06 09:12:14 -07:00
Atlante45
110b034bcb Changed updates locations 2014-08-05 18:41:48 -07:00
Atlante45
293c2e94ad Correct member initialisation 2014-08-05 18:17:49 -07:00
Atlante45
2e7d34a886 typing error 2014-08-05 17:08:23 -07:00
Atlante45
b360b6c55d PR cleanup + JS API 2014-08-05 17:07:03 -07:00
Andrzej Kapolka
0dbad7d0dd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-05 16:49:22 -07:00
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