Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 13:36:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 74 branches 59 tags 1.2 GiB
Commit graph

28229 commits

Author SHA1 Message Date
Brad Davis
1b612d373f Explicitly delete QML context before releasing engine 2018-04-27 08:11:11 -07:00
Brad Davis
6640313256 Fix memory leak in QML surfaces 2018-04-27 08:10:22 -07:00
Brad Davis
4db83230ce Fix bad virtual cast on qml surface destruction 2018-04-27 08:09:31 -07:00
Brad Davis
2662dc9b4e Suppress tracing log spam when tracing is not active 2018-04-27 08:03:48 -07:00
Simon Walton
1448f3959e Add a utility function to dump ConnectionStats 2018-04-26 17:11:17 -07:00
Ryan Huffman
496b638a88 Fix log file directory not being capped at 50MB 2018-04-26 15:48:55 -07:00
MiladNazeri
098b432fd9
Merge pull request #13011 from ctrlaltdavid/21856-a 
Docs to JSDoc review updates
 2018-04-26 13:29:48 -07:00
Stephen Birarda
c8d7dc9b91 hide default port from addresses, fix localhost scheme 2018-04-26 13:29:26 -07:00
Stephen Birarda
97d793f867 hide default port from addresses, fix localhost scheme 2018-04-26 13:25:56 -07:00
Andrew Meadows
03e03727db fix bug: interface sends too many updates on settle 2018-04-26 12:55:28 -07:00
Stephen Birarda
bc4ce12e64
Merge pull request #13008 from huffman/fix/download-correct-installer 
Fix update installer URLs and add installer info to user activity data
 2018-04-26 11:32:22 -07:00
Stephen Birarda
9f25103b09
Merge pull request #12972 from sethalves/fix-linux-clang-build 
fix linux clang build
 2018-04-26 10:46:51 -07:00
Ryan Huffman
4c8b8d8442 Improve installer campaign+type for updates and user activity data 2018-04-26 08:32:18 -07:00
David Rowe
08dc9b133f Docs to JSDoc review 2018-04-26 21:10:28 +12:00
luiscuenca
e0770f06b1 Add scripts to Model Packager 2018-04-25 19:35:26 -07:00
Simon Walton
9ef56c44a3 Merge PR12964 to not use verification if not keyed 
https://github.com/highfidelity/hifi/pull/12964
 2018-04-25 17:08:08 -07:00
Clément Brisset
2be40d487e
Merge pull request #13002 from birarda/sixty-six-one-mergeback 
merge RC66.1 back to master
 2018-04-25 15:47:56 -07:00
Simon Walton
66bd424ae4 Bump default packet version for new HMAC 2018-04-25 14:51:11 -07:00
Simon Walton
4fa11f116f Add & use HMACAuth method that calculates hash atomically 
To avoid issues with race conditions involving separate
addData() and result() calls use a method that does
both in the lock.
 2018-04-25 14:41:16 -07:00
Liv Erickson
afea186784 fix for both functions 2018-04-25 14:39:04 -07:00
Stephen Birarda
956cc411d5 Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback 2018-04-25 14:33:23 -07:00
John Conklin II
cb7b03652b
Merge pull request #12796 from MiladNazeri/feature/add-findByName 
added Entities.findbyName
 2018-04-25 14:00:10 -07:00
Liv Erickson
1860e66bd2 Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace 2018-04-25 13:52:55 -07:00
Brad Davis
44816941fc Fix debug assert in manipulating thread local data to store GL surfaces 2018-04-25 13:51:27 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate 
Docs/docs to js docs update
 2018-04-25 12:26:19 -07:00
John Conklin II
f04200a620
Merge pull request #12976 from ctrlaltdavid/21856 
Docs to JSDoc
 2018-04-25 11:36:34 -07:00
John Conklin II
748c8cdc58
Merge pull request #12861 from Zvork/taapre 
Bloom and Temporal Anti-Aliasing improvements
 2018-04-25 11:16:56 -07:00
Simon Walton
e25e15d6b3 Merge branch 'hmac-better-locking' into hmac-auth2 2018-04-25 10:38:07 -07:00
Simon Walton
3233cc43ac Revert "Merge pull request #12981 from birarda/bug/revert-hmac" 
This reverts commit 91b93db0c5, reversing
changes made to 6062f21da1.
 2018-04-25 10:30:50 -07:00
John Conklin II
91b93db0c5
Merge pull request #12981 from birarda/bug/revert-hmac 
revert HMAC packet verification for now
 2018-04-25 10:07:36 -07:00
Olivier Prat
328f1dec9b Extended to other shaders 2018-04-25 18:56:18 +02:00
Bradley Austin Davis
ea0ef20416
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-25 09:43:20 -07:00
Olivier Prat
e37b18336a Improved anti-aliasing on text 2018-04-25 12:08:08 +02:00
Olivier Prat
eab7dd6006 Fixed procedural shaders 2018-04-25 10:25:34 +02:00
Olivier Prat
f332849d9a Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-25 09:19:21 +02:00
milad nazeri
4c736b2d62 Fixed defaults 2018-04-24 21:38:48 -07:00
David Rowe
cae9447ac5 Doc review 2018-04-25 15:09:47 +12:00
luiscuenca
165c3214a7 Avatar Scripts 2018-04-24 18:43:53 -07:00
Simon Walton
21a9525a73 Version of HMACAuth with exposed lock 
Client is responsible for locking between adding and
retrieving. Fixes a likely race.
 2018-04-24 17:52:12 -07:00
Liv Erickson
10694e2256 Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace 2018-04-24 17:15:45 -07:00
John Conklin II
6062f21da1
Merge pull request #12961 from Atlante45/fix/es-deadlock 
Enforce correct lock order between EntityTree and EntitySimulation
 2018-04-24 15:40:32 -07:00
Anthony J. Thibault
2136134ed0 Debug Draw rendering now is visible on background skybox 2018-04-24 14:28:08 -07:00
John Conklin II
ce14dfb9a4
Merge pull request #12974 from AndrewMeadows/dont-feed-bullet-garbage 
don't try to build convex hulls with nan data
 2018-04-24 14:11:25 -07:00
Atlante45
d82333534c Ensure the tree lock is always taken before the simulation lock 2018-04-24 13:46:05 -07:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data 
Get the correct device name connect to OpenVr
 2018-04-24 13:29:41 -07:00
Brad Hefta-Gaub
e6f15c720f
Merge pull request #12973 from birarda/bug/no-node-stats 
66.1: fix connection to start stats sending for assignments
 2018-04-24 13:23:39 -07:00
milad nazeri
23d07fa292 fixed spacing issue 2018-04-24 13:14:55 -07:00
John Conklin II
47c983a004
Merge pull request #12978 from AndrewMeadows/fix-crash-createConvexHull-RC66.1 
RC66.1: don't try to build convex hulls with nan data
 2018-04-24 13:03:13 -07:00
Stephen Birarda
63491588cb Revert "Merge pull request #12690 from SimonWalton-HiFi/hmac-auth" 
This reverts commit 7378c87ade, reversing
changes made to 92bf99f436.
 2018-04-24 12:44:51 -07:00
Brad Hefta-Gaub
c6f4e118ce
Merge pull request #12953 from huffman/hotfix/node-list-connections 
Hotfix, avatars disappear on quick reconnect
 2018-04-24 12:38:21 -07:00
