Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 21:11:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15187 commits 75 branches 59 tags 1.2 GiB
Commit graph

8125 commits

Author SHA1 Message Date
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
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -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
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
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
Atlante45
8cd59ab5de Forward declaration of RotationExtractor 2014-07-29 16:08:15 -07:00
Atlante45
42ba3ea338 CR lost _transformChanged 2014-07-29 15:59:53 -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
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
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
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
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
Atlante45
6183c4d97e Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation 2014-07-28 16:51:09 -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
fbfd63c429 fix build to work if Qxmpp is not available 2014-07-28 15:17:33 -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
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
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
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
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