overte-HifiExperiments/libraries
Andrew Meadows 661a916ebd merge rig into cleanup (removal of legacy shapes)
Conflicts:
	interface/src/avatar/Avatar.h
	tests/physics/src/ShapeColliderTests.cpp
	tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
..
animation Prototype blend. Just equal weighting for now. 2015-07-30 17:01:48 -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 Don't display update dialog if this is a PR build 2015-07-02 14:17:36 -06:00
avatars Merge howard/rig into andrew/caesium 2015-07-29 09:04:32 -07:00
embedded-webserver
entities merge rig into cleanup (removal of legacy shapes) 2015-07-31 13:40:51 -07:00
entities-renderer Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 10:08:30 -07:00
environment put back correct include for memcpy 2015-07-17 16:38:20 -07:00
fbx merge rig into cleanup (removal of legacy shapes) 2015-07-31 13:40:51 -07:00
gpu FIxed the problem on Mac, by removing all of the gpuConfig includesgit status 2015-07-30 18:27:47 -07:00
model compile on linux with GLEW 2015-07-28 17:53:01 -07:00
networking only output no listener for type message one time 2015-07-24 09:36:27 -07:00
octree remove legacy shapes 2015-07-29 09:02:24 -07:00
physics fix crash for convex hull of co-planar points 2015-07-22 15:06:10 -07:00
render REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
render-utils merge rig into cleanup (removal of legacy shapes) 2015-07-31 13:40:51 -07:00
script-engine merge rig into cleanup (removal of legacy shapes) 2015-07-31 13:40:51 -07:00
shared remove legacy shapes 2015-07-29 09:02:24 -07:00
ui Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00