samcake
382161659e Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork 2018-04-24 11:37:00 -07:00
Sam Gateau
b342b16857 Fixing the crash on mac 2018-04-24 11:25:40 -07:00
Sam Gateau
2cae294ab4
Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate 
LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it
 2018-04-24 11:22:48 -07:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash 
Attempt to shutdown web surfaces more consistently
 2018-04-24 10:15:25 -07:00
Brad Davis
4228b4269f Fixing PR build 2018-04-24 10:06:28 -07:00
Brad Davis
a144de54e7 Attempt to shutdown web surfaces more consistently 2018-04-24 10:06:20 -07:00
milad nazeri
1121fe8da0 fix tabs 2018-04-23 21:47:53 -07:00
Brad Davis
ecaf162afb Fixing PR build 2018-04-23 20:41:36 -07:00
Andrew Meadows
95d07345d4 don't try to build convex hulls with nan data 2018-04-23 17:00:38 -07:00
David Rowe
98f43b6a70 Interim JSDoc for MyAvatar - stubs for remainder 2018-04-24 10:47:33 +12:00
Andrew Meadows
ae186d46c6 don't try to build convex hulls with nan data 2018-04-23 14:46:23 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
John Conklin II
91197cadcf
Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix 
Fix for null sourceNode use
 2018-04-23 14:11:06 -07:00
David Rowe
719062dd9f Interim JSDoc for MyAvatar - first pass 2018-04-24 09:10:59 +12:00
John Conklin II
70689dd297
Merge pull request #12968 from birarda/bug/wrong-domain-local-id 
fix setting of domain local ID from domain list
 2018-04-23 13:50:21 -07:00
John Conklin II
5a3f44fa15
Merge pull request #12965 from NissimHadar/bug12979 
Fix for bug #12979: Setting colors [0, 0, 254] from js api ends up as black color
 2018-04-23 13:49:41 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert 
Minimum entity dimension (1mm)
 2018-04-23 13:40:53 -07:00
Stephen Birarda
a6509f5ea7 fix connection to start stats sending for assignments 2018-04-23 13:25:18 -07:00
Seth Alves
6d8f769cf8 fix linux clang build 2018-04-23 13:18:36 -07:00
John Conklin II
b3dbf7a025
Merge pull request #12943 from vladest/fix_spinbox 
Fix SpinBox.
 2018-04-23 13:02:01 -07:00
Stephen Birarda
779386fbc4 fix setting of domain local ID from domain list 2018-04-23 12:29:02 -07:00
Simon Walton
f849d6f937 Change packetSourceAndHashMatchAndTrackBandwidth logging in same manner 2018-04-23 12:26:02 -07:00
Andrew Meadows
577f9a03e6 fix bug: animation reset on 'hold' 2018-04-23 12:08:40 -07:00
Andrew Meadows
748af5a65f worry about multi-threads when updating animation props 2018-04-23 12:08:40 -07:00
Andrew Meadows
8e51d66092 fix bug: animation should reset on start running 2018-04-23 12:08:40 -07:00
Andrew Meadows
b48e9495a5 rollback change to MaterialEntityItem, we'll fix later 2018-04-23 12:08:40 -07:00
Andrew Meadows
75508385cf more correct needsToCallUpdate() implementations 2018-04-23 12:08:40 -07:00
Andrew Meadows
e36dbab838 remove unused data member 2018-04-23 12:08:40 -07:00
NissimHadar
ea6585a0b9 Corrected tosRGBFloat() computation. 2018-04-23 11:53:35 -07:00
Gabriel Calero
001cd5e937 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-23 14:25:26 -03:00
Sam Gateau
d1e2e9ce71
Merge pull request #12921 from SamGondelman/precisionq 
Fix AMD shader compilation
 2018-04-23 10:17:35 -07:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu 
Android: Hide menu and fix shader compilation
 2018-04-23 09:51:20 -07:00
milad nazeri
4ac06fe99f Updating previous jsdocs 2018-04-22 22:22:33 -07:00
David Rowe
941e9360dd JSDoc fixes 2018-04-23 16:09:56 +12:00
David Rowe
d65f66a73d Interim JSDoc for Recording 2018-04-23 14:13:29 +12:00
David Rowe
6a2b7244eb Interim JSDoc for Tablet 2018-04-23 11:06:17 +12:00
David Rowe
eeb511c359 Reticle JSDoc fix 2018-04-23 10:20:04 +12:00
David Rowe
4fb55ec2af Interim JSDoc for Users 2018-04-23 09:59:14 +12:00
David Rowe
8e22941ad7 Interim JSDoc for Reticle 2018-04-23 09:22:45 +12:00
milad nazeri
e9b9c05b5d removed cruft 2018-04-22 08:51:47 -07:00
David Rowe
2c39f2dbad Interim JSDoc for Scene 2018-04-22 17:37:06 +12:00
David Rowe
62930eb576 Interim JSDoc for Script 2018-04-22 15:26:39 +12:00
Seth Alves
9e1bd69af3
Merge pull request #12918 from kitely/fix-addentity-failure 
Fixed null pointer exception if importing an entity from JSON fails
 2018-04-21 18:12:48 -07:00
David Rowe
01870af624 Interim JSDoc for ScriptDiscoveryService 2018-04-22 11:32:46 +12:00
MiladNazeri
3710ce593d
Merge pull request #12922 from ctrlaltdavid/21815 
Controller API JSDoc
 2018-04-21 10:44:05 -07:00
vladest
2e44220b80 Merge branch 'master' into fix_spinbox 2018-04-21 19:38:28 +02:00
Olivier Prat
fbd06f7d5e Fixed compilation error on Android 2018-04-21 11:07:26 +02:00
David Rowe
3792b28a3e Add input recorder examples 2018-04-21 14:53:40 +12:00
SamGondelman
ac7e8623bf quiet shader warnings 2018-04-20 18:25:30 -07:00
MiladNazeri
080e26f408
Merge pull request #12952 from ctrlaltdavid/21851 
Vec3 API JSDoc
 2018-04-20 18:10:18 -07:00
Simon Walton
4973605bf7 Restore two makePrograms from previous commit 2018-04-20 17:52:40 -07:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
SamGondelman
d59f368ad6 hide menu, fix shaders 2018-04-20 17:38:38 -07:00
Seth Alves
84e71a9bca missed a file 2018-04-20 16:08:57 -07:00
Seth Alves
6fc02638d7 control verbose logging with a menu-item in developer menu 2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7 remove some uncatagorized logging, suppress some categories by default 2018-04-20 16:08:57 -07:00
David Rowe
7087abd201 Merge branch 'master' into 21815 2018-04-21 10:49:56 +12:00
John Conklin II
39ad8be1b8
Merge pull request #12743 from SimonWalton-HiFi/short-id 
Use 16-bit local IDs for Nodes in NL packets
 2018-04-20 15:28:18 -07:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup 
Make Audio.cpp threadsafe
 2018-04-20 11:36:08 -07:00
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -07:00
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
SamGondelman
3b4b43cf66 try to fix audio crash on startup 2018-04-20 10:23:47 -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
vladest
b8577bd791 Merge branch 'master' into fix_spinbox 2018-04-20 18:09:16 +02:00
Ryan Huffman
9cf133cff2 Increase packet version for Ping 2018-04-20 08:25:57 -07:00
Ryan Huffman
5bd89159dd Update variable naming in NodeList from Id to ID 2018-04-20 08:25:52 -07:00
Ryan Huffman
a930e39bd4 Fix nodelist connections not resetting on both ends 
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
 2018-04-20 08:25:45 -07:00
