Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 15:26:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries
History
Brad Hefta-Gaub 54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
2015-09-14 21:13:08 -07:00
..
animation fix bug using unitialized std::vector elements 2015-09-14 17:14:04 -07:00
audio resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
audio-client Merge branch 'master' of https://github.com/kencooke/hifi 2015-09-14 12:28:16 -07:00
auto-updater
avatars improved debug render of hand coordinates 2015-09-11 13:22:11 -07:00
display-plugins quiet compiler 2015-09-12 09:59:25 -07:00
embedded-webserver Merge pull request #5663 from birarda/master 2015-08-27 12:46:24 -07:00
entities quiet compiler 2015-09-12 10:10:53 -07:00
entities-renderer Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 2015-09-14 21:13:08 -07:00
environment
fbx quiet compiler 2015-09-12 09:59:25 -07:00
gpu Fixing differing highlights between left and right eyes in stereo modes 2015-09-14 11:24:28 -07:00
gpu-networking put back TextureCache headers 2015-09-08 15:23:26 -07:00
input-plugins Toggle mute while holding the hydras 2015-09-04 16:19:58 -07:00
model Procedural skybox work 2015-09-08 14:31:16 -07:00
networking Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 2015-09-14 21:13:08 -07:00
octree Merge branch 'master' into homer 2015-09-11 16:31:18 -07:00
physics Merge pull request #5778 from jherico/homer 2015-09-11 17:54:53 -07:00
plugins
procedural Fix procedural vec3 uniforms 2015-09-12 13:19:33 -07:00
render Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00
render-utils Don't do an O(N^2) operation on cluster matrices 2015-09-14 16:09:13 -07:00
script-engine Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 2015-09-14 21:13:08 -07:00
shared Merge branch 'master' of https://github.com/highfidelity/hifi into phrc 2015-09-14 11:21:37 -07:00
ui quiet compiler 2015-09-12 09:59:25 -07:00