overte/libraries
Ryan Huffman da5bdd5641 Merge pull request #5752 from birarda/master
make all AssetClient packets reliable
2015-09-09 12:50:47 -07:00
..
animation Merge pull request #5744 from hyperlogic/tony/enable-lean-flag 2015-09-09 10:18:12 -07:00
audio resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
audio-client call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
auto-updater call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
avatars Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-08 08:40:51 -07:00
display-plugins Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-04 09:12:32 -07:00
embedded-webserver Merge pull request #5663 from birarda/master 2015-08-27 12:46:24 -07:00
entities resolve conflicts on merge with upstream/master 2015-09-08 14:56:23 -07:00
entities-renderer resolve conflicts on merge with upstream/master 2015-09-08 15:18:39 -07:00
environment call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
fbx Merge pull request #5741 from AndrewMeadows/brokenCapsules 2015-09-09 09:33:57 -07:00
gpu Procedural skybox work 2015-09-08 14:31:16 -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 use the exact payload size where possible 2015-09-09 10:39:53 -07:00
octree resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
physics fix hold action with zero offsetLength 2015-09-04 14:07:12 -07:00
plugins call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
procedural resolve conflicts on merge with upstream/master 2015-09-08 15:18:39 -07:00
render Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00
render-utils Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements 2015-09-08 17:07:51 -07:00
script-engine resolve conflicts on merge with upstream/master 2015-09-08 15:18:39 -07:00
shared resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
ui call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00