Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 13:56:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
47834 commits 25 branches 0 tags 1.1 GiB
Commit graph

397 commits

Author SHA1 Message Date
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
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
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
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
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
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
b6f2150d2e HeadData::_yaw and friends change to _baseYaw 2014-03-27 10:37:07 -07:00
Andrew Meadows
17d878bc94 sanitiy checking when unpacking AvatarData update 2014-03-25 09:55:43 -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
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
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
44374732fa Further joint bits. 2014-03-06 19:30:24 -08:00
Andrzej Kapolka
3adea84b81 Basic joint data sending. Closes #2166. 2014-03-06 17:07:29 -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
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
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
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
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
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
Andrew Meadows
be1aaee359 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 09:05:08 -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
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
f3f1539111 Splitting avatar collision check in two: vs hands and vs skeleton. 2014-01-30 09:28:21 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
ZappoMan
b36cc0bcf9 removed old cruft around mousePitch in Head and unified pitch 2014-01-29 02:09:49 -08:00
ZappoMan
98cdc656c4 more scripting support, including adding a Quat helper class that makes JS quat math easier 2014-01-29 00:56:08 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
Stephen Birarda
8d2e9823de remove notion of owning node from NodeData 2014-01-23 17:06:03 -08:00
Stephen Birarda
d57aec9793 don't use separate NodeList owner UUID and Avatar UUID 2014-01-22 11:48:04 -08:00
Andrzej Kapolka
81ab68a529 Store hand position relative to body orientation/position. 2014-01-20 12:44:09 -08:00
Andrzej Kapolka
a16d38ced6 Removed joints from avatar state messages. 2014-01-16 15:07:09 -08:00
Andrew Meadows
1266ffd0ca merge of windows-build 
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
 2014-01-16 09:00:13 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Andrew Meadows
af3fae7bbf Merge upsteam master into current project (experimental hand paddles) 
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/avatars/src/AvatarData.cpp
 2014-01-14 16:39:46 -08:00
Andrew Meadows
eb207efe32 Adding simple CollisionInfo class as data wrapper and a findSphereCollision() method to AgentData API. 2014-01-14 16:11:27 -08:00
Stephen Birarda
767a241105 Merge remote-tracking branch 'upstream/master' into nodelist-container 2014-01-14 16:08:58 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
392ff94ebe Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	interface/src/DataServerClient.cpp
	interface/src/avatar/MyAvatar.cpp
	libraries/avatars/src/AvatarData.h
 2014-01-13 15:06:26 -08:00
Stephen Birarda
42e3bcfe91 allow fade scale to get smaller than minimum avatar scale 2014-01-13 13:52:41 -08:00
Stephen Birarda
3f2c6504a6 fix for avatar scale bug, closes #1506 2014-01-13 12:27:47 -08:00
Brad Hefta-Gaub
b0f8e21d06 more windows build hackery 2014-01-10 20:36:37 -08:00
Philip Rosedale
f0460bac5f Merge pull request #1492 from stojce/19466 
Code Review for Job #19466
 2014-01-10 11:19:43 -08:00
Andrzej Kapolka
e37203d833 The overloaded function should be const, true. 2014-01-03 17:59:15 -08:00
stojce
2814cca9af #19466 - Add avatar scale to preferences panel 2014-01-03 21:02:56 +01:00
Andrew Meadows
d520adba98 exposed getVelocity() and findSpherePenetration() in Avatar base class 2014-01-02 09:31:24 -08:00
ZappoMan
d9f412406f better implementation of particle palm collisions 2013-12-16 18:12:47 -08:00
Andrzej Kapolka
cabd6ccbad Advertise to others whether we have chat circling enabled, only include people 
with it enabled when doing the computations.
 2013-11-27 11:47:23 -08:00
Andrzej Kapolka
083800dc59 Glow/shrink avatars when killed, send kill message when we move between 
domains, locations, etc.
 2013-11-22 16:23:40 -08:00
