Cristian Luis Duarte
401bf2f2a4
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-30 14:38:32 -03:00
Ken Cooke
1e25d48941
Merge pull request #13044 from roxanneskelly/roxie-arm64-fixes
...
Two fixes for arm64 on linux
2018-04-27 17:15:03 -07:00
Roxanne Skelly
ac8b3e4f5e
Two fixes for arm64 on linux
...
1) size_t is not defined by default in gcc, so stddef.h needed to be added
to AudioDynamics.h to handle some size_t usage.
2) gcc defaults char to unsigned, where windows defaults to signed. OctalCode.cpp
was assuming signed
2018-04-27 23:21:54 +00:00
John Conklin II
37f4a2d3a8
Merge pull request #12986 from hyperlogic/bug-fix/debug-rendering-over-background
...
Debug Draw rendering now is visible on background skybox
2018-04-27 15:56:44 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
...
Quiet logging
2018-04-27 14:59:38 -07:00
John Conklin II
1f4a9b6bcc
Merge pull request #12950 from SimonWalton-HiFi/batch-compile-shaders2
...
Batch compile more shaders
2018-04-27 14:55:57 -07:00
Cristian Luis Duarte
e47173a3d9
Set highp float precision for material values
2018-04-27 17:14:48 -03:00
Cristian Luis Duarte
8e0886667e
Revert "Revert "Merge pull request #12921 from SamGondelman/precisionq""
...
This reverts commit 729e9c2162
2018-04-27 16:54:45 -03:00
John Conklin II
ddedfce8a3
Merge pull request #12932 from ZappoMan/fixBug349
...
fix bug 349
2018-04-27 12:48:17 -07:00
John Conklin II
73b175a1f2
Merge pull request #12934 from misslivirose/fix/import-whitespace
...
trim before importing from clipboard
2018-04-27 12:44:35 -07:00
Zach Fox
0f36fb113d
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 10:20: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
Cristian Luis Duarte
729e9c2162
Revert "Merge pull request #12921 from SamGondelman/precisionq"
...
This reverts commit d1e2e9ce717842ee8eac
2018-04-26 17:10:10 -03: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
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
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
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
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
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
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
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 7378c87ade92bf99f436
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
