Commit graph

77717 commits

Author SHA1 Message Date
Shannon Romano
ec22f7847e
Merge pull request #15367 from dback2/editContinualTranslateRC82ToMaster
Case 22130: PR 15366 changes from v82 to Master
2019-04-16 15:17:08 -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
Shannon Romano
adbcbe6585
Merge pull request #15381 from dback2/materialTargetMasterFollowup2
Case 22195: PR 15380 changes from v82 to Master
2019-04-16 11:48:07 -07:00
Shannon Romano
7de56092f8
Merge pull request #15376 from SimonWalton-HiFi/delayed-node-adds-tweaks
Clear delayed Node-adds upon restart
2019-04-16 11:27:15 -07:00
Shannon Romano
4b91363226
Merge pull request #15375 from SimonWalton-HiFi/pingpunch-lower-rate
Increase ping interval for unconnected Nodes
2019-04-16 11:22:30 -07:00
r3tk0n
d0abb86366 Reversed costants because no sleep. >_< 2019-04-15 17:26:22 -07:00
Sam Gateau
db9df76337
Merge pull request #15391 from sabrina-shanman/hfm_disable-embedded-materials_master
(master) Disable baking of embedded material textures in material entities
2019-04-15 15:51:41 -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
Shannon Romano
4d255fce93
Merge pull request #15373 from sabrina-shanman/hfm_crash_textures
(case 21906) Fix TextureBaker failures and heap corruption in MaterialBaker
2019-04-15 15:12:39 -07:00
sabrina-shanman
8f87afd7db Disable baking of embedded material textures in material entities 2019-04-15 15:00:14 -07:00
Shannon Romano
d00ba2a9f1
Merge pull request #15384 from roxanneskelly/Case21707
Case21707 - Wallet doesn't work if user has unicode characters in windows username
2019-04-15 14:48:30 -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
r3tk0n
a40fdf3f77 Merge branch 'master' of https://github.com/highfidelity/hifi into running-fix 2019-04-15 09:47:26 -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
unknown
d342d93ec9 fix material targets when re-opening properties to same entity 2019-04-12 14:49:59 -07:00
r3tk0n
87deb348a8 Adjust run speed constants. 2019-04-12 14:07:06 -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
Shannon Romano
5e8e44f97b
Merge pull request #15316 from amantley/bugSetRotation
Bug fixed for MyAvatar.getJointRotation(name, quat) and MyAvatar.setJointRotation(name, quat)
2019-04-12 12:23:03 -07:00
Simon Walton
7180d8b99b Clear delayed Node-adds upon restart 2019-04-11 17:56:27 -07:00
Shannon Romano
13fb3148a5
Merge pull request #15352 from dback2/materialTargetMasterFollowup
Case 22082, 22101: PR 15325 follow up and PR 15351 RC82 > Master
2019-04-11 17:53:05 -07:00
Simon Walton
a5e94eea75 Increase ping interval for unconnected Nodes 2019-04-11 17:36:09 -07:00
Shannon Romano
feeb057fef
Merge pull request #15371 from huffman/fix/edit-out-of-range-on-numerical-types
Case 22167: Fix lack of ranges on numerical types in Create
2019-04-11 17:27:39 -07:00
Roxanne Skelly
a1591061c6
Merge pull request #15368 from roxanneskelly/Case22140
Case 22140 - Dynamic Jitter Buffer switch on admin UI disables dynamic buffers when it's set to enable them.
2019-04-11 15:17:46 -07:00
Ryan Huffman
f2474b4d2b Fix lack of ranges on numerical types in Create 2019-04-11 14:20:52 -07:00
Anthony J. Thibault
7aeb4bca87 Include head rotation in getEyeModelPositions 2019-04-11 14:05:15 -07:00
sabrina-shanman
39cf3c3d83 Fix TextureBaker failures and heap corruption in MaterialBaker 2019-04-11 13:44:26 -07:00
Shannon Romano
5856ab3d3a
Merge pull request #15353 from roxanneskelly/Case819
Case 819 - Add min-listen-port command line parameter to assignment monitor
2019-04-10 16:32:30 -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
Roxanne Skelly
1f838c681c Case 22140 - Dynamic Jitter Buffer switch on admin UI disables dynamic buffers when it's set to enable them.
The dynamic jitter buffer switch is inverted in that it disables dynamic buffers
when it set to enable them, and vice versa.  As it defaults to 'enable,' dynamic
buffers are basically disabled for everyone which will affect audio quality negatively.
2019-04-10 13:07:50 -07: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
6f4f7335dc
Merge pull request #15307 from kencooke/audio-gain-interpolation
Case 22019: Audio clicks/pops when gain is rapidly changing
2019-04-10 12:26:59 -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
081fdf14ef
Merge pull request #15283 from kitely/fix-script-warnings
case 21978: Eliminated some JavaScript warnings due to missing commas
2019-04-10 11:28:04 -07:00
unknown
ca7cfc0240 only call onMove on lastMouseEvent change 2019-04-10 09:56:35 -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
Shannon Romano
6a05b7ec23
Merge pull request #15348 from SamGondelman/jsbaker
Case 22093: Disable JSBaker for now
2019-04-10 09:39:44 -07:00
Sam Gondelman
ab355c4c30
Merge pull request #15358 from SamGondelman/hashtag
Case 22108: Use # instead of ? for material URL name selection
2019-04-09 16:56:56 -07:00