Olivier Prat
46a1ff4dd2 Set jitter to O on RenderableWebEntityItems 2018-04-20 12:02:17 +02:00
Olivier Prat
c6d598cc88 Jitter is now set through a batch command 2018-04-20 10:52:50 +02:00
Olivier Prat
57ff1c54e1 Created shared c++/glsl header for transformcamera 2018-04-20 09:01:19 +02:00
Olivier Prat
440e2b8452 Merged with master 2018-04-20 08:13:25 +02:00
David Rowe
8173ac87a8 Minor improvement to Quat.IDENTITY JSDoc 2018-04-20 16:41:10 +12:00
David Rowe
b1e214de5a Vec3 API JSDoc 2018-04-20 16:40:15 +12:00
David Rowe
0a7cccc3f7 Move Vec2 and Vec4 JSDoc 2018-04-20 12:47:53 +12:00
samcake
cb706cb9d9 Reapply extra sanity check that hasn;t been applied correctly in rc66 2018-04-19 17:24:04 -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
Gabriel Calero
adfbaac18f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-19 19:40:00 -03:00
Simon Walton
999e5beba1 Move linear pass down sample shader to deferred compile 2018-04-19 15:30:16 -07:00
Simon Walton
529d5517e5 Move antialiasing and velocity buffer makeProgram to deferred scheme 2018-04-19 15:30:16 -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
milad
42471c539b initial fixes from ctralt david's comments 2018-04-19 13:40:57 -07:00
vladest
663af09605 Fix SpinBox. attempt 1 2018-04-19 20:43:48 +02: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
milad
3f129bda13 More done on audio 2018-04-18 20:04:41 -07: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
Liv Erickson
d2335ea9f6 fix in where octree imports url so fix is global 2018-04-18 13:18:50 -07:00
Simon Walton
01c39d4310 Use NULL_LOCAL_ID in more places, as requested by review 2018-04-18 11:53:47 -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
ZappoMan
1a82101360 fix bug 349 2018-04-18 09:27:09 -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
SamGondelman
901301485b reorganizing shader defines to fix compilation errors 2018-04-17 15:11:56 -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
SamGondelman
527d71c379 CR 2018-04-17 10:58:54 -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
Olivier Prat
0800c5eeb9 Removed TAA from web shaders. With reduced jittering, jittering on these objects is less noticeable 2018-04-17 16:36:52 +02:00
Olivier Prat
6ec9378739 Used unjittered projection matrix for a sharper and more stable TAA 2018-04-17 15:13:03 +02: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
Olivier Prat
d0d974d4f5 Bizarelly the jitter was 2 pixel wide...? 2018-04-17 12:24:12 +02:00
Oren Hurvitz
91e27db9b0 When importing entities from JSON: fixed a null pointer exception if addEntity() failed on any of the entities 2018-04-17 12:32:28 +03:00
Olivier Prat
08146a7618 Used previous projection matrix to limit overblur 2018-04-17 11:28:59 +02:00
Olivier Prat
89669b326b Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-17 09:24:35 +02: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
milad
988dca437d added case-sensitive search 2018-04-16 18:30:00 -07:00
Stephen Birarda
898d61fcf7 delay NL reset on login until new username known 2018-04-16 17:45:05 -07:00
David Rowe
c1ede6ef58 Merge branch 'master' into 21815 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12: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
Gabriel Calero
e3b94b163c Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-16 14:55:16 -03: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
Dante Ruiz
5af1ea54d3 Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data 2018-04-16 10:10:55 -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
Seth Alves
22fd4a7116 fix bug that caused tractor action to go crazy if only one of the two entities it connected were known to interface 2018-04-14 12:27:58 -07:00
Simon Walton
b469cdfda2 More shaders to deferred compile scheme 2018-04-13 17:52:33 -07:00
samcake
8e7b9dfa2b Reverting TAA to FXAA in rc66 until we fix the aa on tablet 2018-04-13 17:30:30 -07:00
SamGondelman
c8afaf27e5 Merge remote-tracking branch 'upstream/master' into scaleAssert 2018-04-13 17:30:03 -07:00
Simon Walton
1ab31d9116 Defer some shader compilation to a batch job - WIP 2018-04-13 15:38:48 -07:00
SamGondelman
b71a06a18e min dim = 1 mm 2018-04-13 15:26:37 -07:00
Anthony Thibault
f2c38a77a6
Merge pull request #12877 from hyperlogic/bug-fix/avatar-recording-mtu-overflow 
Fix for avatar recording playback on avatars with many joints
 2018-04-13 14:26:32 -07:00
Seth Alves
426d18ed2a code review 2018-04-13 13:20:06 -07:00
John Conklin II
008c7be369
Merge pull request #12787 from druiz17/fix-offscreen-windows 
hide desktop windows when switching into HMD mode
 2018-04-13 12:17:15 -07:00
Seth Alves
0e081a3944 code review 2018-04-13 10:42:22 -07:00
Olivier Prat
8ef25301cb Fixed some shader program link errors 2018-04-13 17:14:19 +02:00
Olivier Prat
190e9313c7 Sorted out the mix between eye space and world space vectors in translucent object shading 2018-04-13 15:38:55 +02:00
Seth Alves
a56f3f4a10 code review 2018-04-12 19:06:12 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate 
Migrate materials from userData to materialData
 2018-04-12 18:24:33 -07:00
John Conklin II
ec10fcb7b7
Merge pull request #12868 from SamGondelman/missingAlpha 
Fix for missing alpha on server restart
 2018-04-12 16:42:34 -07:00
John Conklin II
5322195eee
Merge pull request #12867 from ctrlaltdavid/21836-a 
Fix location.protocol value for serverless domains
 2018-04-12 16:28:31 -07:00
John Conklin II
3d90f93cf1
Merge pull request #12812 from SamGondelman/compression 
Support ETC2/EAC compressed textures
 2018-04-12 16:04:08 -07:00
John Conklin II
67a8e6c82e
Merge pull request #12824 from SamGondelman/matFix 
Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch
 2018-04-12 15:30:11 -07:00
John Conklin II
9123c05eb3
Merge pull request #12859 from samcake/one 
Fix a bug when switching shadow on/off in front of mirror
 2018-04-12 15:25:05 -07:00
Anthony J. Thibault
da319b9af6 Changed version constants into a enum class, to fix macosx warnings. 2018-04-12 15:09:01 -07:00
Gabriel Calero
bd4a7ce4fa Hide jump button while moving. Fix jump button right alignment in pixel 2018-04-12 19:02:03 -03:00
John Conklin II
40ae2913eb
Merge pull request #12847 from SamGondelman/clientMat 
Fix client-only materials on non-avatars
 2018-04-12 14:53:34 -07:00
SamGondelman
284364683d Merge remote-tracking branch 'upstream/master' into scaleAssert 2018-04-12 14:46:40 -07:00
SamGondelman
9f3a431c5d minimum entity dimension 2018-04-12 14:12:52 -07:00
Gabriel Calero
aaaa17be7b Merge branch 'android_goto_splash' of https://github.com/gcalero/hifi into android_goto_splash 2018-04-12 18:00:05 -03:00
Gabriel Calero
476e1cf7ae Adjust UI with pixel perfect precision. Support devices with on-screen bars. 2018-04-12 17:59:38 -03:00
John Conklin II
1834325970
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by 
set lastEditedBy in local tree whenever a script adds or edits an entity
 2018-04-12 13:02:05 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership 
