Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 22:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5021 commits 71 branches 56 tags 1.2 GiB
Commit graph

5021 commits

This branch
This branch
All branches
Author SHA1 Message Date
atlante45
f441295eb1 Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option 2013-08-02 14:15:07 -07:00
atlante45
1cae9fc6c7 merge 2013-08-02 14:14:21 -07:00
ZappoMan
55f7028726 Merge pull request #744 from PhilipRosedale/master 
Smoother movement, rotation, less distracting collision noises.  Play sound on click voxel
 2013-08-02 14:03:51 -07:00
ZappoMan
95830a15e2 Merge pull request #739 from Ventrella/particles 
added emitter active switch
 2013-08-02 14:02:26 -07:00
Jeffrey Ventrella
29c5511a54 test 2013-08-02 13:49:50 -07:00
Jeffrey Ventrella
28dd38c013 Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 13:36:01 -07:00
Jeffrey Ventrella
a9ec94de49 fixed a problem with emitters not being coordinated with Leap fingers 2013-08-02 13:35:35 -07:00
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
Jeffrey Ventrella
c60acfad28 merge 2013-08-02 11:00:53 -07:00
Jeffrey Ventrella
6ebe33bb0b Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 11:00:10 -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
Jeffrey Ventrella
8fc800acff some work on hands 2013-08-02 10:59:04 -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
Philip Rosedale
8f95534644 Fix jittering in view from body slowly following head 2013-08-01 16:04:38 -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
atlante45
fdd01a6551 merge 2013-08-01 15:48:57 -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
Philip Rosedale
9defa6255a disable mouse wheel voxel scale change 2013-08-01 15:31:09 -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
atlante45
b6049c9a10 Merge branch 'master' of https://github.com/worklist/hifi into pie_menu 2013-08-01 15:28:35 -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
Philip Rosedale
ef8daffa4d Merge branch 'master' of https://github.com/worklist/hifi 2013-08-01 15:00:27 -07:00
Philip Rosedale
fcf20a7ebc Sound on click, but not on hover 2013-08-01 15:00:08 -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
e917924f7b Merge branch 'master' of https://github.com/worklist/hifi 2013-08-01 12:49:26 -07:00
Philip Rosedale
bc1ac6b455 turn down collision sounds 2013-08-01 12:49:10 -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
Jeffrey Ventrella
1df7026b26 merge? 2013-08-01 10:54:09 -07:00
Jeffrey Ventrella
5c38f78afc Merge remote-tracking branch 'upstream/master' into particles 2013-08-01 10:53:49 -07:00
Jeffrey Ventrella
0cd1018e76 some experimental work on hand rendering 2013-08-01 10:53:20 -07:00
Philip Rosedale
ba2c98a3eb Merge branch 'master' of https://github.com/worklist/hifi 2013-08-01 10:12:13 -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
Jeffrey Ventrella
8f8d230761 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 17:59:37 -07:00