Zach Fox
d4752926b8
First pass - checking performance
2017-05-17 13:51:27 -07:00
Seth Alves
8a88b30da7
Merge pull request #10468 from AndrewMeadows/cleanup-actions
...
cleanup Actions and Constraints part-1
2017-05-17 11:33:53 -07:00
Sam Gateau
0f250e693d
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-17 09:49:20 -07:00
Dante Ruiz
a18940142e
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-17 16:23:50 +01:00
Brad Hefta-Gaub
764bfe94f5
Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
...
Feature/snap turn smoothing 21270
2017-05-16 21:05:38 -07:00
Andrew Meadows
d065b569d3
support for variable avatar mass by size
2017-05-16 16:03:51 -07:00
Andrew Meadows
805d23567d
fix simple typo
2017-05-16 16:03:50 -07:00
Atlante45
201f81f20a
Don't wait on the sandbox
2017-05-16 14:41:57 -07:00
Andrew Meadows
e9c703b147
add deprecation log for DYNAMIC_TYPE_SPRING
2017-05-16 10:34:39 -07:00
Andrew Meadows
9e08dadaf4
Remove ObjectActionSpring
2017-05-15 22:11:42 -07:00
Dante Ruiz
724f849d88
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-16 00:15:18 +01:00
Dante Ruiz
975b1ab077
moved low velocity filter in the input system
2017-05-16 00:15:06 +01:00
samcake
2df6d0df48
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-15 13:40:56 -07:00
Seth Alves
66a1dbfcfe
Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation
...
cleanup Head::simulate() code
2017-05-15 11:21:43 -07:00
Vladyslav Stelmakhovskyi
cc10fc81b7
Fix crash in sit script
2017-05-13 20:57:04 +02:00
anshuman64
49d4cf4e68
Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config
...
More stable IK when hips, feet and chest are controlled via external input
2017-05-12 17:22:29 -07:00
Seth Alves
4af0a85aa0
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-12 13:03:58 -07:00
Clément Brisset
1658ced671
Merge pull request #10437 from Atlante45/feat/faster-startup
...
Use baked default skybox
2017-05-12 11:35:51 -07:00
Seth Alves
bc6fb182eb
pull out motor action, fix import of slider and cone-twist constraints
2017-05-12 10:32:28 -07:00
samcake
3393456d91
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-12 10:15:13 -07:00
Seth Alves
c6131916e1
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-12 09:46:21 -07:00
Seth Alves
e1c805e76f
lock in Overlays::findRayIntersectionInternal
2017-05-11 17:02:00 -07:00
Andrew Meadows
a43447310d
remove physics dependency from avatars-render lib
2017-05-11 15:22:22 -07:00
Andrew Meadows
f4df223d23
cleanup Head::simulation() code
2017-05-11 14:46:00 -07:00
Seth Alves
9d63113e62
Merge pull request #10337 from vladest/audio-source-sync
...
Audio source sync
2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi
bd6ac7a39e
Code style fixes
2017-05-11 20:38:09 +02:00
Andrew Meadows
0852852f39
Merge pull request #10443 from ctrlaltdavid/21326-2
...
Fix avatar recording playback mouth not moving
2017-05-11 10:41:41 -07:00
samcake
6b32219f5f
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-11 10:07:27 -07:00
Seth Alves
4042e2bceb
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-11 09:29:30 -07:00
Vladyslav Stelmakhovskyi
f963233a7b
Merge branch 'master' into audio-source-sync
2017-05-11 15:25:24 +02:00
Thijs Wenker
0a3a2705af
Merge pull request #10426 from huffman/fix/tablet-invisible-by-default
...
Fix tablet showing up for a short period of time on launch
2017-05-11 15:03:52 +02:00
David Rowe
1b855f2c6b
Voice modulation and facetrackers write to transient blendshapes
2017-05-11 18:15:38 +12:00
Anthony J. Thibault
147d067c4e
Merge branch 'master' into feature/ik-solver-init-config
2017-05-10 18:12:39 -07:00
samcake
737fdf9dd8
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-10 17:28:07 -07:00
Atlante45
79d53d92a1
Use baked default skybox
2017-05-10 16:03:02 -07:00
Vladyslav Stelmakhovskyi
2328da3c48
Merge branch 'master' into audio-source-sync
2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi
2d46f9d30e
Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum
2017-05-10 21:21:39 +02:00
Brad Hefta-Gaub
f91f42b0c8
Merge pull request #10411 from zzmp/feat/tester-flag
...
Add launch.tester to user_actions
2017-05-10 11:58:24 -07:00
samcake
39f6e22da3
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-10 09:48:26 -07:00
Seth Alves
9184936496
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-10 09:30:39 -07:00
Anthony J. Thibault
93b8dc550c
Merge branch 'master' into feature/ik-solver-init-config
2017-05-10 09:03:21 -07:00
Ryan Huffman
bddfdfa838
Adjust Web3DOverlay to load QML even if not visible
2017-05-09 16:01:20 -07:00
Zach Pomerantz
45feee38b2
Merge pull request #10269 from zzmp/fix/audio-bg-join
...
Cleanup Audio background threads on shutdown
2017-05-09 17:23:36 -04:00
trent
a3545661dc
Merged hifi/master into this PR and resolved merge conflicts.
2017-05-09 15:09:53 -04:00
samcake
c36035d3eb
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-09 10:46:38 -07:00
trent
9c8b844e26
Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270
2017-05-09 12:51:28 -04:00
trent
7faed38bb5
Just use the smooth time constant instead of a variable.
2017-05-09 12:51:25 -04:00
Seth Alves
1e1968357a
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-09 09:24:50 -07:00
Andrew Meadows
e92e710cdc
Merge pull request #10413 from humbletim/fix_lookat_regression
...
Fix lookAt eye snapping
2017-05-09 08:51:10 -07:00
Vladyslav Stelmakhovskyi
7ab6909c77
Merge branch 'master' into audio-source-sync
2017-05-09 11:08:08 +02:00
humbletim
29b1ac3572
optimizations per feedback
2017-05-08 21:50:24 -04:00
humbletim
42d1498d20
call Model::updateRig (not Parent::updateRig)
2017-05-08 21:19:18 -04:00
Andrew Meadows
2835a73c6b
Merge pull request #10071 from AndrewMeadows/walk-up-steps
...
avatar can walk up steps
2017-05-08 18:17:16 -07:00
Zach Pomerantz
defc3c1c4f
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
2017-05-08 19:55:10 -04:00
Seth Alves
de589a32f3
clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring
2017-05-08 16:36:51 -07:00
Zach Pomerantz
929079df97
add launch.tester to user_actions
2017-05-08 19:33:09 -04:00
humbletim
ef0e32643d
update refactored logic to match previous application behavior
2017-05-08 18:53:47 -04:00
Anthony J. Thibault
712fcbe27a
Removed cruft/debug code & comments
2017-05-08 15:06:30 -07:00
Anthony J. Thibault
7af93f9fea
Hooked up IK constraint rendering
2017-05-08 15:06:29 -07:00
Anthony J. Thibault
e992d6703a
WIP: debug render joint constraints.
2017-05-08 15:06:28 -07:00
Anthony J. Thibault
a260163aee
WIP commit, first pass at generating limit center joints + debug draw
2017-05-08 15:06:27 -07:00
Andrew Meadows
afe0447322
remove unnecessary virtual keyword
2017-05-08 14:27:39 -07:00
Andrew Meadows
138a987a8f
_rotationChanged is a timestamp
2017-05-08 14:27:18 -07:00
Vladyslav Stelmakhovskyi
d0111ac0bb
Merge branch 'master' into audio-source-sync
2017-05-08 20:09:34 +02:00
Seth Alves
c8cdad5b4e
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-08 11:02:42 -07:00
Chris Collins
4bfb23b5d2
Merge pull request #10388 from humbletim/21308
...
CR #21308 Fix Script.print
2017-05-08 10:46:49 -07:00
Chris Collins
0351ac1575
Merge pull request #10401 from jherico/fix_benny_hill_animations
...
Fix sped up animations
2017-05-08 09:11:23 -07:00
Sam Cake
d3724116d9
Using the items to pick the key light!
2017-05-08 00:20:20 -07:00
Brad Davis
b63015eaea
Fix sped up animations
2017-05-06 14:34:28 -07:00
Seth Alves
5d539bcc17
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-06 07:49:02 -07:00
Seth Alves
9e0845f17e
Merge pull request #10387 from vladest/tablet-performance
...
Decrease CPU usage in tabletUI periodical updates
2017-05-06 07:07:29 -07:00
Chris Collins
820ed5049b
Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire
...
Fix -- dont send non-entity edits to entity-server
2017-05-05 16:37:27 -07:00
samcake
bc1e5101ac
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-05 16:13:51 -07:00
Seth Alves
b2ccc33a79
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-05 14:52:07 -07:00
Zach Pomerantz
ca7cd61c64
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
2017-05-05 13:04:01 -04:00
Chris Collins
fd836dcd68
Merge pull request #10366 from Atlante45/feat/normal-map-compression
...
Feat/normal map compression
2017-05-05 10:03:01 -07:00
Chris Collins
8d49540f3a
Merge pull request #10380 from vladest/rightclick-fix
...
Rightclick fix
2017-05-05 10:01:11 -07:00
Andrew Meadows
63042eea3a
fix flawed fix of bad rebase
2017-05-05 09:37:00 -07:00
Andrew Meadows
41ad25ade1
fix bad rebase of changed menu option
2017-05-05 09:37:00 -07:00
Andrew Meadows
fe401c7488
improved management of collisionless avatar state
2017-05-05 09:37:00 -07:00
Andrew Meadows
d34b667e82
remove kinematic character controller implemention
2017-05-05 09:35:49 -07:00
Andrew Meadows
0aa579225c
even more correct API: MyAvatar.collisionsEnabled
2017-05-05 09:35:49 -07:00
Andrew Meadows
559f5836c5
restore MyAvatar.setCharacterControllerEnabled()
2017-05-05 09:35:49 -07:00
Andrew Meadows
94ee6d6838
fix driving motion of collisionless avatars
2017-05-05 09:35:49 -07:00
Andrew Meadows
c47e26174c
support collisionless avatar when playing recording
2017-05-05 09:35:49 -07:00
Andrew Meadows
e21bd7a67a
help avatar walk up steps
2017-05-05 09:35:49 -07:00
humbletim
25807a5258
fix warning color
2017-05-05 09:48:24 -04:00
Vladyslav Stelmakhovskyi
e395a51c60
Merge with master
2017-05-05 07:05:16 +02:00
Seth Alves
92966377fb
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 19:05:57 -07:00
Seth Alves
0406cc41e0
if model-overlay has no name, use its url
2017-05-04 18:37:04 -07:00
Seth Alves
c04c0c5b13
if model-overlay has no name, use its url
2017-05-04 18:36:51 -07:00
samcake
df2c5b8c23
adding the notification for keyLight changes modifying the KeyLIghtPayoad
2017-05-04 18:28:12 -07:00
Seth Alves
960bab6e4e
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 16:42:57 -07:00
Atlante45
ecda313223
Add runtime access to compression settings
2017-05-04 15:07:59 -07:00
humbletim
6cb95b2393
add and connect handlers for scriptWarningMessage and scriptInfoMessage signals
2017-05-04 17:43:00 -04:00
Brad Davis
9def788956
Merge pull request #10314 from jherico/avatars-renderer
...
Migrate Avatar rendering code to library
2017-05-04 14:23:49 -07:00
Brad Davis
2d0bbf70ae
Migrate core avatar rendering functionality to library
2017-05-04 14:08:59 -07:00
Anthony Thibault
7006fa6da4
Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update
...
grab is driven by timer rather than update, load tablet model with high priority
2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi
ba5a371da1
Decrease CPU usage in tabletUI periodical updates
2017-05-04 22:54:41 +02:00
humbletim
fe36e6a793
fix JSConsole script message handlers and about: filename
2017-05-04 16:45:12 -04:00
Vladyslav Stelmakhovskyi
d522864141
Remove debug prints
2017-05-04 21:16:58 +02:00
Vladyslav Stelmakhovskyi
c8a9b02c7a
Block only secondary button
2017-05-04 20:26:02 +02:00
Vladyslav Stelmakhovskyi
4cefa0379c
Merge branch 'master' into rightclick-fix
2017-05-04 16:13:07 +02:00
Vladyslav Stelmakhovskyi
99ed2556f2
Do not send non primary button events to Tablet window
2017-05-04 16:11:07 +02:00
Seth Alves
69944cc76d
add a way to get a SpatiallyNestable's name without knowing what its type is
2017-05-03 21:32:49 -07:00
Seth Alves
a259d00b63
Merge pull request #10332 from sethalves/bullet-constraints-5
...
Bullet constraints
2017-05-03 16:30:34 -07:00
Zach Fox
4d49ae5b09
Remove the +1s
2017-05-03 15:43:57 -07:00
Zach Fox
07d3e482cf
ARG
2017-05-03 15:40:39 -07:00
trent
d7ed727faf
Adjustments based on PR feedback, though it looks like this snap-turn-snafu-story is not yet complete.
2017-05-03 16:56:18 -04:00
trent
ca4b563768
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-03 16:34:34 -04:00
Zach Pomerantz
4a8f5e380f
Merge pull request #10358 from zzmp/fix/minimize-deadlock
...
Fix deadlock from minimizing
2017-05-03 15:06:27 -04:00
Zach Fox
ae72b9b73d
Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2
...
Lots of Snapshot app improvements, Round Two
2017-05-03 11:44:40 -07:00
trent
fc3cce6b73
Fixed the silly and stupid subtle issue that was causing the bug in inconsistencies.
2017-05-03 12:35:35 -04:00
trent
24f2678cdd
Adjusted the smooth time for the snap-turn remote view. Fixed tab issue.
2017-05-03 12:05:21 -04:00
trent
786838d092
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 20:21:35 -04:00
Zach Pomerantz
ad8d3e5490
continue idling while minimized
2017-05-02 20:05:55 -04:00
trent
557a8fffd7
Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D
2017-05-02 19:56:47 -04:00
Trent Polack
0a5dfbb9af
Changed l to interp.
...
In my defense, if anyone ever looked at it and thought the 'l' was a '1', they should never be programming unless they used a special language where you could reassign numbers.
2017-05-02 19:10:33 -04:00
Sam Gateau
a7eecdfb26
Merge pull request #10265 from samcake/ambient
...
Making the render engine Job/Task system configurable and reusable
2017-05-02 14:55:53 -07:00
Zach Fox
d1dff7606c
Lint cleanup; Immediate share button visibility;
2017-05-02 14:10:24 -07:00
Zach Fox
5302110e7b
Merge pull request #10346 from zfox23/newSnapshotReview_Improvements
...
Lots of Snapshot app improvements, Round One
2017-05-02 13:00:08 -07:00
Vladyslav Stelmakhovskyi
e789b69a8e
Merge branch 'master' into audio-source-sync
2017-05-02 20:57:01 +02:00
trent
f79e032841
Silly online git merge tool. You are silly. Errors fixed.
2017-05-02 14:48:27 -04:00
Zach Fox
c9e0679b70
Subscribe to changes to snapshotsLocation setter for better UX
2017-05-02 10:55:57 -07:00
trent
6d1fb8a6f8
Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270
2017-05-02 13:55:39 -04:00
trent
49881b5ea2
Actually the full set of changes. Kids: don't forget to pop your stash.
2017-05-02 13:55:32 -04:00
samcake
df54ad2339
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-02 10:50:39 -07:00
Trent Polack
8f93a9a074
Merge branch 'master' into feature/snap-turn-smoothing-21270
2017-05-02 13:43:32 -04:00
trent
8f34ec4c7f
Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.
2017-05-02 13:41:34 -04:00
Brad Davis
425405f72d
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
...
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
Seth Alves
dc569051f9
Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update
2017-05-02 09:50:13 -07:00
trent
6317857e3d
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 12:11:39 -04:00
samcake
4514da2a09
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-01 16:49:35 -07:00
Seth Alves
45a50f9a46
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5
2017-05-01 15:32:29 -07:00
Seth Alves
a75544a9fb
Merge pull request #10319 from hyperlogic/feature/head-standard-action
...
Head, Hips and Chest IK can now be controlled from Controller inputs
2017-05-01 13:03:23 -07:00
trent
4d7eeed343
Marking MyAvatar's rotation as dirty if smoothing is going down.
2017-05-01 15:21:25 -04:00
Brad Davis
40e4e2f307
Merge pull request #10327 from jherico/face_tracker_refactor
...
Remove Faceshift
2017-05-01 12:14:55 -07:00
trent
773563850c
Merge hifi/master with my branch, fixed merge issue.
2017-05-01 13:23:02 -04:00
Vladyslav Stelmakhovskyi
dde363ef3d
Merge branch 'master' into audio-source-sync
2017-05-01 18:42:53 +02:00
Vladyslav Stelmakhovskyi
28447cde0b
Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items
2017-05-01 18:41:38 +02:00
Anthony J. Thibault
0c09823f67
clang warning fixes, unused variables...
2017-05-01 09:10:31 -07:00
Seth Alves
7f69bdecb2
first try at angular-velocity setting action
2017-05-01 07:06:21 -07:00
Seth Alves
7ce0ef2ec4
fix spring action so that it can be linear or rotational or both
2017-04-30 10:04:07 -07:00
Seth Alves
4c4e0dffcc
bullet cone-twist constraint
2017-04-29 12:30:12 -07:00
Seth Alves
6623028d71
ball-and-socket constraint
2017-04-29 08:35:55 -07:00
Seth Alves
9e7ef83bd1
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4
2017-04-29 07:01:44 -07:00
Brad Davis
2b43a1989f
Moving face and eye trackers out of interface
2017-04-28 23:28:17 -07:00
Brad Davis
5e1bc0d908
Remove faceshift
2017-04-28 16:34:54 -07:00
Stephen Birarda
c518aa55be
Merge pull request #10312 from birarda/upload-new-models-to-entity
...
add an entity file replacement via domain-server content page
2017-04-28 16:06:05 -07:00
Vladyslav Stelmakhovskyi
368334e07e
Merge branch 'master' into audio-source-sync
2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi
d18ac6dd49
Reimplemented Tablet Audio screen using C++ model
2017-04-28 23:02:28 +02:00
Anthony J. Thibault
108cd80bb5
Merge branch 'master' into feature/head-standard-action
2017-04-28 10:41:29 -07:00
Andrew Meadows
994eed7b83
safer delete of AvatarMotionStates
2017-04-28 10:18:19 -07:00
Stephen Birarda
9bc0609b1e
address code review comments
2017-04-28 10:17:48 -07:00
Seth Alves
2a0fc5b34c
Merge pull request #10273 from hyperlogic/feature/hips-ik-target
...
Avatar IK system now supports manipulating the hips.
2017-04-28 09:17:33 -07:00
Anthony J. Thibault
b80270400f
Merge branch 'master' into feature/hips-ik-target
2017-04-27 18:15:12 -07:00
Anthony J. Thibault
2120e63e3a
Merge branch 'master' into feature/head-standard-action
2017-04-27 17:51:13 -07:00
Stephen Birarda
038ac745c8
clear domain octree details if ES killed
2017-04-27 17:47:18 -07:00
Anthony J. Thibault
764f6c69ea
Head input action will override the HMD for IK.
2017-04-27 17:39:25 -07:00
Zach Fox
3ce81844da
Snapshot JS interface for better Settings handling
2017-04-27 14:01:08 -07:00
Zach Fox
6711e8cbc2
Remove duplicate setting; Make settings page open; button state
2017-04-27 14:01:07 -07:00
Zach Fox
3221214283
New Snap FTUE flow
2017-04-27 14:01:07 -07:00
Zach Fox
eaa699bbfd
Wow, it's really coming together!
2017-04-27 14:01:06 -07:00
Zach Fox
880bcf3b1e
Checkpoint
2017-04-27 14:01:06 -07:00
Zach Fox
16b4af8a9d
Rearchitecture
2017-04-27 14:01:06 -07:00
Howard Stearns
88c3b4d9d3
Merge pull request #10258 from howard-stearns/watch-for-announcements
...
watch for announcements
2017-04-27 14:00:39 -07:00
Andrew Meadows
5cf233db3a
less labyrinth
2017-04-27 13:16:50 -07:00
Andrew Meadows
aa90a6bd02
use static methods for setting avatar debug options
2017-04-27 13:16:50 -07:00
Andrew Meadows
75b563d598
restore rendering of avatar receive stats
2017-04-27 13:16:50 -07:00
Andrew Meadows
442080dec7
remove unused RenderArgs::_cameraMode hack
2017-04-27 13:16:50 -07:00
Andrew Meadows
00b05ed137
connect menu options to avatar render features
2017-04-27 13:16:50 -07:00
Andrew Meadows
823f3a73c6
remove commented out cruft
2017-04-27 13:16:50 -07:00
Andrew Meadows
72f5860538
restore RecordingScriptingInterface to Application
2017-04-27 13:16:50 -07:00
Andrew Meadows
caf6a77baf
repair bad merge during rebase
2017-04-27 13:16:50 -07:00
Andrew Meadows
2441536de3
remove Avatar dependency on AvatarMotionState
2017-04-27 13:16:49 -07:00
trent
53f47c132f
Avatar snap-turn rotation smoothing (sent out from the local client outward).
2017-04-27 16:12:25 -04:00
Andrew Meadows
010d1dfa22
remove Menu dependency from Avatar class
2017-04-27 13:11:57 -07:00
Andrew Meadows
6393972874
remove AvatarManager dependency from Avatar
2017-04-27 13:11:57 -07:00
Andrew Meadows
65682a914d
remove cufty AvatarManager LocalLights feature
2017-04-27 13:11:57 -07:00
Andrew Meadows
4c212fb1e5
pull qApp spaghetti out of Avatar class
...
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
2017-04-27 13:11:57 -07:00
Seth Alves
b0c12dd84a
warn rather than crash if we get unexpected action data
2017-04-27 13:04:47 -07:00
Seth Alves
203a14f2a0
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux
2017-04-27 12:56:11 -07:00
David Kelly
63468cc9e1
Thread safety for sending location
2017-04-27 12:20:56 -07:00
Philip Rosedale
f555291d92
Merge pull request #10296 from Triplelexx/21296
...
21296 - Move two menu items
2017-04-27 11:37:07 -07:00
Seth Alves
93f9716557
merge from upstream
2017-04-27 10:17:00 -07:00
Seth Alves
15661987be
load tablet overlay models with higher priority
2017-04-27 10:16:08 -07:00
Seth Alves
68b59e4601
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux
2017-04-27 07:56:49 -07:00
Seth Alves
b196dd082b
expose bullet slider constraint to javascript
2017-04-27 07:56:35 -07:00
Triplelexx
a154879001
change menu item text Audio Noise Reduction to Noise Reduction
2017-04-27 03:25:24 +01:00
Triplelexx
f9c6cb27f4
change menu item for avatar collisions to "Collide with world"
2017-04-27 03:16:04 +01:00
ZappoMan
c0df82ff69
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62
remove debugging code
2017-04-26 18:36:44 -07:00
Triplelexx
f795027ab7
change menu item locations
...
AudioNoiseReduction moved under Audio. Avatar Collision under Avatar.
2017-04-27 01:09:04 +01:00
anshuman64
d146431e9b
Merge pull request #10268 from druiz17/input-recorder
...
Input recorder/ input playback system for all input actions
2017-04-26 16:20:20 -07:00
humbletim
f8bbd9174c
Merge remote-tracking branch 'upstream/master' into 21281
2017-04-26 18:26:15 -04:00
anshuman64
5bd9b2e631
Merge pull request #10130 from ctrlaltdavid/21249
...
New avatar record and playback script
2017-04-26 15:18:30 -07:00
Ryan Huffman
8ba56a96df
Merge pull request #10240 from zzmp/fix/hmd-tutorial
...
Condition tutorial on active HMD
2017-04-26 14:00:02 -07:00
Andrew Meadows
fd874429c1
remove unused cruft
2017-04-26 12:51:16 -07:00
Andrew Meadows
ac751029c0
remove identity cache code
2017-04-26 12:51:16 -07:00
Andrew Meadows
4511156d7b
cache avatar identity info forever
2017-04-26 12:50:48 -07:00
Anthony J. Thibault
ef43ff4b99
Add default pose matrices to InputCalibrationData structure
2017-04-26 11:55:24 -07:00
ZappoMan
5dd6daaad7
send identity on nodeActivated not nodeAdded
2017-04-26 11:42:38 -07:00
Dante Ruiz
d8e6e8e7d0
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-26 16:53:02 +01:00
David Rowe
1b635d8c5e
Replace FIXMEs with proper code
2017-04-26 13:29:51 +12:00
David Rowe
4a5f84f4b9
Merge branch 'master' into 21249
...
# Conflicts:
# libraries/audio-client/src/AudioClient.cpp
2017-04-26 13:24:18 +12:00
ZappoMan
65801cbb4d
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 18:21:17 -07:00
ZappoMan
5164aa4056
hacking
2017-04-25 18:21:09 -07:00
trent
2963d3d212
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-04-25 19:31:21 -04:00
ZappoMan
90cdeb9582
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 16:09:59 -07:00
Atlante45
33f58f99d1
CR
2017-04-25 16:09:31 -07:00
Dante Ruiz
5a9cf554e7
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-25 23:57:48 +01:00
Atlante45
62b7855e1f
Add pending to stats
2017-04-25 15:56:23 -07:00
Atlante45
ad16a935e9
Texture::create returns shared pointer
2017-04-25 15:56:23 -07:00
Atlante45
a450f52427
Start to setup image library
2017-04-25 15:56:22 -07:00
David Rowe
7c2e1aa846
Tidy FIXME
2017-04-26 10:16:35 +12:00
Anthony J. Thibault
dc19f37726
input/controller routing thru skeleton model and rig.
2017-04-25 15:04:47 -07:00
Brad Hefta-Gaub
1962a49f3b
Merge pull request #10225 from sethalves/bullet-constraints-1
...
Bullet constraints + far-grab bootstrap fix
2017-04-25 13:36:47 -07:00
Zach Pomerantz
d2bfcce3f7
Merge pull request #10242 from zzmp/fix/display-log
...
Send changed_display_mode after it changes
2017-04-25 16:36:12 -04:00
trent
f28b58f56e
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-04-25 15:35:11 -04:00
Seth Alves
23592f4a53
get rid of _trackedHeadPosition
...
(cherry picked from commit e909938b232e11400832ae7dd29de16968967668)
2017-04-25 11:03:43 -07:00
Seth Alves
0cd2863df4
start on routing HMD position and rotation through controller interface
...
(cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)
2017-04-25 11:01:52 -07:00
David Rowe
d682924b00
Temporary fix for recording audio
2017-04-25 21:08:10 +12:00
ZappoMan
382645ddd0
more cleanup
2017-04-24 18:01:54 -07:00
ZappoMan
aa955ee360
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762
new approach to the tpose fix, as well as other improvements
2017-04-24 17:36:05 -07:00
Anthony J. Thibault
937f308ba8
code cleanup
2017-04-24 17:04:16 -07:00
humbletim
3641ca3816
add support for jointRotations/jointTranslations to ModelOverlay
2017-04-24 19:24:54 -04:00
humbletim
28b3eef7aa
add getJointTranslations() methods
2017-04-24 19:22:02 -04:00
Zach Pomerantz
4a26785eda
cleanup Audio bg threads in cleanupBeforeQuit
2017-04-24 18:21:27 -04:00
Zach Pomerantz
cd2665fc55
standardize Audio bg thread joins
2017-04-24 18:10:50 -04:00
Anthony J. Thibault
dc3803a225
Re-enable IK _hipsOffset computation when no hips IK target is present.
2017-04-24 13:59:02 -07:00
David Rowe
d52125e2f5
Merge branch 'master' into 21249
2017-04-25 07:19:56 +12:00
Dante Ruiz
f69691afd5
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-24 19:57:48 +01:00
Dante Ruiz
d057dfebf0
got input recording to work
2017-04-24 19:57:38 +01:00
samcake
c36f8da4c0
Fixing build on mac
2017-04-24 10:46:29 -07:00
trent
b00cd66a2a
Revisited where smoothing was done (to a much lower-level); still needs testing.
2017-04-21 22:36:11 -04:00
Seth Alves
17b83dd64c
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-21 17:19:47 -07:00
Andrew Meadows
3f9f16cc98
Merge pull request #10223 from kunalgosar/blendshapesbug
...
Make setBlendshape changes persist
2017-04-21 16:11:13 -07:00
howard-stearns
ce7f3197f6
watch for announcements
2017-04-21 14:27:38 -07:00
ZappoMan
ff45ad53a3
some more CR cleanup
2017-04-21 10:40:41 -07:00
trent
a94f4ca182
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-04-21 13:22:32 -04:00
ZappoMan
f133713d0e
CR feedback
2017-04-21 10:21:34 -07:00
Ken Cooke
a5ed3007b3
Merge pull request #10248 from vladest/notify-sound-inject
...
Notify sound inject
2017-04-21 09:26:36 -07:00
ZappoMan
c03182546b
some cleanup
2017-04-21 09:11:51 -07:00
Dante Ruiz
641a7390ba
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-21 16:46:55 +01:00
David Rowe
daedb94b04
Merge branch 'master' into 21249
2017-04-21 14:50:28 +12:00
ZappoMan
e89b6c5d2c
some initial debugging on tpose avatars
2017-04-20 17:26:31 -07:00
Sam Gateau
a668ed0409
Merge pull request #10244 from samcake/ambient
...
Cleaning the Engine/Task/Job interface
2017-04-20 15:48:21 -07:00
Vladyslav Stelmakhovskyi
2665ede06f
Audio injector cleanup
2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi
b2533b6106
Code nitpick. Pointer cleanup on exit
2017-04-20 21:12:57 +02:00
