overte/interface/src
Kevin M. Thomas 5f7fe30b9b Merge branch 'master' of https://github.com/highfidelity/hifi into 20618
# Conflicts:
#	interface/src/Menu.cpp
2015-07-24 15:10:34 -04:00
..
audio Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
avatar Merge pull request #5407 from samcake/yellow 2015-07-24 13:09:07 -04:00
devices Merge pull request #5401 from ZappoMan/renderLaserPointers 2015-07-24 10:41:32 -07:00
octree resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
scripting Add ability to update title of WebWindow after it's created 2015-07-23 21:59:19 -07:00
ui Merge pull request #5401 from ZappoMan/renderLaserPointers 2015-07-24 10:41:32 -07:00
AbstractLoggerInterface.h Move file log persistence to a separate thread 2015-07-08 22:35:23 -07:00
Application.cpp Merge pull request #5401 from ZappoMan/renderLaserPointers 2015-07-24 10:41:32 -07:00
Application.h On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp Merge with master 2015-06-24 15:04:03 -07:00
Camera.h
DiscoverabilityManager.cpp
DiscoverabilityManager.h
FileLogger.cpp Fixing log file viewer 2015-07-09 09:54:35 -07:00
FileLogger.h Fixing log file viewer 2015-07-09 09:54:35 -07:00
FileUtils.cpp
FileUtils.h
GLCanvas.cpp fix a bunch of warnings 2015-07-20 15:12:27 -07:00
GLCanvas.h Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
InterfaceActionFactory.cpp bring over code from entity-level-locking branch 2015-07-09 15:23:05 -07:00
InterfaceActionFactory.h bring over code from entity-level-locking branch 2015-07-09 15:23:05 -07:00
InterfaceLogging.cpp CR comments and fixing the average calculation 2015-07-01 16:30:42 -07:00
InterfaceLogging.h CR comments and fixing the average calculation 2015-07-01 16:30:42 -07:00
LODManager.cpp
LODManager.h While we work on FPS I have decreased the default LOD FPS 2015-07-15 13:09:55 -07:00
main.cpp Cleanup 2015-07-14 12:36:18 -07:00
MainWindow.cpp
MainWindow.h
Menu.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into 20618 2015-07-24 15:10:34 -04:00
Menu.h completely remove six sense lasers 2015-07-23 11:17:22 -07:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp Revert changes to ModelPropertiesDialog 2015-06-25 16:04:02 -07:00
ModelPropertiesDialog.h Revert changes to ModelPropertiesDialog 2015-06-25 16:04:02 -07:00
ModelSelector.cpp
ModelSelector.h
Physics.cpp
Physics.h
ScriptHighlighting.cpp
ScriptHighlighting.h
ScriptsModel.cpp
ScriptsModel.h
ScriptsModelFilter.cpp
ScriptsModelFilter.h
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
Stars.cpp Make stars a little smaller 2015-07-22 13:44:37 -04:00
Stars.h Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
UIUtil.cpp
UIUtil.h
Util.cpp remove non-batch versions of GeometryCache renderXYZ() methods 2015-07-23 07:42:58 -07:00
Util.h remove non-batch versions of GeometryCache renderXYZ() methods 2015-07-23 07:42:58 -07:00
world.h