| .. |
|
animation
|
resolve conflicts on merge with upstream/master
|
2015-09-04 12:31:46 -06:00 |
|
audio
|
resolve conflicts on merge with upstream/master
|
2015-09-04 12:31:46 -06:00 |
|
audio-client
|
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
|
2015-08-26 11:09:59 -07:00 |
|
auto-updater
|
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
|
2015-08-26 11:09:59 -07:00 |
|
avatars
|
resolve conflicts on merge with upstream/master
|
2015-09-04 12:31:46 -06:00 |
|
display-plugins
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
|
2015-09-04 09:12:32 -07:00 |
|
embedded-webserver
|
Merge pull request #5663 from birarda/master
|
2015-08-27 12:46:24 -07:00 |
|
entities
|
resolve conflicts on merge with upstream/master
|
2015-09-04 12:31:46 -06:00 |
|
entities-renderer
|
resolve conflicts on merge with upstream/master
|
2015-09-04 12:31:46 -06:00 |
|
environment
|
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
|
2015-08-26 11:09:59 -07:00 |
|
fbx
|
Merge branch 'master' into ajt/new-anim-system
|
2015-09-04 11:05:29 -07:00 |
|
gpu
|
remove warnings from linux build
|
2015-08-27 19:12:25 -07:00 |
|
input-plugins
|
fix sixense and vive rotation readings for palms
|
2015-09-02 11:37:36 -07:00 |
|
model
|
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
|
2015-08-26 11:09:59 -07:00 |
|
networking
|
resolve conflicts on merge with upstream/master
|
2015-09-04 12:31:46 -06:00 |
|
octree
|
resolve conflicts on merge with upstream/master
|
2015-08-27 14:50:04 -07:00 |
|
physics
|
fix thinko -- if the changes didn't happen, put them back on the list and don't clear their dirty flags
|
2015-08-28 10:31:28 -07:00 |
|
plugins
|
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
|
2015-08-26 11:09:59 -07:00 |
|
render
|
Add AA state to RenderContext and Menu
|
2015-08-30 20:38:05 -07:00 |
|
render-utils
|
resolve conflicts on merge with upstream/master
|
2015-09-04 12:31:46 -06:00 |
|
script-engine
|
resolve conflicts on merge with upstream/master
|
2015-09-04 12:31:46 -06:00 |
|
shared
|
resolve conflicts on merge with upstream/master
|
2015-09-04 12:31:46 -06:00 |
|
ui
|
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
|
2015-08-26 11:09:59 -07:00 |
