Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 17:09:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74158 commits 76 branches 59 tags 1.2 GiB
Commit graph

30404 commits

Author SHA1 Message Date
Zach Fox
e0ca535853 CR round 2 2018-11-08 10:08:42 -08:00
Zach Fox
142dfab9ac CR round 1 2018-11-08 10:05:57 -08:00
Dante Ruiz
358aa547b1 feedback changes 2018-11-08 09:58:53 -08:00
Dante Ruiz
f664421fe0 addressing code review feedback 2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Zach Fox
b97fd6eb95
Merge pull request #14255 from zfox23/textToSpeech 
Text to Speech App
 2018-11-08 09:44:59 -08:00
Andrew Meadows
5bfb9c1f71 fix ShapeInfo::contains() logic for capsule shapes 2018-11-08 08:39:43 -08:00
Olivier Prat
be7806644a Removed ternary operators with mix (try to limit branching) 2018-11-08 17:29:00 +01:00
Olivier Prat
87e6bffc46 Added sampler2Darray precision for GLES 2018-11-08 14:28:00 +01:00
Olivier Prat
d64127aa9c Android shader compilation fix 2018-11-08 13:48:19 +01:00
Olivier Prat
829e5ff44f Same android problem fix, but elsewhere 2018-11-08 13:37:22 +01:00
Olivier Prat
09b26db650 Shader fix for android... <sigh> 2018-11-08 13:19:42 +01:00
Olivier Prat
40b7b42f5b Bis 2018-11-08 12:29:01 +01:00
Olivier Prat
cd89ce5388 Another stupid android shader compilation error fix 2018-11-08 12:07:17 +01:00
Olivier Prat
de2f1c52cc Another android shader compilation fix 2018-11-08 11:44:47 +01:00
Olivier Prat
05ac2fccb6 Still android fixes 2018-11-08 11:24:46 +01:00
Olivier Prat
851cfff960 Again, android shader compilatio fix 2018-11-08 11:06:28 +01:00
Olivier Prat
c79c403a52 More android shader compilation fixes 2018-11-08 10:47:24 +01:00
Olivier Prat
7e93d91bfa Fixed android shader compilation 2018-11-08 09:29:02 +01:00
Olivier Prat
9d5dcec0a0 Merge from master 2018-11-08 09:14:42 +01:00
Clement
ef54a63de6 Use uint8_t instead of bool on the wire 2018-11-07 17:54:49 -08:00
Clement
8f763dfd50 Fix bug and crash in solo logic 2018-11-07 17:46:18 -08:00
amantley
6b4620b4a1 working on the input mapper problem for the offset rotations 2018-11-07 17:32:23 -08:00
Sam Gateau
4489efa58b
Merge pull request #14346 from AndrewMeadows/fix-crash-19654 
Case 19654: fix crash in btCollisionWorld::updateSingleAabb()
 2018-11-07 16:09:36 -08:00
Zach Fox
48d3450c5a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-07 14:59:23 -08:00
sam gateau
9ada9a7ad3 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-11-07 12:07:15 -08:00
sabrina-shanman
4d9c20343a Link shared library in hfm 2018-11-07 11:44:58 -08:00
Clement
65a83cb026 Resend solo nodes on mixer reconnect 2018-11-07 11:41:04 -08:00
Jeff Clinton
63bf077776
Merge pull request #14263 from ElderOrb/better_imports_for_controls_and_styles 
Better imports for controls and styles
 2018-11-07 11:19:55 -08:00
Sam Gateau
e28560a9c7
Merge pull request #14311 from SamGondelman/interstitial 
Case 19682: Disable interstitial on android
 2018-11-07 10:47:31 -08:00
Sam Gateau
d15c8a8854
Merge pull request #14313 from SamGondelman/macFix 
Case 19686: Possibly fix mac debug deferred issue
 2018-11-07 10:33:41 -08:00
