Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 22:36:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

811 commits

Author SHA1 Message Date
Atlante45
1afdd34577 Added custom audio offset and volume to Player 2014-09-30 11:23:25 -07:00
Atlante45
c99047677f Members initialisation 2014-09-29 14:49:55 -07:00
Atlante45
6d15728283 frame interpolation for recordings 2014-09-29 12:30:10 -07:00
Atlante45
cf453a8953 removed _isPaused 2014-09-25 19:32:57 -07:00
Atlante45
cf925120ca Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-25 19:23:46 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
Atlante45
75dc26c9ff Slider can moved when recording paused or stoped 2014-09-24 16:19:47 -07:00
Atlante45
11e60c864a Changed recording file format 2014-09-24 15:17:23 -07:00
Philip Rosedale
75e536235c Avatars look at your camera, not your avatar. Improvements to lookAt code 2014-09-24 14:38:44 -07:00
Atlante45
f536e33d13 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-23 14:54:49 -07:00
Atlante45
7ab8c7750c Extra spaces 2014-09-23 14:37:43 -07:00
Atlante45
3b33db9a6b Added pause/setCurrentTime/setCurrentFrame JShooks 2014-09-23 14:19:16 -07:00
Atlante45
95c00b1d4e Added pause behavior + change frame computation 2014-09-23 14:18:54 -07:00
Atlante45
13a5dbf489 Added frame computation and JS hooks 2014-09-23 11:01:21 -07:00
Andrew Meadows
ab53202003 remove warning about signed/unsigned comparison 2014-09-23 09:07:05 -07:00
Atlante45
8393fcc6eb Frame computation + timerOffset member 
When jumping inside a recording
 2014-09-22 14:01:02 -07:00
Atlante45
58b1db4f09 Added JS hooks for new Player options 2014-09-18 16:49:13 -07:00
Atlante45
29ff8c09d9 Fix LookAtPosition 2014-09-18 15:23:58 -07:00
Stephen Birarda
1a5149af02 add another missing const to readRecordingFromRecFile 2014-09-18 11:29:51 -07:00
Stephen Birarda
b1abdc05a0 add the last missing consts in Recording.h 2014-09-18 11:25:50 -07:00
Stephen Birarda
93d83b707d use a copy of filename in Recording.cpp to make changes to filename 2014-09-18 11:21:09 -07:00
Stephen Birarda
2ee367fa44 add a couple of missing consts 2014-09-18 11:14:17 -07:00
Stephen Birarda
ac588a569e add const to recording methods where arguments are passed by reference 2014-09-18 11:12:11 -07:00
Stephen Birarda
6e39f049c8 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 11:08:59 -07:00
Atlante45
72d8522adc Fixed typo + removed MesageBoxes 2014-09-18 10:45:12 -07:00
Atlante45
397be962f4 CR fixes 2014-09-18 10:37:36 -07:00
Stephen Birarda
c9c8a1c194 handle another casing issue for Nodelist include 2014-09-18 10:11:34 -07:00
Stephen Birarda
6d335a8634 fix capitalization in NodeList include 2014-09-18 10:02:54 -07:00
Stephen Birarda
1ac6c8a568 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 10:02:29 -07:00
Atlante45
e0739e4aa8 PreCR fixes 2014-09-18 00:03:02 -07:00
Atlante45
06dd9d0376 Moved Player and Recording to their own files 2014-09-17 23:52:21 -07:00
Atlante45
d27134a7ac Added getters for the different Player options 2014-09-17 17:06:47 -07:00
Atlante45
34c16b8a74 Convert .rec to new format if necessary 2014-09-17 16:25:48 -07:00
Atlante45
6e55c66d09 Fix radix bug 2014-09-17 16:24:54 -07:00
Andrew Meadows
489871d0d6 added MyAvatar.setMotorVelocity() & friends for JS 2014-09-16 17:09:32 -07:00
Atlante45
c699726ae8 Fixed URLs not read properly 2014-09-16 16:32:14 -07:00
Atlante45
81fc0d3696 Added options to use recording context 2014-09-16 14:50:20 -07:00
Atlante45
f649cd1a6e Changed how looping occurs in recordings 2014-09-16 14:49:47 -07:00
Atlante45
96995e3aed Enforce checksums equality 2014-09-16 13:59:30 -07:00
Atlante45
1c5c9cb31b Fix bug adding first samples twice 2014-09-16 13:57:46 -07:00
Atlante45
72481999df Compute actual checksum 2014-09-16 12:46:42 -07:00
Atlante45
8573130f07 Write correct Offset ad Length of the data 2014-09-16 12:34:22 -07:00
Atlante45
59637390a2 Add global timestamp to recordings 2014-09-16 12:26:55 -07:00
Atlante45
f5b53a77ab Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-16 12:14:11 -07:00
Atlante45
d80a42b800 New recording file format 
Added header containing:
		- Magic number
		- Version number
		- Data Offset
		- Data Length
		- CRC-32
	Planned space for metadata
	Added context block (domain, models, transform, display name,
attachments)
	Improved glm types packing (SHould take about half the space it
used to))
 2014-09-15 19:19:10 -07:00
