Brad Davis 3231bbba5a Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp		2015-06-22 09:44:16 -07:00
..
animation
audio	merge from master	2015-06-18 10:04:14 -07:00
audio-client	merge from master	2015-06-18 10:04:14 -07:00
auto-updater	typo	2015-06-16 14:49:55 -06:00
avatars	Make renderDisplayName const	2015-06-18 15:22:49 +02:00
embedded-webserver
entities	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-18 18:17:59 -07:00
entities-renderer	merge from upstream	2015-06-18 15:03:09 -07:00
environment
fbx	fix syntax	2015-06-19 17:13:29 +02:00
gpu	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-19 14:48:38 -07:00
model	merge from upstream	2015-06-18 15:03:09 -07:00
networking	Returning ref to stack to view controller	2015-06-19 16:05:45 -07:00
octree	Prep work for procedural stars & stuff	2015-06-22 09:43:12 -07:00
physics	Merge pull request #5147 from sethalves/more-actions	2015-06-18 17:35:50 -07:00
render	Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque	2015-06-19 16:30:48 +02:00
render-utils	Prep work for procedural stars & stuff	2015-06-22 09:43:12 -07:00
script-engine	Expose mouseDoublePressEvents to js	2015-06-19 15:52:27 -07:00
shared	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-18 18:17:59 -07:00
ui	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00