Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27259 commits 29 branches 0 tags 1.1 GiB
Commit graph

761 commits

Author SHA1 Message Date
Andrzej Kapolka
083543419d More priority bits. 2014-05-22 15:00:36 -07:00
Andrzej Kapolka
d4af39a9f5 Working on handling animation priorities to prevent Hydra move/restore from 
interfering with scripted animations.
 2014-05-22 14:41:46 -07:00
Andrzej Kapolka
e81e6f3cb2 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 18:00:57 -07:00
barnold1953
5b366fe714 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
 2014-05-21 16:01:28 -07:00
Andrzej Kapolka
de7c05cb2d More animation controls. 2014-05-21 15:30:50 -07:00
Andrzej Kapolka
709a9d75f6 Provide an option for the masked joints in the scriptable method, fix a couple 
of annoying warnings.
 2014-05-21 12:03:47 -07:00
Andrzej Kapolka
0e15c82e49 Allow setting masked joints for each animation. 2014-05-21 11:58:20 -07:00
barnold1953
b5ad295756 Fixed improper coding style in previous pull request 2014-05-21 11:24:39 -07:00
Andrzej Kapolka
6797d1ad81 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 11:02:05 -07:00
Andrzej Kapolka
0dfd787034 Added some basic method to allow scripts to run/stop animations on the avatar. 2014-05-21 10:44:51 -07:00
Andrzej Kapolka
1022f1bec4 Added a priority setting so that we can control the order in which animations 
are applied.
 2014-05-21 09:40:49 -07:00
barnold1953
742543317c Stopped magnifying FOV when wearing Oculus. 2014-05-21 09:12:28 -07:00
Andrzej Kapolka
49a0645677 Animation bits. 2014-05-20 15:23:15 -07:00
Andrzej Kapolka
62e7a31602 More work on animation configuration. 2014-05-19 18:09:33 -07:00
Andrzej Kapolka
5da656e3f5 Working on animation dialog. 2014-05-19 16:55:33 -07:00
Philip Rosedale
074a6b7f38 Merge pull request #2861 from birarda/master 
send an updated address to data-server with domain (when changed)
 2014-05-15 14:01:39 -07:00
Stephen Birarda
8e9defad3e send an updated address to data-server with domain (when changed) 2014-05-15 12:18:24 -07:00
Andrzej Kapolka
f28ba72f75 When PrioVR is connected but head rotation is unavailable, use Faceshift 
rotation.
 2014-05-15 11:37:58 -07:00
Andrzej Kapolka
95c05a720d Tabs -> spaces. 2014-05-14 13:48:03 -07:00
Andrzej Kapolka
cf230d1cc3 PrioVR tweaks. 2014-05-14 13:36:26 -07:00
Andrzej Kapolka
498f9e73ac Merge branch 'master' of https://github.com/highfidelity/hifi into priority 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2014-05-14 10:23:44 -07:00
Kai Ludwig
b01b144854 No more hand movement when clicking with the mouse. 2014-05-14 07:36:27 +02:00
Andrzej Kapolka
eceb600de7 More work on PrioVR integration. 2014-05-13 14:44:24 -07:00
Andrzej Kapolka
0321821b55 More work on PrioVR integration. 2014-05-13 11:38:24 -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
Andrzej Kapolka
47268fef32 Fixed kooky conditional. 2014-05-12 11:06:14 -07:00
Andrzej Kapolka
0474375a39 Don't render head attachments in first person mode. 2014-05-09 15:13:58 -07:00
Andrew Meadows
217080fe1d cleanup - remove unused leap fingers 2014-05-09 10:27:01 -07:00
Philip Rosedale
8c5a1c7bc8 Merge pull request #2822 from ey6es/master 
Save attachment data for skeleton/attachment combinations so that they persist even when the attachment isn't present, and users can tweak script-attached models.
 2014-05-08 19:42:57 -07:00
Philip Rosedale
14bab0adbc Merge pull request #2821 from AndrewMeadows/inertia 
avatar walks up ledges
 2014-05-08 19:40:09 -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
Andrew Meadows
d725be37d0 merge upstream/master into andrew/inertia 2014-05-08 17:11:55 -07:00
Andrew Meadows
f019e2366e Add lift for walking up stairs 
Also some fixes for freeing avatars trapped in voxel collisions
 2014-05-08 17:10:02 -07:00
Andrzej Kapolka
acab09b89a Update billboard when attachments change. 2014-05-08 16:23:15 -07:00
Philip Rosedale
2c6c57eec2 increase hand restoration rate, improve function name clarity 2014-05-08 00:28:02 -07:00
Philip Rosedale
2797d0ab3b removed hand trying to follow mouse and other cruft 2014-05-08 00:09:07 -07:00
Philip Rosedale
e439694d72 reset only pitch and roll on spacebar so that you don’t turn away from someone 2014-05-07 22:56:06 -07:00
Philip Rosedale
538e785208 Merge pull request #2815 from ZappoMan/modelserver 
More Model Improvements & some other tweaks
 2014-05-07 20:59:04 -07:00
Philip Rosedale
c6b4b7c250 Merge pull request #2811 from AndrewMeadows/inertia 
prevent avatar from getting trapped in voxel collisions
 2014-05-07 16:54:28 -07:00
