Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 22:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15485 commits 25 branches 28 tags 1.2 GiB
Commit graph

4648 commits

Author SHA1 Message Date
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
Andrzej Kapolka
f356f0652b Collapse nodes when they fall out of LOD. 2014-07-30 16:36:40 -07:00
wangyix
24be668d36 added check before pushAudioToOutput to prevent starvecount buildup 2014-07-30 15:47:49 -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
barnold1953
66c1aba7f7 Animation improvements, exposed roll/yaw head control. 2014-07-30 15:23:03 -07:00
Andrzej Kapolka
a722c4ba0a Merge fix. 2014-07-30 15:22:45 -07:00
barnold1953
c4a7c2783c Merge branch 'master' of https://github.com/highfidelity/hifi into dancerScript 2014-07-30 15:21:49 -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
Atlante45
069f1ed247 Added ModelReferential 2014-07-30 14:19:32 -07:00
Atlante45
92b75d29cf Added referentials base class 2014-07-30 14:18:55 -07:00
Stephen Birarda
ab1be38fd5 reset the cost of the packet back to 0 so it doesn't keep accumulating 2014-07-30 14:02:46 -07:00
Andrew Meadows
f579d2a0e2 add CollisionInfo::getShapePairKey() 2014-07-30 13:11:45 -07:00
Andrew Meadows
176d8d157d remove unused Constraint::_type 2014-07-30 13:07:32 -07:00
Andrew Meadows
7b76753daf add PhysicsSimulation::_frame 2014-07-30 11:45:53 -07:00
wangyix
af5eedb50e fixed sequenceNumberStats sender changed msgs 2014-07-30 11:39:29 -07:00
Andrew Meadows
c0689f3784 fix old bug: rotation of CapsuleShape not updated 
when setting endpoints directly
 2014-07-30 11:30:08 -07:00
Andrew Meadows
53db6dec13 fix old copy-n-paste typo 2014-07-30 11:29:43 -07:00
Andrew Meadows
917833d92a namechange for Shape::_id 2014-07-30 11:29:07 -07:00
Andrew Meadows
dde0cbddcc add Shape::_id 2014-07-30 11:09:19 -07:00
Andrew Meadows
81ba686fdf more perfstats for ragdoll simulation 2014-07-30 11:02:47 -07:00
wangyix
5b0662f1d0 fixed setToStarved() behavior of InboundAudioStream 2014-07-30 10:51:50 -07:00
wangyix
656131b7ee made frames available avg window 2s; added missing _silentFramesDropped update 2014-07-30 10:24:24 -07:00
Stephen Birarda
7a128e5f77 add satoshi cost to voxel packet debug 2014-07-30 10:14:51 -07:00
Stephen Birarda
66592466ad pipe satoshi cost down to queuePacketToNodes 2014-07-30 10:05:21 -07:00
Stephen Birarda
2c8808e922 repairs to cost calculations for voxels 2014-07-30 09:45:33 -07:00
Stephen Birarda
ff889882ce Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-30 09:24:48 -07:00
Stephen Birarda
f944c27caf don't calculate satoshi cost if the costs are non-existent 2014-07-30 09:24:31 -07:00
Andrzej Kapolka
1ea9b0ccbc Working on heightfield encoding. 2014-07-29 19:13:43 -07: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
Stephen Birarda
6a534a6ff1 send along satoshi costs for voxel additions from VoxelEditPacketSender 2014-07-29 17:31:12 -07:00
Stephen Birarda
9dbe74b02f parse voxel costs to the DomainHandler object 2014-07-29 17:22:17 -07:00
Andrew Meadows
67b9c185eb formatting and minor tweaks to constraint strengths 2014-07-29 16:48:34 -07:00
Stephen Birarda
40e08d5008 add voxel cost amounts to VoxelEditPacketSender 2014-07-29 16:39:06 -07:00
wangyix
d49970d010 maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
Andrzej Kapolka
2a7847c5b3 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-29 14:28:14 -07:00
wangyix
bb2adb2721 minor refactoring 2014-07-29 14:02:18 -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
Stephen Birarda
39e6d7d31b octree packet methods can take a cost 2014-07-29 11:40:07 -07:00
Stephen Birarda
85b8449e83 use two different signals for settings success and failure 2014-07-29 11:17:27 -07:00
Stephen Birarda
133e8570a3 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-29 10:50:36 -07:00
wangyix
ccedb1bd20 forgot some code in checkBuffersBeforeFrameSend 
corrected updateLastPopOutputTrailingLoudness behavior to match what the
old code did.
 2014-07-29 10:40:01 -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