entity-server will expire stale simulation ownership
 2018-04-12 12:04:52 -07:00
Sam Gateau
77a27b2be7
Merge pull request #12835 from NissimHadar/speedUp1 
ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG
 2018-04-12 11:48:09 -07:00
Anthony J. Thibault
568af7a072 Fix for avatar recording playback on avatars with many joints 
Before this fix, playback of avatar recording frames could overflow the maximum UDP packet size (MTU).
This is playback of a recording was causing all the rotations and translations to be transmitted,
even if the translations were not any different then the avatar default pose.

This explicitly records the rotationIsDefaultPose and translationIsDefaultPose in the recording stream.
This does not break backwards compatibility.
However, it does require new recordings for avatars with large numbers of bones.
 2018-04-12 11:24:26 -07:00
Sam Gateau
20ae247185
Merge pull request #12784 from Zvork/zeye 
Potential bug correction when constructing eye position from Z-buffer depths in shaders
 2018-04-12 11:10:09 -07:00
Simon Walton
a584d67acd Tweaks for clang error and gcc warning 2018-04-12 10:44:41 -07:00
John Conklin II
ef133806be
Merge pull request #12813 from ctrlaltdavid/21826 
Fix Controller.getActions(), .getHardware(), and .getStandard()
 2018-04-12 10:42:25 -07:00
Cristian Luis Duarte
b031c1c070 Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash 2018-04-12 14:32:07 -03:00
Simon Walton
5c141aa5e9 Add --disableWatchdog command-line option 
Watchdog still runs but doesn't abort on timeout.
Also fixes for previous tracing improvements.
 2018-04-12 09:28:28 -07:00
Olivier Prat
2adac241d0 Fixed incorrect fragment to eye dir computation in haze 2018-04-12 15:11:10 +02:00
Simon Walton
888fca2127 Qualify getName in task template to satisfy gcc 2018-04-11 18:31:09 -07:00
Simon Walton
adcf991125 Improvements to profiling data capture 
Use code-provided task names for profile blocks; record QML URLs for
loadInternal.
 2018-04-11 17:36:32 -07:00
Ryan Huffman
5bf894d1f7 Fix FBX vertex colors not being read correctly 2018-04-11 16:48:02 -07:00
John Conklin II
5c26166bd6
Merge pull request #12841 from SamGondelman/simAssert 
Fix asserts on domain switch
 2018-04-11 16:02:45 -07:00
David Rowe
c2f0f7ef5f Doc review 2018-04-12 10:54:35 +12:00
Gabriel Calero
865e3a05f1 Move jump button to the right. Adjust position of buttons 2018-04-11 19:33:43 -03:00
David Rowe
7a9e3388fa Merge branch 'master' into 21801 2018-04-12 09:48:51 +12:00
SamGondelman
3270409b7b possible fix for missing alpha on server restart 2018-04-11 14:06:30 -07:00
Cristian Luis Duarte
d993e4938e Merge remote-tracking branch 'hifi/master' into android_goto_splash 2018-04-11 18:03:16 -03:00
David Rowe
b82f2510f2 Fix location.protocol value for serverless domains 2018-04-12 08:55:47 +12:00
John Conklin II
7a905ed420
Merge pull request #12777 from ctrlaltdavid/21813 
Fix Window API position and size reporting
 2018-04-11 13:48:21 -07:00
SamGondelman
e0b2c076ef cleanup and fix forward procedural rendering 2018-04-11 13:03:57 -07:00
Gabriel Calero
578012b662 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-11 16:30:53 -03:00
John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX 
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
 2018-04-11 12:08:35 -07:00
John Conklin II
19bf793910
Merge pull request #12761 from ctrlaltdavid/21821 
Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT
 2018-04-11 12:07:32 -07:00
Andrew Meadows
a0f3e3a031 add simulation ownership expiry 2018-04-11 09:40:32 -07:00
Olivier Prat
9ca0b39f74 Adjusted TAA blend to find the antialiasing and bloom stability sweet spot 2018-04-11 11:12:22 +02:00
Olivier Prat
cfacd80e08 Moved not in front overlays and highlight before TAA and Bloom 2018-04-11 10:56:27 +02:00
Sam Gateau
167db14bdb restoring the sampler desc layout to fix ktx cache and fixing the bug shadow when turning global shadow on off 2018-04-11 00:00:11 -07:00
Olivier Prat
182febe3e9 Switched to 9 tap gaussian blur to try to limit visible mach bands on larg glows 2018-04-11 08:44:02 +02:00
David Rowe
e37655ecdc Update location.hostname JSDoc per serverless domains 2018-04-11 16:35:49 +12:00
SamGondelman
d841eeb6e9 Merge remote-tracking branch 'upstream/master' into androidPrimitives 2018-04-10 16:52:08 -07:00
Zach Fox
b9d0360ea2 Finally fix the grey security pic bug! 2018-04-10 16:00:53 -07:00
SamGondelman
0c069574c5 forward pipelines for primitives 2018-04-10 15:56:08 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Seth Alves
f81836c830 support specification of named landing-points in serverless-domain json files 2018-04-10 14:25:59 -07:00
Simon Walton
9b6306601a Merge Clement's PR12700 diffs for early trace start 2018-04-10 13:13:46 -07:00
SamGondelman
bba47ba2b4 materials on client only entities 2018-04-10 11:35:24 -07:00
Olivier Prat
e2f442d7c1 Adjusted default bloom size 2018-04-10 18:06:36 +02:00
Olivier Prat
0085a6cfc0 TAA now operates on tonemapped input and performs inverse tone map before bloom 2018-04-10 17:33:33 +02:00
Olivier Prat
6dd6218b77 Reduced blur taps for better performance and limited normal attenuation distance 2018-04-10 14:30:36 +02:00
Olivier Prat
f6ffbef60d Final intensity adjustments 2018-04-10 12:36:36 +02:00
Olivier Prat
2974e05cf2 Tweaked bloom intensity mix 2018-04-10 11:13:37 +02:00
Olivier Prat
3c4409c5e1 Merge with master 2018-04-10 09:16:08 +02:00
Sam Gondelman
d781cf43ee
Merge pull request #12775 from Cristo86/android_jump 
Android Control - jump and view sensitivity
 2018-04-09 17:32:57 -07:00
SamGondelman
8f65813924 fix asserts on domain switch 2018-04-09 17:10:49 -07:00
Cristian Luis Duarte
1242446c52 Cleanup controller code 2018-04-09 19:57:55 -03:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66 
RC66 merge back to master
 2018-04-09 13:17:12 -07:00
SamGondelman
9b07880aab migrate materials from userData to materialData 2018-04-09 12:49:03 -07:00
John Conklin II
d281d7b2cb
Merge pull request #12819 from Atlante45/fix/location-hostname 
Fix location.hostname
 2018-04-09 09:42:41 -07:00
Gabriel Calero
b30cb25a3f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-09 12:20:35 -03:00
NissimHadar
f610d6b201 Merge branch 'master' of github.com:highfidelity/hifi into speedUp1 2018-04-07 20:36:57 -07:00
NissimHadar
10ce785ad7 If not in DEBUG then do not call qcDebug (in NetworkTexture::ktxInitialDataRequestFinished) 2018-04-07 09:17:08 -07:00
SamGondelman
6ffdae0500 disable etc2/eac compression on 4.1 2018-04-06 15:38:29 -07:00
SamGondelman
5503c7909a fix materials not disappearing on deletion in certain cases 2018-04-06 15:18:21 -07:00
Cristian Luis Duarte
f556c8d3a7 Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-06 18:02:30 -03:00
John Conklin II
02422ba538
Merge pull request #12820 from birarda/bug/store-serverless-with-tilde 
RC66 - move file ~ expansion from AddressManager to DomainHandler
 2018-04-06 13:31:01 -07:00
