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
|
0b393c845a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-05-15 13:38:03 -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 |
|
samcake
|
b627fe463b
|
Generate correct KTX for the default Sky
|
2017-05-15 10:50:10 -07:00 |
|
Anthony J. Thibault
|
1e276d113c
|
Added support for weights per target
|
2017-05-15 09:26:24 -07:00 |
|
Anthony J. Thibault
|
67fbb15faa
|
WIP: initial implementation of flexCoefficients
|
2017-05-15 09:26:23 -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 |
|
Seth Alves
|
fabcd7e8e0
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-12 10:31:55 -07:00 |
|
Howard Stearns
|
63f2a1061a
|
Merge pull request #10447 from davidkelly/dk/smoothScrollFeed
animate scroll of partially visible cards
|
2017-05-12 10:13:49 -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
|
b14b0ef403
|
Merge pull request #10449 from sethalves/fix-overlay-rayintersection-crash
lock in Overlays::findRayIntersectionInternal
|
2017-05-11 19:13:43 -07:00 |
|
Anthony Thibault
|
c40e3d6ac9
|
Merge pull request #10272 from Triplelexx/21292
21292 - Implement a script to hand-raise while in desktop mode
|
2017-05-11 17:38:27 -07:00 |
|
David Kelly
|
a9716313be
|
cr feedback -- really good feedback in fact
|
2017-05-11 17:02:37 -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 |
|
David Kelly
|
ae5f9e4fb1
|
animate scroll of partially visible cards
|
2017-05-11 15:10:19 -07:00 |
|
Andrew Meadows
|
f4df223d23
|
cleanup Head::simulation() code
|
2017-05-11 14:46:00 -07:00 |
|
druiz17
|
e4df4369ad
|
Merge pull request #10436 from druiz17/config-ui
Added the ability to choose puck configuration from the general settings
|
2017-05-11 13:39:05 -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 |
|
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 |
|
Atlante45
|
79d53d92a1
|
Use baked default skybox
|
2017-05-10 16:03:02 -07:00 |
|
Dante Ruiz
|
0f0bf79367
|
Merge branch 'master' of github.com:highfidelity/hifi into config-ui
|
2017-05-10 22:12:26 +01:00 |
|
Dante Ruiz
|
4365907462
|
drop down puck configuration for gernal settings
|
2017-05-10 22:12:11 +01: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 |
|
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 |
|
Dante Ruiz
|
fbbfe18e2a
|
Merge branch 'master' of github.com:highfidelity/hifi into vive-head-input
|
2017-05-10 00:10:38 +01:00 |
|
Dante Ruiz
|
bb4c0d972d
|
head routed through the vive input plugin
|
2017-05-10 00:10:26 +01:00 |
|
Zach Fox
|
8c2851b996
|
Merge pull request #10425 from zfox23/PAL_FixConnectionsDrift
Enable the PAL to update data about a single connection
|
2017-05-09 16:01:45 -07:00 |
|
Ryan Huffman
|
bddfdfa838
|
Adjust Web3DOverlay to load QML even if not visible
|
2017-05-09 16:01:20 -07:00 |
|
anshuman64
|
b796d8e484
|
Merge pull request #10412 from druiz17/config-pucks
Moved the puck configuration to actions into the vive controller plugin
|
2017-05-09 15:29:51 -07:00 |
|
Zach Fox
|
cf3c10c5b1
|
Fix the bugs, add the feature
|
2017-05-09 14:40:41 -07:00 |
|
Dante Ruiz
|
f90bfd0c9e
|
Merge branch 'master' of github.com:highfidelity/hifi into config-pucks
|
2017-05-09 22:35:13 +01: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 |
|
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 |
|
Anthony J. Thibault
|
84aa86b464
|
Added animVar support for IK solutionSource.
|
2017-05-08 18:07:45 -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
|
f8cab08b19
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-08 16:37:19 -07: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 |
|
Dante Ruiz
|
2d3eb7ba07
|
Merge branch 'master' of github.com:highfidelity/hifi into config-pucks
|
2017-05-09 00:28:09 +01: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 |
|
David Rowe
|
116175cf9f
|
Fix going back from Twitter password recovery page
|
2017-05-09 09:03:48 +12:00 |
|
David Rowe
|
c8328e9b9f
|
Merge branch 'master' into 21319
|
2017-05-09 08:04:27 +12:00 |
|
Vladyslav Stelmakhovskyi
|
fa9a4053ca
|
Save selected device in settings to make sure it will not be changed back in Menu
|
2017-05-08 21:24:46 +02: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 |
|
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 |
|
David Rowe
|
1b26ba22cb
|
Fix browser history in goto "i" pages on tablet
|
2017-05-06 11:13:13 +12:00 |
|
Seth Alves
|
b2ccc33a79
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-05 14:52:07 -07:00 |
|
Zach Fox
|
6b00688289
|
Merge pull request #10392 from zfox23/AvailabilityLanguageChanges
"Set Availability" UI changes
|
2017-05-05 14:03:39 -07:00 |
|
Zach Fox
|
a10606b994
|
OMG language changed again
|
2017-05-05 11:44:59 -07:00 |
|
Zach Fox
|
905f36976f
|
New language
|
2017-05-05 11:28:49 -07:00 |
|
howard-stearns
|
2ecc71a990
|
Annoncement Card visual tweeks.
|
2017-05-05 10:49:09 -07:00 |
|
Zach Fox
|
b41fb952ae
|
UI changes - Thanks Alan!
|
2017-05-05 10:29:46 -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 |
|