overte-JulianGro/interface/src
Brad Davis 2a1776303d Merge remote-tracking branch 'upstream/master' into plugins
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
..
audio Fixing the mic/camera buttons and the mirror UI buttons 2015-06-19 14:46:39 -07:00
avatar Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
devices responses to code review 2015-07-01 10:29:42 -07:00
octree
scripting Working on mac compilability 2015-07-01 23:03:33 -07:00
starfield Fixing projection during star rendering 2015-06-21 17:16:30 -07:00
ui Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
AbstractLoggerInterface.h
Application.cpp Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
Application.h Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp Merge remote-tracking branch 'upstream/master' into plugins 2015-06-26 17:02:16 -07:00
Camera.h Merge branch 'master' into plugins 2015-06-22 13:35:40 -07:00
DatagramProcessor.cpp
DatagramProcessor.h
DiscoverabilityManager.cpp
DiscoverabilityManager.h
DisplayPlugins.cpp Trying to get mac display plugins working: 2015-07-02 22:29:22 -07:00
DisplayPlugins.h
FileLogger.cpp
FileLogger.h
FileUtils.cpp
FileUtils.h
InterfaceActionFactory.cpp rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready. 2015-07-01 20:17:21 -07:00
InterfaceActionFactory.h start on code to de/serialize actions 2015-06-18 15:01:34 -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 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
LODManager.h
main.cpp Working on 64 bit builds 2015-06-18 21:44:12 -07:00
MainWindow.cpp Working on display plugins 2015-06-05 00:00:57 -07:00
MainWindow.h Final fixes. Snapshot should be good now 2015-06-03 15:09:45 -07:00
Menu.cpp Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
Menu.h Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
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 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Stars.h
UIUtil.cpp Working on mac compilability 2015-07-01 23:03:33 -07:00
UIUtil.h
Util.cpp enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Util.h CR feedback 2015-06-08 14:36:31 -07:00
world.h