Clement
dea5382991 Fix location.hostname 2018-04-06 13:19:07 -07:00
John Conklin II
fe5e797a24
Merge pull request #12816 from SamGondelman/web66 
RC66: Possible fix for QML texture leak
 2018-04-06 13:08:50 -07:00
Cristian Luis Duarte
bd6f0fd59e Make view/rotation control independent of touchUpdate events rate 2018-04-06 16:17:28 -03:00
Stephen Birarda
1ff7939735 move file ~ expansion from AddressManager to DomainHandler 2018-04-06 11:05:17 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66 
Merge back RC66 to master
 2018-04-06 10:43:01 -07:00
John Conklin II
c8d109854b
Merge pull request #12800 from huffman/fix/entity-lock 
Remove lock file recovery in entity server
 2018-04-06 10:04:34 -07:00
SamGondelman
d38dadaf58 possible fix for qml texture leak 2018-04-06 09:34:00 -07:00
Olivier Prat
573f399023 Fixed incorrect shadow frustum far clip computation due to not taking into account shadow receivers 2018-04-06 14:45:16 +02:00
Olivier Prat
7e111e89c4 Merge branch 'master' of http://github.com/highfidelity/hifi into shadow 2018-04-06 11:43:48 +02:00
David Rowe
8d25a745f0 Fix Controller.getActions(), .getHardware(), and .getStandard() 2018-04-06 17:21:49 +12:00
SamGondelman
44ea5a2e84 add etc2/eac support 2018-04-05 18:59:22 -07:00
Seth Alves
8de545acdf add new address accessor for 'public' addresses, use it for snapshot and stream 2018-04-05 13:39:51 -07:00
Seth Alves
148007435e update comment 2018-04-05 13:01:31 -07:00
Seth Alves
1de878eb9c fix logic 2018-04-05 12:43:03 -07:00
Seth Alves
81ba875ad2 currentShareableAddress wont return file: urls. copy-current-address menu item uses non-shareable version 2018-04-05 12:39:49 -07:00
Gabriel Calero
0da2c972e3 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-05 16:22:56 -03:00
Ryan Huffman
010356709d Remove lock file recovery in entity server 
* We no longer make backups at the ES, so there is no backup to
  recover from if we crash during persist to disk.
  * When loading the most recent backup we look for files that match our
  backup rules. If we have no backup rules we end up grabbing
  everything.
  * Because we grab everything, we are at risk of grabbing the lock file
  and treating it as a backup. In the case where we crash on persist, we
  end up replacing the models.json.gz file with the lock file (!!).

This commit makes a small change to not do the recovery on startup. In a
future update we will remove the backup-related code on the ES
altogether.
 2018-04-05 11:52:31 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003 
cleanup around simulation-ownership
 2018-04-05 10:58:45 -07:00
milad
4adc8928f0 added Entities.findbyName 2018-04-05 09:58:54 -07:00
samcake
78053b8b48 Refix the normal map case foro translucents 2018-04-04 18:33:27 -07:00
Simon Walton
f10bbce557 Squelch initialization warning 2018-04-04 18:32:40 -07:00
Simon Walton
93bcd1df20 Fix Linux build for std::call_once with lambda 
MacOS & Ubuntu don't like the combination of std::call_once and
lambda w/ reference param, for some reason. Change to pointer
param.
 2018-04-04 17:55:45 -07:00
Cristian Luis Duarte
1a967e45a6 Android View control - Remove limit, use a scale filter, remove deadZone to increase sensitivity 2018-04-04 21:54:12 -03:00
Simon Walton
a370d287c3 Change AudioRingBuffer.cpp to use std::call_once 2018-04-04 16:42:10 -07:00
Simon Walton
d05f0600d4 Handle one-time messages outside LogHandler class 
Also change to std::call_once for the file-scope message IDs.
 2018-04-04 15:44:47 -07:00
Gabriel Calero
15163f5e87 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-04 19:25:20 -03:00
Atlante45
895023ca4b Fix unprotected tree traversals 2018-04-04 14:54:21 -07:00
Simon Walton
ce5f6da6ca Restore setup of flush timer that was inadvertently lost 2018-04-04 14:43:26 -07:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade 
Update to Transitions debugging / editing script
 2018-04-04 14:31:59 -07:00
Cristian Luis Duarte
b61a436a84 Android fly - Use new asset and screen position - missing cpp 2018-04-04 18:23:03 -03:00
Cristian Luis Duarte
ffb8b0a60e Android fly - Use new asset and screen position 2018-04-04 18:19:01 -03:00
Simon Walton
ed3347a89b Repeated logging - reviewer fixes 2018-04-04 14:11:10 -07:00
Seth Alves
2545e67b14 set lastEditedBy in local tree whenever a script adds or edits an entity 2018-04-04 12:27:41 -07:00
Ryan Huffman
2546ff91ca Fix nodelist connections not resetting on both ends 
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
 2018-04-04 11:53:05 -07:00
Dante Ruiz
09ced24710 hide desktop windows when switching into HMD mode 2018-04-04 11:05:25 -07:00
Stephen Birarda
3a8c9de4fb fix some xcode warnings for unnecessary captured this 2018-04-04 10:38:32 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Gabriel Calero
ddbf4417ff Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-04 12:24:25 -03:00
Seth Alves
db82c464eb
Merge pull request #12741 from ctrlaltdavid/21816 
Remove Entities.currentAvatarEnergy and related from the API
 2018-04-04 08:07:46 -07:00
Olivier Prat
fc86525863 Cleaned up a bit shadow map clear 2018-04-04 12:00:06 +02:00
Olivier Prat
e3908662fe Merge branch 'master' of http://github.com/highfidelity/hifi into zeye 2018-04-04 09:50:37 +02:00
Andrew Meadows
f0fcfc432c fix typo in comment 2018-04-03 22:16:10 -07:00
Andrew Meadows
d57cb0b5d7 use list.empty() instead of comparing list.size() 2018-04-03 22:15:57 -07:00
Andrew Meadows
6d7574cab9 use std::numeric_limtis<uint64_t>::max() instead of -1 2018-04-03 22:13:25 -07:00
Andrew Meadows
70d6aa99e8 more 'const uint64_t&' purges 2018-04-03 21:55:31 -07:00
Andrew Meadows
bd2bfb6807 DRY: simpler removal of element from middle of std::vector 2018-04-03 18:28:07 -07:00
Andrew Meadows
0a2b4a8d1d add comment about returning smart pointer by ref 2018-04-03 18:26:43 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
Anthony Thibault
00bec7310e
Merge pull request #12731 from hyperlogic/feature/log-exceptions-in-controller-js 
JavaScript exceptions during Controller system callbacks are now logged
 2018-04-03 16:22:44 -07:00
Cristian Luis Duarte
88c83f3bfe Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-03 19:59:21 -03:00
Simon Walton
d4ab06b1d4 Move HIFI_FDEBUG macro to LogHandler.h 
Not all uses of repeated log messages include NetworkLogging.h,
but if they use addRepeatedMessageRegex() they must include
LogHandler.h. Also add second macro for client-supplied
message ID.
 2018-04-03 15:53:12 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66 
