Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems
...
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
2019-04-24 09:13:59 -07:00
Simon Walton
5e251b1033
Don't double-free an openssl struct
2019-04-19 17:03:43 -07:00
SamGondelman
7fa81ffef3
fix warnings
2019-04-18 12:48:46 -07:00
Shannon Romano
6c15719618
Merge pull request #15310 from danteruiz/fix-keyboard-scaling
...
Case 21513: Keyboad doesn't scale to avatar after reloading content
2019-04-17 16:59:42 -07:00
Shannon Romano
da314694b4
Merge pull request #15271 from amantley/overrideHandAnimsSquashed
...
Allow Hand Animations to be Overridden
2019-04-17 11:53:41 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc
...
case 22219: Improved ambient maps
2019-04-17 10:20:53 -07:00
amantley
035c8a687d
fixed merge conflict
2019-04-17 10:16:39 -07:00
Shannon Romano
50f39e88d6
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check
...
Better head vs camera checks for avatar head cauterization
2019-04-16 15:07:46 -07:00
Shannon Romano
517710bcb8
Merge pull request #15388 from r3tk0n/running-fix
...
Case 22192: Adjust run speed constants.
2019-04-16 14:51:23 -07:00
amantley
ba9b539bd2
removed hand fbx files that will be used in the future for default hand overrides
2019-04-16 14:12:32 -07:00
Shannon Romano
3500a1b19e
Merge pull request #15386 from danteruiz/fix-bubble
...
Case 22203: Shield/bubble animation and sound plays when other users are ignored by PAL or their own shields of RC83
2019-04-15 15:15:53 -07:00
Roxanne Skelly
3949ca2638
Remove logging and bump build.
2019-04-15 12:35:36 -07:00
r3tk0n
12d7e35722
Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release.
2019-04-15 10:56:07 -07:00
Roxanne Skelly
743d626b32
Merge branch 'master' of https://github.com/highfidelity/hifi into Case21707
2019-04-15 10:27:28 -07:00
Roxanne Skelly
8f9d8372d8
Public Key was getting corrupted.
2019-04-12 20:30:03 -07:00
Roxanne Skelly
e36a8fc6a2
Fix osx/ubuntu build error
2019-04-12 18:36:14 -07:00
danteruiz
246f11ba02
fixing bubble
2019-04-12 17:11:35 -07:00
Shannon Romano
d321ae9b79
Merge pull request #15284 from amantley/eyeRotationOverrideBug
...
Fixes Bug that Prevented Eye Rotation Override When Procedural Eye Movement is Disabled
2019-04-12 17:06:11 -07:00
Roxanne Skelly
3bf8fb5d95
Case21707 - Wallet doesn't work if user has unicode characters in windows username
2019-04-12 16:40:41 -07:00
Shannon Romano
a0ddadc0e7
Merge pull request #15320 from ctrlaltdavid/M21989
...
Case 21989: AvatarList and AvatarManager JSDoc
2019-04-12 12:27:29 -07:00
Shannon Romano
11e5f0a101
Merge pull request #15323 from ctrlaltdavid/M22052
...
Case 22052: Camera JSDoc
2019-04-12 12:26:39 -07:00
Seth Alves
feda884c71
remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts.
2019-04-12 09:21:48 -07:00
David Rowe
38e21dcaa2
Doc review
2019-04-11 11:04:02 +12:00
David Rowe
ca3f45163f
Merge branch 'master' into M21989
2019-04-11 10:37:34 +12:00
David Rowe
a7b1d613d3
Doc review updates
2019-04-11 10:27:17 +12:00
David Rowe
617617736e
Merge branch 'master' into M22052
2019-04-11 10:24:27 +12:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize
...
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
2019-04-10 12:29:40 -07:00
Sam Gateau
c33efdf9e0
Merge pull request #15282 from kitely/fix-ray-local-entities
...
Case 21883: Fix safe landing code improperly finding local entities
2019-04-10 12:28:07 -07:00
Sam Gateau
feb2757990
Merge pull request #15302 from sethalves/fix-linux-window-manager-fight
...
case 21994: cooperate, rather than fight with, Linux window managers
2019-04-10 12:26:10 -07:00
Sam Gateau
d7e5f1eb8e
Merge pull request #15280 from kitely/fix-startup-race-condition
...
case 21981: Fix startup race conditions in Interface
2019-04-10 11:30:23 -07:00
Sam Gateau
89ff63e8bb
Merge pull request #15267 from jherico/fix/tracing
...
Case 21930: Don't change OpenGL context state every frame
2019-04-10 09:42:09 -07:00
Anthony J. Thibault
02d5769991
Better head vs camera checks for avatar head cauterization
...
* cameraInsideHead() check now uses detailed avatar collision when possible.
* head is now more constantly hidden in first person camera mode
* getEyeModelPositions() uses a better estimate when avatar eye joints are missing.
* moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp
* added isPlayingOverrideAnimation() method to Rig class
2019-04-09 12:57:03 -07:00
SamGondelman
27338c3639
fix cauterization of entities that are children of MyAvatar's head
2019-04-08 19:48:11 -07:00
John Conklin II
759d59c709
Merge pull request #15336 from r3tk0n/controller-help-update
...
Case 22069: Update Controller Help Screen
2019-04-05 17:31:29 -07:00
maspring
575d9673e2
Merge pull request #15338 from danteruiz/another-fading-avatar
...
Case 22074: Avatars ignored via PAL or bubble (shield) leave semi-permanent copies of themselves
2019-04-05 17:21:28 -07:00
Roxanne Skelly
4565bd7e77
Merge pull request #15340 from roxanneskelly/Case21890
...
Case 21890 - Marketplace search doesn't refresh when enter is pressed
2019-04-05 16:40:29 -07:00
r3tk0n
d6ff1caee9
Convert tabs to spaces.
2019-04-05 16:32:20 -07:00
Sam Gondelman
19b109c1f7
Merge pull request #15333 from highfidelity/revert-15266-stencil
...
Case 22070: Revert "Case 20060: Grab correct stencil masks from display plugins"
2019-04-05 16:23:26 -07:00
r3tk0n
9dda272acd
Update gamepad with new graphic.
2019-04-05 16:22:31 -07:00
r3tk0n
6d03182ed9
Fix scaling issue.
2019-04-05 16:21:42 -07:00
David Back
e8b4b8b74c
Merge pull request #15290 from dback2/fixDeleteKeyInHMDDoesCtrlDelete
...
Case 20880: Fix delete key doing ctrl + delete in HMD
2019-04-05 16:06:01 -07:00
r3tk0n
e3fdbc3b3c
Set bounds of image.
2019-04-05 15:44:34 -07:00
Roxanne Skelly
057ee2b01c
Case 21890 - Marketplace search doesn't refresh when enter is pressed
2019-04-05 15:20:23 -07:00
danteruiz
475cf4d6f7
fix another fading avatar
2019-04-05 15:10:30 -07:00
r3tk0n
e03e78cc8c
Add href element to image.
2019-04-05 15:04:35 -07:00
r3tk0n
84a67641a8
Update images.
2019-04-05 14:39:02 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins"
2019-04-05 11:59:46 -07:00
Olivier Prat
a45b91c4be
Merge branch 'master' of https://github.com/highfidelity/hifi into amc
2019-04-05 09:01:03 +02:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco
...
Case 21777: Locomotion Project
2019-04-04 16:18:32 -07:00
Wayne Chen
3f85e064b8
initialize transform outside of switch statement
2019-04-04 14:46:06 -07:00
