Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 12:52:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries
History
Brad Davis aea07fe671 Merge branch 'master' into gl4_1 
Conflicts:
	libraries/gpu/src/gpu/Config.slh
	libraries/render-utils/src/deferred_light_limited.slv
	libraries/render-utils/src/simple.slf
	libraries/render-utils/src/simple_textured.slf
	tests/render-utils/src/main.cpp
	tools/scribe/src/main.cpp
2015-07-31 15:08:37 -07:00
..
animation CR 2015-07-14 15:16:00 -07:00
audio resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
audio-client kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
auto-updater
avatars add a comment for size guard 2015-07-23 17:17:59 -07:00
embedded-webserver
entities Fixed float constant. 2015-07-27 09:28:56 -07:00
entities-renderer Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-27 17:40:19 -07:00
environment put back correct include for memcpy 2015-07-17 16:38:20 -07:00
fbx treat a "g" in an obj file the same as a "o" 2015-07-29 17:55:56 -07:00
gpu Merge branch 'master' into gl4_1 2015-07-31 15:08:37 -07:00
model Merge branch 'master' into gl4_1 2015-07-31 15:08:37 -07:00
networking only output no listener for type message one time 2015-07-24 09:36:27 -07:00
octree add back a removed comment from jurisdiction map 2015-07-17 14:00:02 -07:00
physics fix crash for convex hull of co-planar points 2015-07-22 15:06:10 -07:00
render merge with upstream 2015-07-29 17:11:13 -07:00
render-utils Merge branch 'master' into gl4_1 2015-07-31 15:08:37 -07:00
script-engine fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine 2015-07-29 10:02:06 -07:00
shared Preparing for first pr 2015-07-22 10:43:50 -07:00
ui Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00