Commit graph

70210 commits

Author SHA1 Message Date
r3tk0n
f8c611b1d0 Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp 2018-07-26 15:35:12 -07:00
Dante Ruiz
02232daa58 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-26 15:26:24 -07:00
Dante Ruiz
6edd109dfe revert back to the old way we checkForChildTooFarAway 2018-07-26 15:23:54 -07:00
SamGondelman
74b3143bc3 remove scaling from teleport script 2018-07-26 12:23:14 -07:00
SamGondelman
6a52b7b8f3 CR improvements 2018-07-26 12:15:12 -07:00
amantley
12cb212dc7 used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards 2018-07-26 12:05:17 -07:00
howard-stearns
699d1647ca typo, and more conservative item limit 2018-07-26 12:01:56 -07:00
Anthony Thibault
6c92949aed
Merge pull request #13672 from luiscuenca/fixElbowPoleVector
Redesign and enable hand's Pole Vectors for elbow simulation
2018-07-26 11:51:33 -07:00
howard-stearns
9b61e8c4ad Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-26 11:50:15 -07:00
SamGondelman
1c1b68ee66 emitterShouldTrail fix, review comments, rotateWithEntity 2018-07-26 11:41:16 -07:00
Thijs Wenker
6e23caca0d handle both wantsTrigger and triggerable in CreateApp 2018-07-26 20:25:42 +02:00
David Back
cb8e9f218b reset all property fields when no selection 2018-07-26 11:23:28 -07:00
John Conklin II
5efd981ecd
Merge pull request #13693 from NissimHadar/bug16943
Corrects loading of texture and default visibility.
2018-07-26 09:10:55 -07:00
NissimHadar
ce53b44b02 CR comments. 2018-07-25 15:58:46 -07:00
Zach Fox
cc921ed9c4
Merge pull request #13685 from zfox23/MS16820_rateLimitPolaroids
Fix MS16820: Rate limit Snapshot Polaroids
2018-07-25 15:45:51 -07:00
SamGondelman
9b41cb5554 improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot 2018-07-25 15:19:25 -07:00
Ryan Huffman
0e0966004c Fix edit.js not being able to delete after creating entity
This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'
2018-07-25 14:52:56 -07:00
John Conklin II
21d043d179
Merge pull request #13534 from huffman/fix/ess-avatar-entities
Fix crash when editing avatar entities with no myAvatar
2018-07-25 14:21:12 -07:00
NissimHadar
630df7c233 Corrects loading of texture and default visibility. 2018-07-25 13:28:23 -07:00
John Conklin II
89e7e3b938
Merge pull request #13682 from zfox23/MS16704_removeWearableAvatar
Fix MS16704: Remove worn Avatar/Wearable before updating
2018-07-25 12:12:50 -07:00
amantley
85b7a9b67c added the changes committed to the hot fix rc70.1 in AvatarConstants.h 2018-07-25 11:31:02 -07:00
John Conklin II
6a491d1ac6
Merge pull request #13690 from danteruiz/fix-audio-hmd-issue
Fix audio page being set to desktop when starting in HMD.
2018-07-25 10:53:29 -07:00
amantley
37540c79b3 removed print statement and added const upper leg fraction 2018-07-25 10:51:19 -07:00
amantley
c5599623f7 added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting 2018-07-25 10:29:29 -07:00
Sam Gondelman
d29332595b
jsdoc fixes 2018-07-25 09:54:14 -07:00
Sam Gondelman
2aeef2e016
min spinSpread is 0 2018-07-25 09:40:52 -07:00
Sam Gondelman
b4cc9c8004
typo 2018-07-25 09:36:43 -07:00
Dante Ruiz
a21a475784 Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-hmd-issue 2018-07-25 08:44:28 -07:00
Dante Ruiz
8da1db31df fix audio page being in desktop when your in HMD 2018-07-25 08:44:11 -07:00
John Conklin II
1a732f9c8f
Merge pull request #13684 from ElderOrb/FB17036
FB17036 Avatar App causes error on cache reload (CTRL+R)
2018-07-25 08:03:02 -07:00
SamGondelman
4750611af9 particles don't spin with head roll, add particle spin properties, negative emitSpeed 2018-07-24 23:47:58 -07:00
Dante Ruiz
b750a005cf fix script memory issue 2018-07-24 16:31:12 -07:00
Stephen Birarda
0cd5a24233
Merge pull request #13677 from birarda/bug/no-socket-error-string
remove thread-unsafe socket errorString call
2018-07-24 16:16:25 -07:00
Zach Fox
04754d0dab Fix MS16820: Rate limit Snapshot Polaroids 2018-07-24 15:28:37 -07:00
Alexander Ivash
6db46e84ff FB17036 Avatar App causes error on cache reload (CTRL+R) 2018-07-25 01:11:26 +03:00
Zach Fox
a0319f1f71 Implement MS17039: Don't delete entities during DDV when Metaverse API call returns error 2018-07-24 15:09:08 -07:00
Zach Fox
eea4630d2b Fix MS16704: Remove worn Avatar/Wearable before updating 2018-07-24 14:29:05 -07:00
SamGondelman
fbcddf1445 test gradual normal interpolation 2018-07-24 14:15:49 -07:00
SamGondelman
645f905239 cleanup, model performance improvements 2018-07-24 13:25:49 -07:00
John Conklin II
fe5b13b781
Merge pull request #13636 from gcalero/android_audio_fixes2
Android audio fixes
2018-07-24 13:02:56 -07:00
Stephen Birarda
8224492d72 avoid thread-unsafe socket errorString call 2018-07-24 12:24:01 -07:00
Alexander Ivash
c13f27e2eb FB17023 - Make visible avatar url in the avatar app 2018-07-24 22:10:18 +03:00
John Conklin II
99c26e6363
Merge pull request #13674 from r3tk0n/16984-CompositorHelper
Added _aboutToQuit guard on eventFilter()
2018-07-24 11:37:19 -07:00
Gabriel Calero
f24cfebe88 Revert "Add logs to debug. Revert later"
This reverts commit 3c49e7783c.
2018-07-24 14:57:48 -03:00
Thijs Wenker
b7d12c6b1c
Merge pull request #13656 from huffman/fix/create-selection-box
Fix the Create selection box not always matching outline
2018-07-24 19:49:20 +02:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
luiscuenca
e7d70a832d Pole Vectors always calculated when arms are crossed 2018-07-24 08:58:17 -07:00
Thijs Wenker
e2d7431456 move agent scripting interface to its own class to get rid of deprecated API 2018-07-24 16:54:24 +02:00
luiscuenca
8f547d9bdd fix warnings 2018-07-23 16:37:25 -07:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix
FB16870: Avatar Wearables showing incorrect number
2018-07-23 15:55:11 -07:00