samcake
e0487f7e04
Solving the size evaluation for compressed format
2017-05-22 16:51:54 -07:00
Brad Davis
3995f539cf
Merge pull request #10500 from Atlante45/feat/bc7
...
Add BC7 compression support
2017-05-22 16:47:27 -07:00
Dante Ruiz
d98e7d5bc6
adding left and right arm
2017-05-23 00:26:12 +01:00
samcake
e4f9f2935e
Solving the size evaluation for compressed format
2017-05-22 15:42:18 -07:00
David Rowe
b0962865b2
Code review
2017-05-23 09:57:53 +12:00
Stephen Birarda
3e09c911f5
remove number of versions behind from the update dialog
2017-05-22 14:19:36 -07:00
David Rowe
9f83ca518f
Merge branch 'master' into 21359
2017-05-23 09:18:10 +12:00
volansystech
1cbf685133
Merge branch 'master' into Wl-21298
2017-05-22 10:58:05 +05:30
volansystech
6da46c2d4c
Resolve Mouse hover issue.
2017-05-22 10:53:58 +05:30
Atlante45
2928507e48
Fix "Reset Settings" window poping up every time
2017-05-21 08:37:17 -07:00
samcake
c5b5aa93b1
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-19 18:13:42 -07:00
David Rowe
768415695d
Tidying
2017-05-20 12:43:47 +12:00
David Rowe
eef707e4e9
Simplify code
2017-05-20 12:42:40 +12:00
Andrew Meadows
d3956b47d0
remove bad break
2017-05-19 15:35:29 -07:00
Andrew Meadows
bb4d366c40
use SmartPointer for Zone _model
2017-05-19 15:33:23 -07:00
Sam Gateau
36ac623e66
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-19 13:25:36 -07:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
Anthony J. Thibault
6ae2e6778e
ensure left and right arm flexCoeff are the same.
2017-05-19 10:51:09 -07:00
Atlante45
c2e2682eff
Fix "Reset Settings" window poping up every time
2017-05-19 10:50:23 -07:00
volansystech
2691855e2b
Merge branch 'master' into Wl-21298
2017-05-19 10:43:31 +05:30
Anthony J. Thibault
e99001d86c
debug draw ik chains, bug fix for flex coef on tips
...
And opened up hip constraints.
2017-05-18 16:29:55 -07:00
Zach Fox
8efac1e7f1
Prevent another GIF from being captured while one is processing
2017-05-18 14:30:08 -07:00
Dante Ruiz
984f9e1ba5
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-18 21:23:06 +01:00
Dante Ruiz
78f6d2e850
fix low velocity filter
2017-05-18 21:22:42 +01:00
Atlante45
9044cb40d5
Compress Default Skybox with BC7
2017-05-18 13:13:40 -07:00
Anthony J. Thibault
87adeb0565
apply flexCoeff to tip of joint chain as well.
2017-05-18 11:26:49 -07:00
Anthony J. Thibault
abe19310da
WIP: checkpoint of ik changes
2017-05-18 11:26:48 -07:00
Sam Gateau
d9ad45bf4a
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-18 09:37:04 -07:00
samcake
2c6e10fbe1
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-18 09:21:02 -07:00
Dante Ruiz
90ddc16d09
add calibration data to filters
2017-05-18 17:07:28 +01:00
volansystech
b2ac4381eb
Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.
2017-05-18 19:13:59 +05:30
samcake
80b6fd65ae
Cleaning up counters and naming schemes...
2017-05-17 18:31:28 -07:00
Brad Hefta-Gaub
c07eb3e45e
Merge pull request #10471 from hyperlogic/feature/ik-flex-coeff
...
Flex and weight IK tuning parameters
2017-05-17 16:48:50 -07:00
Andrew Meadows
09433a93ba
Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
...
More correct avatar mass
2017-05-17 16:22:06 -07:00
Zach Fox
d4752926b8
First pass - checking performance
2017-05-17 13:51:27 -07:00
Zach Fox
bb3f9e9033
Merge pull request #10479 from zfox23/PAL_ImproveDisplayNameField
...
Improve robustness of display name focus in PAL
2017-05-17 11:47:57 -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
Zach Fox
b9ddc3b19f
Improve robustness of display name focus in PAL
2017-05-16 16:25:22 -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
Dante Ruiz
25b1bb0633
adjusted values
2017-05-16 23:34:46 +01: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
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
samcake
3393456d91
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-12 10:15:13 -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
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
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
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
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
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
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
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
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
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
samcake
327dac8a19
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-05 09:31:03 -07:00
Andrew Meadows
f809afae2f
Merge pull request #10363 from jherico/qmlspam
...
Removing logspam on toggling scripts window
2017-05-05 08:29:12 -07:00
humbletim
25807a5258
fix warning color
2017-05-05 09:48:24 -04:00
David Rowe
88dc6b5f61
Fix tablet Web view "back" button not greying out when disabled
2017-05-05 17:24:36 +12: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
Howard Stearns
fc9e9e1d28
Merge pull request #10374 from howard-stearns/notification-circumstances
...
Notification circumstances
2017-05-04 16:18:58 -07:00
Atlante45
ecda313223
Add runtime access to compression settings
2017-05-04 15:07:59 -07:00
howard-stearns
9954380ce3
don't filter out the place you're at anymore
2017-05-04 14:44:48 -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
Andrew Meadows
7cb2bff4c5
Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash
...
Fix vr 2d vr tablet crash
2017-05-04 10:08:55 -07:00
Seth Alves
9ab2a61a4b
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 10:04:18 -07:00
Dante Ruiz
3894c7c2ff
Merge branch 'master' of github.com:highfidelity/hifi into config-pucks
2017-05-04 16:54:00 +01: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
David Rowe
30604ab901
Fix some typos noticed in passing
2017-05-04 16:56:18 +12:00
David Rowe
9d92ed2b9b
Fix keyboard not appearing in social media snapshot sharing dialogs
2017-05-04 16:55:10 +12: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
David Rowe
8ae3d4e8a0
Merge branch 'master' into 21314
...
# Conflicts:
# interface/resources/qml/controls/TabletWebView.qml
2017-05-04 13:10:09 +12:00
Zach Fox
affc7fc654
Merge pull request #10369 from druiz17/url-fix
...
Fix tablet webview showing incorrect url.
2017-05-03 16:58:06 -07:00
Zach Fox
d28d89e8ff
Merge pull request #10368 from zfox23/palWebViewtoTabletWebView
...
PAL WebView is now a TabletWebView
2017-05-03 16:51:32 -07:00
anshuman64
a924a33428
Merge pull request #10361 from ctrlaltdavid/21315
...
Fix numeric keys not displaying in social media sharing dialogs
2017-05-03 16:41:43 -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
Dante Ruiz
5390a29859
tabletwebview-url-fix
2017-05-03 23:05:05 +01:00
Zach Fox
eaf819d11d
Remove FIXME
2017-05-03 14:59:07 -07:00
Zach Fox
066b2db73f
Make the change
2017-05-03 14:57:31 -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
Dante Ruiz
31f6038e45
limbs tracking pucks
2017-05-03 20:08:42 +01: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
Brad Davis
8e12c1959d
Removing logspam on toggling scripts window
2017-05-03 09:53:32 -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
David Rowe
7fdcb9b1f0
Fix numeric keys not displaying in social media sharing dialogs
2017-05-03 14:59:41 +12:00
David Rowe
7b387c52c3
Fix reliability of keyboard enabling in tablet Web pages
2017-05-03 14:42:06 +12: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
Seth Alves
6b2caf8081
Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash
2017-05-02 09:41:47 -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
druiz17
18368cc073
Merge pull request #10343 from druiz17/tabletwebview-fix-links
...
fix Tablet webview issues of not loading correct url.
2017-05-02 08:09:22 -07:00
Seth Alves
71deac49c6
reset tablet to homescreen when going from 2d to vr
2017-05-01 17:06:15 -07:00
samcake
4514da2a09
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-01 16:49:35 -07:00
Howard Stearns
73c24a5240
Merge pull request #10344 from howard-stearns/announcement-styling
...
goto announcement card styling
2017-05-01 16:41:39 -07:00
howard-stearns
ca5318f121
remove debugging code
2017-05-01 15:57:22 -07:00
howard-stearns
545fd1355f
cleanup
2017-05-01 15:45:26 -07:00
howard-stearns
61b738e3cd
announcment styling
2017-05-01 15:35:17 -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
Dante Ruiz
a08b55d5f5
minimize diff
2017-05-01 23:08:25 +01:00
druiz17
67daa4b0a9
Merge pull request #10335 from druiz17/webview-js
...
Implemented of a web app to bring up the tablet webView
2017-05-01 15:03:55 -07:00
Dante Ruiz
b00d7d763a
Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links
2017-05-01 22:45:42 +01:00
Dante Ruiz
64b8237bd6
fix twitter and facebook links
2017-05-01 22:45:13 +01:00
Dante Ruiz
62870d85d3
Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links
2017-05-01 21:58:09 +01:00
Dante Ruiz
bb9eb98625
prevent mouse events from propagating to far
2017-05-01 21:49:57 +01:00
Dante Ruiz
c205bf0980
working on cleaner navigation
2017-05-01 21:23:38 +01: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
Seth Alves
2b13d4d257
Merge pull request #10331 from ctrlaltdavid/21306
...
Fix keyboard not raising for Facebook username field
2017-05-01 13:02:19 -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
Howard Stearns
9fab66b66a
Merge pull request #10328 from howard-stearns/tablet-discovery-events
...
fix announcement suggestions
2017-05-01 11:28:45 -07:00
trent
773563850c
Merge hifi/master with my branch, fixed merge issue.
2017-05-01 13:23:02 -04:00
Dante Ruiz
763feccbe1
removed tabs
2017-05-01 18:07:42 +01:00
Dante Ruiz
9f33af479d
saving work
2017-05-01 18:04:22 +01: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
druiz17
f60deb0cfc
fixed the twitter link
2017-04-30 22:55:44 -07:00
