overte/libraries
Brad Davis d1fc30435b Merge remote-tracking branch 'upstream/stable' into RC-33
Conflicts:
	libraries/render-utils/src/MeshPartPayload.cpp
	libraries/render-utils/src/MeshPartPayload.h
	scripts/system/controllers/handControllerGrab.js
2017-02-07 09:31:41 -08:00
..
animation add and remove some profile data points 2017-01-26 08:35:25 -08:00
audio fix AudioRingBuffer::appendData 2017-01-26 19:16:02 -05:00
audio-client use lock-free pipe for local audio in device callback 2017-01-22 00:25:08 -05:00
auto-updater
avatars Skipped this line 2017-02-01 18:13:24 -08:00
controllers
display-plugins Additional trace details for GPU timing, frame data updates 2017-01-18 16:19:32 -08:00
embedded-webserver
entities avoid bootstrapping self with something that has someone else as simulation owner 2017-02-06 17:05:16 -08:00
entities-renderer Merge pull request #9557 from hyperlogic/tablet-ui 2017-01-31 13:37:56 -08:00
fbx merge from upstream 2017-01-17 09:29:30 -08:00
gl merge from upstream 2017-01-12 15:44:27 -08:00
gpu Add profiling in COntext batch execution and shortcuts for trace names 2017-01-09 18:05:02 -08:00
gpu-gl Disable sparse textures 2017-01-27 10:06:31 -08:00
input-plugins tablet-ui: Added 6 pixel deadspot for bringing up the tablet in desktop mode. 2017-02-01 14:44:14 -08:00
model
model-networking
networking send UserActivityLogger events when tablet is opened or closed 2017-02-07 09:12:30 -08:00
octree don't recurse on octree elements that have not changed 2017-01-30 17:01:45 -08:00
physics when the parentID is changed by a network update, set physics flags 2017-02-06 17:05:07 -08:00
plugins Rename Steam.isRunning to Steam.running 2017-01-24 17:06:50 -08:00
procedural
recording
render First cut of Web3DOverlays without FXAA applied. 2017-01-30 11:24:58 -08:00
render-utils Merge remote-tracking branch 'upstream/stable' into RC-33 2017-02-07 09:31:41 -08:00
script-engine tablet-ui: reduced volume of button click 2017-02-01 18:47:50 -08:00
shared make findAncestorOfType understand AVATAR_SELF_ID 2017-02-06 17:04:14 -08:00
ui merge from upstream 2017-01-25 15:57:53 -08:00
ui-plugins