Brad Hefta-Gaub d2e264ab32 Merge pull request #12583 from samcake/punk ... Fix Local lights not showing anymore		2018-03-08 10:31:58 -08:00
..
animation
audio	make sure dont make audio devices that don't use stereo use stereo	2018-03-02 10:56:44 -08:00
audio-client	Merge pull request #12533 from druiz17/stereo-checkbox	2018-03-05 12:45:01 -08:00
auto-updater
avatars
avatars-renderer	Merge remote-tracking branch 'upstream/master' into scriptableMaterials	2018-02-27 13:30:03 -08:00
baking
controllers
display-plugins	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
embedded-webserver
entities	Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers	2018-03-01 14:56:29 -08:00
entities-renderer	Merge pull request #12515 from SamGondelman/scriptableMaterials	2018-03-07 14:29:31 -08:00
fbx	* remove Model_temporary_hack	2018-02-26 04:58:22 -05:00
gl
gpu	Merge pull request #12515 from SamGondelman/scriptableMaterials	2018-03-07 14:29:31 -08:00
gpu-gl
gpu-gles
graphics	Merge pull request #12515 from SamGondelman/scriptableMaterials	2018-03-07 14:29:31 -08:00
graphics-scripting	docs	2018-03-07 13:34:48 -08:00
image	Fix BGR/RGB bug on GLES	2018-02-22 14:11:05 -08:00
input-plugins	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
ktx
midi
model-networking	Merge pull request #12482 from SimonWalton-HiFi/declare-metatype	2018-03-08 09:37:06 -08:00
networking	Merge pull request #12388 from highfidelity/android	2018-03-08 10:18:35 -08:00
octree	Fix Edit -> Export Entities exporting gzipped json	2018-03-01 16:42:41 -08:00
physics
plugins
pointers
procedural
qml	Merge branch 'android' into android_bubble_fix	2018-03-06 18:58:49 -03:00
recording
render	Resolving conflicts	2018-03-02 10:36:55 -08:00
render-utils	Merge pull request #12583 from samcake/punk	2018-03-08 10:31:58 -08:00
script-engine	Merge pull request #12388 from highfidelity/android	2018-03-08 10:18:35 -08:00
shared	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
task
trackers
ui	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
ui-plugins
workload