| .. |
|
audio
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-01-30 12:02:11 -08:00 |
|
avatar
|
fix packet processing, PerfWarn label
|
2015-02-06 12:21:05 -08:00 |
|
devices
|
Merge branch 'rssdk_fix_missing_constants' into 20224
|
2015-02-07 13:44:55 +01:00 |
|
octree
|
Merge branch 'master' into 20280
|
2015-01-30 18:44:14 -08:00 |
|
scripting
|
changed HMDScriptingInterface MyAvatar to new way of retrieving this object
|
2015-02-07 13:37:33 +01:00 |
|
starfield
|
|
|
|
ui
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-02-07 00:34:38 +01:00 |
|
AbstractLoggerInterface.h
|
|
|
|
Application.cpp
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-02-07 00:34:38 +01:00 |
|
Application.h
|
Merge pull request #4245 from ctrlaltdavid/20301
|
2015-02-06 14:19:10 -08:00 |
|
Bookmarks.cpp
|
Moved last methog out of Menu
|
2015-01-18 07:14:52 -08:00 |
|
Bookmarks.h
|
|
|
|
Camera.cpp
|
|
|
|
Camera.h
|
|
|
|
DatagramProcessor.cpp
|
resolve conflicts on merge with upstream master
|
2015-02-03 10:25:17 -08:00 |
|
DatagramProcessor.h
|
change display style of bandwidth detail dialog, include a totals line
|
2015-01-30 13:43:28 -08:00 |
|
Environment.cpp
|
|
|
|
Environment.h
|
|
|
|
FileLogger.cpp
|
|
|
|
FileLogger.h
|
|
|
|
FileUtils.cpp
|
|
|
|
FileUtils.h
|
|
|
|
GLCanvas.cpp
|
|
|
|
GLCanvas.h
|
|
|
|
LODManager.cpp
|
Leave LOD settings as globals
|
2015-02-03 16:13:13 -08:00 |
|
LODManager.h
|
Leave LOD settings as globals
|
2015-02-03 16:13:13 -08:00 |
|
main.cpp
|
remove doubled Q_INIT_RESOURCE calls
|
2015-02-06 15:28:36 -08:00 |
|
MainWindow.cpp
|
More settings update
|
2015-02-03 10:52:50 -08:00 |
|
MainWindow.h
|
More settings update
|
2015-02-03 10:52:50 -08:00 |
|
Menu.cpp
|
resolve conflicts on merge with upstream/master
|
2015-02-04 10:38:05 -08:00 |
|
Menu.h
|
More settings update
|
2015-02-03 10:52:50 -08:00 |
|
MetavoxelSystem.cpp
|
capture network bandwidth stats from NodeList rather than various places
|
2015-01-31 20:02:04 -08:00 |
|
MetavoxelSystem.h
|
Fix for buffer crash.
|
2015-01-18 15:17:45 -08:00 |
|
ModelUploader.cpp
|
Merge pull request #4217 from Atlante45/master
|
2015-02-03 19:13:52 -08:00 |
|
ModelUploader.h
|
Merge pull request #4217 from Atlante45/master
|
2015-02-03 19:13:52 -08:00 |
|
Physics.cpp
|
|
|
|
Physics.h
|
|
|
|
ScriptHighlighting.cpp
|
|
|
|
ScriptHighlighting.h
|
|
|
|
ScriptsModel.cpp
|
Merge branch 'master' into 20277
|
2015-01-30 13:49:45 -08:00 |
|
ScriptsModel.h
|
|
|
|
ScriptsModelFilter.cpp
|
|
|
|
ScriptsModelFilter.h
|
|
|
|
SpeechRecognizer.cpp
|
|
|
|
SpeechRecognizer.h
|
Moved SpeechRecognizer out of Menu
|
2015-01-18 06:50:34 -08:00 |
|
SpeechRecognizer.mm
|
|
|
|
Stars.cpp
|
|
|
|
Stars.h
|
|
|
|
UIUtil.cpp
|
|
|
|
UIUtil.h
|
|
|
|
Util.cpp
|
Working on text rendering refactor
|
2015-02-03 18:57:39 -08:00 |
|
Util.h
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
|
2015-01-27 16:44:11 -08:00 |
|
world.h
|
|
|
|
XmppClient.cpp
|
|
|
|
XmppClient.h
|
|
|
