Atlante45
|
ea0f414c23
|
Added possibility to create a VoxelSystem from an already existing VoxelTree
|
2014-02-28 15:11:38 -08:00 |
|
Atlante45
|
4bcb43f7dd
|
Added an overlay system for local trees
|
2014-02-28 15:10:53 -08:00 |
|
Atlante45
|
fb10676121
|
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
|
2014-02-28 11:32:27 -08:00 |
|
Atlante45
|
41931ebd57
|
Removed copyTo and pasteFrom from ClipboardScriptingInterface (not useful in the end)
|
2014-02-28 11:22:14 -08:00 |
|
Atlante45
|
5b085a72cd
|
Added import tree to LocalVoxels
|
2014-02-28 11:21:32 -08:00 |
|
Philip Rosedale
|
7a2279bda8
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-02-27 23:31:45 -08:00 |
|
Philip Rosedale
|
d5e106b30d
|
collision submenu only under edit (I don’t think you can make same one twice)
|
2014-02-27 23:29:29 -08:00 |
|
Philip Rosedale
|
bae16e24e8
|
new audio buffer display text, cleanup drawText()
|
2014-02-27 23:17:39 -08:00 |
|
Philip Rosedale
|
bde7152246
|
Merge pull request #2135 from ZappoMan/bugfixes
bug fixes
|
2014-02-27 20:43:48 -08:00 |
|
Philip Rosedale
|
5f8c5d36da
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-02-27 20:29:35 -08:00 |
|
Andrzej Kapolka
|
73ec568b4b
|
Further work on request limiting.
|
2014-02-27 19:28:45 -08:00 |
|
Andrzej Kapolka
|
5d4ed4c85e
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-02-27 18:14:18 -08:00 |
|
Andrzej Kapolka
|
29f7954d20
|
Factored out bits common to resource caches, added global limit on number of
resources being requested at any one time.
|
2014-02-27 18:13:40 -08:00 |
|
Philip Rosedale
|
7ce380a333
|
relocate mute button, audio scope
|
2014-02-27 18:02:53 -08:00 |
|
ZappoMan
|
19b7189269
|
switch AUTO LOD to use moving avarage of FPS, and also tweak the min and max behavior
|
2014-02-27 18:00:58 -08:00 |
|
Atlante45
|
2ee7974fa8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
|
2014-02-27 17:53:59 -08:00 |
|
Philip Rosedale
|
f06b30e024
|
remove audio barograph latency display
|
2014-02-27 17:45:47 -08:00 |
|
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 |
|
Atlante45
|
5986fcafae
|
Added copyTo and pasteFrom to ClipboardScriptingInterface
- Supports LocalVoxels
|
2014-02-27 16:41:58 -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
|
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 |
|
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 |
|
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
|
8d53fc9671
|
Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels
|
2014-02-27 01:05:20 -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 |
|
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 |
|
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 |
|
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
|
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
|
7a2419a5bd
|
removed old menu items for voxel protocol options
|
2014-02-26 01:54:32 -08:00 |
|
ZappoMan
|
5b1037cc63
|
switching to OctreeQuery instead of VoxelQuery
|
2014-02-26 01:22:53 -08:00 |
|
Philip Rosedale
|
46469612c7
|
Merge pull request #2108 from ZappoMan/remove_cpp_voxel_editing
Remove cpp voxel editing
|
2014-02-25 22:07:54 -08:00 |
|
ZappoMan
|
f2b95e0a00
|
added a comment
|
2014-02-25 21:54:52 -08:00 |
|
ZappoMan
|
5fdf114ff0
|
removed more cruft
|
2014-02-25 21:53:20 -08:00 |
|
ZappoMan
|
d61ba02a38
|
removed more cruft
|
2014-02-25 21:44:38 -08:00 |
|
ZappoMan
|
869b35a7aa
|
remove old c++ implementation of voxel tools
|
2014-02-25 21:38:10 -08:00 |
|
ZappoMan
|
d3594808d9
|
some cruft cleanup
|
2014-02-25 20:45:49 -08:00 |
|
ZappoMan
|
d765e250d5
|
removed AbstractMenuInterface.h
|
2014-02-25 20:42:59 -08:00 |
|
ZappoMan
|
42ddc82ac4
|
possible fix to windows assert
|
2014-02-25 20:23:38 -08:00 |
|
ZappoMan
|
d4c36acd7d
|
fix windows warning
|
2014-02-25 18:43:31 -08:00 |
|