Bradley Austin Davis
|
95d160a170
|
Working on mac GL issues
|
2018-10-26 11:23:29 -07:00 |
|
Sam Gondelman
|
7339a43536
|
Merge pull request #14278 from SamGondelman/macbs
Mac: Possibly fix a completely different blendshapes bug
|
2018-10-26 09:26:30 -07:00 |
|
SamGondelman
|
7dff015585
|
maybe?
|
2018-10-25 14:40:58 -07:00 |
|
Jeff Clinton
|
946d68af6a
|
Merge pull request #14262 from SamGondelman/particleLoad
Fix and expose Particle Entity emitRadiusStart
|
2018-10-25 12:41:02 -07:00 |
|
John Conklin II
|
2eb801bdc6
|
Merge pull request #14035 from SimonWalton-HiFi/avatar-mixer-improvements
Further avatar-mixer improvements
|
2018-10-25 12:25:32 -07:00 |
|
SamGondelman
|
faff5f11e8
|
Merge remote-tracking branch 'upstream/master' into particleLoad
|
2018-10-25 10:56:11 -07:00 |
|
Jeff Clinton
|
eb383b1d09
|
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
Quality Improvements to Avatars driven by Vive Trackers
|
2018-10-25 08:51:59 -07:00 |
|
Sam Gateau
|
6afd9a1dca
|
Merge pull request #14269 from SamGondelman/bs
Possible fix for yet another blendshape crash
|
2018-10-24 17:51:23 -07:00 |
|
Jeff Clinton
|
67fe43ebb1
|
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars
Small avatars now have a minimum jump height of 0.25 meters
|
2018-10-24 17:08:28 -07:00 |
|
Simon Walton
|
b6f259fc42
|
Fix incorrect merge-resolution
|
2018-10-24 13:17:45 -07:00 |
|
SamGondelman
|
a3c42363cc
|
please for the love of god
|
2018-10-24 12:43:01 -07:00 |
|
Simon Walton
|
e22e0ecb04
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-24 10:39:23 -09:00 |
|
Luis Cuenca
|
fac9188dfb
|
Merge pull request #14187 from luiscuenca/transitAddAnimation
Add animations to Avatar Transit
|
2018-10-24 10:51:21 -07:00 |
|
Simon Walton
|
0a78eeaf1a
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-23 15:56:56 -07:00 |
|
John Conklin II
|
e21e7d30d7
|
Merge pull request #14126 from amantley/squattyPottyFix
Sit State for the seated user in HMD: Squatty Potty Fix
|
2018-10-23 15:20:49 -07:00 |
|
Kerry Ivan Kurian
|
3cf000a71b
|
Merge pull request #14232 from kkurian/log-resource-requests-2
Display resource-access events in marketplace item tester
|
2018-10-23 15:18:30 -07:00 |
|
John Conklin II
|
7019439356
|
Merge pull request #14260 from SamGondelman/resourceCrash
Fix ResourceCache crash on shutdown
|
2018-10-23 15:03:55 -07:00 |
|
Stephen Birarda
|
b789fa96f8
|
Merge pull request #14192 from Atlante45/fix/traits-race
Prevent race on internal client traits members
|
2018-10-23 14:53:11 -07:00 |
|
Stephen Birarda
|
061f86e550
|
Merge pull request #14051 from birarda/feat/improve-sock-addr-belongs
consider all node sockets in sockAddrBelongsToNode
|
2018-10-23 14:21:42 -07:00 |
|
Kerry Ivan Kurian
|
e7d1c2873a
|
Merge branch 'master' into log-resource-requests-2
|
2018-10-23 13:46:59 -07:00 |
|
Stephen Birarda
|
5cbddfe0c4
|
consider all sockets in findNodeWithAddr
|
2018-10-23 13:35:07 -07:00 |
|
SamGondelman
|
8807b90474
|
fix emitRadiusStart
|
2018-10-23 13:33:14 -07:00 |
|
Bradley Austin Davis
|
5416de9a02
|
Merge pull request #13951 from jherico/feature/spirv
Bug 15087: Updating our shader tool chain to enable SPIRV optimization
|
2018-10-23 13:27:49 -07:00 |
|
SamGondelman
|
78f0afd39f
|
fix crash on shutdown
|
2018-10-23 12:13:41 -07:00 |
|
luiscuenca
|
fa67e1b269
|
Remove logs and magic numbers
|
2018-10-23 11:51:15 -07:00 |
|
Brad Hefta-Gaub
|
405b1d5725
|
Revert "Better imports for controls and styles"
|
2018-10-23 10:58:28 -07:00 |
|
Brad Davis
|
5a43462218
|
Remove unneeded shader directive
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
85b92a372d
|
Don't use optimized GLSL on android for now
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
4cf4a5582d
|
Fix Android build on Windows hosts
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
3f2f5b18ec
|
Reimplement procedural uniforms without extension requirements
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
c8e664a0a1
|
New SPIRV Shader toolchain
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
339b25a362
|
Fix access to uniforms at index 0
|
2018-10-23 08:36:18 -07:00 |
|
amantley
|
cce2f295a1
|
fixed conflict in myskeletonmodel.cpp
|
2018-10-22 17:49:30 -07:00 |
|
Sam Gateau
|
40b77c338c
|
Merge pull request #14176 from jherico/fix/fb19156
Add additional safety checks to gl::Uniform::load
|
2018-10-22 14:12:36 -07:00 |
|
Kerry Ivan Kurian
|
a2a6acd45c
|
Improve code formatting
|
2018-10-22 14:04:59 -07:00 |
|
Kerry Ivan Kurian
|
a1bb685176
|
Remove cruft
|
2018-10-22 14:00:08 -07:00 |
|
Zach Fox
|
bccca94111
|
Prevent duplicate resources in logs. Thanks to Roxanne!
|
2018-10-22 13:59:55 -07:00 |
|
Zach Fox
|
493262052c
|
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
|
2018-10-22 13:59:52 -07:00 |
|
Zach Fox
|
7be5d5674d
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-22 13:59:35 -07:00 |
|
Stephen Birarda
|
3aac294a92
|
optimize sockAddrBelongsToNode and reduce connection filter usage
|
2018-10-22 13:57:30 -07:00 |
|
John Conklin II
|
e40a021339
|
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles
Better imports for controls and styles
|
2018-10-22 11:50:09 -07:00 |
|
Stephen Birarda
|
3c79a79487
|
Merge pull request #14163 from Atlante45/fix/bw-recorder
Fix crash with BandwidthRecorder
|
2018-10-22 10:11:26 -07:00 |
|
Seth Alves
|
a2d4c236c1
|
Merge pull request #14220 from SamGondelman/pickFree
Fix PickManager::removePick heap use after free
|
2018-10-22 09:48:22 -07:00 |
|
Stephen Birarda
|
ea3bdeb26e
|
Merge pull request #14181 from Atlante45/feat/timebox-packet-processing
Timebox packet processing
|
2018-10-22 09:43:30 -07:00 |
|
Luis Cuenca
|
e1c760b566
|
Merge branch 'master' into transitAddAnimation
|
2018-10-20 15:30:23 -07:00 |
|
luiscuenca
|
f8d67d124f
|
Hold flickering fixed and refactor
|
2018-10-20 15:22:25 -07:00 |
|
Seth Alves
|
2ce8ed25f8
|
Merge pull request #14125 from Atlante45/fix/mac-warnings
Fix new Mac warnings
|
2018-10-20 13:40:53 -07:00 |
|
Brad Hefta-Gaub
|
23ddb7dea6
|
Merge pull request #14207 from Atlante45/fix/white-spheres
Remove pending avatars data structure
|
2018-10-20 12:09:51 -07:00 |
|
Sam Gateau
|
6005b934ad
|
Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001
minor bug fix and optimization in ModelEntity animation
|
2018-10-19 17:02:48 -07:00 |
|
Brad Hefta-Gaub
|
e6ec32e515
|
Merge pull request #14222 from SamGondelman/material
Fix material entity opacity maps
|
2018-10-19 16:45:31 -07:00 |
|