Andrew Meadows
a11b996a51 cleaner way to achieve the last commit 2014-05-07 16:00:39 -07:00
Andrew Meadows
2d3592e367 avoid resolving penetration twice 2014-05-07 15:58:00 -07:00
Andrew Meadows
b92bbafc26 prevent avatar from getting trapped in voxels 2014-05-07 15:21:12 -07:00
ZappoMan
37ca6efc7c correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't 2014-05-07 11:48:32 -07:00
Andrew Meadows
80ed8e7cf0 disable environment gravity when not set in menu 2014-05-06 14:56:16 -07:00
Andrew Meadows
68b0e91630 gravity disabled by default 2014-05-06 11:09:13 -07:00
Andrew Meadows
8a630a148e fix copy-n-paste typo 2014-05-06 11:03:51 -07:00
Andrew Meadows
2d0e4fb94f use START_LOCATION as default settings 2014-05-06 10:55:30 -07:00
Andrew Meadows
d1a262bb56 maintenance: replace implicit casts with explicit 2014-05-06 10:02:41 -07:00
AndrewMeadows
7a191961cf Merge pull request #2793 from PhilipRosedale/master 
Further improvements to avatar eye contact based on head direction
 2014-05-06 09:08:19 -07:00
Philip Rosedale
bb20762083 Merge pull request #2791 from AndrewMeadows/thermonuclear 
fix avatar motor to point in direction of camera
 2014-05-05 22:10:13 -07:00
Philip Rosedale
e3ab16997a tweaks to roll (back to no magnify) and lookAt indicator dot 2014-05-05 22:06:28 -07:00
Philip Rosedale
e0c898bba0 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-05 18:03:33 -07:00
Andrew Meadows
e33ef1a571 fix avatar motor to point in direction of camera 2014-05-05 17:35:23 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Philip Rosedale
da0b36ed5c merge fix 2014-05-05 16:21:52 -07:00
Philip Rosedale
691b1d6069 Added lookAt rendering bubble 2014-05-05 16:19:09 -07:00
Andrzej Kapolka
f37460e39a Basic attachment rendering. 2014-05-05 15:46:09 -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
Andrew Meadows
301c3c5649 don't ignore wall collisions when walking 
also reduced max walk speed
 2014-05-05 13:47:11 -07:00
Andrew Meadows
0c78449cf7 reduce movement speed when walking 2014-05-05 13:28:42 -07:00
Andrew Meadows
815262b802 update _lastFloorContactPoint 2014-05-05 13:06:55 -07:00
Andrew Meadows
6b129c86d0 reduce snagging when walking across voxel seams 2014-05-05 12:33:05 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Andrew Meadows
5ac301a77e set the _lastFloorContactPoint 2014-05-02 11:17:46 -07:00
Andrew Meadows
d8cb84080c stop avatar integration when standing at rest 2014-05-02 10:43:10 -07:00
Philip Rosedale
69f0611a06 Correction to actually pick closest 2014-05-02 09:05:09 -07:00
Philip Rosedale
03b59055fd merge conflict fix 2014-05-02 07:10:43 -07:00
Philip Rosedale
4089d54389 Avatar makes eye contact with the person nearest to gaze direction 2014-05-02 00:21:14 -07:00
Andrzej Kapolka
3ebe1df6de Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-01 21:00:32 -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
22bf10a9e7 repair addThrust() API so hydraMove.js works 2014-05-01 16:18:55 -07:00
Andrew Meadows
8d4dca31c5 add velocity model for controlling avatar motion 2014-05-01 12:05:34 -07:00
AndrewMeadows
2ad31793e2 Merge pull request #2756 from PhilipRosedale/master 
Added back ability to see/debug head/gaze position with ‘Head Mouse'
 2014-05-01 11:51:58 -07:00
Philip Rosedale
223d9cf32e Added back ability to see/debug head and eye gaze position with ‘Head Mouse’ 2014-04-30 21:29:50 -07:00
Atlante45
3a64ce733a Fixed warning 2014-04-30 16:55:51 -07:00
Andrew Meadows
ae3b58a33f use setGravity() instead of setting it directly 2014-04-28 16:46:16 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Clément Brisset
fd8ec9b5c2 Merge pull request #2723 from huffman/19554-2 
19554 - Chat Updates
 2014-04-24 16:44:22 -07:00
Ryan Huffman
d88897ccc7 Add error box when going to user/location that doesn't exist 2014-04-24 15:55:34 -07:00
Andrew Meadows
0b5c1b0a9a add MyAvatar::_motionBehaviors (for obeyGravity) 
Also reconcile Menu checkable set vs script-set collision groups.
 2014-04-24 15:43:03 -07:00
Andrew Meadows
f07a418a27 namechange CollisionFlags --> CollisionGroups 2014-04-24 11:07:49 -07:00
Andrzej Kapolka
4f8c1f9c65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 16:09:23 -07:00
Andrew Meadows
10265a4a3e temp disable of screen flash for avatar collisions 2014-04-23 14:37:24 -07:00
Andrew Meadows
96ca537400 removing unused motion-state timers 2014-04-23 13:44:25 -07:00
Andrew Meadows
203dac054a remove unused MoveTarget stuff from MyAvatar 2014-04-23 12:19:48 -07:00
Andrew Meadows
37a5d9130f move _thrust from Avatar to MyAvatar 2014-04-23 11:55:28 -07:00
Andrew Meadows
359c14e319 cleanup: remove unused Avatar::_mode 
The mode, if it is required, should probably eventually live in
AvatarDAta since it will be determined by whatever engine is running the
avatar (script or interface) and then broadcast to the rest of the
world.  When we need it we'll add it back in the right place.
 2014-04-23 11:48:42 -07:00
Andrzej Kapolka
c471a55f1f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 09:40:51 -07:00
Andrew Meadows
5992651c27 update avatar collision shapes when necessary 2014-04-22 20:55:28 -07:00
Andrew Meadows
364431328f remove include StreamUtils.h 2014-04-22 14:26:40 -07:00
Andrew Meadows
0b9ebe4c08 avatar-voxels collisions work again 2014-04-22 11:51:36 -07:00
Andrew Meadows
f033990fae merge upstream/master into andrew/inertia 2014-04-22 10:49:44 -07:00
Andrew Meadows
7537d240bb toward working avatar-vs-voxel collisions again 2014-04-22 10:48:42 -07:00
Atlante45
681aab5bf0 Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
Andrzej Kapolka
30248747d6 Provide a means of visualizing the joint constraints. 2014-04-18 14:26:34 -07:00
Stephen Birarda
5904d19603 Merge pull request #2637 from birarda/authentication 
add optional DTLS option for domain-server to node communication
 2014-04-14 10:24:17 -07:00