Atlante45
ffba243a4f Added methods to read/write glm types 2014-09-15 19:17:16 -07:00
Atlante45
b28e7e4562 Added RecordingContext support to Player/Recorder 
Changed meaning of certain values stored in recordings
 2014-09-15 19:14:47 -07:00
Atlante45
29f85ecca4 Introduced RecordingContext class 2014-09-15 19:09:40 -07:00
Atlante45
8f65f036dd Remove deprecated getters 2014-09-15 19:06:09 -07:00
Atlante45
145e11a478 Move one-line method to .h 
Moved method to .h f line less than 120 characters
	Added _lookAtPosition to RecordingFrame
 2014-09-15 19:01:50 -07:00
Atlante45
9b87e31739 Fixed typo 2014-09-15 18:47:55 -07:00
Andrew Meadows
b2432876ce More reliable floor detection for avatar movement. 
Also tweaked max walking speed.
 2014-09-15 13:53:37 -07:00
Andrew Meadows
15025bf8d8 fix for flickering avatars 2014-09-08 13:08:08 -07:00
Andrew Meadows
bd8fc75305 fix bug: zero velocity when teleporting to new locations 2014-09-05 17:51:18 -07:00
Andrew Meadows
7be411b4ca expose _measured_ MyAvatar velocity to JS 2014-09-05 11:44:13 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
Atlante45
a1e6d9e7a1 Protections against null pointers 2014-09-02 12:56:12 -07:00
ZappoMan
0f2a14a359 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-09-02 07:52:51 -07:00
Atlante45
9b5b83117f CR 2014-08-29 14:25:05 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Atlante45
a6bf9d7b90 Handle URL recordings + some safety checks 2014-08-28 11:42:39 -07:00
Atlante45
9df68dc2f1 CR 2014-08-28 10:58:07 -07:00
Atlante45
691ace7cc6 Looping option 2014-08-27 19:05:39 -07:00
Atlante45
465b076998 Removed debug + ignore frame 0 2014-08-26 18:19:26 -07:00
Atlante45
056cd0a4d1 extra line 2014-08-26 18:06:10 -07:00
Atlante45
41461cd322 Added option to playback from current location 2014-08-26 17:23:50 -07:00
Atlante45
dda02b5dcf Fake faceshift connection while playing back 2014-08-26 15:54:16 -07:00
Atlante45
3826ed0d69 Added setFinalPitch/Yaw/Roll to HeadData 2014-08-26 15:36:08 -07:00
Atlante45
9e686b4096 Moved lean and head rotation inside Player class 2014-08-26 14:36:46 -07:00
Atlante45
b92ae53753 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-08-26 14:34:39 -07:00
ZappoMan
ef8feec91a fix referentials corruption and removed some debugging 2014-08-26 10:42:46 -07:00
ZappoMan
74585bc593 fix bug in referentials 2014-08-26 10:14:28 -07:00
ZappoMan
4e38cb7c68 more debugging of referentials 2014-08-25 15:12:29 -07:00
Atlante45
f207abdd98 Move Player over to AvatarData for ACs to use 2014-08-21 15:24:19 -07:00
Atlante45
b13604f968 JS API for recording 2014-08-19 16:43:26 -07:00
Atlante45
52640c8482 Various tweaks and code cleanup 2014-08-18 14:23:29 -07:00
Atlante45
73a3a13c59 More recording work 2014-08-12 18:15:48 -07:00
Atlante45
ff0a5df2d6 Joint rotations manipulation helper 2014-08-12 16:12:34 -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
Stephen Birarda
c63e886444 don't look backwards for fbx header from avatars library 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
45afce48f7 remember old session UUID in AvatarHashMap to work around ghosting 2014-08-08 13:14:03 -07:00
Atlante45
fe8839b4b8 CR 2014-08-06 10:40:55 -07:00
Atlante45
110b034bcb Changed updates locations 2014-08-05 18:41:48 -07:00
Atlante45
b360b6c55d PR cleanup + JS API 2014-08-05 17:07:03 -07:00
Atlante45
39a74cbc28 Few modifications to how avatars update their positions 2014-08-05 12:03:53 -07:00
Atlante45
9999c88d84 Added Referential getters + fixed stupid unpacking bug 2014-08-05 12:01:47 -07:00
Atlante45
f0af2f022e Pack/Unpack asymetry fix + added forgotten consts 2014-08-04 17:53:21 -07:00
Atlante45
d9dde06c14 Various tweaks to referentials 2014-08-04 14:59:15 -07:00
Atlante45
ee4b7664b0 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-07-31 13:39:23 -07:00
Atlante45
490dad6bbd Work on network streaming of referentials 2014-07-31 11:52:03 -07:00
Atlante45
1138a3a275 Added referentials to AvatarData 2014-07-30 16:50:25 -07:00
barnold1953
66c1aba7f7 Animation improvements, exposed roll/yaw head control. 2014-07-30 15:23:03 -07:00
Atlante45
92b75d29cf Added referentials base class 2014-07-30 14:18:55 -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
barnold1953
9ac8b732f0 FIxed error on ubuntu 2014-07-24 10:32:34 -07:00
barnold1953
aba031a125 Proper blendshape JS api. 2014-07-23 16:25:45 -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
barnold1953
512034fd7c Ability to modify AC avatar blendshapes from JS 2014-07-23 15:23:27 -07:00
barnold1953
f3ae228030 Moved some FaceShift stuff to FacialAnimationData. Made use of 
FacialAnimationData
 2014-07-22 13:46:29 -07:00
