Commit graph

72507 commits

Author SHA1 Message Date
David Back
001601d28f Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-17 11:30:10 -07:00
John Conklin II
7b226aa559
Merge pull request #14124 from SamGondelman/particle
Don't render particles without textures
2018-10-17 11:17:23 -07:00
John Conklin II
72c9f697ab
Merge pull request #14119 from SamGondelman/varying
Move stage frames to Varyings
2018-10-17 11:16:28 -07:00
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation
Fix various ResourceCache bugs
2018-10-17 11:13:35 -07:00
John Conklin II
eb088772d0
Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls
Fix "Good" collision not honoring mesh groups in OBJ files
2018-10-17 11:12:21 -07:00
Thijs Wenker
4ef2ad041b
Merge pull request #14136 from thoys/feat/create/exportSelection
MS19053: [CreateApp/EntityList] Move export selection button to bottom of the list
2018-10-17 19:50:37 +02:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox
Rebake default skybox for all platforms
2018-10-17 09:50:00 -07:00
David Back
c71deab5c4 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-17 09:04:20 -07:00
Anthony Thibault
cd3bb1fad2
Merge pull request #14165 from luiscuenca/fixSmallStep
Increase velocity increments when the avatar is really small.
2018-10-16 16:31:13 -07:00
Anthony Thibault
7f102727f2
Merge pull request #14166 from luiscuenca/fixJumpWhenSmall
Allow avatar to fly when its scale is very small
2018-10-16 16:28:00 -07:00
David Back
a2aa63e9ed adjust no entities message 2018-10-16 14:28:52 -07:00
David Back
5ae4425729 Merge branch 'entityListTypeFilter' of github.com:dback2/hifi into entityListTypeFilter 2018-10-16 14:20:48 -07:00
David Back
58e8d4071d Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-16 13:52:27 -07:00
John Conklin II
b5f6d9d3d8
Merge pull request #14205 from howard-stearns/tablet-login-change
new treatment for hmd/tablet login
2018-10-16 11:31:45 -07:00
Thijs Wenker
f1885159d2 style fixes 2018-10-15 21:17:41 +02:00
Sam Gondelman
121fc7205c Delete Default-Sky-9-cubemap.texmeta 2018-10-14 22:36:22 -07:00
unknown
978cd4bb77 styling tweaks, fix X clear search not refreshing 2018-10-12 18:57:26 -07:00
unknown
a85336044f add X to clear button to filter search 2018-10-12 18:03:47 -07:00
Howard Stearns
a92aa1f9da new treatment for hmd/tablet login 2018-10-12 14:17:23 -07:00
unknown
6320f9bab7 tweaks 2018-10-12 11:39:54 -07:00
unknown
97438a08d9 styling fixes, add icon, adjust Types text, click outside to close 2018-10-11 23:04:33 -07:00
David Back
4883a60afc entity list type filter WIP - still some style issues 2018-10-11 18:55:14 -07:00
Stephen Birarda
b31af8c9c6
Merge pull request #14052 from birarda/macos-10.14
updates for deprecating cmake policies and MacOS 10.14 build
2018-10-11 11:31:43 -07:00
SamGondelman
c10bb7d525 pointers 2018-10-08 18:05:09 -07:00
unknown
4313a34ff3 Allow avatar to fly when its scale is very small 2018-10-08 15:35:07 -07:00
unknown
3c25e6d5a8 Increase the linear velocity step when the avatar is small to avoid freezing 2018-10-08 14:40:54 -07:00
sabrina-shanman
57f67ffe91 Do not have additional compoundMeshes variable in computeShapeInfo 2018-10-08 11:46:46 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged
Merged interstitial page/redirect domain improvements
2018-10-08 10:32:29 -07:00
John Conklin II
dc7a5c0867
Merge pull request #14147 from birarda/bug/large-traits
suppress traits larger than INT16_MAX bytes
2018-10-08 10:27:52 -07:00
divya
01bda8a593
Merge pull request #14154 from gcalero/rebuild_hifi_codec
Build libplugins_libhifiCodec.so
2018-10-08 10:20:57 -07:00
John Conklin II
67c0262a4d
Merge pull request #14153 from hyperlogic/bug-fix/less-agressive-rotation-culling
Reduce the glitches of far away animating avatars
2018-10-08 09:33:26 -07:00
sabrina-shanman
e15a41c839 Fix model being loaded before dimensions are initialized 2018-10-08 09:26:35 -07:00
sabrina-shanman
c8cccc5ec7 Fix "good" collision not subdividing OBJ meshes by group 2018-10-08 09:24:33 -07:00
Brad Hefta-Gaub
2d8458f03e
Merge pull request #14150 from AndrewMeadows/remove-expired-avatarEntities
remove expired avatarEntities from their avatars
2018-10-08 09:16:44 -07:00
Gabriel Calero
42285245d5 Fix gradle script 2018-10-06 00:43:19 -03:00
Gabriel Calero
1719f4a474 Build libplugins_libhifiCodec.so 2018-10-05 23:49:06 -03:00
Anthony Thibault
335c60e6b8 Reduce the glitches of far away animating avatars
Currently, the avatars that are further then 10 meters away have a
very aggressive 15 degree rotation threshold, used to reduce the
amount of rotation joint changes sent over the network.

This PR tunes both the distances and rotation thresholds used for
this LOD culling.
2018-10-05 17:29:25 -07:00
Wayne Chen
f758438dcc
Merge pull request #9 from danteruiz/interstitialMerged
fix for failing to enter domain
2018-10-05 16:19:25 -07:00
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
Stephen Birarda
82170a66ed avoid backwards seek for skipped trait deletes 2018-10-05 15:07:54 -07:00
Andrew Meadows
c3478dc018 remove expired avatarEntities from their avatars 2018-10-05 13:48:35 -07:00
Stephen Birarda
88f76ac760 suppress traits larger than INT16_MAX bytes 2018-10-05 09:46:55 -07:00
Brad Hefta-Gaub
4d4a67cba0
Merge pull request #14088 from roxanneskelly/sysTraySetup
Sys tray setup
2018-10-05 09:39:47 -07:00
Wayne Chen
8abbd51bb1 removing unused variable 2018-10-04 23:11:27 -07:00
Sam Gateau
46a50b04ea
Merge pull request #14034 from samcake/black-bis
Refactor Deformed mesh rendering pipeline for better scalability and performances at runtime
2018-10-04 20:41:28 -07:00
Wayne Chen
fc17e0ea16
Merge pull request #8 from danteruiz/interstitialMerged
remmoving some debug statements
2018-10-04 19:32:14 -07:00
danteruiz
d285080197 remmoving some debug statements 2018-10-04 18:38:25 -07:00
Wayne Chen
89e2cf7153
Merge pull request #7 from danteruiz/interstitialMerged
Interstitial merged
2018-10-04 17:10:27 -07:00
Dante Ruiz
5d011bafb2 small tweaks 2018-10-04 17:02:44 -07:00
Wayne Chen
a2237aa48a reverting click overlay behavior 2018-10-04 16:41:14 -07:00