Andrzej Kapolka
25d25b1472 Merge pull request #2658 from AndrewMeadows/inertia 
don't render avatar boundary shapes in first person
 2014-04-14 10:23:43 -07:00
Andrew Meadows
0ad841edfb don't render avatar boundary shapes in first person 2014-04-11 17:44:51 -07:00
Andrew Meadows
fd3b317c09 merge 2014-04-11 16:36:42 -07:00
Andrew Meadows
b5e7c30178 merge 2014-04-11 16:00:34 -07:00
Andrew Meadows
5ac7be8945 merge upstream/master -> andrew/inertia 2014-04-11 12:20:00 -07:00
Andrew Meadows
f7862eb600 check for bad deltaTime during avatar-avatar collisions 2014-04-11 08:58:26 -07:00
Andrew Meadows
a436b59971 save settings for change in: identity, position 2014-04-10 17:14:51 -07:00
Andrew Meadows
66b6328687 protection against bad avatar-avatar collisions 
Also with logging if we encounter incorrectly large penetration depths
 2014-04-10 16:58:52 -07:00
Andrzej Kapolka
6cf971c849 More intersection-avoidance tweaks. 2014-04-10 14:51:43 -07:00
Andrew Meadows
3755aee3e0 merge upstream/master into andrew/scripting 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-10 08:32:14 -07:00
Philip Rosedale
de6b55644b Merge pull request #2636 from ey6es/faceplus 
Basic Faceplus integration, cleanup for handling the various face trackers.
 2014-04-09 22:13:34 -07:00
Philip Rosedale
d4bfffe518 Merge pull request #2628 from AndrewMeadows/oculus-with-thrust 
fix glitchy oculus when looking directly behind
 2014-04-09 21:59:11 -07:00
Andrew Meadows
c88be1ac34 remove unnecessary change 2014-04-09 17:26:05 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Andrzej Kapolka
f707719f4e Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:34:29 -07:00
Andrew Meadows
3a93096093 fixing floats to be *.0f instead of *.f 2014-04-09 15:31:26 -07:00
Andrew Meadows
034f518d40 emit signal on avatar body-body collisions 2014-04-09 14:15:45 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Andrew Meadows
f95542e4d6 merge upstream/master into oculus-with-thrust proj 2014-04-08 18:34:15 -07:00
Andrew Meadows
34aefe1b49 fix glitchy oculus when looking directly behind 2014-04-08 18:33:08 -07:00
Andrzej Kapolka
5b0e7f818d More work on Faceplus integration/cleaning up support for multiple face 
trackers.
 2014-04-08 18:03:49 -07:00
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00
Stephen Birarda
080b0d7221 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 10:28:14 -07:00
Andrzej Kapolka
a157c67901 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 09:56:07 -07:00
Andrew Meadows
bf0eb69e2c fix for sometimes slow avatar 2014-04-07 16:28:55 -07:00
Stephen Birarda
efcf506383 resolve conflicts on merge with upstream master 2014-04-07 09:32:08 -07:00
Andrzej Kapolka
1c822542c1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-04 15:29:13 -07:00
Andrew Meadows
01c42c741c fix #2567 thrust + oculus doesn't change body rot 2014-04-04 14:46:54 -07:00
Andrzej Kapolka
a2b94aa433 Working on render modes. 2014-04-04 14:22:01 -07:00
Andrew Meadows
933cade6b0 Re-add fullUpdate hint to Model::simulate() 2014-04-02 16:34:33 -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
515593e41c modify avatar thrust during collisions 2014-04-01 17:25:26 -07:00
Stephen Birarda
62041d91a8 rename NodeList DomainInfo to DomainHandler 2014-04-01 13:09:35 -07:00
Andrew Meadows
b65855a384 merge upstream/master into avatar-interaction 2014-04-01 12:53:47 -07:00
Andrew Meadows
59bba99c6f Resolve body-body collisions with other avatars 2014-04-01 12:48:17 -07:00
Andrew Meadows
1bbdc9d78b Adding bounding capsule shape for Model 
Also:
Cleaned up the automatic geometry LOD loading
Removed staticExtents data member from FBXGeometry
Split debug rendering of bounding shapes from joint shapes
 2014-04-01 09:25:25 -07:00
Stephen Birarda
3c8aa90ae0 Merge pull request #2559 from AndrewMeadows/avatar-interaction-2 
split lean input from lean perturbations
 2014-03-28 09:25:36 -07:00
Stephen Birarda
be5888e692 Merge pull request #2549 from AndrewMeadows/avatar-interaction 
name changes to get rid of "tweaked" angles in Head code
 2014-03-28 09:19:45 -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
Andrzej Kapolka
ca9f0c01c1 Couple of quick fixes: reset the skeleton joints when space is pressed as a 
last resort to fix broken IK, don't render display names at the origin if
we don't have a skeleton model.
 2014-03-27 11:08:55 -07:00