Atlante45
35caef1882 Added pointing behaviour 2014-07-18 15:39: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
fc21f7bbac Removed outdated and incorrect getFingerTipPosition() 2014-07-10 14:21:17 -07:00
Andrew Meadows
0be70063c5 only set hasNewJointRotations true for valid rotation 2014-07-10 11:39:49 -07:00
Atlante45
30644c750d Switched AvatarData to NetworkAccessManager 2014-07-01 17:46:23 -07:00
Andrew Meadows
ca77eb9d1e cleanup of avatar collisions, prep for more ragdoll collisions 
removal of paddle hands
particles use general sphere collision path against avatars
temp removal of skeleton self collision
 2014-06-06 10:51:22 -07:00
Philip Rosedale
d17eeaf35b remove old oculus yaw offset, expand limit on head yaw 2014-05-29 16:50:13 -07:00
Andrew Meadows
d1a8c18d10 simplified hand index constants 2014-05-27 16:32:29 -07:00
Andrew Meadows
d425b5b322 Enable local gravity when there is a floor nearby. 2014-05-23 15:59:27 -07:00
Andrew Meadows
aad9d0441e merge upstream/master to andrew/bispinor 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/SkeletonModel.cpp
	libraries/avatars/src/HandData.cpp
	libraries/avatars/src/HandData.h
 2014-05-14 09:38:31 -07:00
Andrew Meadows
366e9c7d34 PalmDataA::getPalmDirection --> getNormal() 2014-05-14 09:05:54 -07:00
Andrew Meadows
607094075c Revert "Merge pull request #2834 from andrew/thermonuclear" 
This reverts commit e088c3d115, reversing
changes made to d124c0319d.
 2014-05-13 10:38:56 -07:00
Brad Hefta-Gaub
e088c3d115 Merge pull request #2834 from AndrewMeadows/thermonuclear 
remove leap fingers
 2014-05-13 08:04:40 -07:00
