Nex Pro ad315cf68a Merge branch '20660' of github.com:thoys/hifi into 20660 ... Conflicts: interface/src/Util.cpp		2015-08-23 16:30:46 +01:00
..
audio	remove glLineWidth completely because it s not available anymore for wide lines in core	2015-08-04 11:57:20 -07:00
avatar	Merge pull request #5613 from howard-stearns/eye-correction	2015-08-21 00:20:00 -07:00
devices	re-enabled ctrlaltdavid's eye calibration code	2015-08-17 12:20:46 -07:00
octree	add a missed char[] in OctreePacketProcessor	2015-07-31 14:48:54 -07:00
scripting	Add size and position properties, methods, and events to WebWindow	2015-08-14 14:42:32 -07:00
ui	Merge pull request #5566 from howard-stearns/recapitate	2015-08-19 10:46:05 -07:00
AbstractLoggerInterface.h
Application.cpp	fix ifdef	2015-08-20 19:33:39 -07:00
Application.h	fix throttled rendering for the 2D display plugin	2015-08-19 21:11:48 -07:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp
Camera.h	Revert Camera.h changes.	2015-07-29 09:55:19 -07:00
DiscoverabilityManager.cpp
DiscoverabilityManager.h
FileLogger.cpp
FileLogger.h
FileUtils.cpp
FileUtils.h
GLCanvas.cpp	fix throttled rendering for the 2D display plugin	2015-08-19 21:11:48 -07:00
GLCanvas.h	fix throttled rendering for the 2D display plugin	2015-08-19 21:11:48 -07:00
InterfaceActionFactory.cpp
InterfaceActionFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
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	Working on cleaning up diff	2015-07-16 20:51:37 -07:00
MainWindow.h
Menu.cpp	Add menu item that disables adjusting eyelids to follow pupil	2015-08-20 16:10:31 -07:00
Menu.h	Add menu item that disables adjusting eyelids to follow pupil	2015-08-20 16:10:31 -07:00
ModelPackager.cpp	ResourceCache, NetworkGeometry and Model refactoring and optimizations.	2015-08-20 18:59:51 -07:00
ModelPackager.h	ResourceCache, NetworkGeometry and Model refactoring and optimizations.	2015-08-20 18:59:51 -07:00
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
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	fixing the stars again	2015-07-29 16:27:45 -07: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	Merge branch '20660' of github.com:thoys/hifi into 20660	2015-08-23 16:30:46 +01:00
Util.h	remove non-batch versions of GeometryCache renderXYZ() methods	2015-07-23 07:42:58 -07:00
world.h