Clement
|
9e84603ca4
|
Make proper -v and -h options for interface
|
2018-07-30 17:18:32 -07:00 |
|
John Conklin II
|
bd2ab38bfe
|
Merge pull request #13701 from ElderOrb/FB16702
FB16702 - Avatar App does not save Animation JSON Override URL
|
2018-07-30 14:51:32 -07:00 |
|
John Conklin II
|
200292c18e
|
Merge pull request #13675 from howard-stearns/forget-you
pal refresh fixes
|
2018-07-30 14:38:24 -07:00 |
|
Sam Gondelman
|
8201997a16
|
Merge pull request #13660 from SamGondelman/parabolic
Parabolic Picking + Pointers
|
2018-07-30 10:49:02 -07:00 |
|
SamGondelman
|
3d4639bfdd
|
CR
|
2018-07-27 16:36:22 -07:00 |
|
SamGondelman
|
1ef54b2fe6
|
back to ray teleport
|
2018-07-27 14:58:56 -07:00 |
|
John Conklin II
|
9c37e30fe6
|
Merge pull request #13678 from ElderOrb/FB17023
FB17023 - Make visible avatar url in the avatar app
|
2018-07-27 14:57:25 -07:00 |
|
John Conklin II
|
021e09d083
|
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash
fix a crash when grabbing a non-dynamic entity with an overlay child
|
2018-07-27 12:49:14 -07:00 |
|
John Conklin II
|
9770331259
|
Merge pull request #13687 from danteruiz/fix-script-memory-issue
Fix ScriptEngine begin held onto after script stopped runnning
|
2018-07-27 12:31:31 -07:00 |
|
John Conklin II
|
d4cbbfe4c1
|
Merge pull request #13692 from amantley/leanBackSittingFix
Fix For Unnatural Hips Behaviour When Sitting In HMD
|
2018-07-27 12:30:31 -07:00 |
|
Seth Alves
|
91d509f5a4
|
fix a crash when grabbing a non-dynamic entity with an overlay child
|
2018-07-27 10:35:26 -07:00 |
|
Seth Alves
|
41af82a7f6
|
Merge pull request #13702 from r3tk0n/17016-flying-settings
17016 flying settings
|
2018-07-27 10:07:13 -07:00 |
|
Sam Gondelman
|
3284f7b9d6
|
Merge pull request #13654 from huffman/fix/mirror-mode-create
Fix computePickRay when in mirror mode
|
2018-07-27 09:05:58 -07:00 |
|
SamGondelman
|
f5364f752f
|
fix scaling
|
2018-07-26 18:01:24 -07:00 |
|
Alexander Ivash
|
29f7cab7df
|
FB16702 - Avatar App does not save Animation JSON Override URL
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
|
2018-07-27 02:08:44 +03:00 |
|
r3tk0n
|
f3d0d9b4a0
|
Clean up garbage comments.
|
2018-07-26 15:37:42 -07:00 |
|
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 |
|
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 |
|
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 |
|
NissimHadar
|
ce53b44b02
|
CR comments.
|
2018-07-25 15:58:46 -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 |
|
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
|
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 |
|
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 |
|
Dante Ruiz
|
b750a005cf
|
fix script memory issue
|
2018-07-24 16:31:12 -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 |
|
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 |
|
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 |
|
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 |
|
howard-stearns
|
48184c102b
|
Merge branch 'master' of github.com:highfidelity/hifi into forget-you
|
2018-07-23 15:25:46 -07:00 |
|
howard-stearns
|
f87db26cad
|
pal refresh that remembers your place
|
2018-07-23 15:25:06 -07:00 |
|
John Conklin II
|
27b35d84cc
|
Merge pull request #13652 from r3tk0n/16206-flying-settings
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
|
2018-07-23 15:19:46 -07:00 |
|
MuteTab
|
52e5bdb360
|
Added _aboutToQuit guard on eventFilter()
|
2018-07-23 14:27:38 -07:00 |
|
luiscuenca
|
2adb334034
|
unused code deleted
|
2018-07-23 14:25:30 -07:00 |
|
luiscuenca
|
9d2d7c3aa4
|
Redesign and enable hand's Pole Vectors for elbow simulation
|
2018-07-23 13:16:11 -07:00 |
|
Alexander Ivash
|
33c858774b
|
fix coding standard compliance
|
2018-07-23 21:01:43 +03:00 |
|
Seth Alves
|
ae83c33621
|
Merge pull request #13646 from sethalves/put-back-old-style-attachment-dialog-master
put back old-style avatar-attachments menu-item
|
2018-07-23 10:25:23 -07:00 |
|
r3tk0n
|
bc91affa70
|
Bring this PR inline with RC70.1 PR.
|
2018-07-20 15:13:44 -07:00 |
|
SamGondelman
|
763e6465a2
|
followNormal, fixin stuff
|
2018-07-20 10:41:24 -07:00 |
|
Alexander Ivash
|
f5717b7648
|
add check for SELF_ID
|
2018-07-20 19:33:16 +03:00 |
|
Alexander Ivash
|
849c91d8f6
|
remove not necessary EntityTreeRenderer from removeAvatarEntities's condition
|
2018-07-20 19:32:58 +03:00 |
|