Andrzej Kapolka
8541df9c32 Remember attachment parameters per joint (as well as the last joint used) so 
that the gun script correctly allows both guns' positions to be tweaked.
 2014-05-12 12:16:30 -07:00
Andrew Meadows
e983be4013 fix typo (finger length = 0.3m, not 0.03m) 2014-05-12 11:52:16 -07:00
Andrew Meadows
cea472b730 remove the last of Leap specific cruft 2014-05-12 11:48:56 -07:00
Andrew Meadows
efb3edf400 Store sixense data in meters not millimeters 2014-05-12 11:39:21 -07:00
Andrew Meadows
49dedb72c9 remove FingerData class and related cleanup 2014-05-12 11:09:12 -07:00
Andrzej Kapolka
c424f6ce69 Save attachment data for attachment model/skeleton model combinations, let 
scripts use those saved parameters so that you can tweak the location of
(for example) the gun and have it saved appropriately.
 2014-05-08 18:00:41 -07:00
Andrzej Kapolka
c02b708ee5 Provide the option to avoid making duplicate attachments. 2014-05-08 15:54:30 -07:00
Andrzej Kapolka
f866828db2 Avatar attachment scripting bits. 2014-05-08 15:20:14 -07:00
Andrew Meadows
6c289b682d move #include <StreamUtils.h> to cpp file 2014-05-07 11:18:50 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Andrzej Kapolka
0021c77789 Missed a spot for decoding avatar identity data. 2014-05-05 16:29:11 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
Andrzej Kapolka
65e34f9697 More work on attachment interface. 2014-05-05 13:41:50 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Andrzej Kapolka
e0400dbd9c Working on allowing attachment models to be uploaded. 2014-05-04 15:23:31 -07:00
Andrew Meadows
d8cb84080c stop avatar integration when standing at rest 2014-05-02 10:43:10 -07:00
Andrzej Kapolka
5e1f18635f Need to initialize this to an invalid URL, too. 2014-05-01 18:05:01 -07:00
Andrzej Kapolka
322e12b9de Allow users to clear the head URL and have no separate head model. 2014-05-01 17:55:16 -07:00
Andrew Meadows
8d4dca31c5 add velocity model for controlling avatar motion 2014-05-01 12:05:34 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Andrew Meadows
c2f1507df1 move AVATAR_MOTION_OBEY_GRAVITY to libs 2014-04-25 14:16:42 -07:00
Stephen Birarda
1a895b9342 add property for display name to JS 2014-04-18 14:24:50 -07:00
Stephen Birarda
77202af20d add debug for erase from AvatarHashMap, repair check for display name 2014-04-17 18:05:22 -07:00
Stephen Birarda
f8106e5063 add an AvatarHashMap to the Agent 2014-04-17 17:49:55 -07:00
Stephen Birarda
47d4ef0b2d add a method to determine if avatar with display name exists 2014-04-17 17:44:41 -07:00
Stephen Birarda
e75d14139f fix avatar kill behaviour 2014-04-17 17:21:38 -07:00
Stephen Birarda
3e4369f2ff kill avatars in hash map after a timeout threshold 2014-04-17 16:57:00 -07:00
Stephen Birarda
69d3360675 add a convenience method to AvatarHashMap to check for avatar removal 2014-04-17 16:48:24 -07:00
Stephen Birarda
e303ce1a12 move some Avatar management to AvatarHashMap 2014-04-17 16:37:40 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Andrew Meadows
4b306401af use slot to change AvatarData::_sessionUUID 2014-04-09 11:32:52 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Andrew Meadows
229d6cefa2 merge upstream/master into andrew/scripting 2014-04-09 08:17:33 -07:00
Andrew Meadows
b8232b5dfd AvatarData now stores sessionUUID 2014-04-09 08:11:15 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Andrzej Kapolka
fa05a48270 Provide a means of supplying the joint mappings in the FST file so that agent 
scripts can address joints by name.  Closes #2526.
 2014-04-07 17:55:36 -07:00
Andrew Meadows
79670563d4 AvatarData stores its sessionID 2014-04-07 14:42:49 -07:00
Andrew Meadows
97ba5250a5 Only simulate() Avatar Models when necessary 
Also: rebuild collision shapes when Model scale changes
 2014-04-02 12:01:18 -07:00
