| .. |
|
animation
|
Merge branch 'rig' of github.com:howard-stearns/hifi into rig
|
2015-07-23 15:14:23 -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
|
Don't display update dialog if this is a PR build
|
2015-07-02 14:17:36 -06:00 |
|
avatars
|
Better name for signal.
|
2015-07-23 15:09:06 -07:00 |
|
embedded-webserver
|
|
|
|
entities
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-20 14:50:44 -07:00 |
|
entities-renderer
|
JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates.
|
2015-07-22 18:43:10 -07:00 |
|
environment
|
put back correct include for memcpy
|
2015-07-17 16:38:20 -07:00 |
|
fbx
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-17 17:59:19 -07:00 |
|
gpu
|
remove deprecated renderBatch()
|
2015-07-23 08:35:03 -07:00 |
|
model
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-20 14:50:44 -07:00 |
|
networking
|
Merge pull request #5371 from Atlante45/smart_pointers
|
2015-07-21 08:52:29 -07:00 |
|
octree
|
add back a removed comment from jurisdiction map
|
2015-07-17 14:00:02 -07:00 |
|
physics
|
fix crash for convex hull of co-planar points
|
2015-07-22 15:06:10 -07:00 |
|
render
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-20 13:51:51 -07:00 |
|
render-utils
|
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
|
2015-07-23 16:12:42 -07:00 |
|
script-engine
|
Avoid creating a new variable in js print
|
2015-07-23 15:32:40 -07:00 |
|
shared
|
Preparing for first pr
|
2015-07-22 10:43:50 -07:00 |
|
ui
|
Merge remote-tracking branch 'upstream/master' into marge
|
2015-07-21 08:59:29 -07:00 |
