overte/interface/src
ZappoMan 2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
2014-08-28 21:19:56 -07:00
..
avatar Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
devices fixes per code review 2014-08-19 20:54:08 -07:00
entities fix the issue with moving entities not being simulated makes motion smoother 2014-08-28 16:44:52 -07:00
location handle not found errors returned for addresses from data-web 2014-08-28 10:54:05 -07:00
particles
renderer Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
scripting Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
starfield
ui Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
voxels Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
AbstractLoggerInterface.h
Application.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
Application.h cleanup in prep for PR 2014-08-25 10:56:43 -07:00
Audio.cpp fix for crash in Audio 2014-08-27 16:03:53 -07:00
Audio.h Merge pull request #3323 from chansensturm/wangyix-qt_stats_for_audiomixer 2014-08-27 11:14:52 -07:00
AudioReflector.cpp FinalOrientation -> FinalOrientationInWorldFrame 2014-06-04 10:41:17 -07:00
AudioReflector.h
BuckyBalls.cpp Removed outdated and incorrect getFingerTipPosition() 2014-07-10 14:21:17 -07:00
BuckyBalls.h
Camera.cpp Removed magic number to use DEFAULT_NEAR/FAR_CLIP 2014-07-25 10:56:44 -07:00
Camera.h Expose mode shift period to JS, remove default value 2014-06-24 20:32:41 -07:00
DatagramProcessor.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -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
FileLogger.cpp
FileLogger.h
GLCanvas.cpp Coding style fix. 2014-07-10 19:25:00 +02:00
GLCanvas.h Stop QMenuBar to steal keyboard focus when pressing Alt key in Linux. 2014-07-09 13:55:38 +02:00
Hair.cpp add body angular acceleration 2014-07-14 12:23:00 -07:00
Hair.h Merge branch 'master' of https://github.com/worklist/hifi 2014-07-17 16:04:21 -07:00
main.cpp more cleanup 2014-06-04 11:30:35 -07:00
MainWindow.cpp
MainWindow.h
Menu.cpp Rename method 2014-08-28 13:53:47 -07:00
Menu.h Rename method 2014-08-28 13:53:47 -07:00
MetavoxelSystem.cpp Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
MetavoxelSystem.h Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
ModelUploader.cpp Switch ModelUploader to NetworkAccessManager 2014-07-02 10:52:08 -07:00
ModelUploader.h Switch ModelUploader to NetworkAccessManager 2014-07-02 10:52:08 -07:00
PaymentManager.cpp add some error messages to PaymentManager 2014-07-31 11:41:49 -07:00
PaymentManager.h call PaymentManager when an OctreeEditPacketSender needs to pay 2014-07-30 18:07:08 -07:00
Physics.cpp
Physics.h
ScriptHighlighting.cpp
ScriptHighlighting.h
ScriptsModel.cpp Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback 2014-07-02 21:45:19 -07:00
ScriptsModel.h Switched ScriptModel to NetworkAccessManager 2014-07-02 11:21:26 -07:00
SignedWalletTransaction.cpp add a method to SignedWalletTransaction to return binary message 2014-07-31 09:18:57 -07:00
SignedWalletTransaction.h allow unauthenticated redemptions of signed transactions from octree server 2014-07-31 10:05:26 -07:00
SpeechRecognizer.h Update speech recognizer to fully turn off when disabling 2014-08-07 17:45:01 -07:00
SpeechRecognizer.mm Update speech recognizer to fully turn off when disabling 2014-08-07 17:45:01 -07:00
Stars.cpp
Stars.h
UserLocationsModel.cpp Update JSONCallbackParameters to take params in constructor 2014-07-02 11:12:06 -07:00
UserLocationsModel.h Fix cleanup of resources for UserLocations* 2014-07-01 17:59:49 -07:00
Util.cpp Merge branch 'master' of https://github.com/worklist/hifi 2014-06-24 16:21:35 -07:00
Util.h
windowshacks.h
world.h
XmppClient.cpp fix build to work if Qxmpp is not available 2014-07-28 15:17:33 -07:00
XmppClient.h fix build to work if Qxmpp is not available 2014-07-28 15:17:33 -07:00