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

8325 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
a7600c06dd cruft removal 2014-01-15 17:12:53 -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
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
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
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
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
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
Lucas Crisman
73dfc5dd58 Merge branch 'master' of git://github.com/worklist/hifi into 19485 2014-01-15 14:50:59 -03:00
Lucas Crisman
24103740da equal sign shortcut for Reset Avatar Size on Application keyPress Event 2014-01-15 14:50:25 -03:00
Stephen Birarda
8325753962 Merge pull request #1529 from birarda/master 
remove newlines from node debug
 2014-01-15 09:42:38 -08:00
Stephen Birarda
13dfe91358 remove newlines from Node debug 2014-01-15 09:42:11 -08:00
Philip Rosedale
6a2c962326 Merge pull request #1525 from ey6es/armstrong 
First cut at stretching the arms out and aligning forearms with wrists.
 2014-01-14 20:10:18 -08:00
Philip Rosedale
a702c6a868 merge fix 2014-01-14 17:24:24 -08:00
Philip Rosedale
7f09aff297 Added voxelBird example script 2014-01-14 17:12:14 -08:00
Andrew Meadows
af3fae7bbf Merge upsteam master into current project (experimental hand paddles) 
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/avatars/src/AvatarData.cpp
 2014-01-14 16:39:46 -08:00
Andrzej Kapolka
7e4fcb43f2 Merge branch 'master' of https://github.com/worklist/hifi into armstrong 2014-01-14 16:31:30 -08:00
Andrzej Kapolka
fdfdefaf4b Merge pull request #1518 from birarda/debug-cleanup 
some debugging cleanup so we don't always have to add new lines
 2014-01-14 16:31:18 -08:00
Stephen Birarda
e76a37f48b resolve conflicts on merge with upstream master 2014-01-14 16:26:02 -08:00
Andrew Meadows
b51699bb2f First pass at particle-hand collisions using hacked hand capsules. 2014-01-14 16:25:31 -08:00
Andrew Meadows
9847ab3bfd Adding findSphereDiskPenetration() method for hand paddle experiment. 2014-01-14 16:23:35 -08:00
Andrzej Kapolka
617453da8c Merge branch 'master' of https://github.com/worklist/hifi into armstrong 2014-01-14 16:22:41 -08:00
Andrzej Kapolka
d8933b66b2 Merge pull request #1516 from birarda/domain-change 
replace the DomainChangeListener class with a signal/slot combo
 2014-01-14 16:22:28 -08:00
Andrew Meadows
761fdc9d84 Adding methods to Model for accessing hand info and computing hand collisions. 2014-01-14 16:19:57 -08:00
Stephen Birarda
540378262d Merge branch 'master' of https://github.com/worklist/hifi into domain-change 2014-01-14 16:19:37 -08:00
Stephen Birarda
299e558b79 Merge branch 'master' of https://github.com/worklist/hifi into debug-cleanup 2014-01-14 16:19:21 -08:00
Andrzej Kapolka
242597bbda Merge branch 'master' of https://github.com/worklist/hifi into armstrong 2014-01-14 16:19:10 -08:00
Andrew Meadows
22679687c5 Minor cleanup: moved #include out of header and into cpp file. 2014-01-14 16:17:37 -08:00
Stephen Birarda
6b2f72f14d repair reference to _targetScale in MyAvatar 2014-01-14 16:17:07 -08:00
Andrzej Kapolka
a1c6075c5b Merge pull request #1526 from ey6es/master 
Fix compile error.
 2014-01-14 16:16:38 -08:00
Andrzej Kapolka
4c2b67f6f3 Fix compile error. 2014-01-14 16:16:06 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Andrew Meadows
a08b7b3fd8 Adding initial Agent::findSphereCollision() implementation and removing some debug log spam. 2014-01-14 16:15:41 -08:00
Stephen Birarda
77ee27e5d7 resolve conflicts on merge with upstream master 2014-01-14 16:12:42 -08:00
Andrew Meadows
eb207efe32 Adding simple CollisionInfo class as data wrapper and a findSphereCollision() method to AgentData API. 2014-01-14 16:11:27 -08:00