RC66 mergeback
 2018-04-03 15:39:16 -07:00
David Rowe
a3c8b2792d Fix Window.geometryChanged() values for moving and resizing window 2018-04-04 09:42:05 +12:00
Seth Alves
5f13df4102
Merge pull request #12722 from druiz17/fix-entities-outline 
fix ContextOverlayInferface highlighing unspecified entities.
 2018-04-03 12:29:19 -07:00
Simon Walton
5b0bcd76e3 Repeated logging - Fixes and clean-up 2018-04-03 12:23:21 -07:00
Cristian Luis Duarte
cbf13c9f8c Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-03 16:12:17 -03:00
Cristian Luis Duarte
1ea056a8a9 Android - Initial Jump button implementation 2018-04-03 16:07:40 -03:00
Simon Walton
a7fc6a2991 Repeated logs - use #define to replace qCDebug 2018-04-03 10:44:53 -07:00
Gabriel Calero
78c50410b3 Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash 2018-04-03 14:37:19 -03:00
Olivier Prat
01cba0c591 Merge branch 'master' of http://github.com/highfidelity/hifi into zeye 2018-04-03 08:03:35 +02:00
Simon Walton
6d078f41e7 Use unique IDs for log strings that should have repeats supressed 2018-04-02 17:32:18 -07:00
Seth Alves
71d6dbf9bf allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree 2018-04-02 15:52:28 -07:00
David Rowe
ab8ee20960 Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT 2018-04-03 10:00:19 +12:00
Brad Davis
14ea168ab3 Merge remote-tracking branch 'upstream/master' into bindless 2018-04-02 13:13:28 -07:00
Anthony Thibault
dc9c9fd0ee
Merge pull request #12683 from hyperlogic/bug-fix/reduce-elbow-flapping 
Reduce avatar elbow fluttering by disabling pole vectors
 2018-04-02 10:51:28 -07:00
Simon Walton
2ba64e1115 LocalID - Use tbb hash map instead of std one for better concurrency 2018-04-02 10:46:38 -07:00
Simon Walton
f4bd1f5ed7 Add definition for NetworkPeer::NULL_LOCAL_ID to (hopefully) satisfy MacOS 2018-04-02 09:45:46 -07:00
Simon Walton
efb1fdbc0d Local IDs - add an explicit null value, use it for replicated packets 2018-03-30 18:29:26 -07:00
Simon Walton
734b48eee0 Local IDs - Reviewer's suggested improvements 2018-03-30 17:27:52 -07:00
Andrew Meadows
59abc1d5b5 DRY sendBid() and sendUpdate() 2018-03-30 17:04:31 -07:00
Sam Gateau
8178ee7f34 Merge branch 'RC66' of https://github.com/highfidelity/hifi into rc66-mirror 2018-03-30 17:00:11 -07:00
Sam Gateau
d5496d68fd FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly 2018-03-30 16:58:41 -07:00
Andrew Meadows
766077204e fix typo inside assert() 2018-03-30 16:35:16 -07:00
Dante Ruiz
c99676b510 atlernate fix for selected entities 2018-03-30 13:44:54 -07:00
Andrew Meadows
a924bd4eb0 set correct _bidPriority on first ownership update 2018-03-30 13:18:32 -07:00
Andrew Meadows
5a5376c3d5 untangle 'bidding' from 'owned' 2018-03-30 13:18:32 -07:00
Andrew Meadows
170ec83870 remove unnecessary assert 2018-03-30 13:18:32 -07:00
Andrew Meadows
eb07f6732f add reminder comment 2018-03-30 13:18:32 -07:00
Andrew Meadows
49dce6fa1a remove some redundancy checks 
no need to assert(_entity) : guaranteed by ctor and dtor logic
moved some checks around to avoid redundant work
 2018-03-30 13:18:32 -07:00
Andrew Meadows
dcf5110caa clarify hardcoded constant 2018-03-30 13:18:32 -07:00
Andrew Meadows
4e0f307dc0 quint8 --> uint8_t 2018-03-30 13:18:32 -07:00
Andrew Meadows
d6ac294f39 use uint8_t instead of quint8 2018-03-30 13:18:32 -07:00
Andrew Meadows
4501033861 add description of simulation ownership rules 2018-03-30 13:18:32 -07:00
Andrew Meadows
2be0f0fa22 better comments 2018-03-30 13:18:32 -07:00
Andrew Meadows
c61a226bb5 delete default EntityMotionState ctor 2018-03-30 13:18:32 -07:00
Andrew Meadows
73fa6d3d2f slightly simpler EntityMotionState delete logic 2018-03-30 13:18:32 -07:00
Andrew Meadows
6746e08206 faster EntitySimulation::takeDeadEntities() 2018-03-30 13:18:32 -07:00
Andrew Meadows
e1d2a5e5f3 more cleanup for deleting entities 2018-03-30 13:18:32 -07:00
Andrew Meadows
5854a36ff7 more correct handling of simulated entity 2018-03-30 13:18:32 -07:00
Andrew Meadows
a05c753e03 only process changed entities when simulated 2018-03-30 13:18:32 -07:00
Andrew Meadows
738e1267ab small optimization in EntitySimulation::changeEntity() 2018-03-30 13:18:32 -07:00
Andrew Meadows
f20c9d3c5b EntitySimulation::removeEntityInternal isn't pure virtual 2018-03-30 13:18:32 -07:00
Andrew Meadows
0596497930 more correct comments 2018-03-30 13:18:32 -07:00
Andrew Meadows
5649748b17 make EntitySimulation::changeEntityInternal() pure virtual 2018-03-30 13:18:32 -07:00
Andrew Meadows
bd434e3f18 make EntitySimulation::addEntityInternal() pure virtual 2018-03-30 13:18:32 -07:00
Andrew Meadows
6837d042ad move entityCollisionWithEntity to PhysicalEntitySimulation 2018-03-30 13:18:32 -07:00
John Conklin II
8c8400947f
Merge pull request #12745 from SamGondelman/shadow 
RC66: Fix shadows on primitives
 2018-03-30 12:52:08 -07:00
Gabriel Calero
b123b67134 Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash 2018-03-30 15:38:36 -03:00
SamGondelman
5a7e9d8e3e fix shadows on primitives 2018-03-30 09:48:04 -07:00
Brad Davis
440c01ae05 Merge remote-tracking branch 'upstream/master' into bindless 2018-03-30 09:29:35 -07:00
Olivier Prat
02cf15d115 Lightclusters no unpack position from zdb 2018-03-30 10:06:27 -04:00
John Conklin II
5013760aa1
Merge pull request #12742 from jherico/fix/rc66_crashes 
Fix/rc66 crashes
 2018-03-29 18:04:52 -07:00
Olivier Prat
6f7a1eaefa Fixed correct inverse projection matrix when computing from Zeye 2018-03-29 18:05:43 -04:00
Simon Walton
e9ec4df36f Gcc complained about superfluous const qualifier 2018-03-29 14:10:31 -07:00
Olivier Prat
bd0e13463d Fix on unpackDeferredPosition 2018-03-29 17:06:23 -04:00
David Rowe
7027ccb6d8 Remove unused code 2018-03-30 09:35:25 +13:00
Olivier Prat
5f8693aae2 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-29 15:52:38 -04:00
David Rowe
3b90078097 Remove Entities.currentAvatarEnergy and related from the API 2018-03-30 08:36:18 +13:00
John Conklin II
a76b4b1008
Merge pull request #12734 from samcake/RC66-fetchMetaItem 
RC66: Add an extra sanity check when calling fetchMetaSubItemBounds
 2018-03-29 11:05:08 -07:00
