Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 04:20:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8887 commits 72 branches 59 tags 1.2 GiB
Commit graph

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
35016c7d69 make faceshift compile sources on windows to address linker error 2014-01-14 10:20:27 -08:00
Stephen Birarda
57f977668f replace the Node mutex with a QMutex 2014-01-14 10:15:31 -08:00
Stephen Birarda
53d435006c more follow mode cleanup, fix silent node iterator 2014-01-14 10:07:26 -08:00
Stephen Birarda
cbcdeb570b pull all available datagrams in Application processDatagrams 2014-01-14 10:01:11 -08:00
Philip Rosedale
21d2a5d9f4 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-14 09:54:09 -08:00
Brad Hefta-Gaub
a39c20e4d4 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-14 09:18:52 -08:00
Leonardo Murillo
4a4b483532 Resolving conflicts 2014-01-14 10:31:47 -06:00
Leonardo Murillo
24bedc90a7 Resolving conflicts 2014-01-14 10:30:52 -06:00
Brad Hefta-Gaub
b3e3bcbe1b adding more opencv libraries and fix cmake for opencv and faceshift for windows 2014-01-13 20:12:31 -08:00
Brad Hefta-Gaub
73aae6ef02 adding more opencv libraries and fix cmake for opencv and faceshift for windows 2014-01-13 20:12:11 -08:00
Andrzej Kapolka
c163b513d2 Working on allowing visitors to modify, as well as read, data. 2014-01-13 18:09:28 -08:00
Stephen Birarda
3ab7a6d9d5 move network packet processing to main thread 2014-01-13 17:58:48 -08:00
Philip Rosedale
a8bbe41642 Merge pull request #1512 from ey6es/retryagain 
After failing to download textures or geometry, retry again after increasing delays.
 2014-01-13 17:44:18 -08:00
Stephen Birarda
1faa2120aa use typedef in NodeList implementation 2014-01-13 17:36:27 -08:00
Stephen Birarda
0579b18426 fix deadlock in silent node removal 2014-01-13 17:33:58 -08:00
Stephen Birarda
6a0c431562 repair add of new node (so it doesn't immediately kill) 2014-01-13 17:29:45 -08:00
Stephen Birarda
677303b5c0 properly hook SharedNodePointer for signals/slots 2014-01-13 17:17:53 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
a24dbfce0b opencv windows libs 2014-01-13 17:04:20 -08:00
Andrzej Kapolka
3734aa4fe1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-13 16:31:45 -08:00
Brad Hefta-Gaub
54fa3ba17c link to faceshift for windows 2014-01-13 16:14:02 -08:00
Andrzej Kapolka
ce03853da5 Merge branch 'master' of https://github.com/worklist/hifi into retryagain 2014-01-13 16:13:38 -08:00
Andrzej Kapolka
0694a7d4a5 When we fail to download textures or geometry, retry after steadily increasing 
delays.  Closes #1471.
 2014-01-13 16:09:36 -08:00
Brad Hefta-Gaub
3af4703230 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-13 15:58:28 -08:00
Brad Hefta-Gaub
2217d79200 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-13 15:57:52 -08:00
Brad Hefta-Gaub
e60446a632 more windows build work 2014-01-13 15:57:31 -08:00
ZappoMan
85161382d6 Merge pull request #1511 from ey6es/master 
Fix (hopefully) for Windows warning, orbit around hover voxel center (not corner).
 2014-01-13 15:54:42 -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
Andrzej Kapolka
f21436a29e Fix (hopefully) for warning on Windows build. 2014-01-13 15:02:46 -08:00
Brad Hefta-Gaub
b947d1e80c more surgical removal of WebCam with HAVE_LIBVPX 2014-01-13 15:00:15 -08:00
Brad Hefta-Gaub
8e8e6fcb30 added latest version of freeglut for windows 2014-01-13 14:46:03 -08:00
Andrzej Kapolka
d8bae0530f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 14:44:18 -08:00
Andrzej Kapolka
9d831a2ab5 Orbit around voxel center, limit hover distance. 2014-01-13 14:43:59 -08:00
Brad Hefta-Gaub
b6b9ca881c removed more LIBVPX code by ifdef 2014-01-13 14:43:50 -08:00
Philip Rosedale
c78f4184df Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 14:17:40 -08:00
Philip Rosedale
0f2aa6ce00 Merge pull request #1510 from ey6es/master 
When teleporting to a user, face them from a couple meters away.
 2014-01-13 14:16:20 -08:00
Philip Rosedale
91f2bbb9b4 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 14:11:45 -08:00
Andrzej Kapolka
7abb7d9ccd Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 14:03:08 -08:00
Andrzej Kapolka
e721e8b7d4 Merge pull request #1509 from birarda/master 
fix for avatar fade/scale bug
 2014-01-13 14:02:45 -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
Stephen Birarda
3f2c6504a6 fix for avatar scale bug, closes #1506 2014-01-13 12:27:47 -08:00
Brad Hefta-Gaub
83f62de69f removed some openGL hacks from windowshacks.h because we don't need them with correct setup 2014-01-13 12:16:35 -08:00
Brad Hefta-Gaub
483ac66518 more windows build tweaks, warnings and linking 2014-01-13 11:48:16 -08:00
Philip Rosedale
9b4286fcd8 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 11:13:10 -08:00
Andrzej Kapolka
68eb1f79fe Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 10:40:59 -08:00
Brad Hefta-Gaub
3f03145386 fix ordering and includes for oculusmanager and 3dtv 2014-01-13 10:11:08 -08:00
Leonardo Murillo
0e25c85eef Trivial change - testing deploy changes 2014-01-13 11:46:27 -06:00
Leonardo Murillo
4373cc1718 Trivial commit - triggering github merge for testing 2014-01-13 11:05:58 -06:00
Leonardo Murillo
ca16acef6b Checkpoint 2014-01-13 07:37:47 -06:00