Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 09:54:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
4170 commits 76 branches 59 tags 1.2 GiB
Commit graph

4170 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
f7f321663a DRY up multiple stat type sending 2013-07-02 14:42:31 -07:00
ZappoMan
147f090d56 Merge pull request #599 from PhilipRosedale/master 
3P transition turned off, field of view now in preferences
 2013-07-02 14:19:09 -07:00
ZappoMan
f36d7e7677 Merge pull request #607 from heracek/19385 
Code Review for Job #19385
 2013-07-02 14:16:13 -07:00
Tomáš Horáček
6f6f0423a0 Merge remote-tracking branch 'worklist/master' into 19385 2013-07-02 23:05:50 +02:00
Tomáš Horáček
a9f8b586ee re #19385: CR changes 2013-07-02 23:04:06 +02:00
Stephen Birarda
08c1d54cf3 send count of alive nodes to logstash from DS 2013-07-02 12:18:16 -07:00
Stephen Birarda
64f3b55aaa split logstash stash methods to stat types 2013-07-02 12:10:46 -07:00
Stephen Birarda
2a4d9c98ee add return of number of alive agents from AgentList 2013-07-02 10:34:57 -07:00
Stephen Birarda
ef8c48245e remove a couple of unused variables in the domain-server 2013-07-02 10:05:28 -07:00
Tomáš Horáček
5f9f2fee71 re #19385: use righ axis name 2013-07-02 11:47:53 +02:00
Philip Rosedale
e7113d26f8 Add field of view as an option in preferences 2013-07-01 23:00:39 -07:00
Philip Rosedale
6fbab462f0 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-01 22:30:06 -07:00
Philip Rosedale
6a3833359e Merge pull request #600 from tschw/19377 
Code Review for Job #19377
 2013-07-01 22:24:36 -07:00
tosh
f062319c2b introduces named constants for bandwidth meter channel indices / max. drag length 2013-07-02 03:53:49 +02:00
Tomáš Horáček
66de431d67 re #19385: add hot-fix to allow import of big PNGs 
sendVoxelsOperation() is sending data too fast, printf slows it down.
Better fix is required.
 2013-07-02 02:57:55 +02:00
Tomáš Horáček
2eeb0d9bb9 re #19385: importing voxels should be destructive 2013-07-02 01:16:20 +02:00
Tomáš Horáček
71c54586ba re #19385: use right neighbour voxels 2013-07-02 01:16:20 +02:00
Tomáš Horáček
b5e5806988 re #19385: fill gaps between neighbourhood voxels 2013-07-02 01:16:20 +02:00
Tomáš Horáček
c4c2d46847 re #19385: first version of PNG import 
works for size <= 128px
 2013-07-02 01:16:20 +02:00
tosh
f49e63f842 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-07-02 00:06:10 +02:00
tosh
7ebd912788 improves defaults and inline documentation of bandwidth meter layout constants 2013-07-01 23:38:00 +02:00
Stephen Birarda
818bfb0ba8 Merge pull request #605 from birarda/master 
add a license
 2013-07-01 11:56:53 -07:00
Stephen Birarda
8129f0d028 add an all rights reserved license 2013-07-01 11:56:19 -07:00
Stephen Birarda
bdf5248d6a Merge pull request #603 from birarda/master 
more podspec changes to avoid tagging
 2013-07-01 09:45:37 -07:00
Stephen Birarda
dd37516ed6 remove specific glm version, don't specify commit 2013-07-01 09:45:11 -07:00
Stephen Birarda
3ee690b11d Merge pull request #602 from birarda/master 
type squishes for podspec test
 2013-07-01 09:39:15 -07:00
Stephen Birarda
3c51f9cac7 type squishes in Agent socket match 2013-07-01 09:38:39 -07:00
Stephen Birarda
8d5ddd7101 Merge pull request #601 from birarda/master 
provide version for glm dependency
 2013-07-01 09:30:45 -07:00
Stephen Birarda
1a69364e8e provide a version requirement for glm dependency 2013-07-01 09:30:17 -07:00
tosh
3f62edd68e makes bandwidth details dialog properly close (and reopen) on ESC key 2013-07-01 10:53:49 +02:00
tosh
639858dfc9 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-07-01 10:29:56 +02:00
tosh
98589adef5 Bandwidth meter: Bytes -> bits, number formatting (colors, digits, aligment) on dialog 2013-07-01 10:28:17 +02:00
Philip Rosedale
54826a4099 Merge pull request #596 from birarda/podspec 
add a podspec for inclusion to iOS app as pod
 2013-06-30 23:27:40 -07:00
Philip Rosedale
138b8d7f64 Merge pull request #585 from birarda/owning-agent 
boolean helper for Avatar isMyAvatar check
 2013-06-30 23:26:32 -07:00
Philip Rosedale
d464ae4158 Merge pull request #578 from birarda/fervor 
add an autoupdater for release OS X builds
 2013-06-30 23:25:42 -07:00
tosh
fdf9f10e82 increases height of bandwidth meters by 8 pixels 2013-06-30 17:32:44 +02:00
tosh
f1e5a56347 adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars 2013-06-30 17:08:01 +02:00
tosh
435b958671 polishes bandwidth meter 2013-06-29 20:52:07 +02:00
tosh
46f8136f2e combined bandwidth display at automatic scale 2013-06-29 20:30:12 +02:00
tosh
c88642bac2 keeps audio from crashing when sound device is unavailable 2013-06-29 15:58:25 +02:00
tosh
c18400f8b7 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-06-29 15:41:56 +02:00
Philip Rosedale
5025e89c25 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-28 16:36:08 -07:00
Philip Rosedale
c2ef960a9e Changed horizontal field of view to a constant, made it 90 degrees 2013-06-28 16:31:59 -07:00
Stephen Birarda
800bcdfd18 Merge pull request #598 from LionTurtle/master 
Added menu toggle for displaying ping
 2013-06-28 16:26:10 -07:00
Philip Rosedale
c09fa3cc62 Turned avatar balls off 2013-06-28 16:22:56 -07:00
Philip Rosedale
8bac3b6a2b Merge branch 'master' of https://github.com/worklist/hifi 2013-06-28 16:20:23 -07:00
Mark Peng
be2e6518a1 Fixed if statement formatting in displayStats() and timer() in Application.cpp 2013-06-28 16:20:05 -07:00
Mark Peng
53543c26fe Added menu toggle for displaying ping 2013-06-28 16:02:49 -07:00
Stephen Birarda
02b37febad Merge pull request #597 from LionTurtle/master 
fix typo grabbing avatar mixer agent
 2013-06-28 15:57:33 -07:00
Mark Peng
745dc03c72 Fixed AGENT_TYPE typo in Application::displayStats() 2013-06-28 15:42:27 -07:00