ZappoMan
|
cad51885e8
|
removed some hackery
|
2013-11-07 17:21:45 -08:00 |
|
ZappoMan
|
1587cf0bbe
|
some comment cleanup
|
2013-11-07 17:17:34 -08:00 |
|
ZappoMan
|
2c4ab63d2b
|
tweaks to placement and wording of voxel stats
|
2013-11-07 17:11:35 -08:00 |
|
ZappoMan
|
19515c80fd
|
Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats
Conflicts:
interface/src/Application.cpp
|
2013-11-07 16:44:34 -08:00 |
|
Andrzej Kapolka
|
6ac3fe4c9c
|
Merge pull request #1224 from birarda/master
use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem
|
2013-11-07 15:44:41 -08:00 |
|
Stephen Birarda
|
5889d4122f
|
use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem
|
2013-11-07 15:41:10 -08:00 |
|
Philip Rosedale
|
5118de6fd6
|
Merge pull request #1216 from ZappoMan/vs_shutdown_behavior
add menu option for voxel server fade in/out and dont remove local voxels when server shuts down
|
2013-11-07 15:27:16 -08:00 |
|
ZappoMan
|
c87446c90f
|
Merge pull request #1222 from birarda/master
actually create the QCoreApplication instance
|
2013-11-07 15:06:53 -08:00 |
|
Stephen Birarda
|
ce52395a08
|
actually create the QCoreApplication instance
|
2013-11-07 15:06:11 -08:00 |
|
Philip Rosedale
|
40dec7c05f
|
Merge pull request #1217 from birarda/master
fix for AC lack of QCoreApplication
|
2013-11-07 14:35:11 -08:00 |
|
Stephen Birarda
|
9aacda7d56
|
fix for AC lack of QCoreApplication
|
2013-11-07 14:34:01 -08:00 |
|
ZappoMan
|
05d647557b
|
Merge pull request #1213 from birarda/master
temp remove audio from agent, mutate GOL placeholder
|
2013-11-07 14:12:38 -08:00 |
|
ZappoMan
|
64d5ccf91e
|
add menu option for voxel server fade in/out and dont remove local voxels when server shuts down
|
2013-11-07 14:10:09 -08:00 |
|
Philip Rosedale
|
22e041f64e
|
Merge pull request #1215 from ZappoMan/bugfixes
fix thread contention issues and VS crash on domain server shutdown and restart
|
2013-11-07 13:30:15 -08:00 |
|
ZappoMan
|
77ba88e56d
|
removed dead comment
|
2013-11-07 13:06:57 -08:00 |
|
ZappoMan
|
b5f6a51728
|
fix thread contention issues and VS crash on domain server shutdown and restart
|
2013-11-07 13:03:04 -08:00 |
|
ZappoMan
|
77343695a1
|
Merge pull request #1214 from birarda/assignment
fix for deleteLater on Node linkedData
|
2013-11-07 12:55:10 -08:00 |
|
Stephen Birarda
|
72b2309dc0
|
Merge branch 'master' of github.com:worklist/hifi into assignment
|
2013-11-07 12:43:58 -08:00 |
|
Stephen Birarda
|
24c88512e2
|
only attempt to deleteLater on linkedData if it exists
|
2013-11-07 12:41:29 -08:00 |
|
Stephen Birarda
|
fe962e6be1
|
only call deleteLater for linkedData if we have a QCoreApplication instance
|
2013-11-07 12:38:28 -08:00 |
|
Stephen Birarda
|
4cbb98028f
|
temp remove audio from agent, fix GOL placeholder
|
2013-11-07 12:07:34 -08:00 |
|
Stephen Birarda
|
065fda2b84
|
Merge pull request #1207 from ZappoMan/bugfixes
added debugging to JurisdictionMap for server crashes
|
2013-11-06 17:45:34 -08:00 |
|
ZappoMan
|
100439784d
|
got rid of redundant getTree()
|
2013-11-06 17:37:37 -08:00 |
|
ZappoMan
|
76ad42015a
|
added debugging to JurisdictionMap for server crashes
|
2013-11-06 16:41:08 -08:00 |
|
Philip Rosedale
|
43daafbe51
|
Merge pull request #1205 from ZappoMan/bugfixes
implement ReadWriteLock for VoxelTree to fix crashes in VoxelServer
|
2013-11-06 15:42:14 -08:00 |
|
ZappoMan
|
f9291e6e5c
|
implement ReadWriteLock for VoxelTree to fix crashes in VoxelServer
|
2013-11-06 15:22:17 -08:00 |
|
Leonardo Murillo
|
cd9e3a72c8
|
Merge pull request #1203 from ZappoMan/bugfixes
Potential fix to VS crash on domain server shutdown
|
2013-11-06 14:02:08 -08:00 |
|
ZappoMan
|
c3914e648f
|
lock our node while using it to prevent crash on domain shutdown
|
2013-11-06 13:52:31 -08:00 |
|
ZappoMan
|
0a2488ad39
|
Merge pull request #1199 from birarda/master
an actual patch for two finger mouselook fail after dialog
|
2013-11-06 12:57:58 -08:00 |
|
Stephen Birarda
|
a4fcff6b19
|
only send fake event to the OGLWidget
|
2013-11-06 12:36:52 -08:00 |
|
Stephen Birarda
|
503de083f8
|
an actual patch for two finger mouselook fail after dialog
|
2013-11-06 12:27:45 -08:00 |
|
ZappoMan
|
5cd0ecde18
|
small tweak in debug out
|
2013-11-06 12:10:19 -08:00 |
|
Philip Rosedale
|
51cce81060
|
Merge pull request #1197 from ZappoMan/bugfixes
debbugging for node shutdown in VS
|
2013-11-06 11:27:10 -08:00 |
|
ZappoMan
|
0da28fd44c
|
debbugging for node shutdown in VS
|
2013-11-06 11:20:40 -08:00 |
|
Philip Rosedale
|
a6f917b68f
|
Merge pull request #1195 from ZappoMan/bugfixes
more potential fixes for voxel server crashes
|
2013-11-06 07:46:29 -08:00 |
|
Philip Rosedale
|
59d81061d8
|
Merge pull request #1196 from Forceflow/master
Glibc Linux compilation fix
|
2013-11-06 07:45:40 -08:00 |
|
Jeroen Baert
|
4af5fc0650
|
Updated readme file with list of required Ubuntu packages
|
2013-11-06 16:03:11 +01:00 |
|
Jeroen Baert
|
ae3364289c
|
Glibc Linux compilation fix
|
2013-11-06 15:02:58 +01:00 |
|
ZappoMan
|
987ce16b10
|
more potential fixes for voxel server crashes
|
2013-11-06 01:55:04 -08:00 |
|
ZappoMan
|
2d71d1ba73
|
Merge pull request #1194 from ZappoMan/bugfixes
removed force_crash by default
|
2013-11-06 00:10:18 -08:00 |
|
ZappoMan
|
1b18b53cfd
|
removed force_crash by default
|
2013-11-06 00:09:37 -08:00 |
|
ZappoMan
|
9f20980779
|
Merge pull request #1193 from ZappoMan/bugfixes
added force_crash to test crashing behavior
|
2013-11-06 00:01:02 -08:00 |
|
ZappoMan
|
c1b22dfdd6
|
added force_crash to test crashing behavior
|
2013-11-06 00:00:21 -08:00 |
|
Philip Rosedale
|
ad3012000f
|
Merge pull request #1192 from ZappoMan/bugfixes
added uptime/start time to server status page, and disabled noisy debuging
|
2013-11-05 20:58:23 -08:00 |
|
ZappoMan
|
58b74e1f58
|
added uptime/start time to server status page, and disabled noisy debuggin
|
2013-11-05 20:49:20 -08:00 |
|
Philip Rosedale
|
6103787811
|
Merge pull request #1190 from ey6es/master
Restore arms to neutral position (rather than straight down) when mouse cursor hidden, remove growing heads.
|
2013-11-05 16:25:01 -08:00 |
|
Andrzej Kapolka
|
c55f8c5900
|
Forgot to return a value.
|
2013-11-05 16:14:21 -08:00 |
|
Andrzej Kapolka
|
ae4db63368
|
Remove growing head behavior.
|
2013-11-05 16:11:12 -08:00 |
|
Andrzej Kapolka
|
9460fb87c2
|
Return arm to neutral position when mouse pointer is invisible.
|
2013-11-05 16:06:11 -08:00 |
|
Stephen Birarda
|
ef491be12d
|
Merge pull request #1189 from ZappoMan/bugfixes
make temp copy of NetworkPacket to protect against vector resizing
|
2013-11-05 15:28:26 -08:00 |
|