Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-15 13:16:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8466 commits 25 branches 28 tags 1.2 GiB
Commit graph

8466 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
c5e10465c4 don't include civetweb in DomainServer 2014-01-16 17:08:06 -08:00
Stephen Birarda
d236d6335d add initial rev of embedded webserver based on QTcpSocket 2014-01-16 17:05:02 -08:00
Stephen Birarda
d85616d690 cleaup matching with node in addOrUpdateNode 2014-01-16 16:14:25 -08:00
Stephen Birarda
0ddf9520dd if audio is muted don't loopback local audio, fixes #1561 2014-01-16 14:55:09 -08:00
AndrewMeadows
e538b4cd8d Merge pull request #1559 from ZappoMan/windows_build 
remove glut and clean up windows build cmake
 2014-01-16 14:51:21 -08:00
Brad Hefta-Gaub
cdfc328f79 remove no longer needed compiler warning disable 2014-01-16 14:38:14 -08:00
Brad Hefta-Gaub
ef98a74ec8 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-16 14:33:44 -08:00
ZappoMan
146af812a0 Merge pull request #1557 from birarda/master 
some more library removal
 2014-01-16 14:32:04 -08:00
Brad Hefta-Gaub
87bb4e691c remove glut and clean up windows build cmake 2014-01-16 14:27:08 -08:00
Stephen Birarda
e8b6f8a7e4 remove docs from glew and freeglut 2014-01-16 14:24:04 -08:00
Stephen Birarda
495d227950 remove Faceshift here report, Quazip find module 2014-01-16 14:18:27 -08:00
Stephen Birarda
323aa18c0e remove MotionDriver and pthread libraries 2014-01-16 14:16:38 -08:00
Stephen Birarda
04675d8a5c Merge pull request #1555 from ey6es/debone 
Removal of old skeleton code, webcam bits.
 2014-01-16 14:08:02 -08:00
Andrzej Kapolka
cf40e76767 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 13:55:28 -08:00
Stephen Birarda
c2148d2aea Merge pull request #1554 from ZappoMan/bugfixes 
Fix the issue with voxels randomly disappearing in the client
 2014-01-16 13:55:11 -08:00
Andrzej Kapolka
813c31050a Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 13:54:55 -08:00
Stephen Birarda
c8b3132895 Merge pull request #1553 from ZappoMan/generic_thread_fix 
fixes leak of GenericThread and also fixes crash in octree servers on client disconnect
 2014-01-16 13:52:09 -08:00
Brad Hefta-Gaub
a1257d1b98 fixed comment that erroneously said wait when it should have said quit 2014-01-16 13:39:55 -08:00
Andrzej Kapolka
90f7941d87 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 13:38:23 -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
Brad Hefta-Gaub
a76f5a088c fixed comment 2014-01-16 13:19:21 -08:00
Brad Hefta-Gaub
a960330f34 fix voxel randomly disappearing bug 2014-01-16 13:17:41 -08:00
Brad Hefta-Gaub
f3074c1fcc Merge branch 'master' of git://github.com/worklist/hifi into generic_thread_fix 2014-01-16 12:55:55 -08:00
ZappoMan
a8a634752a Merge pull request #1552 from birarda/master 
fix for NodeList moveToThread
 2014-01-16 12:55:38 -08:00
Brad Hefta-Gaub
76d5ef5bc6 removed dead code 2014-01-16 12:54:28 -08:00
Brad Hefta-Gaub
f97ab1dafe fixes leak of GenericThread and also fixes crash in octree servers on client disconnect 2014-01-16 12:53:32 -08:00
Andrzej Kapolka
3f08504e3e Replaced missing functionality. 2014-01-16 12:39:07 -08:00
Stephen Birarda
9095874844 fix moveToThread for AssignmentClient NodeList, fixes #1551 2014-01-16 12:30:23 -08:00
Stephen Birarda
84a5d75131 Merge pull request #1547 from ZappoMan/windows_build 
removed unneeded redundant #ifdefs and fixed compiler warning
 2014-01-16 11:35:21 -08:00
Brad Hefta-Gaub
b9bca46c6b fix sign warning 2014-01-16 11:24:42 -08:00
Brad Hefta-Gaub
8034538f41 removed redundant embedded ifdefs 2014-01-16 11:20:09 -08:00
ZappoMan
b4c963b9f8 Merge pull request #1545 from birarda/master 
some warning fixes
 2014-01-16 10:03:43 -08:00
Stephen Birarda
75152abe2c fix unused variable warnings and constructor ordering 2014-01-16 09:52:29 -08:00
ZappoMan
7c4b341f52 Merge pull request #1544 from ZappoMan/windows_build 
Windows build
 2014-01-16 09:38:12 -08:00
Andrew Meadows
b60b9776ae removal of unused OctreePersistThread::_loadCompleted 2014-01-16 09:23:47 -08: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
ZappoMan
b11f9e5460 Merge pull request #1539 from AndrewMeadows/master 
first pass particle-hand-paddle collisions
 2014-01-15 18:16:33 -08:00
Andrew Meadows
2e1c2f3a61 merge upstream with local repo 2014-01-15 17:13:59 -08:00
Andrew Meadows
a7600c06dd cruft removal 2014-01-15 17:12:53 -08:00
Stephen Birarda
d7388c2288 Merge pull request #1537 from ZappoMan/stephens_requests 
added option to disable local cache file
 2014-01-15 17:07:43 -08:00
ZappoMan
ec3699da3b Merge pull request #1543 from birarda/master 
perform a proper oculus teardown if it isn't present
 2014-01-15 17:04:52 -08:00
Andrew Meadows
4e51aee00b Merge latest upstream into local repo. 2014-01-15 17:04:33 -08:00
Andrew Meadows
221f830b5f Uncommenting particle shift on penetration. 2014-01-15 17:03:07 -08:00
Andrew Meadows
4b94e53acf Removing Model::findSpherePenetrationWithJoint() which was experimental method that was not finally used. 2014-01-15 17:02:02 -08:00
Andrew Meadows
989b733de6 Removing magic numbers, but still only supporting 2 hands (the SkeletonModel currently has two hands hardcoded). 2014-01-15 16:59:49 -08:00
ZappoMan
4beea7f0ec Merge pull request #1541 from birarda/double-stars 
clarify output for double stars
 2014-01-15 16:57:08 -08:00
Andrew Meadows
76e8eb2bfc Moving SIXENSE_CONTROLLER_ID* constants into header to help eliminate magic numbers in other code (to be committed later). 2014-01-15 16:53:27 -08:00
Stephen Birarda
0f7d86a111 perform a proper oculus teardown if it isn't present 2014-01-15 16:52:03 -08:00
ZappoMan
4c5a3bdc32 Merge pull request #1540 from birarda/nodelist-container 
make sure killNodeWithUUID is called from right thread in DomainServer
 2014-01-15 16:30:27 -08:00
Stephen Birarda
a694425823 clarify output for star generation time 2014-01-15 16:26:01 -08:00