overte/interface/src
David Rowe d9e353e498 Merge branch 'master' into 20280
Conflicts:
	libraries/networking/src/LimitedNodeList.h
2015-02-03 14:46:27 -08:00
..
audio remove glColor calls related to text rendering 2015-01-28 13:54:48 -08:00
avatar Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval 2015-01-30 10:21:18 -08:00
devices fix build buster 2015-01-29 13:41:39 -08:00
octree Merge branch 'master' into 20280 2015-01-30 18:44:14 -08:00
scripting Add Window.setFocus 2015-02-03 11:44:22 -08:00
starfield move ProgramObject to libraries 2014-12-15 14:21:22 -08:00
ui Merge pull request #4214 from ctrlaltdavid/20281 2015-02-03 13:54:19 -08:00
AbstractLoggerInterface.h
Application.cpp Merge branch 'master' into 20280 2015-02-03 14:46:27 -08:00
Application.h Merge branch 'master' into 20280 2015-02-03 14:46:27 -08:00
Audio.cpp capture network bandwidth stats from NodeList rather than various places 2015-01-31 20:02:04 -08:00
Audio.h Merge branch 'master' into 20276 2015-01-27 19:08:40 -08:00
Bookmarks.cpp Moved last methog out of Menu 2015-01-18 07:14:52 -08:00
Bookmarks.h Moved Bookmarks related funct out of Menu 2015-01-16 16:30:33 -08:00
Camera.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
Camera.h restore camera lookAt and keepLookingAt features 2015-01-07 13:41:07 -08:00
DatagramProcessor.cpp formatting and cleanups 2015-02-02 12:21:46 -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 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Environment.h
FileLogger.cpp
FileLogger.h
GLCanvas.cpp
GLCanvas.h Made dependencies inherit from Dependency 2015-01-13 20:38:01 -08:00
LODManager.cpp Don't call settings in render loop 2015-01-20 10:56:58 -08:00
LODManager.h More settings hooks 2015-01-20 16:52:42 -08:00
main.cpp Removed more QSettings references 2015-01-18 19:29:27 -08:00
MainWindow.cpp Don't use (set)Geometry to save/restore mainWindow 2015-01-20 14:03:26 -08:00
MainWindow.h Move (re)storeSizeAndGeometry out of Application 2015-01-18 18:24:44 -08:00
Menu.cpp Start on refactoring of bandwidth metrics 2015-01-30 11:11:17 -08:00
Menu.h Start on refactoring of bandwidth metrics 2015-01-30 11:11:17 -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 branch 'master' into 20277 2015-01-30 13:49:45 -08:00
ModelUploader.h ModelUploader only has static methods accessible 2014-12-23 14:00:23 -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 ScriptModel destructor 2015-01-15 22:54:32 +01:00
ScriptsModelFilter.cpp running script window treeview fully works 2015-01-12 00:41:38 +01:00
ScriptsModelFilter.h running script window treeview fully works 2015-01-12 00:41:38 +01:00
SpeechRecognizer.cpp
SpeechRecognizer.h Moved SpeechRecognizer out of Menu 2015-01-18 06:50:34 -08:00
SpeechRecognizer.mm
Stars.cpp
Stars.h
Util.cpp remove glColor calls related to text rendering 2015-01-28 13:54:48 -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