| .. |
|
avatar
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-01-17 17:10:46 -08:00 |
|
devices
|
added fountain script
|
2014-01-17 17:10:15 -08:00 |
|
renderer
|
Merge
|
2014-01-16 23:15:02 +01:00 |
|
starfield
|
Merge
|
2014-01-16 18:39:21 +01:00 |
|
ui
|
Merge branch 'master' of https://github.com/worklist/hifi into debone
|
2014-01-16 13:35:03 -08:00 |
|
AbstractLoggerInterface.h
|
possible fix for jenkins build error
|
2014-01-02 23:10:21 +01:00 |
|
Application.cpp
|
Merge branch 'master' of https://github.com/worklist/hifi into 19483
|
2014-01-19 13:59:20 +01:00 |
|
Application.h
|
fix 3d mode switch on/off issue
|
2014-01-16 14:54:08 -08:00 |
|
Audio.cpp
|
Merge branch 'master' of https://github.com/worklist/hifi into 19484
|
2014-01-17 19:46:44 +01:00 |
|
Audio.h
|
WL job #19484
|
2014-01-16 20:17:04 +01:00 |
|
BandwidthMeter.cpp
|
|
|
|
BandwidthMeter.h
|
Merge
|
2014-01-16 18:39:21 +01:00 |
|
BuckyBalls.cpp
|
merge fix
|
2014-01-14 17:24:24 -08:00 |
|
BuckyBalls.h
|
Cleanup to move BuckyBalls prototype to own class file
|
2014-01-02 17:02:04 -08:00 |
|
Camera.cpp
|
Somehow, I overwrote this value in Camera.
|
2013-12-17 17:21:56 -08:00 |
|
Camera.h
|
|
|
|
Cloud.cpp
|
Merge
|
2014-01-16 18:39:21 +01:00 |
|
Cloud.h
|
|
|
|
ControllerScriptingInterface.cpp
|
fixed build buster
|
2013-12-18 10:42:35 -08:00 |
|
ControllerScriptingInterface.h
|
fixed build buster
|
2013-12-18 10:42:35 -08:00 |
|
DataServerClient.cpp
|
Merge
|
2014-01-16 18:39:21 +01:00 |
|
DataServerClient.h
|
Persist the user orientation as well as the position, show up a couple meters
|
2014-01-13 13:51:51 -08:00 |
|
Environment.cpp
|
initial newline removal from all QDebug calls
|
2014-01-14 13:09:22 -08:00 |
|
Environment.h
|
|
|
|
Field.cpp
|
|
|
|
Field.h
|
|
|
|
FileLogger.cpp
|
changed locking to QMutexLocker
|
2014-01-03 00:11:24 +01:00 |
|
FileLogger.h
|
QMutex reference
|
2014-01-02 23:56:28 +01:00 |
|
GLCanvas.cpp
|
|
|
|
GLCanvas.h
|
|
|
|
ImportDialog.cpp
|
fixed file deselection
|
2014-01-20 21:43:43 +01:00 |
|
ImportDialog.h
|
File filter
|
2014-01-11 21:03:49 +01:00 |
|
InfoView.cpp
|
|
|
|
InfoView.h
|
|
|
|
main.cpp
|
initial newline removal from all QDebug calls
|
2014-01-14 13:09:22 -08:00 |
|
Menu.cpp
|
Merge pull request #1585 from AndrewMeadows/paddle-fixes
|
2014-01-17 16:50:10 -08:00 |
|
Menu.h
|
Merge pull request #1585 from AndrewMeadows/paddle-fixes
|
2014-01-17 16:50:10 -08:00 |
|
MetavoxelSystem.cpp
|
change NodeList container to QHash with QSharedPointer
|
2014-01-13 17:09:21 -08:00 |
|
MetavoxelSystem.h
|
change NodeList container to QHash with QSharedPointer
|
2014-01-13 17:09:21 -08:00 |
|
Oscilloscope.cpp
|
Merge
|
2014-01-16 18:39:21 +01:00 |
|
Oscilloscope.h
|
fix scope for input
|
2013-12-16 12:16:08 -08:00 |
|
PairingHandler.cpp
|
Merge
|
2014-01-16 18:39:21 +01:00 |
|
PairingHandler.h
|
|
|
|
ParticleTreeRenderer.cpp
|
fix flashy particles caused by server deleting octree elements while particles still exist
|
2013-12-11 09:54:30 -08:00 |
|
ParticleTreeRenderer.h
|
have ParticleEditHandle update local tree as well
|
2013-12-12 10:41:55 -08:00 |
|
Physics.cpp
|
|
|
|
Physics.h
|
|
|
|
PieMenu.cpp
|
Merge
|
2014-01-16 18:39:21 +01:00 |
|
PieMenu.h
|
|
|
|
Stars.cpp
|
|
|
|
Stars.h
|
|
|
|
Swatch.cpp
|
|
|
|
Swatch.h
|
|
|
|
Tool.cpp
|
|
|
|
Tool.h
|
|
|
|
ToolsPalette.cpp
|
|
|
|
ToolsPalette.h
|
|
|
|
Util.cpp
|
Merge
|
2014-01-16 18:39:21 +01:00 |
|
Util.h
|
Removed _avatarTouch class
|
2013-12-06 15:11:01 -08:00 |
|
VoxelFade.cpp
|
|
|
|
VoxelFade.h
|
|
|
|
VoxelHideShowThread.cpp
|
initial newline removal from all QDebug calls
|
2014-01-14 13:09:22 -08:00 |
|
VoxelHideShowThread.h
|
|
|
|
VoxelImporter.cpp
|
Merge branch 'master' of https://github.com/worklist/hifi into 19483
|
2014-01-15 20:18:34 +01:00 |
|
VoxelImporter.h
|
save and restore dialog settings
|
2014-01-12 00:33:46 +01:00 |
|
VoxelPacketProcessor.cpp
|
resolve conflicts on merge with upstream master
|
2014-01-14 16:15:58 -08:00 |
|
VoxelPacketProcessor.h
|
|
|
|
VoxelSystem.cpp
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-16 15:01:57 -08:00 |
|
VoxelSystem.h
|
Merge
|
2014-01-16 18:39:21 +01:00 |
|
windowshacks.h
|
Merge
|
2014-01-16 18:39:21 +01:00 |
|
world.h
|
|
|