Andrew Meadows
b6f2150d2e HeadData::_yaw and friends change to _baseYaw 2014-03-27 10:37:07 -07:00
Andrew Meadows
7a649084bd reduce the lean recovery timescale 2014-03-26 14:07:21 -07:00
Andrew Meadows
9a4db152ff avatar responds to hand-vs-head collisions again 2014-03-26 13:20:18 -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
d90b325b1c Add penetration resolution helper for Hand class 2014-03-25 15:31:46 -07:00
Andrzej Kapolka
f1fd8175d2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-24 14:53:00 -07:00
Andrzej Kapolka
62884f1f4f Don't use textures/fancy shaders when rendering shadow map. Closes #2270. 2014-03-24 13:15:03 -07:00
ZappoMan
b7243b0bfe more cleanup 2014-03-22 20:42:34 -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
22aa9b075d datalength sanity checking for AvatarData packet 2014-03-20 16:52:40 -07:00
Atlante45
4604f5333d Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 12:15:55 -07:00
Atlante45
39a6e03476 Modified MyAvatar to support more JS 2014-03-20 12:09:33 -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
Andrzej Kapolka
500f9d1485 Merge pull request #2338 from AndrewMeadows/cleanup 
Don't send redundant avatar hand/head data, and cleanup.
 2014-03-18 13:57:30 -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
Stephen Birarda
db25ae8865 remove extra debug 2014-03-18 12:27:45 -07:00
Stephen Birarda
c7c51c7504 remove orientation string debug 2014-03-18 12:05:32 -07:00
Stephen Birarda
05e2bb8022 keep storing degrees in data-web but convert on receipt 2014-03-18 12:04:03 -07:00
Stephen Birarda
1d944ac829 reset orientation to identity with spacebar, fix orientation storing 2014-03-18 12:02:12 -07:00
Stephen Birarda
c8d3cd2a1b fix go to orientation to not put the user sideways 2014-03-18 11:55:11 -07:00
Andrew Meadows
68ba2201df cleanup of Avatar:: and MyAvatar::render() 
MyAvatar now calls Avatar::render() which does most of the work.
Also, made ::renderBody() a proper virtual function
 2014-03-17 10:22:02 -07:00
Andrzej Kapolka
4366b45445 Changed orientation tweak names, restore tweaked orientation rather than 
primary one.  Closes #2310.
 2014-03-14 11:13:15 -07:00
Andrew Meadows
e68241d2a9 using glm::degrees() instead of DEGREES_PER_RADIAN 2014-03-12 12:08:27 -07:00
Andrew Meadows
c3e8d51694 orientation stored in dataserver is in degrees 2014-03-12 12:06:59 -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
Stephen Birarda
2d10995d01 Merge pull request #2219 from ZappoMan/cruft_removal 
Fix Crash and Cruft Removal
 2014-03-06 15:01:31 -08:00
Andrew Meadows
868e92c0fa Merge upstream/master' into shapes branch 2014-03-06 12:45:43 -08:00
Andrew Meadows
37b088ebfa Hands can collide with avatar head again 2014-03-06 12:38:07 -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
ZappoMan
a887baf081 fix warning 2014-03-05 21:22:08 -08:00
Andrzej Kapolka
a7af3bc284 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-05 18:08:59 -08:00
Andrzej Kapolka
3930b3e824 Display names are great, but not in the shadow map. Closes #2208. 2014-03-05 17:44:08 -08:00
Andrew Meadows
7db5aaaf37 new collision pipeline for avatar shapes 2014-03-05 07:08:59 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Andrew Meadows
eec8affd84 fix warning about unused variable 2014-03-04 11:56:22 -08:00
Andrew Meadows
7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-03-04 09:01:24 -08:00
ZappoMan
9bd29bdd92 removed findSpherePenetration() and findCapsulePenetration() from VoxelSystem, use VoxelTree 2014-03-02 15:34:36 -08:00
Andrzej Kapolka
2639796402 Wait until both head and body are loaded before rendering. Closes #2145. 2014-02-28 12:22:10 -08:00
Stephen Birarda
7067cf2ab3 fix go to user and address update for new API 2014-02-26 13:40:49 -08:00
Andrzej Kapolka
038f1acf01 Don't render the hover text in mirror/billboard mode. Closes #2098. 2014-02-25 15:34:16 -08:00
Philip Rosedale
e637e48598 Merge pull request #2076 from birarda/authentication 
groundwork for secure node communication via data-server
 2014-02-25 10:07:55 -08:00
ZappoMan
76355dc1a8 add support for hiding local rendering of avatar 2014-02-24 19:24:45 -08:00
Stephen Birarda
c1b45d7eaa Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-24 15:18:21 -08:00
Stephen Birarda
f20808b47f remove option to drive from transmitter 2014-02-24 15:11:02 -08:00
Andrzej Kapolka
2cea83a599 Proper header on ribbon.js, show display name for own avatar. 2014-02-24 13:36:43 -08:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Andrzej Kapolka
d80b52dc9f Fixes for camera mode transitions, seeing inside head. 2014-02-24 11:33:52 -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
Stephen Birarda
37ba6219e6 hook up go to for HTTP data-server 2014-02-21 17:04:03 -08:00
Stephen Birarda
52a21d4dfd hook to request user's location from data-server 2014-02-21 16:55:20 -08:00
Stephen Birarda
625299e6e6 update location information in data-server from MyAvatar 2014-02-21 16:36:07 -08:00
Andrzej Kapolka
ac02609bc2 The basic billboard behavior, closes #1864. 2014-02-21 15:38:49 -08:00
Stephen Birarda
340248ac43 resolve conflicts on merge with upstream master 2014-02-21 15:16:15 -08:00
Andrzej Kapolka
10ce2cb3f0 Working on sending the billboards over the network. 2014-02-21 11:49:29 -08:00
Andrzej Kapolka
495447fc0d Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo 2014-02-21 10:19:52 -08:00
Andrzej Kapolka
6b90a3994d Working on avatar billboards. 2014-02-20 19:22:59 -08:00
Stephen Birarda
6f84230d9d resolve conflicts on merge with upstream/master 2014-02-20 10:14:36 -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
Stephen Birarda
ff7a49d8c2 resolve conflicts on merge with upstream master 2014-02-19 13:07:26 -08:00
Andrew Meadows
c24cbdadc1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-02-19 10:00:51 -08:00
Andrew Meadows
4010f3ab3f Remove Avatar::_head, use AvatarData::_headData 2014-02-18 17:41:46 -08:00
Andrew Meadows
c134b8de5b Remove Avatar::_hand, use AvatarData::_handData 2014-02-18 17:08:12 -08:00
Andrzej Kapolka
f83254882a Attempting to get the head rotation from Visage. 2014-02-18 16:07:08 -08:00
Jose Carlos
59f8851b50 Merge remote-tracking branch 'upstream/master' into 19489 2014-02-19 00:05:16 +01:00
Jose Carlos
46ed506196 Display names are shown when distance is below a threshold 
Used polygon offset to render display names
Saved model view and projection matrices in order to save glGetDoublev calls
 2014-02-19 00:04:00 +01:00