Andrew Meadows
796d20168e splitting lean input from lean perturbations 2014-03-27 15:30:30 -07:00
Andrew Meadows
7949be0319 PitchTweak and friends become DeltaPitch 2014-03-27 11:14:26 -07:00
Andrew Meadows
b6f2150d2e HeadData::_yaw and friends change to _baseYaw 2014-03-27 10:37:07 -07:00
Andrew Meadows
fff7a36b54 merge upstream/master into physics project 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/renderer/Model.h
 2014-03-25 15:55:26 -07:00
Andrew Meadows
17d878bc94 sanitiy checking when unpacking AvatarData update 2014-03-25 09:55:43 -07:00
Brad Hefta-Gaub
5abe044c30 Merge pull request #2412 from AndrewMeadows/emergency-fixes 
datalength sanity checking for AvatarData packet
 2014-03-21 14:48:07 -07:00
Andrew Meadows
1214794f05 QMap is not used by AvatarData 2014-03-20 17:03:28 -07:00
Andrew Meadows
22aa9b075d datalength sanity checking for AvatarData packet 2014-03-20 16:52:40 -07:00
Philip Rosedale
03381c3df8 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 15:34:28 -07:00
Andrew Meadows
6440dd1b5f explicitly send neck angles in avatar data 2014-03-20 11:05:14 -07:00
Philip Rosedale
3ab0288c4f testing numbered joint movement 2014-03-20 08:54:12 -07:00
Philip Rosedale
c26ed77931 merge fix 2014-03-19 09:16:52 -07:00
Philip Rosedale
9c8a4828f2 remove unused variable, function 2014-03-18 22:41:09 -07:00
Andrzej Kapolka
f9fd0d432f Fix for reading aggregate avatar packets. 2014-03-18 17:48:57 -07:00
Andrew Meadows
6340024daa fix bad startPosition in datagram unpack 
The startPosition was wrong (too far back) and the bytesRead return
value was too big and the unpacking of the second chunk of the
datagram would start in the middle of the chunk.
 2014-03-18 17:42:58 -07:00
Andrzej Kapolka
f8c14a5717 Remove unused variable, reorder includes. 2014-03-18 17:06:01 -07:00
Andrzej Kapolka
635f3b6dc3 Perform the mesh blending in worker threads and only when we've actually 
received new data.  Closes #2075.  Closes #2348.
 2014-03-18 16:38:05 -07:00
Andrew Meadows
4a1a7898ea Merge branch 'cleanup' into 'shapes' 2014-03-18 12:53:45 -07:00
Andrew Meadows
02c58447df merge upstream/master into "shapes" project 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	libraries/avatars/src/HandData.h
	libraries/shared/src/SharedUtil.h
 2014-03-18 12:41:20 -07:00
Andrew Meadows
b69c339279 don't send redundant head rot and hand pos info 2014-03-18 09:39:05 -07:00
Andrew Meadows
3296447af6 remove dupe hand data from avatar updates 
partial progress toward issue #2256
 2014-03-17 18:23:55 -07:00
Andrew Meadows
ed3cf36045 cleanup: AvatarData doesn't derive from NodeData 
Cleaner Interface since the AvatarData is already not the NodeList.
Reduces overhead/confusing code when parsing packets from AvatarMixer.
 2014-03-17 14:10:42 -07:00
ZappoMan
851764a705 more warning fixes 2014-03-15 22:36:43 -07:00
Andrew Meadows
a045a87cca Remove arm stretching, add sixense calibration 2014-03-14 11:11:00 -07:00
Andrew Meadows
e68241d2a9 using glm::degrees() instead of DEGREES_PER_RADIAN 2014-03-12 12:08:27 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Stephen Birarda
d1623e6e4d fixes for warnings produced by Xcode 5.1 2014-03-11 11:45:13 -07:00
Andrew Meadows
47e340dafe Merge upstream/master 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-07 09:16:33 -08:00
Andrzej Kapolka
44374732fa Further joint bits. 2014-03-06 19:30:24 -08:00
Andrzej Kapolka
c5ab32235f Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-06 17:09:24 -08:00
Andrzej Kapolka
3adea84b81 Basic joint data sending. Closes #2166. 2014-03-06 17:07:29 -08:00
Stephen Birarda
ac66f09157 Merge pull request #2194 from AndrewMeadows/cleanup 
g++ warnings
 2014-03-06 15:49:22 -08:00