ZappoMan
0368e8c75e cleanup bit field positions 2013-10-24 14:27:47 -07:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
Stephen Birarda
515e2d5a23 handle conflicts on merge with upstream master 2013-10-11 14:24:05 -07:00
Stephen Birarda
6bd71da84e pack the UUID with the avatar data 2013-10-08 13:31:39 -07:00
Stephen Birarda
e977d28fe3 replace QVariantMap glm::vec3 setters with conversions for QScriptValue 2013-10-03 11:55:30 -07:00
atlante45
8f27d22f7b Put _isFaceshiftConnected in a bit set 2013-09-13 14:57:30 -07:00
Andrzej Kapolka
4961913fc4 Transmit the eye offset position along with the rest of the frustum 
parameters.
 2013-09-05 12:20:15 -07:00
atlante45
5da525fc3e memory wastes and code cleaning PR comments 2013-09-04 15:12:24 -07:00
atlante45
b03482ead5 Some more memory leaks and codes formatting 2013-09-03 17:16:06 -07:00
Stephen Birarda
50e062edf2 some spacing cleanup in AvatarData 2013-08-15 16:06:48 -07:00
Stephen Birarda
154c6b4f32 fix disabling of occlusion culling from menu 2013-08-15 15:32:44 -07:00
Stephen Birarda
b288cc43a2 fix disabling of delta sending and low res while moving 2013-08-15 15:29:05 -07:00
Stephen Birarda
c930d058b1 fix monochrome option menu hook 2013-08-15 15:23:26 -07:00
Stephen Birarda
72b53ea089 add Q_PROPERTY for handPosition 2013-08-07 10:41:32 -07:00
Stephen Birarda
955b7f0d24 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-08-07 10:26:26 -07:00
Stephen Birarda
d0330b0a28 include QVariantMap in AvatarData, map values to floats for glm::vec3 2013-08-06 11:56:54 -07:00
Stephen Birarda
b0783e4cce add Q_PROPERTY macro for position QVariantMap 2013-08-06 11:25:29 -07:00
Stephen Birarda
f3d6f1edd8 add Q_PROPERTY hooks for yaw, pitch, roll, chatMessage 2013-08-06 11:04:13 -07:00
atlante45
32c155ef71 Render a string to show who is following who 2013-08-06 10:53:10 -07:00
Jeffrey Ventrella
96b443ec5d Merge pull request #781 from machinelevel/dev4 
Rave glove demo: Network rave data
 2013-08-05 14:07:57 -07:00
Eric Johnston
a3a5c3d6d4 Rave glove demo: Network rave data 
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
 2013-08-05 13:25:05 -07:00
Stephen Birarda
890d2e40ec more fleshing out of Agent class to interpret javascript 2013-07-24 16:58:44 -07:00
Stephen Birarda
f8e7e1de66 modifications to hook shared classes to iOS 2013-07-24 13:05:02 -07:00
Stephen Birarda
7134d13001 tweaks for iOS compatibility 2013-07-24 12:34:32 -07:00
ZappoMan
d71400a42a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 09:36:39 -07:00
atlante45
280afed7f0 added scale in avatar packets eand slots to change it from the menu 2013-07-12 17:51:47 -07:00
ZappoMan
57ce20d3ce add support for Low Res sending while moving 2013-07-11 12:43:43 -07:00
ZappoMan
dc70675c22 removed obsolete ResIn mode 2013-07-10 19:04:28 -07:00
Andrzej Kapolka
f9f2c66115 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Application.cpp
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	libraries/avatars/src/AvatarData.h
 2013-07-05 22:52:42 -07:00
Andrzej Kapolka
30f77975cf Trying to get the right rotations, send them on the wire. 2013-07-03 17:07:22 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
Andrzej Kapolka
52e7ff9a68 Working on filling in missing joint data. 2013-07-02 14:51:27 -07:00
Eric Johnston
6c42922288 Minor bug fixes for networked Leap hands 2013-06-28 15:22:56 -07:00
Eric Johnston
1c797405da Hand rework in preparation for adding send/receive hand data 
- Added Hand.cpp, Hand.h, HandData.cpp, HandData.h, roughly matching the equivalent Head files
- Cleaned up Avatar by moving hand work into Hand files
- Added fixed-point data packing, for use in sending hand offsets
 2013-06-28 07:57:02 -07:00