Andrew Meadows
4b58d04c17 Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion 2014-02-18 15:00:39 -08:00
Stephen Birarda
c762b92e5a replace DataServerClient and Profile with AccountManager 2014-02-18 11:27:37 -08:00
ZappoMan
5cf0ad46e7 Merge pull request #2000 from gaitat/master 
Worklist Job #19503
 2014-02-18 09:47:26 -08:00
Jose Carlos
e7b54a9ef4 merged from master 2014-02-17 21:59:53 +01:00
Andrew Meadows
48f28ecee7 Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion 
Conflicts:
	interface/src/Menu.h
	interface/src/avatar/Avatar.cpp
 2014-02-17 12:12:47 -08:00
Andrew Meadows
bca50a5b70 Split render options for head/body collision proxy 
This makes the poor proxy shapes easier to see.
 2014-02-17 11:23:01 -08:00
Andrew Meadows
d635ffaaba Remove cruft: old avatar-avatar collision option 2014-02-17 10:40:32 -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
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
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
b75de42802 Making the lean recovery use more tuneable parameters. 2014-02-13 12:22:40 -08:00
Andrew Meadows
e793c207f9 Minor whitespace removal. 2014-02-13 10:03:14 -08:00
Andrew Meadows
04bc05cfe6 Moving hand-avatar collision trigger calls into MyAvatar 
Also renaming some methods in Model to be more descriptive.
 2014-02-12 08:29:22 -08:00
Andrzej Kapolka
e29d6210bb Merge pull request #1981 from AndrewMeadows/avatar-interaction 
Avatar body-body collisions
 2014-02-11 16:02:43 -08:00
Andrew Meadows
6c4ecb0246 Splitting hand collisions between other avatars and ourself. 2014-02-11 14:38:31 -08:00
Andrew Meadows
d0f9b78710 Adding avatar body-body collisions to prevent near-clipping. 2014-02-11 13:48:48 -08:00
ZappoMan
98211a832c Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js 2014-02-10 17:41:21 -08:00
ZappoMan
991c72006c moving the hydra grab behavior to JS 2014-02-10 17:25:14 -08:00
Andrew Meadows
8529858134 Remove experimental joining of hand-avatar and avatar-avatar collision logic. 2014-02-10 17:12:25 -08:00
ZappoMan
8acb6d13d5 move hydra thrust and view code into JS example 2014-02-10 15:25:09 -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
6b2c7c556d Fixing mouselook. 
Faceshift head rotations are stored separately and then integrated into
the final (rendered) head rotation at the right times but do not affect
the camera.
 2014-02-07 17:46:14 -08:00
Stephen Birarda
455442088c Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer 2014-02-07 13:45:14 -08:00
Andrew Meadows
7a8186f1da Adding ModelCollisionInfo struct to get more info about collisions against avatars. 
Had to disable some collisions.  Will go back and make them work again soon.
 2014-02-07 10:48:30 -08:00
ZappoMan
41f6650b20 implement movable independent camera with hydra 2014-02-07 01:23:30 -08:00
Andrew Meadows
eae0f8b2e6 updateCollisionsWithAvatars() --> updateCollisionWithAvatars() 2014-02-06 14:49:25 -08:00
Andrew Meadows
d2d32d0ed9 Changing updateAvatarCollisions() to be updateCollisionsWithAvatars() 
To agree with names of other similar methods.
 2014-02-06 14:46:44 -08:00
Andrew Meadows
082b7cf1a9 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
 2014-02-06 14:37:19 -08:00
Andrew Meadows
802967512a Splitting rendering of avatars and their collision proxies. 
Also disabling old hand-avatar interactions and trying to use new stuff.
 2014-02-06 14:14:48 -08:00
Stephen Birarda
53170d3fe2 fix skeleton setting on parsing of identity packet 2014-02-04 16:49:21 -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
Stephen Birarda
06a3da2b25 store and load face/skeleton meshes in local settings 2014-02-04 14:06:08 -08:00
Stephen Birarda
8bf3b7586b initial movement of mesh/skeleton URLs out of data-server through avatar-mixer 2014-02-04 13:02:33 -08:00
Andrew Meadows
ed93d8db39 Moving headMouse, transmitter, and touchYaw/Pitch stuff into MyAvatar. 2014-01-31 17:42:48 -08:00
Andrew Meadows
a7ffb7df1d Moved LookAtTargetAvatar stuff from AvatarManager to MyAvatar. 2014-01-31 13:17:12 -08:00
Andrew Meadows
d0a4d6a614 Moving MyAvatar specific code out of Avatar and into MyAvatar. 2014-01-30 17:10:00 -08:00
Andrew Meadows
4b8e1f270f Adding preliminary/temporary code for testing hand-vs-avatar collisions. 2014-01-30 09:31:07 -08:00
Andrew Meadows
570b872eda Removing build warning about out-of-order initialization in class ctor. 2014-01-29 14:43:01 -08:00
Andrew Meadows
b2d60ec1f8 Fixing iteration through list of avatars. 2014-01-29 14:36:22 -08:00
Andrew Meadows
f093a571c5 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/particles/src/ParticleCollisionSystem.cpp
	libraries/shared/src/CollisionInfo.h
 2014-01-29 14:12:22 -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
