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

8436 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
0c22aa241f leverage invokeMethod to make sure killNodeWithUUID is called on right thread 2014-01-15 16:10:51 -08:00
Brad Hefta-Gaub
f2e3990ea7 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-15 15:22:02 -08:00
Brad Hefta-Gaub
d6eb6d02e2 adjust comment to reflect know issue 2014-01-15 15:21:48 -08:00
Brad Hefta-Gaub
d793bd44ee fix windows sign mismatch warning 2014-01-15 15:08:58 -08:00
Brad Hefta-Gaub
f445a391b7 added back arpa/inet.h and ifaddrs.h for mac and unix 2014-01-15 15:03:03 -08:00
Brad Hefta-Gaub
ff6e9c0416 added back unistd.h for non-windows 2014-01-15 14:59:14 -08:00
Andrew Meadows
32f3621855 merge upstream work into local repo 2014-01-15 14:13:48 -08:00
Andrew Meadows
09bce076cc All avatars now have disk collision proxies at their hands. 2014-01-15 14:06:31 -08:00
Andrew Meadows
235b6f0c36 Adding disk collision proxy for hand paddles. 2014-01-15 14:05:57 -08:00
Andrew Meadows
ee6a3263bc Changing where the "hand palms" are drawn. Will back them up with collision proxies soon. 2014-01-15 14:02:17 -08:00
Andrew Meadows
e4730790c0 bugfix: findSphereDiskPenetration() would never return true 2014-01-15 14:00:32 -08:00
Brad Hefta-Gaub
bd6e30070d Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
 2014-01-15 13:18:25 -08:00
Brad Hefta-Gaub
9a2ed80ffe added comment 2014-01-15 13:17:16 -08:00
Philip Rosedale
106c8f9f22 Merge pull request #1538 from birarda/nodelist-container 
don't return an iterator from killNodeAtHashIterator
 2014-01-15 13:15:06 -08:00
Stephen Birarda
1912ed0d9e have the Agent ask for an audio-mixer for audio scripting 2014-01-15 13:14:13 -08:00
Brad Hefta-Gaub
952365a1b7 clean up comments and tab spacing 2014-01-15 12:50:36 -08:00
Stephen Birarda
afc37789d4 Merge branch 'master' of https://github.com/worklist/hifi into nodelist-container 2014-01-15 12:45:16 -08:00
Stephen Birarda
0b52b8266e don't return an iterator from killNodeAtHashIterator 2014-01-15 12:44:46 -08:00
Brad Hefta-Gaub
912baf87c8 remove debug cmake code 2014-01-15 12:36:15 -08:00
Brad Hefta-Gaub
f64b3cdddb fix whitespace 2014-01-15 12:35:34 -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
ZappoMan
dfb70ee397 Merge pull request #1527 from PhilipRosedale/master 
New voxelBird example script
 2014-01-15 12:07:39 -08:00
ZappoMan
c07f97358e Merge pull request #1533 from birarda/nodelist-container 
simplify return of nodeWithUUID from NodeList
 2014-01-15 12:06:30 -08:00
Stephen Birarda
b4438c04c6 return result of QHash value from nodeWithUUID 2014-01-15 11:31:23 -08:00
Stephen Birarda
602060525b Merge pull request #1530 from kordero/19485 
Code Review for Job #19485
 2014-01-15 10:55:47 -08:00
Brad Hefta-Gaub
7bfda0d60e removed pthread.h 2014-01-15 10:30:05 -08:00