Commit graph

14069 commits

Author SHA1 Message Date
Howard Stearns
02fba12a48 Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings 2015-09-11 11:53:19 -07:00
Howard Stearns
67ce0966d1 Rationalize the rig state setters. 2015-09-11 11:52:20 -07:00
Brad Davis
7fecd3261d Fixing bad merge 2015-09-11 11:40:57 -07:00
Brad Davis
244795b629 Merge branch 'homer' into temp
Conflicts:
	interface/src/Application.cpp
2015-09-11 11:21:29 -07:00
Seth Alves
218225e4a5 Merge pull request #5781 from hyperlogic/tony/head-ik
Added head target to AnimGraph IK node.
2015-09-11 10:58:53 -07:00
Anthony J. Thibault
7996a02bd8 Added head target to AnimGraph IK node.
* In HMD mode head orientation and position is set.
* When not in HMD only orientation is set, position should
  default to the underlying pose position.
2015-09-11 09:48:48 -07:00
Stephen Birarda
a286f4e7d0 Merge pull request #5772 from Atlante45/protocol
Asset server node JSON stats
2015-09-11 09:35:39 -07:00
Ryan Huffman
9ab603e9a5 Merge pull request #5773 from birarda/master
fail asset request if hash does not match
2015-09-11 09:09:56 -07:00
Atlante45
449d6a04d8 CR 2015-09-11 14:21:56 +02:00
Atlante45
42d1ab3745 Remove accidentally added header 2015-09-11 14:21:55 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Brad Davis
e9edbb9dd1 Can't promote readlock to writelock 2015-09-10 22:52:40 -07:00
Brad Davis
92eeb564fe PR comments 2015-09-10 20:57:43 -07:00
Brad Davis
aa989c3687 Fixing some entity race condition crashes 2015-09-10 20:53:17 -07:00
Brad Davis
3bc9e8c98d Fixing some entity race condition crashes 2015-09-10 20:43:41 -07:00
Howard Stearns
0870c5ed87 Merge pull request #5768 from hyperlogic/tony/ik-and-controllers
AnimInverseKinematics and AnimController node
2015-09-10 15:38:53 -07:00
Stephen Birarda
973fd80c1d fail asset request if hash does not match 2015-09-10 15:24:37 -07:00
David Rowe
4aa553c183 Stop DDE and EyeTracker early but don't destroy until later in shutdown 2015-09-10 14:53:56 -07:00
Anthony J. Thibault
3149baeefc Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:04:31 -07:00
Anthony J. Thibault
68076ccf45 updated anim graph url to use ik-avatar.json 2015-09-10 10:57:30 -07:00
Andrew Meadows
35b894872d Merge pull request #5753 from ctrlaltdavid/20671
Terminate DDE earlier during shut-down and always at start-up
2015-09-10 07:46:53 -07:00
David Rowe
fdcfa9657c Rework and clarify stopping an existing DDE process 2015-09-09 21:06:50 -07:00
Brad Hefta-Gaub
f29bcd8b6a Merge pull request #5755 from jherico/lisa
Fix possible hang when switching out of Oculus mode
2015-09-09 19:24:00 -07:00
Howard Stearns
da6444a776 Start anim graph in the right saved state on startup. 2015-09-09 17:02:55 -07:00
Howard Stearns
bcf16e52af Merge branch 'master' of https://github.com/highfidelity/hifi into animGraph-cleanup 2015-09-09 16:04:15 -07:00
Howard Stearns
5e8fe29674 Remove unused declaration. 2015-09-09 15:09:06 -07:00
Howard Stearns
c1d68e058e Reduce interconnection between AnimGraph and SkeletonModel by removing init and having MyAvatar:initAnimGraph go directly to rig (just like destroyAnimGraph does). 2015-09-09 15:02:11 -07:00
Brad Davis
382de2b4aa Fix possible hang when switching out of Oculus mode 2015-09-09 14:09:01 -07:00
Howard Stearns
ed2ed525b2 Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate. 2015-09-09 12:15:48 -07:00
David Rowe
01d7e68dbb Terminate DDE earlier during shut-down and always at start-up 2015-09-09 11:29:57 -07:00
Howard Stearns
3f5744712f Remove optional "parent" argument.
GenericThread used to accept an optional "parent" argument, defaulting to nullptr.
This was odd, because the moveToThread() in GenericThread::initialize() would
become a no-op if the instance ever inits QObject(someNonNullParentQObject).
(The only clue would be a log message "QObject::moveToThread: Cannot move objects with a parent",
 and things would end up in the same thread that created the instance.)
