Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 14:11:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4814 commits 75 branches 59 tags 1.2 GiB
Commit graph

4814 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
f27eb5e1d8 small code changes for qt5 compatibility 2013-07-24 12:06:55 -07:00
Stephen Birarda
9f2b2d09a9 changes to CMakeLists for Qt5 2013-07-24 11:29:12 -07:00
Stephen Birarda
7fde47655e add Makefiles to the gitignore 2013-07-24 11:28:42 -07:00
Stephen Birarda
a8afaea542 switch to new qt5 find module setup 2013-07-23 20:49:08 -07:00
Stephen Birarda
e4169665a9 changes to CMakeLists to up to qt5 2013-07-23 20:28:11 -07:00
Stephen Birarda
fb05726323 Merge pull request #718 from ZappoMan/voxel_stats 
Sends Voxel Stats from server to client
 2013-07-23 18:16:57 -07:00
ZappoMan
d5e62b0f5a CR feedback 2013-07-22 14:18:16 -07:00
ZappoMan
f4749aa916 CR feedback 2013-07-22 14:17:18 -07:00
ZappoMan
86aeaf175c CR feedback 2013-07-22 14:15:10 -07:00
ZappoMan
60750d1d80 CR feedback 2013-07-22 14:13:10 -07:00
ZappoMan
8186145d35 CR feedback 2013-07-22 14:09:29 -07:00
ZappoMan
70516c8cb4 CR feedback 2013-07-22 14:08:48 -07:00
ZappoMan
d3c46cce8f CR feedback 2013-07-22 14:01:47 -07:00
ZappoMan
307cfcc7a2 CR feedback 2013-07-22 13:58:15 -07:00
Stephen Birarda
4ce2a8a675 Merge pull request #719 from machinelevel/dev4 
Minor tweaks to Rave Glove mode, per Ryan's testing
 2013-07-22 13:50:48 -07:00
Eric Johnston
9ab8fecff5 Minor tweaks to Rave Glove mode, per Ryan's testing 
1. Improve response by using unfiltered data from Leap library
2. Reduce distracting arm-flail by only attaching the arm to che glove when we're not in rave mode.
 2013-07-22 07:19:25 -07:00
ZappoMan
70c6ed040c added averages for bits per voxel and elapsed time 2013-07-21 07:21:23 -07:00
ZappoMan
c3fa37019e replaced old voxel stats with new voxel stats 2013-07-21 05:18:35 -07:00
ZappoMan
de7cd4db03 added total voxel count to stats 2013-07-20 15:49:04 -07:00
ZappoMan
86ad0da09f Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-20 11:35:10 -07:00
ZappoMan
e0f115298d additional stats items 2013-07-20 11:28:12 -07:00
ZappoMan
84328057ba Merge pull request #717 from machinelevel/dev4 
Rave glove demo: Greatly improved Leap handling
 2013-07-20 10:27:26 -07:00
Eric Johnston
6ceb48127a Small fix when no Leap connected. 2013-07-19 19:56:05 -07:00
Eric Johnston
d10ffd4f2d Small .h fix after testing without Leap libs 2013-07-19 19:53:30 -07:00
Eric Johnston
0cdad1a313 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 19:48:52 -07:00
Eric Johnston
b8cf4a9775 Rave glove: stabilization of Leap hands 2013-07-19 19:47:07 -07:00
ZappoMan
4e8ce1b193 tweaks to stats dialog 2013-07-19 18:15:06 -07:00
ZappoMan
83290bc8b7 first cut at real voxel stats dialog box 2013-07-19 17:28:37 -07:00
ZappoMan
4b08996525 Merge pull request #714 from ey6es/pointy 
Basic video/depth sending/receiving using VP8 encoding.
 2013-07-19 16:01:42 -07:00
ZappoMan
2cc42f6773 support piggybacking voxel and voxel stats messages into single packet 2013-07-19 15:59:47 -07:00
Andrzej Kapolka
353f16b2d0 Style fixes. 2013-07-19 15:56:04 -07:00
Andrzej Kapolka
f70b4dcab2 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-19 15:49:07 -07:00
ZappoMan
d9c8a59929 send voxel scene stats from server to client 2013-07-19 15:09:38 -07:00
ZappoMan
b97ef2a2c6 made voxel stats a command line option 2013-07-19 13:54:20 -07:00
ZappoMan
787c448856 include elapsed encoding time in voxel stats, fixed issue with subtree removal stats 2013-07-19 12:29:54 -07:00
ZappoMan
92f7f06af9 more stats 2013-07-19 12:00:51 -07:00
ZappoMan
c2ab5c4d98 more work on voxel stats 2013-07-19 11:42:37 -07:00
ZappoMan
52a2ac50a9 Merge pull request #715 from LionTurtle/master 
Bug fix on lookatVectors (fixed scale in head.cpp)...
 2013-07-19 10:18:42 -07:00
Eric Johnston
262851346c Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing) 
This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.
 2013-07-19 09:31:45 -07:00
Eric Johnston
28bf0b5147 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 08:47:37 -07:00
Mark Peng
a14768bb29 Remove more unnecessary additions. 2013-07-19 01:00:55 -07:00
Mark Peng
ceb743a65d Remove unncessary import math.h (for reals). 2013-07-19 00:56:12 -07:00
Mark Peng
fc22240525 Remove unnecessary import math.h. 2013-07-19 00:55:31 -07:00
Mark Peng
a84c1c9e21 Merge remote-tracking branch 'upstream/master' 2013-07-19 00:46:52 -07:00
Mark Peng
927aea8bb4 Bug fix on lookatVectors (fixed scale in head.cpp). Added bool 
isLookingAtOtherAvatar. Basic halo indicator in Application.cpp.
 2013-07-19 00:44:23 -07:00
ZappoMan
e6c50e3d80 Merge pull request #713 from birarda/ds-switch 
smarter domain-server hostname switching
 2013-07-18 22:15:33 -07:00
Andrzej Kapolka
ff0d63173c Pass the aspect ratio into the shader, since it no longer necessarily 
corresponds to the texture rectangle's aspect ratio.
 2013-07-18 21:25:11 -07:00
Mark Peng
cfcb31172c Merge remote-tracking branch 'upstream/master' 2013-07-18 21:08:08 -07:00
Andrzej Kapolka
0ae6887c4a The depth texture needs nearest neighbor filtering. 2013-07-18 21:06:38 -07:00
Andrzej Kapolka
b15724665b Removed unused variable, fixed shader comments. 2013-07-18 18:16:45 -07:00