overte-HifiExperiments/interface/src
barnold1953 2eda35ff1d Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
2014-06-17 12:25:09 -07:00
..
avatar Update LocationManager::goTo to use new addresses API 2014-06-16 10:43:13 -07:00
devices Allow clicking on magnified controls 2014-06-16 15:24:53 -07:00
location Merge branch 'master' of git://github.com/highfidelity/hifi into 19779 2014-06-16 11:35:55 -07:00
models fix some bugs in models 2014-06-10 13:37:53 -07:00
particles Fixed my mistake by unlocking the lock. 2014-05-22 14:17:26 -07:00
renderer Fix IK for hydra hands. 2014-06-09 15:40:29 -07:00
scripting add support for Menu.menuExists() and menu.menuItemExists() 2014-05-31 13:24:07 -07:00
starfield CR 2014-04-23 11:00:44 -07:00
ui Fixed NAN error with magnification windows 2014-06-17 12:19:15 -07:00
voxels VoxelPacketProcessor -> OctreePacketProcessor 2014-06-10 11:05:51 -07:00
AbstractLoggerInterface.h Fixes the log window to prevent halting of Interface when the log is long and the window is opened 2014-05-16 08:36:56 +05:30
Application.cpp Pressing trigger and bumper at same time toggles UI 2014-06-17 10:37:15 -07:00
Application.h Merge pull request #3019 from ctrlaltdavid/19769 2014-06-12 17:31:53 -07:00
Audio.cpp Modified CALLBACK_ACCELERATOR_RATIO for windows because some systems need larger input buffer to work fine. 2014-06-15 21:08:14 +02:00
Audio.h initial hooks for stereo audio 2014-06-06 10:15:09 -07:00
AudioReflector.cpp FinalOrientation -> FinalOrientationInWorldFrame 2014-06-04 10:41:17 -07:00
AudioReflector.h fix headers 2014-04-22 11:27:50 -07:00
BuckyBalls.cpp Revert "Merge pull request #2834 from andrew/thermonuclear" 2014-05-13 10:38:56 -07:00
BuckyBalls.h IC-1, remove some spaces in BuckyBalls 2014-04-29 14:05:16 -07:00
Camera.cpp Simple raypicking for scripts with oculus rift. 2014-06-09 11:55:29 -07:00
Camera.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
DatagramProcessor.cpp VoxelPacketProcessor -> OctreePacketProcessor 2014-06-10 11:05:51 -07:00
DatagramProcessor.h cleaned up debug statements 2014-06-04 11:20:29 -07:00
Environment.cpp removed debug info, cleaned code for pull req 2014-05-29 10:39:40 -07:00
Environment.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
FileLogger.cpp Fixes the log window to prevent halting of Interface when the log is long and the window is opened 2014-05-16 08:36:56 +05:30
FileLogger.h Fixes the log window to prevent halting of Interface when the log is long and the window is opened 2014-05-16 08:36:56 +05:30
GLCanvas.cpp Merge branch master 2014-04-24 18:52:59 +05:30
GLCanvas.h Merge branch master 2014-04-24 18:52:59 +05:30
main.cpp more cleanup 2014-06-04 11:30:35 -07:00
MainWindow.cpp Fix for OS X Fullscreen (closes #2414) 2014-05-05 11:15:55 -07:00
MainWindow.h Fix code not compliant with coding standards 2014-04-29 16:50:13 -07:00
Menu.cpp remove warnings about unused variables 2014-06-17 11:59:26 -07:00
Menu.h Exposed sixense and mouse options and oculus UI angle to preferences 2014-06-13 10:53:11 -07:00
MetavoxelSystem.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
MetavoxelSystem.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
ModelUploader.cpp change node auth URL to data.highfidelity.io 2014-05-22 14:24:19 -07:00
ModelUploader.h After uploading, refresh the uploaded files so that they are immediately 2014-05-09 17:50:08 -07:00
Physics.cpp add back code blow away in regex replacements 2014-04-09 10:03:26 -07:00
Physics.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
ScriptHighlighting.cpp - Style fixes 2014-05-01 21:07:46 +02:00
ScriptHighlighting.h - Highlighting Fixes ( Single line comments in quoted text don't occur anymore. / Better number recognition) 2014-04-30 23:32:41 +02:00
Stars.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stars.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
Util.cpp Replaced windows usleep version with a non busy waiting high accuracy version. This fixes the high CPU load for the windows servers too! 2014-06-15 21:07:03 +02:00
Util.h Removed Systime.h includes 2014-04-21 17:23:06 -07:00
windowshacks.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
world.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
XmppClient.cpp Changed AccountManager to only rely on a proper OAuth response. 2014-06-12 23:28:43 -07:00
XmppClient.h Fixed online user presence in chat window 2014-04-28 23:49:59 +02:00