Commit graph

27574 commits

Author SHA1 Message Date
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings
fix some xcode warnings for unnecessary captured this
2018-04-20 10:30:27 -07:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836
Update location.hostname JSDoc per serverless domains
2018-04-20 10:27:09 -07:00
John Conklin II
7378c87ade
Merge pull request #12690 from SimonWalton-HiFi/hmac-auth
Change packet authentication to use HMAC
2018-04-20 09:54:25 -07:00
John Conklin II
92bf99f436
Merge pull request #12786 from huffman/fix/node-list-connections
Fix avatars not coming back when briefly disconnected from avatar mixer
2018-04-20 09:53:50 -07:00
Simon Walton
377fc6d6c6 Revert to old packet version for ICE packets
Some ICE (& STUN) packets were using the default version,
which we bumped for the HMAC change. This commit breaks
out the switch for them and reverts to 17.
2018-04-19 16:55:32 -07:00
David Rowe
8ade4f34f4 Tweak wording 2018-04-20 10:11:01 +12:00
David Rowe
0552a7242a Further JSDoc updates for serverless domains 2018-04-20 09:52:35 +12:00
David Rowe
08defea755 Merge branch 'master' into 21836 2018-04-20 09:20:56 +12:00
John Conklin II
11f509e57a
Merge pull request #12873 from Zvork/haze
Fix for weird color shifting of teleportation target in Rust domain
2018-04-19 14:11:47 -07:00
Ryan Huffman
bef4eb1d05 Increase packet version for Ping 2018-04-19 14:04:17 -07:00
MiladNazeri
7e780ed55a
Merge pull request #12915 from ctrlaltdavid/21849
Add Entities materialData JSDoc
2018-04-19 13:49:24 -07:00
Sam Gateau
f87bfc14de
Merge pull request #12898 from kitely/emissivemap-relative-path
In Material resources, support relative paths for 'emissiveMap'
2018-04-19 10:25:02 -07:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code
Remove dead Octree code
2018-04-19 09:58:20 -07:00
Sam Gateau
1e086332cc
Merge pull request #12911 from jherico/feature/splash
Pre-requisite changes for splash screen rendering
2018-04-19 09:19:05 -07:00
Olivier Prat
c8bef8651f Fixed weird specular on hair an teleportation target! Was a stupid mistake... 2018-04-19 10:04:38 +02:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
John Conklin II
87f60e1e25
Merge pull request #12894 from sethalves/fix-tractor-action-crazy
fix bug that caused tractor action to go crazy
2018-04-18 14:13:56 -07:00
Clément Brisset
482f8ddbff
Merge pull request #12913 from birarda/bug/login-no-perms
delay NL reset on login until new username is known
2018-04-18 13:31:56 -07:00
John Conklin II
db99d12736
Merge pull request #12919 from kitely/fix-import-entities-distance
Fixed crash when importing entities from JSON multiple times
2018-04-18 11:52:46 -07:00
John Conklin II
710bfb894a
Merge pull request #12907 from AndrewMeadows/more-correct-stats-002
more correct stats names
2018-04-18 10:50:38 -07:00
Olivier Prat
1c9d1f6c48 Merge branch 'master' of http://github.com/highfidelity/hifi into haze 2018-04-18 09:06:23 +02:00
Clement
2e8a6e1961 Remove more dead octree code 2018-04-17 18:21:51 -07:00
John Conklin II
282db62996
Merge pull request #12928 from birarda/merge-back-stable-66
Merge back stable to master after RC66 promotion
2018-04-17 16:56:04 -07:00
John Conklin II
86c9b8c61d
Merge pull request #12892 from SimonWalton-HiFi/batch-compile-shaders
Batch compile shaders
2018-04-17 15:47:32 -07:00
Stephen Birarda
9fca98aa0f Revert "Reverting TAA to FXAA in rc66 until we fix the aa on tablet"
This reverts commit 8e7b9dfa2b.
2018-04-17 15:35:16 -07:00
Stephen Birarda
95c172f418 Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66 2018-04-17 15:34:46 -07:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018
Discovery: April 2018 (Huge PR; see description)
2018-04-17 15:11:50 -07:00
Brad Davis
d478204722 Working on splash rendering 2018-04-17 14:17:41 -07:00
John Conklin II
44e0a2acc5
Merge pull request #12914 from sethalves/rc66-fix-bookmarks
fix bookmarks, don't put :0 in urls
2018-04-17 08:29:36 -07:00
Oren Hurvitz
3ae65bba15 Fixed crash when importing entities from JSON multiple times
This happened because the Clipboard wasn't being completely cleared between uses.

