Commit graph

4476 commits

Author SHA1 Message Date
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
atlante45
8cc3f202ab Merge with upstream master 2013-07-01 17:12:05 +02:00
atlante45
45e13fda15 More UI improvements 2013-07-01 16:34:43 +02:00
Grayson Stebbins
60bea894d8 UI improvements 2013-07-01 10:32:36 -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
ZappoMan
f764a8d609 DRY up code in polygon 2013-06-29 00:25:04 -07:00
ZappoMan
c7e691a010 cleaned up CoverageMapV2 recursion code, fixes crazy false occlusion 2013-06-29 00:15:57 -07:00
ZappoMan
2b8b7589be latest version of quadtree coverage map 2013-06-28 22:05:46 -07:00
ZappoMan
73ad854235 latest version of quadtree coverage map 2013-06-28 22:05:32 -07:00
Andrzej Kapolka
b4b09b0070 Back up and running, now with OpenNI rather than libfreenect. 2013-06-28 17:31:49 -07:00
Andrzej Kapolka
ea9566596a Build OpenNI/NITE into interface if available. 2013-06-28 16:47:08 -07: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
Stephen Birarda
3349419c68 inital changes to add a version byte to packets 2013-06-28 16:23:35 -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
Andrzej Kapolka
884f14dca1 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-06-28 16:06:58 -07:00
Andrzej Kapolka
f602e1643b Remove references to LibUSB/Freenect. 2013-06-28 16:06:42 -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
Andrzej Kapolka
c4d7cea968 Remove skeltrack from CMakeLists.txt. 2013-06-28 15:57:27 -07:00
Mark Peng
745dc03c72 Fixed AGENT_TYPE typo in Application::displayStats() 2013-06-28 15:42:27 -07:00
Stephen Birarda
eedaf5f76e Merge pull request #593 from LionTurtle/master
ping reporter added to interface
2013-06-28 15:34:46 -07:00
Mark Peng
a5c6cee433 Renamed getPingTime() to getPingMs() in Agent.h, etc. 2013-06-28 15:33:08 -07:00
Philip Rosedale
fd7d9c6399 Merge pull request #595 from machinelevel/dev2
Minor bug fixes for networked Leap hands
2013-06-28 15:28:30 -07:00
Mark Peng
0aa3227228 Merge remote-tracking branch 'upstream/master' 2013-06-28 15:26:34 -07:00
Eric Johnston
6c42922288 Minor bug fixes for networked Leap hands 2013-06-28 15:22:56 -07:00
Mark Peng
9313dbff52 ping reporter added to interface take 5 2013-06-28 15:17:21 -07:00
Mark Peng
a5dc47eaab ping reporter added to interface take 4 2013-06-28 15:10:45 -07:00
Mark Peng
293031de6f ping reporter added to interface take 3 2013-06-28 13:03:30 -07:00
Stephen Birarda
99fddab590 an initial revision of the podspec for Base8 2013-06-28 13:01:21 -07:00
Andrzej Kapolka
f83c16e578 Goodbye, skeltrack. You won't be missed. 2013-06-28 12:27:50 -07:00
Philip Rosedale
a0e6c2869d merge fix 2013-06-28 11:54:25 -07:00