Andrew Meadows
167acb8873 Adding avatars back into ParticleCollisionSystem. 
Had to add Application::_myAvatar to the AvatarManager list so that
particles would properly collide.
 2014-01-28 14:16:34 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -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
7762ea9f94 repair calls to broadcast to nodes 2014-01-23 16:28:35 -08:00
Stephen Birarda
2e548fb39c complete migration of Avatar list to AvatarManager 2014-01-23 14:41:11 -08:00
Stephen Birarda
1f95d0c017 have avatar-mixer report avatar kills to all avatars 2014-01-23 12:47:27 -08:00
Andrew Meadows
e4e495889d added initial avatar-avatar collision stub 2014-01-22 16:06:49 -08:00
Andrew Meadows
09b2d4aa78 Added menu options for more detailed collision preferences. 2014-01-22 13:34:13 -08:00
Andrew Meadows
c40d93ddce Fixing elasticity to range [0,1] during collisions. 2014-01-22 10:40:37 -08:00
Andrzej Kapolka
470b83a55b Got the sign backwards. 2014-01-17 17:04:22 -08:00
Andrzej Kapolka
765f98fadc Remove unused variables, change orbit pitch behavior (closes #1582). 2014-01-17 17:00:03 -08:00
Andrzej Kapolka
515cc5316c Get rid of code to decay pitch on movement. 2014-01-17 10:54:44 -08:00
Andrzej Kapolka
50d224661c Pruning more avatar bits. 2014-01-16 14:47:39 -08:00
Andrzej Kapolka
865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
 2014-01-16 13:35:03 -08:00
Andrzej Kapolka
3f08504e3e Replaced missing functionality. 2014-01-16 12:39:07 -08:00
Andrzej Kapolka
2c7b6b9696 Skeleton removal checkpoint; compiles, but there are a few bits missing. 2014-01-15 15:14:50 -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
Stephen Birarda
6b2f72f14d repair reference to _targetScale in MyAvatar 2014-01-14 16:17:07 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Stephen Birarda
274989935d resolve conflicts on merge with upstream master 2014-01-14 16:09:12 -08:00
Stephen Birarda
767a241105 Merge remote-tracking branch 'upstream/master' into nodelist-container 2014-01-14 16:08:58 -08:00
Stephen Birarda
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Stephen Birarda
4ea14a51fc remove the SerialInterface 2014-01-14 13:14:15 -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
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -08:00
Brad Hefta-Gaub
73c8dc495b changed all fmin to std::min 2014-01-10 21:42:08 -08:00
Andrzej Kapolka
4ae5203f38 Remove unused constant. 2014-01-10 14:10:33 -08:00
Andrzej Kapolka
9fa170494c I believe what we really want to decay is the mouse pitch. 2014-01-10 14:04:46 -08:00
Andrzej Kapolka
8b2212b6cf Fix for "red ball" issue with no skeleton: use avatar position for head 
position.
 2014-01-06 12:08:42 -08:00
Andrzej Kapolka
2b15fdf78f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 17:49:34 -08:00
Andrzej Kapolka
aa9fc290a5 Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior. 2014-01-03 16:46:11 -08:00
Andrew Meadows
6518e70688 Minor cast enforcement during initialization. 2014-01-03 16:27:57 -08:00
Andrew Meadows
1882c9e43b Merge branch 'elasticity' of https://github.com/PhilipRosedale/hifi into elasticity-fix 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-03 16:26:17 -08:00
Philip Rosedale
83101d3d11 reduce elasticity to be less than 1 2014-01-03 15:31:16 -08:00
Philip Rosedale
2cf5efc4a8 Merge pull request #1449 from PhilipRosedale/mirror 
Mirror
 2014-01-03 15:25:28 -08:00
Philip Rosedale
2286916fbb Don’t render head if inside it! 2014-01-03 15:00:42 -08:00
Andrzej Kapolka
ed4ad1cea9 Removed some unused code. 2014-01-02 15:37:56 -08:00
Andrzej Kapolka
6c27569e9b Fix arm bending, compile warning. 2014-01-02 13:23:15 -08:00
Philip Rosedale
e3a77ef139 tuning 2013-12-26 20:20:57 -08:00
Philip Rosedale
74380260b3 Grab includes rotation 2013-12-26 19:07:02 -08:00
Philip Rosedale
58a73dfede yet again remove the test _balls now that we have a particle server 2013-12-21 18:06:04 -08:00
Philip Rosedale
bad47bd527 Fixed chat height 2013-12-20 15:33:56 -08:00
Philip Rosedale
d6efcce28e Debugging render call for head/hand positions, debugging for ball injection 2013-12-17 11:08:38 -08:00
Philip Rosedale
21d7fe1277 Grab and move with button 4 2013-12-13 21:59:19 -08:00
Philip Rosedale
132b313c9c remove voxel glow on local add 2013-12-10 17:00:53 -08:00
Philip Rosedale
c9f96d1adf Basic joystick thrust/view drive behavior 2013-12-10 16:52:08 -08:00
Philip Rosedale
4edb7decdf removed printf 2013-12-06 17:47:01 -08:00
Philip Rosedale
9195d60b71 Fix to jerky avatar movement, fix for rotation broken 2013-12-06 17:45:28 -08:00
Philip Rosedale
4707733563 Removed avatar balls 2013-12-06 16:26:02 -08:00
Philip Rosedale
0fcc2d8634 Removed _avatarTouch class 2013-12-06 15:11:01 -08:00
Philip Rosedale
3f957bbf5d Rave out! 2013-12-05 16:46:11 -08:00
Philip Rosedale
a7dacec63d Don’t render collision if not own avatar, don’t check for collisions with voxel tree if not me. 2013-12-05 13:36:00 -08:00
Philip Rosedale
7ab9cc9c14 Voxel editing with hands, flying and rotation with hands 2013-12-02 00:17:06 -08:00
Philip Rosedale
ea850368de First working voxel insertion at fingertip 2013-12-01 20:16:14 -08:00
Philip Rosedale
a9139b05e8 Drive with trigger pointing 2013-11-29 20:46:16 -08:00
Philip Rosedale
65ec91ec13 Add hand thrusters 2013-11-29 17:49:35 -08:00
Andrzej Kapolka
b294b328dd Only render ball avatars when "avatars as balls" is checked. 2013-11-27 12:56:31 -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
Philip Rosedale
09ca2a45db Add local audio monitor option, tweak turning with head 2013-11-26 11:25:06 -08:00
Philip Rosedale
d7b1eae446 Merge branch 'master' of https://github.com/worklist/hifi 2013-11-25 09:45:27 -08:00
Philip Rosedale
a1ba36d543 Lean drive works with keys and no up/down 2013-11-22 20:08:44 -08:00
ZappoMan
7151d1679f Merge pull request #1288 from ey6es/master 
Have avatars glow/shrink out of existence when they log off or move to another domain/location.
 2013-11-22 16:48:12 -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
Philip Rosedale
582a71990e Improved using faceshift to turn body 2013-11-22 15:08:16 -08:00
Andrzej Kapolka
91b38313be Treat pitchFromTouch more like yawFromTouch, persist mouse pitch. 2013-11-22 11:28:33 -08:00
Andrzej Kapolka
3137e9a3e6 Don't leave out the head when we draw our shadow. 2013-11-21 13:57:55 -08:00
Andrzej Kapolka
f38e74c51c Merge branch 'master' of https://github.com/worklist/hifi into shadowplay 2013-11-21 11:18:56 -08:00
Andrzej Kapolka
5cc5d9bba8 Progress towards shadow maps. 2013-11-20 16:23:54 -08:00
Andrzej Kapolka
69b5b81f34 Limit combined pitch. 2013-11-19 16:31:24 -08:00
Andrzej Kapolka
bc523092ba Sniffing glue, wrong week, etc. 2013-11-19 11:59:25 -08:00
Andrzej Kapolka
ced1fca2e4 Missed another spot. 2013-11-19 11:57:01 -08:00
Andrzej Kapolka
3d82fe65b4 Forgot this part. 2013-11-19 11:53:57 -08:00
Andrzej Kapolka
1e7866ad02 Clamped values, adjusted them. 2013-11-19 11:51:32 -08:00
Andrzej Kapolka
df8fbf8f72 More general, angle-driven form of driving based on lean. 2013-11-19 11:09:02 -08:00
Andrzej Kapolka
f59b403103 Drive avatar with Sixense joysticks and triggers. 2013-11-18 16:20:00 -08:00
Andrzej Kapolka
52a3071cb3 Order of update fix. 2013-11-13 12:29:43 -08:00
Andrzej Kapolka
feb2a150b7 Don't decay head roll/pitch when moving if Faceshift is active. 2013-11-08 18:05:24 -08:00
Philip Rosedale
2991c8af61 screen does not flash when voxels are clicked 2013-11-08 14:34:22 -08:00
Andrzej Kapolka
55d31ee7f3 Render the body in first-person mode so that we can see our hands. 2013-11-07 16:37:51 -08:00
Andrzej Kapolka
2b4db0ea0e Apply Leap data directly to skeleton. 2013-11-06 16:47:03 -08:00
Andrzej Kapolka
d0cd9e9790 Active the hand when we have leap hand data. 2013-11-06 16:24:25 -08:00
Andrzej Kapolka
9460fb87c2 Return arm to neutral position when mouse pointer is invisible. 2013-11-05 16:06:11 -08:00
Andrzej Kapolka
6633b6a633 For now, don't perform avatar collisions unless we have a skeleton model. 2013-11-05 13:56:14 -08:00
Andrzej Kapolka
359083ee9d Sneak in a toggle for chat circling. 2013-11-05 12:30:38 -08:00
Andrzej Kapolka
fdc44f5ec4 Have the hand fall to the side when the mouse is hidden. 2013-10-31 16:06:42 -07:00
Andrzej Kapolka
4e6edfc2db Fix for arm on old skeleton. 2013-10-28 17:28:10 -07:00
Andrzej Kapolka
e7b05f40ef Remove unused variables. 2013-10-28 16:07:07 -07:00
Andrzej Kapolka
6e76179ca3 Place hand based on mouse position, but make sure we don't point above the 
shoulders.
 2013-10-28 15:59:04 -07:00
Andrzej Kapolka
cf78e21ea4 Merge branch 'master' of https://github.com/worklist/hifi into ossome 
Conflicts:
	interface/src/Application.cpp
 2013-10-23 10:06:56 -07:00
Andrzej Kapolka
9dd41f4206 Render sticks, use avatar colors. 2013-10-22 16:52:44 -07:00
Andrzej Kapolka
a33c7ce20c More work on extracting rotations. 2013-10-22 12:54:32 -07:00
Andrzej Kapolka
b5f2dcfa55 Use the head position from the loaded skeleton, if available. 2013-10-21 16:58:01 -07:00
stojce
b45525ae21 Mirror View initial setup 2013-10-21 08:28:38 +02:00
Andrzej Kapolka
7e174093e4 Factoring the FBX model code out to a shared base class. 2013-10-18 17:26:03 -07:00
Andrzej Kapolka
c8b2ed0213 More progress on reading skeletons. 2013-10-17 17:30:34 -07:00
Andrzej Kapolka
36d4be4e3b These should actually start at two pi (that's the maximum distance). 2013-10-17 11:05:52 -07:00
Andrzej Kapolka
b25020b84a Need to halve the target angle, because both participants will be moving. 
Use randomness to resolve cases where two participants are on top of one
another.
 2013-10-17 10:58:33 -07:00
Andrzej Kapolka
121a7f8270 Widen the circle influence, increase the approach rate. 2013-10-16 17:48:28 -07:00
Andrzej Kapolka
89d6c7905b Decrease the distance between members, increase the influence of the circle, 
don't rotate members.
 2013-10-16 17:21:09 -07:00
Philip Rosedale
c324933b8a Move to 'european' comfort distance for chat circle 2013-10-16 16:49:33 -07:00
Andrzej Kapolka
7a1f845189 Another rate adjustment. 2013-10-16 15:48:25 -07:00
Andrzej Kapolka
6df245908c Reduce the approach rate. 2013-10-16 15:41:38 -07:00
Andrzej Kapolka
50216ca4ad Base the number of people we include in the circle on whether we would 
actually fall in its radius (plus an expansion factor).
 2013-10-16 15:37:59 -07:00
Andrzej Kapolka
11fea386b6 First stab at chat circling mechanism. 2013-10-16 14:07:36 -07:00
Eric Johnston
36f06720d0 Add left-arm movement to remote avatars without changing network packet structure. 
Move MyAvatar leap hand arm-movement into Avatar::updateLeapHandPositions(), to enable remote avatars to position fingertips and IK-arms based on Leap hand data.
 2013-10-16 08:21:35 -07:00
Eric Johnston
7bc2cf6fa9 Leap interface and Avatar: left-hand IK works for Leap interface. 
This is in and smooth, and there's a decision to be made:
In the case where only one hand is visible, we have to decide if it's the left or right hand. Currently it's simple, based on which side it's detected on.
So far this seems to work best, in the (very) common case where hands go in/out of the sensor's field frequently.
We could also use a history-based heuristic to hold one hand as left/right, but that means that when it guesses wrong the error lingers.
Detecting handedness based on where the thumbs are would be better, but is unreliable on the Leap.
I went for the simple/clear version, but we can do whatever we want.
 2013-10-14 09:01:50 -07:00
Philip Rosedale
6281a28f69 better movement near others 2013-10-11 17:00:25 -07:00
Andrzej Kapolka
4c073426c8 Ball and cone color from average geometry colors. 2013-10-10 13:41:50 -07:00
Andrzej Kapolka
14dfa72284 Rotation fix. 2013-10-10 11:25:11 -07:00
Andrzej Kapolka
052c8246fa Let's use the "eye level" position. 2013-10-10 10:49:19 -07:00
Philip Rosedale
27a892fa55 Removed old head rotation code, menu items, added ability to turn off faceshift head rotation 2013-10-09 22:46:34 -07:00
Andrzej Kapolka
5511c02449 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:53:08 -07:00
Andrzej Kapolka
1b4daa8eb9 No glow on own avatar, only on others when farther than five units away. 2013-10-09 10:17:41 -07:00
Stephen Birarda
b17e12460c shift get/set of face model URL to Profile class 2013-10-08 13:52:04 -07:00
Stephen Birarda
85edb93710 add a Profile class to hold user data from data-server 2013-10-08 12:13:45 -07:00
Stephen Birarda
e9e77d8276 set username instead of UUID in Interface preferences 2013-10-07 13:35:16 -07:00
Stephen Birarda
f36fd47ef7 store username and not UUID for MyAvatar 2013-10-07 12:17:47 -07:00
Stephen Birarda
98f435ccc2 link mesh URL and UUID in prefs to data server client 2013-10-07 12:03:04 -07:00
Stephen Birarda
ca68846c1b some deletions and cleanup based on Xcode analysis 2013-09-30 15:36:23 -07:00
Philip Rosedale
9645cd9831 Click on voxels as way of moving around 2013-09-28 15:18:59 -07:00
Freddy
c78aa591c5 Fix spinning while flying, top speed now about Mach 1 2013-09-27 15:08:10 -07:00
Freddy
f88a3633a5 Slow down when near other avatars for easier positioning 2013-09-27 00:40:41 -07:00
Freddy
6b0f9314ba Faceshift drives body rotation, remove gyro-driven rotation 2013-09-26 23:52:44 -07:00
Freddy
6bbe34a8c4 missing space 2013-09-23 23:06:32 -07:00
Freddy
027811e37c Increase thrust while holding keys down to allow very fast speeds 2013-09-23 22:53:35 -07:00
Andrzej Kapolka
0fa2eca02d Remove option to use Faceshift rig (using the "macaw" model has much the same 
result, and it lets other people see it).
 2013-09-23 10:43:20 -07:00
Andrzej Kapolka
24bf1e2036 Don't render neck/neck base when blend face is active. 2013-09-20 17:55:31 -07:00
Stephen Birarda
f8f0e3db1b remove the sphere from the ground plane 2013-09-20 14:04:18 -07:00
Andrzej Kapolka
b4ca66eb68 Merge branch 'master' of https://github.com/worklist/hifi into blendface 
Conflicts:
	interface/src/devices/Faceshift.cpp
 2013-09-17 11:05:11 -07:00
Andrzej Kapolka
262365f15f Only render the Perlin face for the local user. 2013-09-17 10:51:33 -07:00
Andrzej Kapolka
f9426cbecc Working on reading and rendering the rig from Faceshift. 2013-09-16 15:49:40 -07:00