Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-17 12:23:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9180 commits 25 branches 0 tags 1.1 GiB
Commit graph

265 commits

Author SHA1 Message Date
matsukaze
ab0b7bba00 Fixes for style conformance: tabs to spaces 2014-02-07 22:52:08 -05:00
matsukaze
f15ddff7e0 Added new display mode to show culled faces. 2014-02-07 22:44:53 -05:00
matsukaze
259b285841 Merging upstream 2014-02-03 10:25:32 -05:00
matsukaze
bbf4f889d8 Completed worklist job #19486 
Job #19486  Don't render the duplicate triangles between adjacent
voxels.

Added checkable item to "developer" menu to activate/deactivate cull
shared faces.

Cull all shared voxel faces regardless of distribution in the octree.
Includes leaf to leaf, leaf to non-leaf, and non-leaf to non-leaf
comparison of contiguous faces.

Added new GL primitive renderer to manage the transfer of cube faces
from the voxel system to GL.

Added some useful classes for queue and lock management.

Modified statistics collection to report number of completely culled
nodes. Extra debugging info also includes the interior occlusions bit
mask of leaf voxels.
 2014-02-03 09:45:12 -05:00
stojce
d2464d89e3 #19493 - @ function can jump to locations as well as avatars 2014-01-30 22:23:31 +01:00
Stephen Birarda
10cfd628aa resolve conflicts on merge with upstream master 2014-01-23 17:52:30 -08:00
AndrewMeadows
6120416cbb Merge pull request #1627 from ey6es/metavoxels 
Basic metavoxel editing interface (doesn't actually perform any edits yet).
 2014-01-23 16:37:22 -08:00
Stephen Birarda
ed9118fd67 more NodeList QSet changes, closes #1660 2014-01-23 15:28:46 -08:00
Stephen Birarda
2e548fb39c complete migration of Avatar list to AvatarManager 2014-01-23 14:41:11 -08:00
Andrzej Kapolka
b5cba2786e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-23 11:21:07 -08:00
Andrew Meadows
fa3c3448f4 Adding option to disable hand collisions against their own avatar. 2014-01-23 10:55:51 -08:00
Andrzej Kapolka
f2cfd868a6 MetavoxelEditorDialog -> MetavoxelEditor. 2014-01-22 13:57:59 -08:00
Andrzej Kapolka
d473b002a8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-21 17:20:24 -08:00
Andrzej Kapolka
5b4447d0b9 More work on metavoxel editing. 2014-01-21 16:17:31 -08:00
Stephen Birarda
f13aa322fc resolve conflicts in merge with upstream/master 2014-01-21 16:01:12 -08:00
Stephen Birarda
e08f4d2eba more DataServerClient API tweaks 2014-01-21 13:13:57 -08:00
Andrzej Kapolka
d9589cd898 Starting on metavoxel editor dialog. 2014-01-21 11:43:15 -08:00
Stephen Birarda
3613773b79 cleanup DSC api, add scripting interface 2014-01-21 09:55:06 -08:00
aw
0eed041deb scripts save on exit and load on entry 2014-01-20 22:58:01 -08:00
Stephen Birarda
d405d31edf add data-server to hifi repo, abstract DataServerClient 2014-01-20 14:42:50 -08:00
Philip Rosedale
317af4c927 Merge pull request #1585 from AndrewMeadows/paddle-fixes 
Paddle fixes
 2014-01-17 16:50:10 -08:00
Andrew Meadows
0921999c3b Removing menu option for where to hold the ball -- we always hold from the finger tip (approximately). 2014-01-17 16:37:44 -08:00
stojce
13f223ff12 Merge branch 'master' of https://github.com/worklist/hifi into 19484 2014-01-17 19:46:44 +01:00
Brad Hefta-Gaub
1cfbfe6611 fix 3d mode switch on/off issue 2014-01-16 14:54:08 -08:00
Andrzej Kapolka
865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
 2014-01-16 13:35:03 -08:00
stojce
150a667cd6 WL job #19484 
- Move 'Fly to voxel on click' menu item;
- add shortcut for muting audio ...
 2014-01-16 20:17:04 +01:00
Andrew Meadows
1266ffd0ca merge of windows-build 
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
 2014-01-16 09:00:13 -08:00
Andrzej Kapolka
2c7b6b9696 Skeleton removal checkpoint; compiles, but there are a few bits missing. 2014-01-15 15:14:50 -08:00
Brad Hefta-Gaub
f1e98720d0 added option to disable local cache file 2014-01-15 12:29:54 -08:00
Brad Hefta-Gaub
477840904b Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 12:09:26 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Lucas Crisman
73dfc5dd58 Merge branch 'master' of git://github.com/worklist/hifi into 19485 2014-01-15 14:50:59 -03:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Brad Hefta-Gaub
392ff94ebe Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	interface/src/DataServerClient.cpp
	interface/src/avatar/MyAvatar.cpp
	libraries/avatars/src/AvatarData.h
 2014-01-13 15:06:26 -08:00
Brad Hefta-Gaub
b947d1e80c more surgical removal of WebCam with HAVE_LIBVPX 2014-01-13 15:00:15 -08:00
Andrzej Kapolka
7abb7d9ccd Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 14:03:08 -08:00
Stephen Birarda
42e3bcfe91 allow fade scale to get smaller than minimum avatar scale 2014-01-13 13:52:41 -08:00
Andrzej Kapolka
2d5df38907 Persist the user orientation as well as the position, show up a couple meters 
in front of (and facing) target.  Closes #1367.
 2014-01-13 13:51:51 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Lucas Crisman
e1aa74a5df equal sign key as shortcut for Reset Avatar Size 2014-01-09 15:00:55 -03:00
stojce
2814cca9af #19466 - Add avatar scale to preferences panel 2014-01-03 21:02:56 +01:00
Stojce Slavkovski
f583013776 Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 23:19:07 +01:00
ZappoMan
a43844447c first cut at 3D TV support 2013-12-28 10:07:33 -08:00
Stojce Slavkovski
ee1eb25dfa replace LogDisplay with File logger 
- added abstract logger interface
 2013-12-22 18:56:53 +01:00
Andrzej Kapolka
f10dccb1b8 Fix for menu shortcuts; just include widget library rather than using awkward 
workaround.
 2013-12-18 17:28:21 -08:00
Stojce Slavkovski
45d926da41 CR fixes 2013-12-18 20:37:45 +01:00
Stojce Slavkovski
4c1226ffd9 Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 08:00:55 +01:00
Andrzej Kapolka
6cffce5b31 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 16:57:25 -08:00
ZappoMan
ccd6058412 get abstract menu class to work 2013-12-17 13:55:17 -08:00
Andrzej Kapolka
a5c8531aa1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-17 13:46:44 -08:00