As it turns out, all the subclasses of GenericThread do not init
GenericThread(parent), so things worked as expected.
2015-09-09 11:04:17 -07:00
Howard Stearns
5572840133 Convert isHMD reference. 2015-09-09 10:39:36 -07:00
Howard Stearns
73a5714d66 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-09 10:37:11 -07:00
Howard Stearns
f081631075 Explicit cast. 2015-09-09 10:36:52 -07:00
Howard Stearns
24f1387579 Consistently use brace initialization in class headers. 2015-09-09 10:34:08 -07:00
Howard Stearns
f818ac2b74 Merge pull request #5744 from hyperlogic/tony/enable-lean-flag
Added a flag to enable and disable lean.
2015-09-09 10:18:12 -07:00
Howard Stearns
74c92af8e0 Merge pull request #5741 from AndrewMeadows/brokenCapsules
fix for bad bounding capsules for avatars
2015-09-09 09:33:57 -07:00
Anthony J. Thibault
75ecf0020d WIP commit, added AnimController node. 2015-09-08 20:34:21 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
Andrew Meadows
614c0be59a HACK so legless avatars don't drag their knuckles 2015-09-08 17:09:37 -07:00
Seth Alves
e06461ea15 Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements
AnimDebugDraw Improvements
2015-09-08 17:07:51 -07:00
Howard Stearns
eb67254e54 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:14 -07:00
Anthony J. Thibault
387d50c217 Added a flag to enable and disable lean.
This should help improve our idle and walk animations, because
animation on the "lean" joint was being lost, even when we did
not require procedural leaning.
2015-09-08 16:35:06 -07:00
Howard Stearns
2c856e4b08 Work around animation cache misbehavior wrt threads. 2015-09-08 16:22:06 -07:00
Howard Stearns
26f63a44fc Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 15:30:22 -07:00
Seth Alves
8a60bba4eb Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers 2015-09-08 15:28:46 -07:00
Stephen Birarda
a3959109f1 resolve conflicts on merge with upstream/master 2015-09-08 15:18:39 -07:00
Andrew Meadows
281e4f21fc fix avatar bounding capsule calculations 2015-09-08 15:03:12 -07:00
Howard Stearns
27f4bca0a4 Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread!
Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.
2015-09-08 14:49:58 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
25aeda2e18 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-08 08:40:51 -07:00
Howard Stearns
d472fd66ff Cleanup. 2015-09-07 17:26:22 -07:00
Howard Stearns
efeaf21305 Checkpoint smoother. 2015-09-07 16:32:51 -07:00
Howard Stearns
0065c64b31 Snapshot of no-judder, before cleanup. 2015-09-07 09:57:05 -07:00
James B. Pollack
670c5ee484 Merge pull request #5723 from jherico/lisa
Toggle mute while holding the hydras
2015-09-06 21:45:47 -07:00
David Rowe
6923e3ce70 Fix logging of intentionally crashing Interface 2015-09-06 16:28:55 -07:00
Anthony Thibault
083c5b6738 Merge pull request #5721 from howard-stearns/default-avatar-for-animations
avatar animation defaults
2015-09-04 17:06:53 -07:00
Brad Davis
644e81e20b Toggle mute while holding the hydras 2015-09-04 16:19:58 -07:00
Anthony J. Thibault
69e463bbfd AnimDebugDraw Improvements
* Now always works, regardless of whether or not Rig or AnimGraph animations
  are enabled.
