overte/libraries
Brad Davis 7955eeda28 Merge branch 'master' into plugins
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
2015-06-12 15:49:35 -07:00
..
animation remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
audio Merge branch 'master' of https://github.com/highfidelity/hifi into restartable-non-local-sound 2015-06-08 15:45:30 -07:00
audio-client Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
avatars Undo the merge with the broken master checking. What could go wrong? 2015-05-28 13:48:27 -07:00
display-plugins Working on display plugins 2015-06-05 00:00:57 -07:00
embedded-webserver try again without macro 2015-04-07 09:59:04 -07:00
entities add handedness setting to avatar-hold action. update stick.js to allow use of hydra 2015-06-11 11:04:19 -07:00
entities-renderer Merge pull request #5113 from Atlante45/debug 2015-06-12 11:23:31 -07:00
environment wire up atmosphere.hasStars property 2015-05-04 14:19:13 -07:00
fbx Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments 2015-06-10 08:53:33 -07:00
gpu Revert "Fix broken identity transforms on OSX" 2015-06-12 12:57:37 -07:00
model Fixing the blackout when entering a zone with a skybox thatis not loaded yet or just a constant color skybox 2015-06-10 01:50:52 -07:00
networking fix indentation in AddressManager 2015-06-09 19:01:03 -07:00
octree Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-03 19:47:51 +02:00
physics Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 19:05:25 -07:00
plugins Working on display plugins 2015-06-05 00:00:57 -07:00
render Merge pull request #5103 from samcake/punk 2015-06-11 10:17:38 -07:00
render-utils Merge branch 'master' into plugins 2015-06-12 15:49:35 -07:00
script-engine Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
shared woops, forgot to include this in last commit 2015-06-10 12:41:15 -07:00
ui Combining with new cursor render code 2015-06-11 16:55:23 -07:00