| .. |
|
animation
|
Merge pull request #5323 from MarcelEdward/20605
|
2015-07-30 07:30:01 -07:00 |
|
audio
|
resolve conflicts on merge with upstream/master
|
2015-07-20 12:29:38 -07:00 |
|
audio-client
|
kill the PacketLister (AKA Huffman 1 : PacketListener 0)
|
2015-07-17 09:07:39 -07:00 |
|
auto-updater
|
|
|
|
avatars
|
Merge branch 'master' into plugins
|
2015-07-24 13:38:18 -04:00 |
|
display-plugins
|
Don't allow leaving VR mode to target the rift
|
2015-07-30 17:40:02 -07:00 |
|
embedded-webserver
|
|
|
|
entities
|
Merge pull request #5468 from bwent/reset-position
|
2015-07-31 11:03:27 -07:00 |
|
entities-renderer
|
Merge branch 'core' into plugins
|
2015-08-03 22:25:50 -07:00 |
|
environment
|
put back correct include for memcpy
|
2015-07-17 16:38:20 -07:00 |
|
fbx
|
implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents
|
2015-08-01 13:07:56 -07:00 |
|
gpu
|
Merge branch 'core' into plugins
|
2015-08-03 22:25:50 -07:00 |
|
input-plugins
|
switched vive buttons
|
2015-07-27 10:53:01 -07:00 |
|
model
|
Merge remote-tracking branch 'upstream/master' into core
|
2015-08-01 20:01:59 -07:00 |
|
networking
|
correct the unique_ptr char allocations
|
2015-07-31 14:29:05 -07:00 |
|
octree
|
add back a removed comment from jurisdiction map
|
2015-07-17 14:00:02 -07:00 |
|
physics
|
Merge branch 'master' into plugins
|
2015-07-23 13:42:03 -04:00 |
|
plugins
|
Ensure the app moves back to a non-rift screen if the saved geometry is bad
|
2015-07-30 17:09:08 -07:00 |
|
render
|
Merge branch 'core' into plugins
|
2015-08-03 22:25:50 -07:00 |
|
render-utils
|
Merge branch 'core' into plugins
|
2015-08-03 22:25:50 -07:00 |
|
script-engine
|
fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine
|
2015-07-29 10:02:06 -07:00 |
|
shared
|
Merge branch 'master' into plugins
|
2015-07-23 13:42:03 -04:00 |
|
ui
|
Merge remote-tracking branch 'upstream/master' into marge
|
2015-07-21 08:59:29 -07:00 |