This bug can also manifest in another way (if Interface doesn't crash): the imported entities appear very far away, instead of right in front of the user. This happens for the same reason as the crash: the Clipboard still contains some previously-imported entities. That causes us to calculate the wrong dimensions for the newly-imported entities which is why they are added to the domain far away.
2018-04-17 15:51:41 +03:00
David Rowe
f36a5289c9 Add Entities materialData JSDoc 2018-04-17 14:33:11 +12:00
Seth Alves
515c185887 don't call setPort on hifi urls when port is 0 (unset) 2018-04-16 19:10:16 -07:00
Stephen Birarda
898d61fcf7 delay NL reset on login until new username known 2018-04-16 17:45:05 -07:00
Anthony J. Thibault
c29bf51226 Fix for avatar glitches, head and legs folding into chest.
As a form of compression, when encoding avatar data we only send joints that have changed significantly from the previous packet.
Also, if a joint has the same value as the avatar's default pose, we don't send the full value, instead we mark it with a single bit.

This particular issue is caused by an interaction between the default value flag and the joint changed culling.

When connecting to a domain for the first time, it's possible that a I-frame or 'full' packet will not be sent for several seconds.
In this case, the AvatarMixer has no previous history for values that have not changed recently.
This causes the AvatarMixer to broadcast incorrect values to other clients.
Keep in mind that the AvatarMixer does not have access to the avatar FBX file, so it cannot make an educated guess for this value and uses zero values instead.
(0, 0, 0) for translation and (0, 0, 0, 1) for rotation.

When a translation value of zero is received for the lower legs it will cause the legs to fold into the avatar's chest.

Also, we've uncovered a bug where sometimes values were not sent to the AvatarMixer even when the value was previously default.
This would also exhibit the same issue where zero translation values would be sent.

I've done three things to help mitigate this issue.

1) On first connect to a new AvatarMixer, the Avatar now sends a 'full' packet.
2) When a joint rotation or translation changes from the default value, we transmit it.  No questions asked.
3) Once a SkeletonModel has finished loading we initialize the avatar's _jointData with the proper
   translations from the default pose.  This will help the case where a client receives a non default value, but has no previous history.

(cherry picked from commit 94efdf76a6454f316985f95d6a221adb24788d66)
2018-04-16 14:58:33 -07:00
Andrew Meadows
4d3109b849 cleanup some comments 2018-04-16 13:31:36 -07:00
Andrew Meadows
ace32193b4 more correct stat names 2018-04-16 13:31:36 -07:00
Ryan Huffman
e9d2912576 Update variable naming in NodeList from Id to ID 2018-04-16 12:03:58 -07:00
Simon Walton
b2e736da70 Remove commented-out code 2018-04-16 11:57:14 -07:00
Sam Gateau
19aa49832b
Merge pull request #12750 from SamGondelman/androidPrimitives
Forward pipelines for primitives
2018-04-16 11:18:56 -07:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801
HMD API JSDoc
2018-04-16 11:12:26 -07:00
Sam Gateau
3ac4a1db2d
Merge pull request #12850 from SimonWalton-HiFi/early-trace
Enable Interface tracing from earliest execution point
2018-04-16 10:24:55 -07:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
John Conklin II
40e34f578a
Merge pull request #12891 from samcake/rc66-backToFXAA
RC66: Reverting TAA to FXAA in rc66 until we fix the aa on tablet
2018-04-16 09:57:39 -07:00
Olivier Prat
f9cc4994df Merge branch 'master' of http://github.com/highfidelity/hifi into haze 2018-04-16 14:00:33 +02:00
Olivier Prat
6a089be973 Enabled haze to be vertically inverted (ceiling lower than base) 2018-04-16 12:15:08 +02:00
Oren Hurvitz
5e22202355 Material resources: support relative path for emissiveMap 2018-04-16 13:11:03 +03:00
Olivier Prat
9ad9c070f8 Some small shader optimizations 2018-04-16 08:50:18 +02:00
Anthony J. Thibault
63ee8c0ccb Fix for character walk animations in desktop mode.
(cherry picked from commit f19b1d9890)
2018-04-15 19:51:55 -07:00
Anthony J. Thibault
f4096c3931 Disable elbow pole vectors, solve from joint limit centers.
(cherry picked from commit 69f462baeb)
2018-04-15 19:51:26 -07:00
Seth Alves
7f285c5f90
Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal
Fix unprotected tree traversals
2018-04-14 14:33:25 -07:00