Simon Walton
1b0b280f3a Fix SequenceNumberStats, misc. clean-up 2018-03-29 10:47:11 -07:00
SamGondelman
afe39aba46 fix octal code char issue 2018-03-29 10:05:08 -07:00
John Conklin II
97d9c1b735
Merge pull request #12726 from jherico/fix/rc66_crashes 
Attempt to resolve potential overlay crashes at shutdown
 2018-03-29 09:37:23 -07:00
Olivier Prat
3c8cd48dfb Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-29 07:21:01 -04:00
Simon Walton
b409e04734 Handle all case of nodes being deleted from nodelist 
Delete erased nodes from local ID mapping, as this uses
SharedPointer. Don't keep the mapping from local IDs
to UUIDs in GateKeeper as it isn't used.
 2018-03-28 17:42:23 -07:00
samcake
2ee0af03c8 Add an extra sanity check when calling fetchMetaSubItems when the subItems is not allocated yet 2018-03-28 16:17:55 -07:00
Cristian Luis Duarte
fe9481b28d Cleanup code, comment out log, simplify radar is valid touch code (no more flag) 2018-03-28 19:50:44 -03:00
Anthony J. Thibault
ca3fe28b05 JavaScript exceptions during Controller system callbacks are now logged 
(cherry picked from commit d3aec12e9e76e4aeb8ecbd449cc76afda1a0e35d)
 2018-03-28 14:01:21 -07:00
Olivier Prat
e4416db06f Added save/file dialog for transition configurations in transition editor 2018-03-28 16:54:53 -04:00
Simon Walton
f823f63211 Add domain local ID to DomainServerList 
Also handle domain local ID for 'domain sourced' packets;
bump packet version.
 2018-03-28 13:27:43 -07:00
Cristian Luis Duarte
f0bcaa47c8 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-28 16:47:21 -03:00
Brad Davis
9be162de95 Synchronously shut down QML rendering threads 2018-03-28 09:13:46 -07:00
Olivier Prat
7fa5e384b9 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-28 11:21:07 -04:00
Seth Alves
46fb2033f2
Merge pull request #12574 from druiz17/remap-keybaord 
changing keyboard mapping
 2018-03-27 19:00:05 -07:00
Simon Walton
bed4033554 Local node IDs now working correctly 
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
 2018-03-27 18:18:14 -07:00
David Rowe
1bcb9738f0 Miscellaneous fixes noticed in passing 2018-03-28 12:26:08 +13:00
David Rowe
b35ee5ce8a Fix JSDoc links to Vec3 constants 2018-03-28 12:25:49 +13:00
David Rowe
f27e8868eb Add HMD JSDoc 2018-03-28 12:25:12 +13:00
Simon Walton
d3464378b7 Short local source IDs - checkpoint 
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
 2018-03-27 13:46:58 -07:00
Gabriel Calero
3fc78da1f5 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-03-26 19:51:34 -03:00
Simon Walton
4ec77e3af6 WIP - assign short IDs to nodes and distribute them. 2018-03-26 14:57:59 -07:00
Seth Alves
6948de7e24 default to serverless tutorial 2018-03-26 14:32:40 -07:00
Gabriel Calero
0068e5dc0f Fix account info persistence after login 2018-03-26 14:56:05 -03:00
Dante Ruiz
b8796db1e5 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-26 09:13:58 -07:00
Cristian Luis Duarte
6cb5cd7f92 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-26 11:19:42 -03:00
Simon Walton
b5f165d481 Store a short ID with the Node on the domain-server side 2018-03-23 16:55:19 -07:00
Cristian Luis Duarte
242b009562 Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events. 2018-03-23 18:59:55 -03:00
SamGondelman
a19f71e759 fix tonemapping on android 2018-03-23 14:16:47 -07:00
Gabriel Calero
8558759d41 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-03-23 16:56:53 -03:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android 
Android: Stats, disable IK, reduce impact of InputRecorder
 2018-03-23 11:08:50 -07:00
John Conklin II
0bc23456c3
Merge pull request #12682 from ctrlaltdavid/21807 
JSDoc that an entity's clientOnly property can be set at entity creation
 2018-03-22 17:55:45 -07:00
Dante Ruiz
4d52caccde making some more requested changes 2018-03-22 17:39:22 -07:00
Dante Ruiz
1d17658c80 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-22 16:29:16 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable 
Merge stable back into master
 2018-03-22 15:08:30 -07:00
Simon Walton
68ab0eed68 HMACAuth - fix some more spacing issue 2018-03-22 14:44:25 -07:00
John Conklin II
6d9892856d
Merge pull request #12510 from sethalves/serverless-domains 
Serverless domains
 2018-03-22 14:06:49 -07:00
Stephen Birarda
e8bea3a611
Merge pull request #12369 from simon-walton/BugFix 
Lexer code has confusion between strings and chars
 2018-03-22 12:03:47 -07:00
Gabriel Calero
f444766551 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-03-22 15:15:50 -03:00
Sam Gondelman
e46a8f022c
Merge pull request #12695 from gcalero/fix/current_context 
Fix/current context
 2018-03-22 10:54:34 -07:00
Dante Ruiz
cea0f98aae reverting files 2018-03-22 09:20:27 -07:00
Dante Ruiz
f5a954d08e Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-03-22 09:06:42 -07:00
Gabriel Calero
12b289bbc1 Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread 2018-03-22 12:38:56 -03:00
Simon Walton
10f3032746 Compare QString w/ char*, not char 2018-03-21 23:09:46 -07:00
Brad Davis
0e7ee95c95 Merge remote-tracking branch 'upstream/master' into bindless 2018-03-21 19:16:55 -07:00
Brad Davis
3b5948ad85 Merge branch 'gl_common' into bindless 2018-03-21 19:16:34 -07:00
Seth Alves
b551b144a7 remove unneeded setIsConnected call 2018-03-21 19:15:27 -07:00
Simon Walton
3e1a333776 Just bump default packet version 2018-03-21 18:40:54 -07:00
Simon Walton
16b0c48b73 HMACAuth - improved syntax for new 2018-03-21 18:32:25 -07:00
Simon Walton
29b4353397 Spacing clean-up 2018-03-21 18:26:32 -07:00
Simon Walton
d58b2acc8c Use raw pointer for possibly-opaque openssl context type 2018-03-21 18:25:26 -07:00
Simon Walton
3ced1c8923 More Openssl 1.1 (Android) fixes 2018-03-21 17:31:54 -07:00
Simon Walton
ef08770235 Missed reviewer change 2018-03-21 17:17:24 -07:00
Simon Walton
755d89464f HMAC Auth - reviewer-requested changes 2018-03-21 17:15:49 -07:00
Simon Walton
64973aa334 OpenSSL HMAC changes for Android 
Looks like Android uses OpenSSL 1.1.0, which provides
an allocator for its HMAC context.
 2018-03-21 17:06:15 -07:00
