Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 01:23:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries
History
Brad Hefta-Gaub 1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
2016-10-20 09:38:03 -07:00
..
animation GLM update and GLI integration 2016-09-09 10:18:15 -07:00
audio STEREO_FACTOR -> AudioConstants::STEREO 2016-10-05 13:02:28 -07:00
audio-client Speculative fix for crash in AudioClient 2016-10-11 10:49:43 -07:00
auto-updater enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
avatars fix typoed threaded call 2016-10-17 15:30:49 -07:00
controllers fix 'any endpoints' for axis style inputs 2016-10-08 20:24:52 -07:00
display-plugins Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-20 09:38:03 -07:00
embedded-webserver add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
entities added EntityItemProperties.merge function. when sending edits for avatar-entities, don't call setProperties on the entity. Fix currentFrame bug in AnimationPropertyGroup::copyToScriptValue 2016-10-17 16:11:37 -07:00
entities-renderer Merge pull request #8856 from jherico/geometry_ids 2016-10-20 08:14:49 -07:00
fbx Speculative fix for crash in FBXReader.cpp 2016-10-17 13:22:17 -07:00
gl Merge pull request #8862 from zzmp/fix/quick-leak 2016-10-20 08:23:28 -07:00
gpu Merge pull request #8785 from jherico/oculus_crash 2016-10-13 13:54:34 -07:00
gpu-gl Fix AMD crash caused by missing glFlush 2016-10-15 15:28:28 -07:00
input-plugins Update tutorial to work with HMD + Hand Controllers only 2016-10-07 10:30:18 -07:00
model Adapt shader for GL ES support which requires operators of the same datatype 2016-10-11 12:15:49 -03:00
model-networking Addressed feedback from code review. 2016-10-07 17:46:46 -07:00
networking Merge pull request #8859 from Atlante45/seq-num-race 2016-10-20 08:26:31 -07:00
octree merge from upstream 2016-08-20 15:25:04 -07:00
physics take care for division by zero when normalizing 2016-10-05 15:00:22 -07:00
plugins hacking 2016-10-18 21:33:37 -07:00
procedural catagorize some qDebugs 2016-09-14 21:39:45 -07:00
recording use the correct Qt windows macro 2016-09-01 11:33:20 -07:00
render fix invalid ShapeKey ref 2016-10-18 17:59:30 -07:00
render-utils Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-20 09:38:03 -07:00
script-engine Merge pull request #8828 from birarda/web-engine-interceptor 2016-10-18 17:24:58 -07:00
shared Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments 2016-10-19 21:51:02 -07:00
steamworks-wrapper try, try again 2016-08-18 11:45:03 -07:00
ui move HFWebEngineProfile back to interface/networking 2016-10-18 20:04:11 -07:00
ui-plugins