Commit graph

10303 commits

Author SHA1 Message Date
Philip Rosedale
fb97abf128 reset audio connection on prefs changes 2014-02-27 17:35:23 -08:00
Philip Rosedale
ae6d156feb remove travelling noises 2014-02-27 17:27:41 -08:00
ZappoMan
0f0f0eeb81 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-02-27 17:10:32 -08:00
Atlante45
5986fcafae Added copyTo and pasteFrom to ClipboardScriptingInterface
- Supports LocalVoxels
2014-02-27 16:41:58 -08:00
ZappoMan
0530a73175 Merge pull request #2134 from stojce/19513
Code Review for Job #19513
2014-02-27 16:30:54 -08:00
ZappoMan
f9718913e2 fix octree-server random spinout sometimes when client disconnects 2014-02-27 16:13:05 -08:00
Philip Rosedale
7b55ee31a3 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-27 16:01:04 -08:00
Philip Rosedale
348295bbb1 Merge pull request #2133 from ey6es/master
Delay loading models until we know that we need them (i.e., that we're not going to use the billboard).
2014-02-27 16:00:04 -08:00
Philip Rosedale
cdda220c83 Merge pull request #2120 from ZappoMan/seeing_voxels
Voxel Scale Testing: Seeing voxels & particles in JS & OctreeServer improvements
2014-02-27 15:58:14 -08:00
Philip Rosedale
e87ae8ac8f audio debugging 2014-02-27 15:52:19 -08:00
ZappoMan
1cc6288899 add back in entry point for import voxels 2014-02-27 15:41:36 -08:00
ZappoMan
b7f62eabf0 clean up more menu items 2014-02-27 15:25:39 -08:00
stojce
ae78cac78b removed some magic numbers 2014-02-28 00:05:46 +01:00
Atlante45
b07081407a Made commom string name static const 2014-02-27 14:47:05 -08:00
Atlante45
0026002ecb Added domain and clipboard to the local trees 2014-02-27 14:38:18 -08:00
Atlante45
b033432684 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-27 14:36:44 -08:00
stojce
7d67b8e60d fixed vertical thumb placement on window resize 2014-02-27 23:28:23 +01:00
stojce
5c22376312 editVoxels new layout / assets 2014-02-27 23:20:40 +01:00
Andrzej Kapolka
e91d47174b Removed unused function. 2014-02-27 12:37:17 -08:00
Andrzej Kapolka
cd2bd32210 Delay loading models until we know that we need them (i.e., that we're not
beyond billboard distance).  Closes #2121.
2014-02-27 12:30:46 -08:00
ZappoMan
cdb0aeb153 some hacking on server performance 2014-02-27 10:47:17 -08:00
ZappoMan
8d53fc9671 Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels 2014-02-27 01:05:20 -08:00
ZappoMan
2832c33482 fixed div by zero 2014-02-26 21:38:28 -08:00
ZappoMan
6f1136c417 more status page formatting, and include max total packets in packets per client interval 2014-02-26 21:25:34 -08:00
ZappoMan
85a42849a8 work on current client count 2014-02-26 21:25:15 -08:00
ZappoMan
8c4fdbb1c6 remove dead comments 2014-02-26 21:24:50 -08:00
ZappoMan
a34aef658d cleanup OctreeSendThread correctly 2014-02-26 21:24:32 -08:00
ZappoMan
1603c1f38c work on client stats and max total packets per second 2014-02-26 21:24:12 -08:00
Philip Rosedale
89cf2f9a7a Merge pull request #2125 from birarda/simple-audio
increase size of audio output buffer to match ring buffer
2014-02-26 16:31:40 -08:00
Stephen Birarda
cb45a3242d increase size of audio output buffer to match size of ring buffer 2014-02-26 16:29:07 -08:00
Stephen Birarda
1f1369367f Merge pull request #2124 from birarda/master
bot.js repair for wrong body when bot # < 20
2014-02-26 16:18:13 -08:00
Stephen Birarda
88b46acdeb repair for wrong body on bots < 20 2014-02-26 16:17:51 -08:00
ZappoMan
98d9e443eb Merge pull request #2119 from PhilipRosedale/master
NPC bots wander and look around, and play sounds
2014-02-26 14:40:58 -08:00
ZappoMan
39ba98f3b1 fixed a comment 2014-02-26 14:23:58 -08:00
Philip Rosedale
af550b8ae0 Merge pull request #2117 from ey6es/master
Preserve joint states when switching between LODs.  Closes #2077.
2014-02-26 14:17:50 -08:00
ZappoMan
d361c75b50 more work on seeing voxels 2014-02-26 14:16:22 -08:00
Philip Rosedale
b27e9b03d4 removed bad include 2014-02-26 14:15:00 -08:00
ZappoMan
08b7b86c3e next pass at seeing voxels 2014-02-26 13:55:16 -08:00
Andrzej Kapolka
d3ba0ca03d Merge pull request #2116 from birarda/authentication
fix address go-to and update for new API
2014-02-26 13:51:37 -08:00
Philip Rosedale
0a1e840d10 Bot.js NPCs wander around and make sounds 2014-02-26 13:50:04 -08:00
Stephen Birarda
7067cf2ab3 fix go to user and address update for new API 2014-02-26 13:40:49 -08:00
Andrzej Kapolka
f335bb8171 Preserve joint states when switching between LODs. Closes #2077. 2014-02-26 13:40:09 -08:00
ZappoMan
1e404404c3 next pass at seeing voxels 2014-02-26 13:35:59 -08:00
Andrzej Kapolka
959c225843 Merge pull request #2112 from ey6es/master
Fix for billboards' rendering incorrectly when rear view mirror is disabled.
2014-02-26 12:13:45 -08:00
Andrzej Kapolka
1265f83f68 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-26 12:12:18 -08:00
Andrzej Kapolka
8644280eb5 Make sure our mode is fully established before we use the mirror camera to
render the billboard.  Closes #2103.
2014-02-26 12:11:03 -08:00
ZappoMan
dee9d48b5f adding OctreeHeadlessViewer::queryOctree() 2014-02-26 01:55:04 -08:00
ZappoMan
7a2419a5bd removed old menu items for voxel protocol options 2014-02-26 01:54:32 -08:00
ZappoMan
a28f016de0 removing VoxelQuery 2014-02-26 01:28:08 -08:00
ZappoMan
e96206914e early cut at headless viewers 2014-02-26 01:24:12 -08:00