Sam Gateau
8cda3f729b
Merge pull request #14316 from AndrewMeadows/workload-views-include-MyAvatar 
Case 19394: always keep entities near MyAvatar in physics simulation
 2018-11-07 10:26:47 -08:00
Sam Gateau
5d0be31fe7
Merge pull request #14354 from SamGondelman/deadlock 
Case 19735: Fix ResourceCache mutex issues
 2018-11-07 09:55:41 -08:00
sabrina-shanman
2c94d1f620 Fix hfm not linking in script-engine for Android build 2018-11-07 09:24:42 -08:00
amantley
1dbccc814b working on the ik dislocation caused by the offsets, head is what I am working on 2018-11-06 17:35:53 -08:00
Simon Walton
f88168bdfb Send avatar-joint translations at world scale 2018-11-06 17:29:02 -08:00
sabrina-shanman
8b37133875 Remove unnecessary draco dependency from hfm library 2018-11-06 17:10:44 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
SamGondelman
e20aeb28eb force low detail on oculus first run 2018-11-06 15:58:35 -08:00
sabrina-shanman
e654ff9bbc Remove forward declaration in HFM.h so ModelPackager and other things can use it instead 2018-11-06 14:53:23 -08:00
amantley
e52f2ab7d6 works for two joints now 2018-11-06 14:14:57 -08:00
sabrina-shanman
70c9db38ef Do not reference HFM inside the hfm namespace 2018-11-06 14:13:48 -08:00
sabrina-shanman
8fa72396ef Consolidate HFM class implementations into source file and move model 
logging.
 2018-11-06 14:05:36 -08:00
