Bradley Austin Davis ac0ec0a458 Ensure the app moves back to a non-rift screen if the saved geometry is bad		2015-07-30 17:09:08 -07:00
..
animation	Merge pull request #5323 from MarcelEdward/20605	2015-07-30 07:30:01 -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	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
display-plugins	HMDTools dialog restoration phase 2, electric boogaloo	2015-07-30 12:25:21 -07:00
embedded-webserver
entities	Fixed float constant.	2015-07-27 09:28:56 -07:00
entities-renderer	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-30 12:55:22 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	Merge pull request #5323 from MarcelEdward/20605	2015-07-30 07:30:01 -07:00
gpu	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-30 12:55:22 -07:00
input-plugins	switched vive buttons	2015-07-27 10:53:01 -07:00
model	REmove the crappy solution for drawing transparent texture into overlay by a proper shader	2015-07-23 23:09:40 -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	Merge branch 'master' into plugins	2015-07-23 13:42:03 -04:00
plugins	Ensure the app moves back to a non-rift screen if the saved geometry is bad	2015-07-30 17:09:08 -07:00
render	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-30 12:55:22 -07:00
render-utils	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-30 12:55:22 -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	Merge branch 'master' into plugins	2015-07-23 13:42:03 -04:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00