Andrew Meadows
bca0ea1502 Adding per-palm penetration accumulator 2014-03-06 12:36:52 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
Andrew Meadows
a014d7883e minor whitespace formatting 2014-03-05 07:05:27 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Andrew Meadows
5252f22d82 fix warning about signed/unsigned comparison 2014-03-04 10:42:10 -08:00
ZappoMan
64a3fb950b fix warning 2014-03-01 11:54:24 -08:00
Andrzej Kapolka
d157428704 When we send data to the avatar mixer, send the tweaked head rotation. Closes 2014-02-28 16:58:22 -08:00
Stephen Birarda
ee70c93a3e have scripted avatars send billboard, if they have one 2014-02-25 13:42:07 -08:00
Stephen Birarda
f2a70bf275 add support for billboard setting from URL 2014-02-25 13:38:20 -08:00
Philip Rosedale
b0f3ab3ccd Merge pull request #2057 from ey6es/master 
I believe this is what was intended for the voxel edit orbit behavior.  Yaw the body, pitch the head.
 2014-02-23 17:22:07 -08:00
Andrzej Kapolka
6f8f15018c Allow setting the combined head orientation, which changes the body yaw and 
applies the rest to the head.  Closes #2050.
 2014-02-21 17:52:20 -08:00
Andrzej Kapolka
ac02609bc2 The basic billboard behavior, closes #1864. 2014-02-21 15:38:49 -08:00
Andrzej Kapolka
10ce2cb3f0 Working on sending the billboards over the network. 2014-02-21 11:49:29 -08:00
Andrzej Kapolka
d8321bd419 Merge pull request #2034 from birarda/master 
fixes for scripted avatars
 2014-02-21 10:14:41 -08:00
Jose Carlos
354c9bff09 Correct text position for default and non default meshes 
Bounding box for text background is now text dependent, much nicer now
 2014-02-21 00:29:52 +01:00
Stephen Birarda
4fbe8acd1e fix face and skeleton model URL Q_PROPERTY macros 2014-02-20 11:12:53 -08:00
Stephen Birarda
ee9f8937e3 fix a silly typo 2014-02-19 18:03:34 -08:00
Stephen Birarda
4ee416ba96 fixes for scripted avatars, closes #2033 2014-02-19 16:55:24 -08:00
Jose Carlos
828508bbf1 merged from master 2014-02-19 23:01:13 +01:00
Andrew Meadows
07a12c1bd4 Removing unused declaration of static method 2014-02-19 09:28:34 -08:00
Andrew Meadows
c134b8de5b Remove Avatar::_hand, use AvatarData::_handData 2014-02-18 17:08:12 -08:00
Andrew Meadows
4565599fb3 Removing unused cruft: setHeadData() and friend 2014-02-18 15:40:38 -08:00
Jose Carlos
59f8851b50 Merge remote-tracking branch 'upstream/master' into 19489 2014-02-19 00:05:16 +01:00
ZappoMan
5cf0ad46e7 Merge pull request #2000 from gaitat/master 
Worklist Job #19503
 2014-02-18 09:47:26 -08:00
Jose Carlos
0ec554ec82 Added fadein and fadeout animations for display name 2014-02-18 00:49:26 +01:00
Jose Carlos
e7b54a9ef4 merged from master 2014-02-17 21:59:53 +01:00
Andrew Meadows
4848aa1d16 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-17 09:14:06 -08:00
Jose Carlos
a8f1f9a00a Added animation for fade out 2014-02-16 14:25:41 +01:00
gaitat
e30cf33a03 Fix for Worklist Job #19503 
Formatting errors
 2014-02-15 23:04:58 -05:00
Jose Carlos
af48998cc7 Fixed position of display name: we take into account skeleton and head's height 
Saved opengl state in renderDisplayName
Moved display data to AvatarData
Unified static chat function for chat and display name
 2014-02-15 18:40:36 +01:00
