| .. |
|
animation
|
Merge pull request #5545 from AndrewMeadows/chlorine
|
2015-08-11 09:19:16 -07:00 |
|
audio
|
resolve conflicts on merge with upstream/master
|
2015-07-20 12:29:38 -07:00 |
|
audio-client
|
Fix https://app.asana.com/0/32622044445063/43589567731045
|
2015-08-02 21:46:39 -07:00 |
|
auto-updater
|
|
|
|
avatars
|
Merge branch 'master' into plugins
|
2015-08-06 11:03:37 -07:00 |
|
display-plugins
|
Fixing mac build
|
2015-08-08 18:00:08 -07:00 |
|
embedded-webserver
|
|
|
|
entities
|
Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization
|
2015-08-10 15:10:12 -07:00 |
|
entities-renderer
|
Merge remote-tracking branch 'upstream/master' into plugins
|
2015-08-10 21:25:35 -07:00 |
|
environment
|
put back correct include for memcpy
|
2015-07-17 16:38:20 -07:00 |
|
fbx
|
cleaning th ecode
|
2015-08-07 10:59:55 -07:00 |
|
gpu
|
Merge branch 'master' into plugins
|
2015-08-06 11:03:37 -07:00 |
|
input-plugins
|
Decouple Application and plugin definitions, cleanup container usage
|
2015-08-08 17:51:16 -07:00 |
|
model
|
Merge remote-tracking branch 'upstream/master' into core
|
2015-08-01 20:01:59 -07:00 |
|
networking
|
missed this in the last commit -- bump protocol version
|
2015-08-10 15:15:54 -07:00 |
|
octree
|
no longer returning early on NaN
|
2015-08-07 16:15:51 -07:00 |
|
physics
|
Merge branch 'master' into plugins
|
2015-07-23 13:42:03 -04:00 |
|
plugins
|
Decouple Application and plugin definitions, cleanup container usage
|
2015-08-08 17:51:16 -07:00 |
|
render
|
Merge branch 'master' into plugins
|
2015-08-06 11:03:37 -07:00 |
|
render-utils
|
Merge remote-tracking branch 'upstream/master' into plugins
|
2015-08-10 21:25:35 -07:00 |
|
script-engine
|
merge rig into cleanup (removal of legacy shapes)
|
2015-07-31 13:40:51 -07:00 |
|
shared
|
Merge pull request #5402 from highfidelity/plugins
|
2015-08-11 11:11:27 -07:00 |
|
ui
|
Merge remote-tracking branch 'upstream/master' into marge
|
2015-07-21 08:59:29 -07:00 |