ZappoMan
7fe6c0e3b3 added occlusion culling menu option 2013-06-18 09:34:12 -07:00
ZappoMan
15587f8b23 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-06-04 18:01:58 -07:00
ZappoMan
4f2af717f2 Fixed merge issue with new orientation vectors, migrated to common identity names 2013-06-04 17:27:40 -07:00
ZappoMan
a12353e112 hopefully fix unix build buster 2013-06-04 11:38:47 -07:00
ZappoMan
eef0636655 some cleanup 2013-06-03 21:53:06 -07:00
ZappoMan
510dfc7353 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-03 21:43:38 -07:00
ZappoMan
4c597a2736 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-06-03 21:35:39 -07:00
Andrzej Kapolka
021dce72be Moved direction vectors to AvatarData, made them align with OpenGL view space 
(to avoid the 180 degree rotations).
 2013-05-30 09:55:34 -07:00
ZappoMan
b3045ea681 working on handPosition optimizations 2013-05-28 16:11:07 -07:00
Stephen Birarda
9f2c0adec7 move audioLoudness to HeadData 2013-05-28 12:22:51 -07:00
ZappoMan
04f4e499e1 Optimize wire-format for AvatarData 
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
 2013-05-27 14:18:10 -07:00
ZappoMan
5d1ba857c5 Optimize View Frustum wire format. 
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
 2013-05-27 14:17:34 -07:00
ZappoMan
06e98d2c43 Optimize wire-format for AvatarData 
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
 2013-05-27 14:10:51 -07:00
ZappoMan
12dc11fbfa Optimize View Frustum wire format. 
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
 2013-05-27 09:56:35 -07:00
Stephen Birarda
59a6016f4b use a NULL default for owningAvatar to simplify constructors 2013-05-24 12:18:38 -07:00
Stephen Birarda
36892da488 keep a pointer to owning agent in AgentData 2013-05-24 12:17:34 -07:00
Stephen Birarda
4738fc888b return Avatar Head by reference so setters actually do something 2013-05-22 16:43:41 -07:00
Stephen Birarda
564244ddd3 move _leanSideways and _leanForwards to HeadData 2013-05-20 17:13:40 -07:00
Stephen Birarda
de84b7803f move _lookAtPosition to HeadData class 2013-05-20 15:51:40 -07:00
Stephen Birarda
257a1d1f2e move head rotations to new HeadData class to be used for transmission 2013-05-20 15:21:02 -07:00
Jeffrey Ventrella
44ef5d4bac fix 2013-05-20 14:37:09 -07:00
Jeffrey Ventrella
b42d093b4a Merge remote-tracking branch 'upstream/master' 2013-05-20 14:36:13 -07:00
ZappoMan
cf065a413c merge 2013-05-20 12:36:16 -07:00
ZappoMan
17c961f1b0 merge 2013-05-20 12:34:15 -07:00
ZappoMan
fe1f02beff moved constructor 2013-05-20 12:16:55 -07:00
Jeffrey Ventrella
545b928971 Merge remote-tracking branch 'upstream/master' 2013-05-20 12:16:40 -07:00
birarda
1e63bb8d20 Merge pull request #353 from ZappoMan/master 
fixed Philip's no animation problem
 2013-05-20 12:15:57 -07:00
Jeffrey Ventrella
ffbc70814a preparing to add transmitted lookat position data 2013-05-20 11:41:21 -07:00
ZappoMan
06242a82c4 fixed Philip's no animation problem 2013-05-19 20:53:46 -07:00
Stephen Birarda
fb2f36519d inline getters and setters in AvatarData 2013-05-17 12:19:19 -07:00
Stephen Birarda
199853711f disallow copying of AvatarData objects 2013-05-17 12:15:10 -07:00
Philip Rosedale
9f57787ece Fixed jerking on gravity, added mouse pitch, yaw behavior. 2013-05-16 17:05:45 -06:00
ZappoMan
a1902e3dc9 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-14 12:14:53 -07:00
ZappoMan
d59a8143d7 added wantDelta, made want bools a bit mask 2013-05-14 11:08:59 -07:00
Philip Rosedale
ba0263a436 Fixed uninitialized audio loudness value 2013-05-13 19:26:46 -07:00
ZappoMan
b196227385 Added wantResIn and wantColor feature between client and server 
- Updated Voxel Server to support non-res-in version of voxel distribution
- Updated agent data to allow client to send desired res-in and color state
- added menu items to client debug menu to toggle wantResIn and wantColor
 2013-05-13 15:02:46 -07:00
