samcake 5f85e8e2cb Merge branch 'master' of https://github.com/highfidelity/hifi into light		2017-12-07 08:48:12 -08:00
..
assets	Fixed typo in qWarning message.	2017-10-06 18:42:02 +01:00
audio
avatar	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
commerce	Fix gray/incorrect security image after relog	2017-12-05 10:27:40 -08:00
devices
java/io/highfidelity/interface
networking	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
octree
raypick	Fixing all the changes of interface name coming from upstream	2017-11-21 14:55:58 -08:00
scripting	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-07 08:48:12 -08:00
ui	Merging with master	2017-12-04 14:20:10 -08:00
webbrowser	License header fix	2017-10-30 20:29:44 +01:00
Application.cpp	expose Window.getDeviceSize()	2017-11-28 16:16:30 -08:00
Application.h	expose Window.getDeviceSize()	2017-11-28 16:16:30 -08:00
Application_render.cpp	expose Window.getDeviceSize()	2017-11-28 16:16:30 -08:00
AvatarBookmarks.cpp
AvatarBookmarks.h
Bookmarks.cpp
Bookmarks.h
ConnectionMonitor.cpp
ConnectionMonitor.h
CrashHandler.cpp
CrashHandler.h
CrashReporter.cpp
CrashReporter.h
DiscoverabilityManager.cpp
DiscoverabilityManager.h
FancyCamera.cpp
FancyCamera.h
FrameTimingsScriptingInterface.cpp
FrameTimingsScriptingInterface.h
GLCanvas.cpp
GLCanvas.h
InterfaceDynamicFactory.cpp
InterfaceDynamicFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
InterfaceParentFinder.cpp
InterfaceParentFinder.h
LocationBookmarks.cpp
LocationBookmarks.h
LODManager.cpp	code review feedback	2017-11-10 10:25:29 -08:00
LODManager.h	remove cruft	2017-09-25 15:52:14 -07:00
main.cpp	Make fix precisely for Linux	2017-09-28 21:38:03 +02:00
Menu.cpp	adjust to coding standards	2017-11-18 11:16:40 +03:00
Menu.h
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
ScriptHighlighting.cpp
ScriptHighlighting.h
SecondaryCamera.cpp	todo comment	2017-11-16 11:41:28 -08:00
SecondaryCamera.h	remove includes, fix comment	2017-11-15 13:37:15 -08:00
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
UIUtil.cpp
UIUtil.h
Util.cpp	[WL21389] Fix scaling issue when computing hull point list (details below).	2017-10-24 14:16:25 -04:00
Util.h	[WL21389] WL21389 PR2: Representation of collision shapes need updating (details below).	2017-10-24 14:16:17 -04:00
world.h