David Rowe b5028a9626 Merge branch 'master' into 21880 ... # Conflicts: # interface./src/scripting/WindowScriptingInterface.h		2018-06-05 09:13:54 +12:00
..
animation
audio
audio-client
auto-updater
avatars
avatars-renderer	Re review adjustments	2018-05-31 12:16:57 -07:00
baking
controllers
display-plugins	Unit testing cached and uncached shader loading	2018-05-24 12:42:34 -07:00
embedded-webserver
entities	Merge branch 'master' into 21880	2018-06-05 09:13:54 +12:00
entities-renderer	merge and update based on sam's changes	2018-05-31 17:53:36 -07:00
fbx	Merge pull request #13205 from luiscuenca/GLTFfix1	2018-05-25 08:28:29 -07:00
gl	Unit testing cached and uncached shader loading	2018-05-24 12:42:34 -07:00
gpu	Cached shader binaries and uniform data for shaders	2018-05-24 12:42:33 -07:00
gpu-gl	Merge pull request #13082 from jherico/feature/shader_cache	2018-05-30 13:55:34 -07:00
gpu-gl-common	Unit testing cached and uncached shader loading	2018-05-24 12:42:34 -07:00
gpu-gles	Cached shader binaries and uniform data for shaders	2018-05-24 12:42:33 -07:00
graphics
graphics-scripting
image
input-plugins
ktx
midi
model-networking
networking	Merge pull request #13188 from SimonWalton-HiFi/placename-crash	2018-05-31 14:34:24 -07:00
octree
physics	activate body before disconnecting action from entity	2018-05-29 17:56:41 -07:00
plugins
pointers
procedural
qml
recording
render	Re review adjustments	2018-05-31 12:16:57 -07:00
render-utils	Re review adjustments	2018-05-31 12:16:57 -07:00
script-engine	Show stats button only in debug mode. Add isDebugMode to Script public interface	2018-05-29 17:21:44 -03:00
shared	Re review adjustments	2018-05-31 12:16:57 -07:00
task	Add JSDoc stubs for new Render API functions	2018-05-28 12:02:08 +12:00
test-utils	Cached shader binaries and uniform data for shaders	2018-05-24 12:42:33 -07:00
trackers
ui	Merge pull request #13206 from ctrlaltdavid/21872-c	2018-05-24 16:44:55 -07:00
ui-plugins
workload