Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 15:33:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
4979 commits 71 branches 56 tags 1.2 GiB
Commit graph

4979 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
b09d40964a Merge pull request #747 from LionTurtle/master 
Add skeleton tracking toggle in options menu in interface.
 2013-08-02 11:10:17 -07:00
Mark Peng
6cf42674d5 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	interface/src/Application.cpp
	interface/src/Webcam.cpp
	interface/src/Webcam.h
 2013-08-02 11:00:05 -07:00
Andrzej Kapolka
cba2c6e335 Merge pull request #753 from ey6es/pointy 
Have particle system option default to off.
 2013-08-02 10:13:35 -07:00
Andrzej Kapolka
11664f9446 Have the particle system default to off. 2013-08-02 10:12:21 -07:00
Andrzej Kapolka
6712ac537a Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-02 09:46:26 -07:00
Philip Rosedale
56e66f8020 Merge pull request #752 from ey6es/pointy 
Depth smoothing, full frame video support (along with ability cycle between no video, just face, full frame).
 2013-08-01 21:11:09 -07:00
Andrzej Kapolka
323e21ad4a Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-01 19:28:34 -07:00
Andrzej Kapolka
e0881ad794 Merge pull request #751 from ey6es/master 
Fix for LEAP data transmission.
 2013-08-01 18:58:59 -07:00
Andrzej Kapolka
69cac69067 Go ahead and show the leap hand by default, but don't include the fingers if 
the palms are inactive (!)
 2013-08-01 18:56:14 -07:00
Andrzej Kapolka
c038e2c9ba Wrong array index here, and finger needs to be flagged as active so that the 
avatar mixer will encode it.
 2013-08-01 18:32:48 -07:00
Andrzej Kapolka
0052221c33 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-01 15:52:58 -07:00
Philip Rosedale
92ec593882 Merge pull request #750 from ZappoMan/tile_import 
implement grid landscape import
 2013-08-01 15:49:50 -07:00
ZappoMan
0a4fcdccb5 Merge branch 'master' of https://github.com/worklist/hifi into tile_import 
Conflicts:
	interface/src/Application.cpp
 2013-08-01 15:44:28 -07:00
ZappoMan
a0ba788679 implement grid landscape import 2013-08-01 15:40:39 -07:00
Andrzej Kapolka
12f42358d5 Allow cycling between video send modes. 2013-08-01 15:39:53 -07:00
Stephen Birarda
75ef136ec5 Merge pull request #749 from birarda/keys 
cleanup the Qt5 find package calls
 2013-08-01 15:30:51 -07:00
Stephen Birarda
269e040263 Qt5 find package cleanup 2013-08-01 15:27:55 -07:00
Mark Peng
6a6c51f80e Add skeleton tracking toggle in options menu in interface. 2013-08-01 15:04:58 -07:00
ZappoMan
f560f63cda Merge pull request #743 from LionTurtle/master 
Add reference lines to mouse voxel when adding/deleting voxels.
 2013-08-01 13:37:08 -07:00
Mark Peng
9ba0e3bb0c Add reference lines to mouse voxel when adding/deleting voxels. 2013-08-01 13:03:17 -07:00
Andrzej Kapolka
ba9b5888d2 More work on full frame sending. 2013-08-01 13:00:01 -07:00
Philip Rosedale
129d428a6e Merge pull request #742 from birarda/local-domain 
use 0 IP address to designate node on same IP as domain
 2013-08-01 12:06:26 -07:00
Stephen Birarda
2b31a3586e comment changes for local vs. non-local 2013-08-01 12:01:48 -07:00
Stephen Birarda
2fde29e04a use a 0 public address to designate server local to DS 2013-08-01 11:53:18 -07:00
ZappoMan
a96c1df691 Merge pull request #740 from birarda/master 
necessary changes for AvatarData
 2013-08-01 10:12:05 -07:00
Stephen Birarda
71ab8ae4f8 some necessary changes for AvatarData transmission 2013-08-01 10:07:10 -07:00
Andrzej Kapolka
a86ceb2759 More work on full frame video. 2013-07-31 18:18:37 -07:00
Andrzej Kapolka
d18a9dc499 Working on full frame video support. 2013-07-31 17:06:09 -07:00
Stephen Birarda
aed0aa3034 Merge branch 'master' of github.com:worklist/hifi 2013-07-31 16:35:25 -07:00
ZappoMan
55988ab802 Merge pull request #738 from Ventrella/particles 
Changed rave glove modes to use names suggested by Brad
 2013-07-31 16:21:04 -07:00
Stephen Birarda
493eda8dd0 Merge pull request #737 from birarda/qt5 
fix automoc error for OpenNI header
 2013-07-31 16:18:32 -07:00
Stephen Birarda
8166ed3a77 move OpenNI include 2013-07-31 16:15:39 -07:00
Stephen Birarda
b3fc378a0f don't include XnCppWrapper if Q_MOC_RUN is defined 2013-07-31 16:14:17 -07:00
Jeffrey Ventrella
5c040ad84d test 2013-07-31 16:08:46 -07:00
Jeffrey Ventrella
eb732abcd6 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 16:07:44 -07:00
Jeffrey Ventrella
be8a587d49 named rave glove effects 2013-07-31 16:07:21 -07:00
ZappoMan
d8245997ce Merge pull request #716 from Ventrella/particles 
Improvements to the Particles System
 2013-07-31 15:50:57 -07:00
Stephen Birarda
d66adc7a18 Merge pull request #736 from birarda/qt5 
call use modules after OpenNI is linked
 2013-07-31 15:49:01 -07:00
Stephen Birarda
c34bc4173b call use modules after OpenNI is linked 2013-07-31 15:45:22 -07:00
Jeffrey Ventrella
6c1cc911d5 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
5b1ba56d67 toggle debug print statements for Leap fingers 2013-07-31 15:12:29 -07:00
Andrzej Kapolka
415949cc26 Terminology change to reflect the fact that we're no longer using the mean. 2013-07-31 14:40:33 -07:00
Stephen Birarda
8807128791 Merge pull request #735 from birarda/qt5 
remove useless link to QT_LIBRARIES
 2013-07-31 14:25:11 -07:00
Stephen Birarda
10b57bca80 remove useless link to QT_LIBRARIES 2013-07-31 14:24:30 -07:00
Jeffrey Ventrella
0aaeb4550a cleanup 2013-07-31 13:07:52 -07:00
Jeffrey Ventrella
89f36a7eb7 cleanup 2013-07-31 12:38:40 -07:00
Jeffrey Ventrella
2901b58059 changed variable name from t to effectsTimer 2013-07-31 12:34:43 -07:00
Stephen Birarda
ffa3c5556c Merge pull request #734 from birarda/qt5 
switch cmake source for jenkins build to root
 2013-07-31 12:28:28 -07:00
Stephen Birarda
2c5b8d3121 cmake source is root, make specific target 2013-07-31 12:21:49 -07:00
Andrzej Kapolka
729158f882 Added depth smoothing, experimenting with using depth minimum rather than 
mean.
 2013-07-31 12:19:14 -07:00