Seth Alves
4f20a87c6d review 2018-03-21 16:26:02 -07:00
Seth Alves
916ed3a0d4 review 2018-03-21 16:18:31 -07:00
Brad Davis
d529d7b1d3 Remove whitespace before shader version line 2018-03-21 16:07:04 -07:00
Seth Alves
ae94ab3d67 make sure _sockAddr is cleared if the new url isn't a hifi:// one 2018-03-21 15:28:12 -07:00
Simon Walton
fb16e772ba Move HMACAuth class to networking lib 
Also reverts addition of openssl headers to shared lib.
Commit will require rerunning cmake.
 2018-03-21 15:25:50 -07:00
Simon Walton
adbb2400ab HMAC Auth - add openssl to cmake file for lib shared 2018-03-21 14:58:14 -07:00
Seth Alves
bea7ee42e2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 14:30:07 -07:00
Seth Alves
ef52ae13ee rearrange domain-url-changed signals 2018-03-21 14:30:00 -07:00
Simon Walton
eb04f77c3d HMAC Auth - code modifications requested by reviewer 2018-03-21 14:04:34 -07:00
Gabriel Calero
35935ed41a Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-03-21 17:41:02 -03:00
Gabriel Calero
11bfc1ca74 Add Goto as splash screen in android 2018-03-21 17:40:14 -03:00
Brad Davis
ae8df7e24e Merge remote-tracking branch 'origin/gl_common' into HEAD 2018-03-21 12:35:17 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex 
Materials on primitives
 2018-03-21 12:08:24 -07:00
John Conklin II
283aff71ec
Merge pull request #12612 from jherico/gl_common 
Break out common GL and GLES code into a single shared library
 2018-03-21 11:28:24 -07:00
Seth Alves
4033af9b11 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 11:11:43 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776 
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
 2018-03-21 09:27:51 -07:00
Dante Ruiz
86cd5ffa30 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-21 08:49:25 -07:00
Bradley Austin Davis
d5d8e4c0b0 Restoring geometry shader 2018-03-20 18:28:53 -07:00
Simon Walton
8ce03d65b7 Only update the connection secret UUID if it changes 
Rekeying the openssl HMAC context occasionally causes
hash generation errors. It is not clear why. The Node
secret never seems to change to check for this before
rekeying. Also other clean-up for PR.
 2018-03-20 18:16:45 -07:00
Anthony J. Thibault
f19b1d9890 Fix for character walk animations in desktop mode. 2018-03-20 18:12:55 -07:00
Olivier Prat
6b44d79f90 Proposal to improve fade editing with some extra visual cues 2018-03-20 17:48:41 -07:00
Olivier Prat
143a315f1d Fade edited objects are now selected with ray picking 2018-03-20 15:29:50 -07:00
Sam Gateau
a7533e5287
Merge pull request #12675 from SamGondelman/hotfix 
Model behaves correctly if missing material
 2018-03-20 14:27:21 -07:00
Sam Gateau
e59eed64fb
Merge pull request #12680 from SamGondelman/relative 
Support relative paths for material images
 2018-03-20 14:24:50 -07:00
Bradley Austin Davis
a861be112f Fix GLES build 2018-03-20 14:15:38 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe 
switch back to app-local VC runtimes and UCRT
 2018-03-20 14:07:27 -07:00
John Conklin II
de5ff20968
Merge pull request #12664 from gcalero/android_websurface_check_nocrash 
Android - Prevent crash when setting the url property to _webSurface.
 2018-03-20 11:40:08 -07:00
Seth Alves
585a523823 unmangle merge 2018-03-20 11:17:56 -07:00
Olivier Prat
f0a7a9b21c Merged with master 2018-03-20 10:24:41 -07:00
Stephen Birarda
cd887b5faf
Merge pull request #12654 from huffman/feat/content-zip-upload 
Add support for .content.zip content uploads
 2018-03-20 10:07:53 -07:00
Brad Davis
f77228bbfe Fixing missing m_pi define 2018-03-20 09:58:47 -07:00
Brad Davis
659da9b0e4 Merge remote-tracking branch 'upstream/master' into gl_common 2018-03-20 09:18:56 -07:00
Anthony J. Thibault
69f462baeb Disable elbow pole vectors, solve from joint limit centers. 2018-03-19 18:53:00 -07:00
Simon Walton
2a486a4c14 Bump packet version numbers 2018-03-19 17:48:11 -07:00
Simon Walton
020a6a6585 Take out hash timing code 2018-03-19 15:57:32 -07:00
Simon Walton
da7298b8bd Support only HMAC - take out passing around of secret UUID 
Also other clean-up for production use.
 2018-03-19 15:28:44 -07:00
Seth Alves
f61504b814 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-19 14:59:18 -07:00
Seth Alves
bc527d5ae8 try again on expandToLocalDataAbsolutePath 2018-03-19 14:59:10 -07:00
John Conklin II
91db0ab00f
Merge pull request #12650 from ctrlaltdavid/21798 
Messages API JSDoc
 2018-03-19 13:56:57 -07:00
David Rowe
541d798a6b Update code comment 2018-03-20 09:53:57 +13:00
David Rowe
4b52c21d1c JSDoc that an entity's clientOnly property can be set at entity creation 2018-03-20 09:51:10 +13:00
Seth Alves
a623ba7499 expandToLocalDataAbsolutePath now expands to a file:// url rather than a qrc:// url 2018-03-19 13:48:31 -07:00
Simon Walton
af21cac0c2 Fixes for gcc 2018-03-19 12:53:16 -07:00
Cristian Luis Duarte
17fddd9e0e RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface 2018-03-19 15:33:14 -03:00
SamGondelman
8ddf360c79 support relative paths for material images 2018-03-19 09:59:11 -07:00
Seth Alves
af42b5e93f trying to fix expandToLocalDataAbsolutePath 2018-03-19 09:42:03 -07:00
Simon Walton
d889384d94 Use elaborated type-specifier for openssl internal class 2018-03-19 09:41:57 -07:00
Seth Alves
a4599fe7ce Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 20:07:35 -07:00
Seth Alves
a144b738e5 fix ACs 2018-03-16 22:39:43 -04:00
Simon Walton
db8a1ccb3e Set HMAC key once and reuse OpenSSL context 
Store the HMAC wrapper in Node. Unfortunately requires a
lot of plumbing down to NLPacket. Added a mutex to the
wrapper since suspicious crashes occurred.
Authentication times seem to be comparable to existing MD5.
 2018-03-16 18:03:13 -07:00
John Conklin II
0934a7d467
Merge pull request #12673 from huffman/fix/ie-edge-ds-settings-failure 
Fix DS settings issues on IE and Edge
 2018-03-16 17:35:56 -07:00
Sam Gondelman
b96f398274
Merge pull request #12593 from gcalero/android_joystick_rotate_move 
Android joystick rotate move
 2018-03-16 17:24:15 -07:00
SamGondelman
06c0b3afd3 disable IK on android, input recorder doesn't do anything if off 2018-03-16 16:52:12 -07:00
SamGondelman
444534f4ff model behaves correctly if missing material 
(cherry picked from commit 1e89debc4e)
 2018-03-16 15:51:37 -07:00
Ryan Huffman
fdca6e0832 Update direct _requestHeaders access to be consistent with other reads 2018-03-16 15:28:27 -07:00
Ryan Huffman
3a98cf284f Fix DS not handling lowercase header keys 2018-03-16 14:30:03 -07:00
Seth Alves
7a7a9e9af0 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 16:55:47 -04:00
Stephen Birarda
472e7c003f
Merge pull request #11860 from huffman/feat/obj-baker-update 
OBJ Baking
 2018-03-16 13:54:07 -07:00
SamGondelman
984a48316d CR 2018-03-16 13:51:29 -07:00