* Changed joint radius to 1 cm.
* Changed xyz axis length to 4 cm.
2015-09-04 16:01:05 -07:00
Brad Hefta-Gaub
b63e15f2e9 fix a bug in bad PPS calculation 2015-09-04 15:06:56 -07:00
Howard Stearns
d3106de7c1 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-04 14:32:58 -07:00
Howard Stearns
086afc47b1 Avatar animations on by default. (Using the now old animation machinery.)
Default robot avatar consistent with the animations.
Don't require all the bones to be present.
2015-09-04 14:24:37 -07:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Anthony J. Thibault
5882ec02d0 Merge branch 'master' into ajt/new-anim-system 2015-09-04 11:05:29 -07:00
Seth Alves
8c3bea6d0d Merge pull request #5713 from AndrewMeadows/flerovium
fix collision shape of avatars
2015-09-04 09:37:17 -07:00
Anthony J. Thibault
df28c7bf1a Merge branch 'master' into ajt/new-anim-system 2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub
20bd14c8db Merge pull request #5684 from rabedik/fxaa
Post-process anti-aliasing effect
2015-09-04 09:01:39 -07:00
Brad Hefta-Gaub
2eb3d90ac2 Merge pull request #5708 from howard-stearns/new-default-avatar-collision-sound
Change default avatar collision sound
2015-09-04 08:48:30 -07:00
Brad Davis
c8069ba73c Working on magballs polish 2015-09-03 20:09:54 -07:00
Howard Stearns
c0fec44f32 Menu item to switch between threaded and not (without restart!). 2015-09-03 19:34:25 -07:00
Anthony J. Thibault
3716d5612b Merge branch 'master' into ajt/new-anim-system 2015-09-03 19:20:06 -07:00
Andrew Meadows
16dfc39f5f fix collision shape of avatars 2015-09-03 18:22:35 -07:00
Howard Stearns
41daea7d92 Merge pull request #5710 from sethalves/fix-stuck-avatars
Fix stuck avatars
2015-09-03 16:26:07 -07:00
Anthony J. Thibault
85cb503152 Made Enable Anim Graph menu option dynamic.
It will load the anim graph when enabled and destroy
the anim graph when disabled.
2015-09-03 14:46:44 -07:00
Seth Alves
36ca789d92 fix differential avatar-joint sending to work if more than 2 avatars are in the domain 2015-09-03 14:08:04 -07:00
Howard Stearns
32eb51d0fa Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-03 13:55:57 -07:00
Howard Stearns
d53c1d0fba Change default avatar collision sound.
Note that this only used when Interface.ini does not already have a setting, and the empty string is a valid setting.
To reset to default, either delete Interface.ini or the line in it that begins with collisionSoundURL=, or just set
Interface|Edit->Preferences->Avatar collision sound URL to
https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav
2015-09-03 13:22:04 -07:00
Brad Davis
70ffe10057 Use a constant log file and rollover accumulated logs to a new file based on startup, time or size 2015-09-02 21:56:58 -07:00
Brad Hefta-Gaub
25673831c2 Merge pull request #5689 from jherico/lisa
Adding 'web3d' overlay type
2015-09-02 21:31:38 -07:00
Anthony J. Thibault
30264e9c3d Added animation debug draw items to menu.
* Debug Draw Bind Pose - used to display the current avatar's bind pose
* Debug Draw Animation - used to display the current avatar's AnimGraph animation.
  Currently does not work with old animation so it's only valid when Enable Anim Graph is true.
* Draw Mesh - used to hide or display the avatar mesh.
2015-09-02 21:04:29 -07:00
Brad Davis
1f83d04423 Fix oculus crash on switching display plugin to something else 2015-09-02 18:28:43 -07:00
Brad Davis
b6ef2e314f Adding 'web3d' overlay type 2015-09-02 18:25:49 -07:00
Brad Hefta-Gaub
b199e9e593 Merge pull request #5703 from jherico/marge
Support HTML colors in overlays
2015-09-02 17:58:44 -07:00
Anthony J. Thibault
de31b92fd5 Merge branch 'master' into ajt/new-anim-system 2015-09-02 17:53:56 -07:00
Anthony J. Thibault
46b3a7fd23 Improved default avatar.json state machine.
Now triggers 7 states.
Idle, WalkFwd, WalkBwd, StrafeLeft, StrafeRight, TurnLeft & TurnRight.
As well as variable speed walking to match current velocity.
2015-09-02 17:28:06 -07:00
Howard Stearns
389e752b6e Merge pull request #5695 from AndrewMeadows/dysprosium
avoid bad joints when computing avatar bounding capsule
2015-09-02 15:58:42 -07:00
Brad Davis
54b7a063e2 Support HTML colors in overlays 2015-09-02 15:56:37 -07:00
Andrew Meadows
992bd5c9d2 fix sixense and vive rotation readings for palms 2015-09-02 11:37:36 -07:00
Andrew Meadows
eb78b39bea fix typo that broke build and remove warning 2015-09-02 11:31:05 -07:00
Anthony J. Thibault
4a749a0403 Updated MyAvatar to use animGraph from gist instead of local host. 2015-09-02 10:41:04 -07:00
Anthony J. Thibault
d151474446 Merge branch 'master' into ajt/new-anim-system 2015-09-02 10:00:36 -07:00
Andrew Meadows
b7d892cfcd Merge pull request #5691 from ctrlaltdavid/display-names-in-front
Only render display names if in front of camera
2015-09-01 19:59:06 -07:00
Anthony J. Thibault
7b4cb8655c First pass integration of new anim system into rig. 2015-09-01 17:57:01 -07:00
Stephen Birarda
e5a10e3174 resolve conflicts on merge with upstream/master 2015-09-01 17:07:32 -06:00
Howard Stearns
8cf71f285d Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-01 16:03:40 -07:00
Andrew Meadows
a7d57d7c60 cleanup whitespace 2015-09-01 14:31:47 -07:00
Andrew Meadows
4a7a384c65 avoid bad joints when computing bounding capsule 2015-09-01 14:12:14 -07:00
Stephen Birarda
33f6933544 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-01 14:36:16 -06:00
Seth Alves
76923583ee Interface only sends joint data to avatar-mixer if they have changed enough since the last send 2015-09-01 13:31:34 -07:00