wangyix
aead7a6823 removed get pointer methods from AudioRingBUffer 2014-07-28 22:48:29 -07:00
Andrzej Kapolka
aeee369286 Working on heightfield implementation. 2014-07-28 19:10:59 -07:00
barnold1953
5c47e9013c Working procedural walk animation with two keyframes 2014-07-28 18:36:25 -07:00
Atlante45
03031c4c04 Outdated link 2014-07-28 16:36:12 -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
Stephen Birarda
84b86c17b7 use common settings retreival code to block before run in AudioMixer 2014-07-28 15:16:59 -07:00
Stephen Birarda
dbf41c8a42 allow domain-server to serve settings publicly, fix retry in DomainHandler 2014-07-28 14:56:26 -07:00
wangyix
7e59723522 removed +1 for philip's jitter frames calculation 2014-07-28 14:24:58 -07:00
wangyix
d221f69767 clamp overridden desired jitter buffer frames value 2014-07-28 14:22:04 -07:00
wangyix
97054d668b fixed header macros 2014-07-28 14:15:14 -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
wangyix
6fc5c74c0b renamed ringbuffer variables to audiostream 2014-07-28 13:08:53 -07:00
Stephen Birarda
6334116070 request domain settings after successful connection to domain 2014-07-28 12:07:19 -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
Stephen Birarda
707db4f5d8 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-28 11:10:38 -07:00
Atlante45
844e5d7e47 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-07-28 10:11:39 -07:00
wangyix
c129db16cb formatting fix, AudioRingBuffer no longer NodeData, 2014-07-28 09:40:44 -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
wangyix
438606d567 _consecutiveNotMixedCount++ moved back into if(starveOnFail) 2014-07-27 11:23:47 -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
wangyix
78031622db removed MixedAudioRingBuffer class files 2014-07-25 16:06:56 -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
wangyix
e17556384d added code to clear agent audiostream frames to prevent buildup 2014-07-25 15:51:34 -07:00
Andrew Meadows
d3ba00770f merge upstream/master into andrew/ragdoll 2014-07-25 15:34:32 -07:00
Andrew Meadows
60612f6397 implement VerletPoint::integrateForward() 2014-07-25 15:23:12 -07:00
Andrew Meadows
b2c2cfec79 implement base Ragdoll::stepRagdollForward() 2014-07-25 15:22:25 -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
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
barnold1953
e25ea64b9b Merge branch 'master' of https://github.com/highfidelity/hifi into dancerScript 2014-07-25 11:11:40 -07:00
Atlante45
72a31ec8fc Removed magic number to use DEFAULT_NEAR/FAR_CLIP 2014-07-25 10:56:44 -07:00
Atlante45
c5ad856e65 Changed DEFAULT_FAR_CLIP to TREE_SCALE 2014-07-25 10:55:42 -07:00
wangyix
822ba4da48 cleaned up code more, dancer.js audio not working 2014-07-25 10:21:38 -07:00
AndrewMeadows
361ec5d1ee Merge pull request #3204 from Barnold1953/jsBlendShapes 
Exposed Avatar Blendshape control to JS
 2014-07-25 09:40:48 -07:00
Stephen Birarda
02a0ee08ec Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-25 08:45:54 -07: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
Philip Rosedale
e272d0be75 Merge pull request #3203 from Atlante45/laser_pointer_js 
Laser pointer js
 2014-07-24 17:28:08 -07:00
wangyix
473cbf2afe client audio now updated with stream class; seems fine for now 2014-07-24 17:15:46 -07:00
Andrzej Kapolka
605b3282e7 Working on render bits. 2014-07-24 17:01:15 -07:00
barnold1953
9b629a7326 Added slerp and squad to the Quat scripting interface 2014-07-24 16:55:23 -07:00
wangyix
83ba4b9a1c Audiomixer now working (added call to updateNextOutputTrailingLoudness()) 2014-07-24 14:43:29 -07:00
Andrzej Kapolka
d0c5fec777 Thread safety for spanners. 2014-07-24 14:28:49 -07:00
wangyix
3d22a11e28 debugging new audio stream organization 2014-07-24 13:58:15 -07:00
Atlante45
3ffc116cc5 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 2014-07-24 13:48:23 -07:00
Andrzej Kapolka
5bd3d1fe20 Working on renderer attribute. 2014-07-24 13:16:18 -07:00
barnold1953
d5ea2de4ea Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes 2014-07-24 11:32:31 -07:00
wangyix
fe70c1f49a didn't commit for some reason 2014-07-24 10:48:56 -07:00
wangyix
c9b6879ca8 audiomixer code complete; need to test 2014-07-24 10:48:27 -07:00
barnold1953
9ac8b732f0 FIxed error on ubuntu 2014-07-24 10:32:34 -07:00
Andrew Meadows
2ddca4fbf9 split independent classes out of Ragdoll files 2014-07-24 09:50:16 -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
Stephen Birarda
9fcb6735ce Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-23 17:50:18 -07:00
Andrew Meadows
7f2eb88fc2 merge upstream/master into andrew/ragdoll 2014-07-23 17:01:43 -07:00
Andrew Meadows
b62f04e9fe check for nan's coming out of rotationBetween() 2014-07-23 16:51:53 -07:00
Andrew Meadows
c0e02107c5 minor cleanup 2014-07-23 16:51:26 -07:00
wangyix
e2f957d6dc added InboundAudioStream class 2014-07-23 16:46:23 -07:00
barnold1953
aba031a125 Proper blendshape JS api. 2014-07-23 16:25:45 -07:00
barnold1953
ba9d896856 Revert "Added FacialAnimationData class" 
This reverts commit fc9fb11e4f.
 2014-07-23 15:54:47 -07:00