Philip Rosedale
c0a54eca14 Added head lean to broadcast data packets, lean now being set from invensense accelerometers. 2013-05-09 15:03:19 -07:00
Andrzej Kapolka
46041b2ed9 Style tweaks: preface privates with underscore, capitalize enum members. 2013-04-26 10:21:14 -07:00
Andrzej Kapolka
d5da35e91a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-25 15:41:57 -07:00
Andrzej Kapolka
d041072d40 Delete support (though the one on my numeric keypad doesn't work?), 
sending key states.
 2013-04-25 15:26:05 -07:00
Andrzej Kapolka
675d06e4b9 More chat bits; basic functionality now working. 2013-04-25 14:03:31 -07:00
Philip Rosedale
ba55175870 Gravity is ON near origin, off in space, and a gravity field can be created with getGravity() 2013-04-25 09:50:35 -07:00
Andrzej Kapolka
f538e2bdbc Added key state to avatar data, started on chat entry field. 2013-04-24 17:06:55 -07:00
Stephen Birarda
87386cb05a line the consts back up in AvatarData 2013-04-24 13:54:35 -07:00
Stephen Birarda
461ca6ecb4 revert some of the const changes that make sense 2013-04-24 13:51:27 -07:00
Stephen Birarda
a423d3c38f more const repairs in AvatarData 2013-04-24 13:49:24 -07:00
Stephen Birarda
142a8a6f08 remove double const in AvatarData.h 2013-04-24 13:45:17 -07:00
Stephen Birarda
cfbe8a719c fix getter for hand state in AvatarData 2013-04-24 12:39:25 -07:00
Jeffrey Ventrella
eb631e2ef6 renamed "bodyPosition" to "position". (This corresponds to the position of the avatar on the ground, where y=0). I will next add a new "getBodyPosition" which returns the avatar's center of gravity - is useful for certain purposes, such as setting collision volumes, etc. 2013-04-23 14:05:23 -07:00
Jeffrey Ventrella
a73ea8c255 some preparation for adding hand state to avatar interactions 2013-04-23 13:48:34 -07:00
Philip Rosedale
5556686875 Fixes from brad's review 2013-04-23 11:59:43 -07:00
Philip Rosedale
2ef45e8512 Avatar head rotation, audio loudness (for facial animation) and hand state (grabbing or not) now sent in broadcast data. 2013-04-23 11:15:11 -07:00
Stephen Birarda
4956370d52 have parseData return the number of bytes consumed 2013-04-22 18:05:27 -07:00
Stephen Birarda
ea5a247f93 view frustum additions means there are now 94 bytes per avatar 2013-04-22 16:22:06 -07:00
ZappoMan
9b34427570 Added camera data to AvatarData class, and include it in interface 2013-04-22 14:12:08 -07:00
tosh
1e6352593a Merge branch 'master' of git://github.com/worklist/hifi into 19262 
Conflicts:
	interface/src/Head.cpp
	interface/src/Util.cpp
	interface/src/main.cpp
	libraries/avatars/src/Orientation.cpp
 2013-04-18 12:38:35 +02:00
birarda
8d4061dd72 Merge pull request #72 from birarda/master 
a better interim solution for bytes per avatar
 2013-04-17 16:58:49 -07:00
Stephen Birarda
e75add411c use a constant number of BYTES_PER_AVATAR as an interim solution 2013-04-17 16:58:16 -07:00
Philip Rosedale
952cb2f2ae Added head _isMine variable, added hand position transmission! 2013-04-17 15:14:30 -07:00
Stephen Birarda
8129c2477a fix broken voxel server build, change some char* to unsigned char* 2013-04-16 12:35:49 -07:00
Stephen Birarda
5c091a51a6 change signature of parseData to use unsigned char*, include packet header always 2013-04-16 11:51:36 -07:00
Stephen Birarda
a5a93443c6 re-work AvatarData to handle body position and rotation 2013-04-15 18:05:22 -07:00
Stephen Birarda
af1071b374 comments to AvatarData and avatar-mixer before pack/unpack refactor 2013-04-15 16:07:46 -07:00
Stephen Birarda
a4011934c6 move Orientation class to avatars library, constants to SharedUtil 2013-04-15 15:39:23 -07:00
Stephen Birarda
2dfe49a885 moved AvatarAgentData to AvatarData 2013-04-15 15:05:55 -07:00
Renamed from libraries/avatars/src/AvatarAgentData.h (Browse further)