| .. |
|
animation
|
Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors
|
2015-08-17 16:56:01 -07:00 |
|
audio
|
shuffle Packet headers, use static enum for PacketType
|
2015-07-23 13:56:47 -07:00 |
|
audio-client
|
Fix https://app.asana.com/0/32622044445063/43589567731045
|
2015-08-02 21:46:39 -07:00 |
|
auto-updater
|
|
|
|
avatars
|
resolve conflicts on merge with upstream/master
|
2015-08-18 11:45:55 -07:00 |
|
display-plugins
|
Fixing bad success macro for the Oculus SDK on windows
|
2015-08-11 14:06:35 -07:00 |
|
embedded-webserver
|
|
|
|
entities
|
resolve conflicts on merge with birarda/protocol
|
2015-08-18 11:48:36 -07:00 |
|
entities-renderer
|
resolve conflicts on merge with upstream/master
|
2015-08-18 11:45:55 -07:00 |
|
environment
|
put back correct include for memcpy
|
2015-07-17 16:38:20 -07:00 |
|
fbx
|
back out the more controversial changes
|
2015-08-17 12:40:56 -07:00 |
|
gpu
|
revert State.h to state in upstream/master
|
2015-08-18 11:58:54 -07:00 |
|
input-plugins
|
Merge pull request #5575 from SamGondelman/sam/input-plugins
|
2015-08-15 10:59:04 -07:00 |
|
model
|
Merge remote-tracking branch 'upstream/master' into core
|
2015-08-01 20:01:59 -07:00 |
|
networking
|
add TODO for settings fail, cleanup
|
2015-08-24 17:02:47 -07:00 |
|
octree
|
resolve conflicts on merge with birarda/protocol
|
2015-08-18 11:48:36 -07:00 |
|
physics
|
Merge pull request #5551 from sethalves/quiet-compiler
|
2015-08-18 09:54:29 -07: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 pull request #5551 from sethalves/quiet-compiler
|
2015-08-18 09:54:29 -07:00 |
|
script-engine
|
merge rig into cleanup (removal of legacy shapes)
|
2015-07-31 13:40:51 -07:00 |
|
shared
|
resolve conflicts on merge with birarda/protocol
|
2015-08-18 11:48:36 -07:00 |
|
ui
|
QML framerate improvments
|
2015-08-12 16:24:34 -07:00 |