gaitat
fcd44f5817 Fix for Worklist Job #19503 2014-02-15 08:16:05 -05:00
gaitat
eee839f423 Merge branch 'master' of github.com:highfidelity/hifi 2014-02-14 20:12:39 -05:00
Andrew Meadows
335141049c Cleaning up collision check API's and re-enabling collisions with particles. 2014-02-14 16:33:19 -08:00
Jose Carlos
19cb20f0cd Added rect around the display name with proper size, paying attention to 
QFontMetrics data
Fully wired up the message sending and receiving from server
 2014-02-15 01:05:21 +01:00
Jose Carlos
04c59b825e merged from master 2014-02-14 20:52:22 +01:00
gaitat
58e773340a Worklist Job #19503 
Exposing the average audio intensity to javascript through the MyAvatar
object.
 2014-02-14 09:40:59 -05:00
Andrzej Kapolka
91fac4eebe Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-13 17:38:23 -08:00
Jose Carlos
b899834c54 Show "displayname" in correct position 
Show "displayname" when on mouse hover
Persistant displayname data
 2014-02-14 00:23:21 +01:00
Andrew Meadows
ee4733d0bd Fixing a comment. 2014-02-13 12:41:23 -08:00
Andrew Meadows
439cbe3f87 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Hand.h
	interface/src/avatar/MyAvatar.cpp
 2014-02-13 12:36:01 -08:00
Andrew Meadows
3a8aa0c47e Removing HeadData::findSpherePenetration() as unused cruft. 2014-02-13 10:02:16 -08:00
Jose Carlos
319d1f6795 Wired up the send of the display data to the servers 
Added the renderDisplayName in Avatar
 2014-02-12 00:54:50 +01:00
Andrzej Kapolka
3c535e6c9c These need to be FST files, too. 2014-02-11 14:38:44 -08:00
ZappoMan
4b5e633258 tweaks to hydraMove.js, added scale to MyAvatar JS 2014-02-10 19:48:51 -08:00
Andrew Meadows
4edc6cd88b Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 15:42:56 -08:00
Stephen Birarda
3e90bcd523 use shorter default URLs, set as placeholder text in prefs 2014-02-10 11:28:22 -08:00
Stephen Birarda
712692f8bf add fallback default URLs for head and body models 2014-02-10 11:15:35 -08:00
Andrew Meadows
be1aaee359 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 09:05:08 -08:00
Philip Rosedale
03bc5adf64 Add Audio Noise Reduction 2014-02-08 16:35:37 -08:00
Andrew Meadows
0a4eec448e Removing findSpherePenetration() from AvatarData class 2014-02-07 10:47:00 -08:00
Stephen Birarda
a823722d27 add writeDatagram helper to NodeList to insert md5 hash 2014-02-06 14:28:58 -08:00
Stephen Birarda
cb6316bf4d fix KeyState enum spacing 2014-02-06 11:45:52 -08:00
Stephen Birarda
f10404b31e allow setting of avatar URLs via AvatarData properties 2014-02-06 11:45:37 -08:00
Stephen Birarda
e72f6d16cc rename NodeList ownerUUID to sessionUUID 2014-02-06 11:43:23 -08:00
Stephen Birarda
092c969e75 more repairs to face and skeleton model passing 2014-02-04 15:48:31 -08:00
Stephen Birarda
adaa36a51d repairs to key-framed URL sending through avatar-mixer 2014-02-04 15:28:27 -08:00
Stephen Birarda
3959209bc2 complete movement of URLs to AvatarData for re-usability 2014-02-04 14:49:56 -08:00
Stephen Birarda
2b80a5fbb8 move face/skeleton model URLs to AvatarData 2014-02-04 14:40:41 -08:00
Andrew Meadows
466a43c77f Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-03 10:47:00 -08:00
Stephen Birarda
4573eaebc6 fix multiple avatar parsing in AvatarManager 2014-01-31 12:02:24 -08:00
Stephen Birarda
9d82347994 add a missing return 2014-01-31 11:32:23 -08:00
Stephen Birarda
4bf8f3a465 reinstate old HandData parsing 2014-01-31 11:29:15 -08:00
Stephen Birarda
4ed748752f fix incorrect packet position in AvatarData, closes #1786 2014-01-31 11:20:36 -08:00