Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-18 01:26:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10084 commits 17 branches 0 tags 1.1 GiB
Commit graph

10084 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
ZappoMan
5b1037cc63 switching to OctreeQuery instead of VoxelQuery 2014-02-26 01:22:53 -08:00
ZappoMan
5fdfee4cd5 cleaning up some stuff 2014-02-26 00:48:38 -08:00
ZappoMan
cbca298717 cruft cleanup 2014-02-26 00:31:05 -08:00
ZappoMan
b08a1708f5 hide some slots from JS 2014-02-26 00:18:15 -08:00
Philip Rosedale
220f9fda76 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-25 22:09:08 -08:00
Philip Rosedale
4da6af96bb Bots will move 2014-02-25 22:08:56 -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
Philip Rosedale
2d2965d53a Merge pull request #2106 from ZappoMan/fixwindowsbuild 
some windows fixes and simplify script menus
 2014-02-25 22:03:52 -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