Sam Gateau
|
860b3a35e4
|
Merge pull request #14992 from hyperlogic/quest-demo-with-avatar-ik-optimizations
Quest demo with avatar ik optimizations
|
2019-02-22 16:32:24 -08:00 |
|
Anthony Thibault
|
1213084fc6
|
Merge pull request #14984 from kencooke/master
Case 21384: Avatar mouth blendshapes are not working correctly (master)
|
2019-02-22 16:29:07 -08:00 |
|
Dante Ruiz
|
eedd54d0b1
|
Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo
|
2019-02-22 15:02:01 -08:00 |
|
Dante Ruiz
|
a87e49bb23
|
start in quest dev
|
2019-02-22 15:01:30 -08:00 |
|
Shannon Romano
|
a63f3e76c8
|
Merge pull request #14972 from SamGondelman/billboard
Case 21341: Fix billboard mode in secondary camera
|
2019-02-22 13:01:09 -08:00 |
|
amantley
|
87d98e5b85
|
These are the squashed commits for the ik optimization for the Quest
Implmented using a new AnimSplineIK node in the anim graph
(cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)
|
2019-02-22 11:21:36 -08:00 |
|
Sam Gateau
|
1d5a4116b9
|
Merge pull request #14986 from amerhifi/quest-demo
case 21374 : Away mode on Quest when device is paused
|
2019-02-22 09:54:57 -08:00 |
|
amer cerkic
|
9c833f7e64
|
clean up
|
2019-02-22 09:21:51 -08:00 |
|
amer cerkic
|
f04fdb2187
|
added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user
|
2019-02-22 09:11:24 -08:00 |
|
luiscuenca
|
3072ca43de
|
Detailed picking if avatar is not null
|
2019-02-22 09:24:38 -07:00 |
|
Ken Cooke
|
c1786edc24
|
Emulate the old behavior of _lastInputLoudness
|
2019-02-21 18:45:17 -08:00 |
|
Anthony Thibault
|
8785f733db
|
Merge pull request #14817 from amantley/animSplineIK
AnimSplineIK node added to inverse kinematics
|
2019-02-21 17:13:41 -08:00 |
|
Anthony Thibault
|
e54754c4ce
|
Merge pull request #14926 from luiscuenca/flowCpp
Cpp implementation of the Flow script
|
2019-02-21 17:10:05 -08:00 |
|
Sam Gateau
|
ddc42585d8
|
Cleanup syntax
|
2019-02-21 16:41:50 -08:00 |
|
Sam Gateau
|
94fc60f285
|
Bad idea to include global here
|
2019-02-21 16:34:50 -08:00 |
|
amer cerkic
|
9097d9c57c
|
working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing.
|
2019-02-21 16:33:25 -08:00 |
|
amantley
|
3bf5c44f98
|
fixed build warnings
|
2019-02-21 16:24:46 -08:00 |
|
amantley
|
5cf8a963cd
|
make spine2 rotation damping only happen in optimized code. the regular code is already damped
|
2019-02-21 15:41:16 -08:00 |
|
Sam Gateau
|
fe33aadd69
|
Assigning the default world detail and max render rate target in vr quest
|
2019-02-21 14:58:06 -08:00 |
|
amantley
|
c9db426ce4
|
Merge remote-tracking branch 'upstream/master' into animSplineIK
|
2019-02-21 14:36:13 -08:00 |
|
amantley
|
6323f49f26
|
changed the define variable to HIFI_USE_OPTIMIZED_IK
|
2019-02-21 14:36:05 -08:00 |
|
SamGondelman
|
544f54e69a
|
fix model scale
|
2019-02-21 14:10:36 -08:00 |
|
amantley
|
afed0b5442
|
review changes
|
2019-02-21 11:08:29 -08:00 |
|
Shannon Romano
|
f9e5ee0185
|
Merge pull request #14970 from danteruiz/quest-no-keyboard
Case 21335: Use old tablet keyboard for quest
|
2019-02-21 10:34:53 -08:00 |
|
SamGondelman
|
4fdf556d5d
|
fix billboard mode in secondary camera
|
2019-02-21 10:29:21 -08:00 |
|
Angus Antley
|
b6bc467f4b
|
added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel
|
2019-02-21 06:42:55 -08:00 |
|
amantley
|
f8a74efdc2
|
fixed build errors from jenkins
|
2019-02-20 17:59:45 -08:00 |
|
amantley
|
27bfe2f0fe
|
changed name of pre processor variable
|
2019-02-20 15:14:12 -08:00 |
|
Dante Ruiz
|
bf8c671cd6
|
keyboard setting
|
2019-02-20 13:38:20 -08:00 |
|
John Conklin II
|
87556059d3
|
Merge pull request #13901 from Cristo86/android_handshake
case 20058: Android - Handshake implementation
|
2019-02-20 13:33:52 -08:00 |
|
Brad Davis
|
79369a0c83
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-20 10:40:49 -08:00 |
|
Shannon Romano
|
0b7bdb185e
|
Merge pull request #14949 from SamGondelman/wearables
Case 21300, Case 21301: Group cull all entity descendants of avatars
|
2019-02-20 10:29:40 -08:00 |
|
John Conklin II
|
97c7b01005
|
Merge pull request #14965 from danteruiz/stylus-pick-perf
Case 21255: PickManager performance is slow when keyboard mallets are enabled
|
2019-02-20 10:11:33 -08:00 |
|
Brad Davis
|
817c24dd0b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-20 09:51:03 -08:00 |
|
Brad Davis
|
122a246d2d
|
Fix typo
|
2019-02-19 17:30:47 -08:00 |
|
Shannon Romano
|
07d084d086
|
Merge pull request #14937 from SamGondelman/pal
Case 21259: Pal textures don't change
|
2019-02-19 17:14:15 -08:00 |
|
Brad Davis
|
518e480a8b
|
Fix plugin activation
|
2019-02-19 17:00:50 -08:00 |
|
SamGondelman
|
6765268998
|
Merge remote-tracking branch 'upstream/master' into wearables
|
2019-02-19 16:52:00 -08:00 |
|
luiscuenca
|
04e57d0dd1
|
No Rig pointer on Flow class, solve network animations and fixed bug
|
2019-02-19 17:45:46 -07:00 |
|
danteruiz
|
6bdf51a460
|
limit number of include items for mallets
|
2019-02-19 16:25:38 -08:00 |
|
danteruiz
|
d1c46e1cdc
|
fixing tablet pointer issues
|
2019-02-19 14:48:17 -08:00 |
|
Dante Ruiz
|
6189aff6b3
|
Merge pull request #14933 from danteruiz/pick-manager-perf
Case 21271: Remove unnessary picks for quest
|
2019-02-19 14:20:56 -08:00 |
|
Brad Davis
|
d60dcb99d2
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-19 12:37:30 -08:00 |
|
SamGondelman
|
2986ca20c5
|
Merge remote-tracking branch 'upstream/master' into pal
|
2019-02-19 11:31:40 -08:00 |
|
John Conklin II
|
d7a5c0bb4f
|
Merge pull request #14947 from SamGondelman/overlayClick
Case 21291, Case 21292, Case 21293: Working on overlay bugs
|
2019-02-19 11:01:19 -08:00 |
|
John Conklin II
|
1348baecc7
|
Merge pull request #14935 from SamGondelman/matEntity
Case 20920: Move Material Entity logic to render thread
|
2019-02-19 10:59:51 -08:00 |
|
John Conklin II
|
0f8c36156b
|
Merge pull request #14952 from SamGondelman/textColor
Case 21305: Fix text overlay color property
|
2019-02-19 10:58:32 -08:00 |
|
Howard Stearns
|
d7d6ff53ca
|
Merge pull request #14765 from howard-stearns/artist-stocking-inventory
Case 20657: artist stocking inventory
|
2019-02-19 10:46:01 -08:00 |
|
danteruiz
|
4bbae1230d
|
making requested chantges
|
2019-02-19 10:07:36 -08:00 |
|
SamGondelman
|
927e824610
|
fix missing color for text overlays
|
2019-02-18 16:14:07 -08:00 |
|
Angus Antley
|
748368bfda
|
mid tweak on the wrist and position coeffs
|
2019-02-17 23:32:52 -08:00 |
|
SamGondelman
|
06ac2b291b
|
attachments and wearables cull with avatar parent
|
2019-02-17 17:52:10 -08:00 |
|
SamGondelman
|
1163cbea70
|
improving web surface interaction and tablet hiding
|
2019-02-16 22:03:55 -08:00 |
|
SamGondelman
|
85421cd6ee
|
speed up stylus picks
|
2019-02-16 21:16:46 -08:00 |
|
SamGondelman
|
71653f95d7
|
working on overlay bugs
|
2019-02-16 20:08:36 -08:00 |
|
Angus Antley
|
70764bc3c4
|
Merge remote-tracking branch 'upstream/master' into animSplineIK
|
2019-02-15 19:24:30 -08:00 |
|
amantley
|
d78f253d24
|
code to generate pole vector from theta
|
2019-02-15 17:43:53 -08:00 |
|
Howard Stearns
|
e9b323a807
|
fix HFC symbol location at checkout, and the display of unavailable items
|
2019-02-15 16:56:31 -08:00 |
|
danteruiz
|
b00746c096
|
Trim picks in use during quest:
|
2019-02-15 16:24:17 -08:00 |
|
SamGondelman
|
0f33d696d2
|
trying to fix pal colors
|
2019-02-15 16:12:36 -08:00 |
|
John Conklin II
|
4520236873
|
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor
Case 21012: Avatar Doctor
|
2019-02-15 15:43:18 -08:00 |
|
Howard Stearns
|
f16eb1c029
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 15:15:13 -08:00 |
|
amantley
|
36093926d0
|
added fake android defines for running the new ik on pc
|
2019-02-15 15:00:39 -08:00 |
|
Thijs Wenker
|
e900d3784b
|
fixes
|
2019-02-15 23:58:42 +01:00 |
|
SamGondelman
|
3df231f1e0
|
it's working!
|
2019-02-15 14:43:22 -08:00 |
|
John Conklin II
|
09d8221582
|
Merge pull request #14834 from gcalero/connection_failure_dialog
Case 20936: Set message dialog text width so wrap mode takes effect
|
2019-02-15 14:16:02 -08:00 |
|
Brad Davis
|
578bc4fc89
|
Suppress logspam with missing Controller in QML
|
2019-02-15 14:15:24 -08:00 |
|
ingerjm0
|
c8791841de
|
Merge pull request #14918 from ctrlaltdavid/M21128
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc
|
2019-02-15 14:15:13 -08:00 |
|
Brad Davis
|
78be935e1a
|
Consolidating differences from master
|
2019-02-15 14:12:37 -08:00 |
|
Brad Davis
|
4409e59682
|
Add per-android-app preprocessor macros
|
2019-02-15 14:11:26 -08:00 |
|
Roxanne Skelly
|
a82385200e
|
Merge pull request #14906 from roxanneskelly/QmlMarketplace
Qml marketplace - multiple improvements/bugfixes
|
2019-02-15 14:04:47 -08:00 |
|
John Conklin II
|
b9356e22d8
|
Merge pull request #14927 from huffman/fix/hide-asset-browser
Case 16349: Fix asset browser being hidden in incorrect way on server switch
|
2019-02-15 13:32:27 -08:00 |
|
SamGondelman
|
c92b82e744
|
merge with master
|
2019-02-15 12:43:30 -08:00 |
|
Roxanne Skelly
|
2c4f485079
|
QmlMarketplace invert arrow direction on sort.
|
2019-02-15 12:31:01 -08:00 |
|
Thijs Wenker
|
74ce98a075
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor
|
2019-02-15 20:57:20 +01:00 |
|
Thijs Wenker
|
556a55ff16
|
Better scale and texture checks
|
2019-02-15 20:55:27 +01:00 |
|
SamGondelman
|
87ab255115
|
finish moving materials to rendering
|
2019-02-15 11:49:20 -08:00 |
|
Brad Davis
|
a5f84ab51a
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 11:37:13 -08:00 |
|
Roxanne Skelly
|
fb524f8900
|
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
|
2019-02-15 11:35:06 -08:00 |
|
Sam Gondelman
|
9aa99f24f0
|
Merge pull request #14905 from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
|
2019-02-15 11:21:51 -08:00 |
|
SamGondelman
|
25b31cfc72
|
merge with master
|
2019-02-15 11:08:24 -08:00 |
|
Howard Stearns
|
490ef3542e
|
update for marketplace-in-qml, and make specific to username
|
2019-02-15 10:58:09 -08:00 |
|
amantley
|
0fcaa695ba
|
Merge remote-tracking branch 'upstream/master' into animArmIK
|
2019-02-15 10:35:33 -08:00 |
|
amantley
|
d6dfaacf6f
|
adding ifdef for android os
|
2019-02-15 10:35:25 -08:00 |
|
Brad Davis
|
0b171ffe13
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 10:31:04 -08:00 |
|
Howard Stearns
|
8a6f2b221b
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 09:47:18 -08:00 |
|
Anthony Thibault
|
702f1c8e74
|
Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization
Revert anim pose optimization
|
2019-02-15 09:42:27 -08:00 |
|
Howard Stearns
|
30c0dda9ed
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 09:27:48 -08:00 |
|
Simon Walton
|
748747da2d
|
Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist
Case 19724: If sorting PAL by loudness re-sort upon loudness updates
|
2019-02-15 09:24:34 -08:00 |
|
luiscuenca
|
c966f71cb1
|
More fixes
|
2019-02-15 10:17:37 -07:00 |
|
luiscuenca
|
98c321c718
|
Fix warnings
|
2019-02-15 09:40:49 -07:00 |
|
amantley
|
425413419a
|
fixed merge conflict in avatar.h
|
2019-02-15 08:26:54 -08:00 |
|
Angus Antley
|
382a03929e
|
changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint
|
2019-02-15 07:06:43 -08:00 |
|
Ryan Huffman
|
ab5c4a927b
|
Fix asset browser being hidden in incorrect way on server switch
|
2019-02-14 22:18:42 -08:00 |
|
luiscuenca
|
624a53449f
|
Merge branch 'master' into flowCpp
# Solved Conflicts:
# interface/src/avatar/MyAvatar.cpp
|
2019-02-14 18:55:43 -07:00 |
|
luiscuenca
|
88eae0f2ec
|
Remove test functions
|
2019-02-14 18:49:49 -07:00 |
|
Shannon Romano
|
f267043953
|
Merge pull request #14838 from SamGondelman/billboardMode
Case 20962: Billboard mode improvements
|
2019-02-14 17:44:48 -08:00 |
|
Shannon Romano
|
3b5b077a3e
|
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
Case 21066: restore shape caching in ShapeManager
|
2019-02-14 17:33:33 -08:00 |
|
luiscuenca
|
3e66bce112
|
set useFlow function
|
2019-02-14 18:30:37 -07:00 |
|
Anthony Thibault
|
a3407b96b0
|
Merge branch 'master' into bug-fix/revert-anim-pose-optimization
|
2019-02-14 16:56:17 -08:00 |
|