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
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
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
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