barnold1953
7c89201ce8 Revert "Moved some FaceShift stuff to FacialAnimationData. Made use of" 
This reverts commit f3ae228030.
 2014-07-23 15:54:45 -07:00
barnold1953
6aa9e6b736 Revert "Ability to modify AC avatar blendshapes from JS" 
This reverts commit 512034fd7c.
 2014-07-23 15:54:40 -07:00
wangyix
a36c9e872e merged with upstream 2014-07-23 15:36:37 -07:00
barnold1953
512034fd7c Ability to modify AC avatar blendshapes from JS 2014-07-23 15:23:27 -07:00
Thijs Wenker
49fcd302f4 AbstractControllerScriptingInterface matches ControllerScriptingInterface 2014-07-24 00:16:00 +02:00
Atlante45
0d039b1cdb Fixed invokeMethod bug + removed debug 2014-07-23 14:38:37 -07:00
Atlante45
cc2bc1ef78 Merge branch 'master' of https://github.com/highfidelity/hifi into make_scriptEngine_a_qScriptEngine 2014-07-23 14:01:58 -07:00
Atlante45
63f0210f1e Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 2014-07-23 14:01:03 -07:00
Atlante45
95c98203a9 Replaced the Avatar in Agent by a scriptable avatar. 2014-07-23 14:00:49 -07:00
wangyix
4a4d065f00 another parseData change 2014-07-23 12:06:31 -07:00
Andrzej Kapolka
4ea8e7de5d Atomics for better thread safety. 2014-07-23 11:45:20 -07:00
wangyix
849c489b4c removed warnings about parseData() overloading in ringbuffer classes 2014-07-23 11:20:30 -07:00
Stephen Birarda
70c8ddf961 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-23 10:38:08 -07: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
Andrzej Kapolka
c31dd4df5f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-22 14:46:43 -07:00
barnold1953
f3ae228030 Moved some FaceShift stuff to FacialAnimationData. Made use of 
FacialAnimationData
 2014-07-22 13:46:29 -07:00
barnold1953
fc9fb11e4f Added FacialAnimationData class 2014-07-22 11:56:19 -07:00
Atlante45
17a6a72bdd ScriptEngine now inherit from QScriptEngine 2014-07-22 11:39:49 -07:00
Andrzej Kapolka
3ea7e79622 Working on distributing metavoxel session handling over multiple threads. 2014-07-21 20:03:50 -07: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
Stephen Birarda
1903fff45c hide remote socket closed error message in HTTPConnection 2014-07-21 17:03:09 -07:00
Stephen Birarda
f45a509508 initial hook-in of OAuth authentication for DS web pages 2014-07-21 16:54:27 -07:00
wangyix
621f0725cc added input ring buffer stats to interface 2014-07-21 15:39:33 -07:00
Andrzej Kapolka
dd7f3703e1 More work on point rendering. 2014-07-21 14:48:54 -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
Andrew Meadows
b21bac25a1 bug fix for broken seams in models 
don't hijack the "weight" variable because it's used elsewhere
 2014-07-21 13:41:41 -07:00
Andrzej Kapolka
38f3f80398 More work on point rendering. 2014-07-18 18:51:01 -07:00
Atlante45
35caef1882 Added pointing behaviour 2014-07-18 15:39:12 -07:00
barnold1953
4410411d9d Script improvements for AC 2014-07-18 14:51:53 -07:00
Andrzej Kapolka
1d6f4295c3 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-18 11:45:02 -07:00
barnold1953
814dd0fcb6 Fixed another crash relating to undo stack. Made script support the 
VoxelViewer
 2014-07-18 11:37:13 -07:00
barnold1953
592c571fcb Fixed crash bug in voxelScriptingInterface 2014-07-17 18:15:34 -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
Andrzej Kapolka
bc2441ac44 Let the visitor maintain a list of reusable visitations, rather than 
always allocating new ones on the stack.
 2014-07-17 15:22:06 -07:00
Andrew Meadows
58e31abf60 improved collision shapes for fingers 2014-07-17 14:31:16 -07:00
Stephen Birarda
5cad6edb38 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 14:06:11 -07:00