Commit graph

6580 commits

Author SHA1 Message Date
dooglifeSF
b914bb60fe Change strafeleft<->straferight transitions to isMoving vars and remove the sidesteps from the blendranges 2019-10-21 14:15:31 -07:00
luiscuenca
33ea63c708
Fix warnings and update controls 2019-10-17 15:06:12 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Shannon Romano
71ef645781
Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed
Fix sliding when stopping from run.
2019-10-16 09:03:00 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction
First Time User Experience Project
2019-10-15 14:56:25 -07:00
dooglifeSF
a043f0a17e Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s 2019-10-15 14:51:42 -07:00
Sabrina Shanman
b8df1c180f
Merge pull request #16343 from jherico/fix/DEV-2375
DEV-2375: ensure web entities stop playing audio
2019-10-14 13:04:57 -07:00
Zach Fox
341abb8185 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-14 12:36:35 -07:00
Brad Davis
6c35387b8d also fix DEV-2083 2019-10-14 10:56:23 -07:00
Brad Davis
95b5c8a905 DEV-2375: ensure web entities stop playing audio 2019-10-14 10:46:32 -07:00
Zach Fox
c8b975b2f1
Merge pull request #16342 from zfox23/newInvalidatedLanguage
DEV-2334: New 'Item Invalidated' language in Inventory
2019-10-14 13:28:33 -04:00
Zach Fox
b45156b44c
Merge pull request #16337 from RebeccaStankus/locationText
Added blank placeholder text on focus to text field
2019-10-14 12:35:29 -04:00
Zach Fox
7bd550e37b DEV-2334: New 'Item Invalidated' language in Inventory 2019-10-14 09:30:44 -07:00
Rebecca Stankus
21503137d4 Added blank placeholder text on focus to text field 2019-10-11 14:42:39 -07:00
dooglifeSF
96510429ba Fix stand talking pops 2019-10-11 10:44:50 -07:00
dooglifeSF
df11977b39 remove all transitions from seated except idle via isNotSeated 2019-10-11 09:54:10 -07:00
Zach Fox
2220234d68 Removed yellow 2019-10-09 14:33:28 -07:00
Zach Fox
bed1192d70 A bunch of fixes, plus added a debug mode Settings switch 2019-10-09 14:18:36 -07:00
Zach Fox
5871e6b83a Host avatars remotely 2019-10-08 17:39:57 -04:00
Zach Fox
17478af32d Remove debug code 2019-10-08 17:31:35 -04:00
Zach Fox
42bf2bf30e All windows 'done' except for final tweaks; debug mode still ON 2019-10-08 13:17:04 -04:00
Zach Fox
a23bee19e8 Controls screen done 2019-10-07 19:52:22 -04:00
Zach Fox
643dd21f86 Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration 2019-10-07 13:22:08 -04:00
dooglifeSF
387f0a3f10 add isInput* and isNotInput vars for use in json, and edit json to use them 2019-10-04 15:28:35 -07:00
RebeccaStankus
2f2b7b0306 Ready for CR Thank you Zach 2019-10-03 17:30:47 -07:00
Zach Fox
b23aecf6c5 Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-03 10:12:58 -07:00
Zach Fox
33b8942ffd Changes to Avatar/Profile App complete 2019-10-03 09:41:30 -07:00
dooglifeSF
ebd0b06475 animation revisions after checking them in a standup group 2019-10-02 17:18:36 -07:00
RebeccaStankus
47841d9bcd Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-02 12:42:53 -07:00
RebeccaStankus
dc15b55aa5 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-02 12:05:34 -07:00
Zach Fox
50b06a40d7 Improved random avatar selection logic, plus local avatars 2019-10-01 17:22:24 -07:00
dooglifeSF
86e67afe34 Merge branch 'master' into sit_variants_and_fidgets 2019-10-01 16:52:17 -07:00
dooglifeSF
0ab4075c3b sit idles and idle fidgets with json edits 2019-10-01 16:51:10 -07:00
RebeccaStankus
d2e62749c7 Ready for Zach to add default avatar changes 2019-10-01 16:36:06 -07:00
luiscuenca
09f0222285
Restore previous control keys for free camera 2019-10-01 14:18:46 -07:00
Shannon Romano
38574cd66b
Merge pull request #16245 from luiscuenca/implementPointAt
DEV-442: Implement directional blending node for point reaction
2019-10-01 11:46:30 -07:00
RebeccaStankus
3167dc9a35 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-01 09:59:14 -07:00
RebeccaStankus
0dfb234089 Finished UI, ready for CR 2019-10-01 09:58:44 -07:00
Anthony Thibault
7ee5b8e229
Merge pull request #16252 from dooglifeSF/emotes_revisions_per_feedback
Emotes revisions per feedback
2019-09-30 15:46:50 -07:00
dooglifeSF
5cfa1cb5ba Merge branch 'master' of https://github.com/highfidelity/hifi into sit_variants_and_fidgets 2019-09-30 09:38:45 -07:00
RebeccaStankus
68f52584cf Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-09-30 09:19:15 -07:00
David Rowe
cd6d9b57c4 Fix Blocks script displaying a blank page 2019-09-28 11:30:56 +12:00
RebeccaStankus
de4e8b9cc4 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-09-27 09:16:26 -07:00
RebeccaStankus
f4ecd3dcd8 Working on initial/second launch 2019-09-27 09:15:39 -07:00
luiscuenca
ea23a82f33
Make mouse pitch less sensitive 2019-09-26 15:14:47 -07:00
luiscuenca
1b064a0ebe
Fix Q key on first person cam. Let camera control flying Y axis 2019-09-26 14:29:01 -07:00
dooglifeSF
0fa7220750 tilt head down slightly to minimize crazy eyes 2019-09-25 15:27:11 -07:00
dooglifeSF
a8fa3a136c emote revisions, json tuning 2019-09-25 14:47:07 -07:00
luiscuenca
0aab2ed07f
Disable head look at when pointing 2019-09-25 12:37:24 -07:00
milad
aba6a28d54 updated camera modes 2019-09-25 11:05:32 -07:00