Clement
0ca0a6f3be Fix JSDoc arrays 2018-11-06 12:57:17 -08:00
Andrew Meadows
91f6a5057a correct capsule height when building btCapsuleShape 2018-11-06 12:54:56 -08:00
Andrew Meadows
6ecf850159 clarify ShapeInfo::setCapsuleY() API and use it correctly 2018-11-06 12:37:55 -08:00
Clement
4e802b0f3f Add JSDoc comments 2018-11-06 11:59:15 -08:00
SamGondelman
1444b3a186 resource mutex issues 
(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
 2018-11-06 11:57:57 -08:00
sabrina-shanman
1a69afb3e8 Move HFM.h to hfm subfolder per convention 2018-11-06 11:43:19 -08:00
Zach Fox
53742e90f5 Cleanup after merge 2018-11-06 10:30:10 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
luiscuenca
e0d1ef3be3 Fix debug output 2018-11-06 11:11:16 -07:00
luiscuenca
599b7761b2 Read quats from fst 2018-11-06 11:09:56 -07:00
luiscuenca
0f1b12475e Use clamp 2018-11-06 10:15:17 -07:00
luiscuenca
0f183b409b Fix warnings 2018-11-06 10:08:06 -07:00
Alexander Ivash
27bb8a0de7 rename stylues-uit => stylesUit & controls-uit => controlsUit 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
 2018-11-06 14:21:14 +05:30
Clement
37c69ebe62 Add audio soloing feature 2018-11-05 19:02:26 -08:00
luiscuenca
dceeadd99a change transit speed 2018-11-05 19:35:37 -07:00
luiscuenca
f9b6d3dc6f Merge addTransitAPI branch 2018-11-05 19:02:35 -07:00
amantley
f0c02bb49b more debug 2018-11-05 17:36:54 -08:00
Howard Stearns
a99facb793
Merge pull request #14261 from howard-stearns/oculus-store-commerce 
Oculus store commerce
 2018-11-05 16:13:04 -08:00
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model 
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
 2018-11-05 15:00:06 -08:00
amantley
484eb8ba09 debugging unity offsets 2018-11-05 14:56:58 -08:00
luiscuenca
8310dd0cba Delete leftovers 2018-11-05 15:10:09 -07:00
sabrina-shanman
c85b809e04 Fix Qt metatypes breaking by moving them back out of the hfm namespace 2018-11-05 13:40:38 -08:00
luiscuenca
bcde01621d set offsets on FBXGeometry 2018-11-05 14:25:52 -07:00
sabrina-shanman
a98a9b1c0c Move HFM prefixed classes to hfm namespace and add HFM prefixed names as typedefs 2018-11-05 12:47:34 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
sabrina-shanman
e00024e8b0 Create HFM library 2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62 Convert remaining HFMModels called model to hfmModel, and rename some missed local variables 2018-11-05 12:07:17 -08:00
Andrew Meadows
228847b507 only look in _activeStaticBodies when body is static 2018-11-05 11:44:58 -08:00
Andrew Meadows
9e7b68fead find and remove dangling pointers from _activeStaticBodies on remove 2018-11-05 11:19:15 -08:00
Andrew Meadows
c6cde2d412 don't assign null Shape to RigidBody already in physics simulation 2018-11-05 11:19:15 -08:00
Zach Fox
a4d36b3845 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-05 10:25:58 -08:00
amantley
d231a35dfa changes to get spine2 and neck to work almost there 2018-11-05 08:35:01 -08:00
Gabriel Calero
58c135a74d Merge remote-tracking branch 'upstream/master' into enable_aec_by_default 2018-11-05 11:25:09 -03:00
Alexander Ivash
cdfa38d4dd FB19514 - Interface crashes on attempt to apply new animation url via AvatarApp 2018-11-04 19:16:43 +05:30
Nex-Pro
3eb70a7617
Change to English spelling of 'declination' 
Addressed other minor typos.
NB: Searched all sources in the project for the call and it is only found in this file.
 2018-11-03 16:08:53 +00:00
amantley
5392d21b1c loading test file to check rotation offsets 2018-11-02 17:59:18 -07:00
Anthony Thibault
dc43d1bf8f AnimDebugDraw: Prevent multi-threaded access to shared map collection. 
It was possible for the render thread to iterate over a map while the main thread mutates the same map.
This could have led to memory corruption and crashes.

To fix this we make a copy of the collection and pass the copy to the lambda that executes on the render thread.
 2018-11-02 17:53:07 -07:00
Zach Fox
a87142b8b7 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-02 16:49:20 -07:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm 
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
 2018-11-02 16:44:31 -07:00
Zach Fox
d0854ca2ab Use AccountManager instead of settings 2018-11-02 16:42:18 -07:00
Zach Fox
402c23e359 Use useragent instead of queryparam to determine limitedCommerce 2018-11-02 16:07:29 -07:00
Simon Walton
26b9e2e162 Fix a URL while we're in the file 2018-11-02 14:47:40 -07:00
Ken Cooke
77988e400e
Merge pull request #14247 from sethalves/dont-let-checkdevices-swap-pool 
don't let checkDevices swamp thread pool
 2018-11-02 14:25:39 -07:00
Gabriel Calero
6a3ccbbe02 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-11-02 17:08:55 -03:00
Gabriel Calero
160e633af5 Implement login through oauth for steam login button 2018-11-02 17:08:19 -03:00
Simon Walton
e64557a46c Clamp the fixed-point network values to their limits 2018-11-02 11:52:40 -07:00
Cristian Luis Duarte
c310d41af7 Change GPU_RESOURCE_BUFFER_SLOT1_TEXTURE to 36 2018-11-02 14:59:30 -03:00
Sam Gateau
fa0c58fa0e Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend 2018-11-02 00:08:47 -07:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
sam gateau
e5a96f265d Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-11-01 16:57:13 -07:00
Zach Fox
20cd1df22c Lotsa changes 2018-11-01 16:48:08 -07:00
amantley
64d8fa6875 added the const argument to the AnimSkeleton constructor that allows the offset rotations to be passed in 2018-11-01 13:33:03 -07:00
Brad Davis
80c83fb4fb Switch back to Qt for GL context creation by default 2018-11-01 12:28:21 -07:00
Zach Fox
b43ad15fa7 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-01 11:32:38 -07:00
Anthony Thibault
5c78a463de
Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix 
Extra joints on soft entities keep their local transform
 2018-11-01 09:29:16 -07:00
Andrew Meadows
cfec94f3ff larger threshold btw 1 vs 2 workload views for 3rd person 2018-11-01 09:28:31 -07:00
Dante Ruiz
a4b345bb58 fix interstitial domain loading due to bad texture url 2018-11-01 09:25:46 -07:00
Andrew Meadows
317f4d28ba always keep a workload view around MyAvatar 2018-10-31 15:42:24 -07:00
sabrina-shanman
0b7ddca5f6 Change naming for straggler names in model loading debug dumps 2018-10-31 14:03:20 -07:00
Stephen Birarda
41ec026f8d cleanup packet times, avoid ambiguous RTT calcs, allow fast re-transmit 2018-10-31 13:32:27 -07:00
SamGondelman
c4c4d2c98d possibly fix mac issues 2018-10-31 13:28:07 -07:00
SamGondelman
8633dc0f66 disable interstitial on android 2018-10-31 12:34:20 -07:00
luiscuenca
914491ae27 fix YX coord swamp 2018-10-31 11:48:55 -07:00
amantley
f1d9ab76b4 Merge remote-tracking branch 'luis/readRotationOffsetsFromFst' into avatarPipelineOffsets 
merging code from luis case #19420 for getting the rotations from the
fst into the rig class
 2018-10-31 10:29:58 -07:00
luiscuenca
c070bce2ec Read joint rotation offsets from .fst 2018-10-31 08:39:35 -07:00
amantley
e24f10a125 debugging offset vector 2018-10-30 17:33:28 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
amantley
339ecb1faa adding the offsets to the AnimSkeleton.cpp 2018-10-30 16:54:34 -07:00
Cristian Luis Duarte
bc7e49482a Add Android for the condition of _meshBlendshapeBuffer usage 2018-10-30 19:44:39 -03:00
sam gateau
592c2b267d Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-30 15:07:20 -07:00
SamGondelman
e64a4d0536 try to fix unnecessary queryAACube updates 2018-10-30 12:47:44 -07:00
Cristian Luis Duarte
a09b1adb6c Android temporal change - Bring back GLESBackend TEX_UNIT constants 2018-10-30 16:45:25 -03:00
SamGondelman
dd96881724 don't submit frames while oculus says it's not visible 2018-10-30 12:15:46 -07:00
Simon Walton
6f6c92e647 Remove unused variable 2018-10-30 09:40:08 -07:00
SamGondelman
df005eedbf fix shape not getting marked changed 2018-10-29 17:43:16 -07:00
Cristian Luis Duarte
f00f1931f3 Merge branch 'master' into gles_use_tbo_no_ssbo 2018-10-29 20:06:32 -03:00
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix 
Fix avatars remain stuck in place for other users intermittently
 2018-10-29 15:03:43 -07:00
luiscuenca
056fe338e1 Apply transit logic if avatar instance is client side 2018-10-27 07:15:31 -07:00
luiscuenca
767f4e9d6d Return server position 2018-10-26 17:16:43 -07:00
luiscuenca
62e4b3fead Avatar mixer gets the updated position 2018-10-26 16:02:17 -07:00
Sam Gateau
439452f9ee
Merge pull request #14123 from jherico/fix/mac_gl2 
Additional Mac OpenGL work
 2018-10-26 15:38:23 -07:00
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props 
keep userData and new grab properties in sync
 2018-10-26 11:52:47 -07:00
Brad Davis
a3a952265a Fix android crash 2018-10-26 11:23:30 -07:00
Brad Davis
7ca8b54039 Fix crash on startup on windows / android 2018-10-26 11:23:30 -07:00
Brad Davis
9a30073f27 Only enable debug GL context on demand 2018-10-26 11:23:29 -07:00
Bradley Austin Davis
28b45ce1d9 Resolve compositing glitches 2018-10-26 11:23:29 -07:00
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
Seth Alves
c5aafd4644 fix spatialKey conversion 2018-10-25 07:47:16 -07:00
Seth Alves
387a8ce933 fix QJsonArray handling 2018-10-25 07:47:15 -07:00
Seth Alves
252e504ab9 attempt to keep userData and new grab properties in sync 2018-10-25 07:47:15 -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
sam gateau
36f2b3543c Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-24 15:50:05 -07:00
Seth Alves
4d34b12f06 rather than do checkDevices to find new audio devices every 2 seconds, do each check 2 seconds after the previous one has completed. This is done to avoid swamping the thread pool when the check takes a long time 2018-10-24 14:00:23 -07:00
Simon Walton
b6f259fc42 Fix incorrect merge-resolution 2018-10-24 13:17:45 -07:00
luiscuenca
b8cd5045c7 Extra joints on soft entities keep their local transform 2018-10-24 12:54:09 -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
Olivier Prat
aa64e51281 Fixed shaders for GLSL 4.1 2018-10-24 11:04:32 +02:00
Olivier Prat
69ace03919 Merged with master 2018-10-24 08:27:39 +02:00
Simon Walton
0a78eeaf1a Merge branch 'master' into avatar-mixer-improvements 2018-10-23 15:56:56 -07:00
Zach Fox
d1556ae4e8 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 15:51:34 -07:00
Zach Fox
8395132830 Attempt to resolve final warnings 2018-10-23 15:45:29 -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
SamGondelman
0efbdc1ab5 merge with master 2018-10-23 14:33:57 -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
sam gateau
4565422876 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-23 14:02:15 -07:00
Kerry Ivan Kurian
e7d1c2873a Merge branch 'master' into log-resource-requests-2 2018-10-23 13:46:59 -07:00
Zach Fox
988bca201b Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 13:36:46 -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
Zach Fox
897d21bea2 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 13:18:08 -07:00
SamGondelman
78f0afd39f fix crash on shutdown 2018-10-23 12:13:41 -07:00
SamGondelman
2755cbcf4f enable interaction with locked web entity 2018-10-23 12:00:50 -07:00
luiscuenca
fa67e1b269 Remove logs and magic numbers 2018-10-23 11:51:15 -07:00
SamGondelman
d254db02dc small cleanup 2018-10-23 11:27:17 -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
Zach Fox
22c3321400 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 09:52:37 -07:00
sam gateau
702f6229b8 Removing the pseudo fix for lod culling that is not ready in this pr 2018-10-23 08:50:10 -07:00
Brad Davis
339b25a362 Fix access to uniforms at index 0 2018-10-23 08:36:18 -07:00
Sam Gateau
7007abf6f9 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-22 20:02:25 -07:00
David Rowe
794767144f Fix Interface crash importing JSON with duplicate entity IDs in file 2018-10-23 15:30:33 +13:00
amantley
cce2f295a1 fixed conflict in myskeletonmodel.cpp 2018-10-22 17:49:30 -07:00
luiscuenca
afc76fec72 Added overrideNetworkAnimation and restoreNetworkAnimation methods 2018-10-22 15:20:32 -07:00
Gabriel Calero
5a8a5bbc55 Set AEC enabled by default 2018-10-22 18:18:16 -03:00
SamGondelman
09ea32dcc0 fix fading and highlighting issues 2018-10-22 14:12:43 -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
Alexander Ivash
657ff7f6f8 eliminate signal, introduce deletion list 2018-10-22 23:29:39 +03: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
Zach Fox
1eca1bfd55 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-22 11:18:10 -07:00
SamGondelman
5652fa0b1e merge with master 2018-10-22 10:18:52 -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