Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 14:43:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8890 commits 25 branches 0 tags 1.1 GiB
Commit graph

8890 commits

This branch
This branch
All branches
Author SHA1 Message Date
stojce
0c2e55a53b Merging with master 
- resolve conflicts on GeometryCache
 2014-01-24 07:31:22 +01:00
Andrzej Kapolka
4296e5e81e Merge pull request #1674 from ey6es/master 
Fix OS X warning.
 2014-01-23 18:10:20 -08:00
Andrzej Kapolka
6619cdb36b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-23 18:10:00 -08:00
Stephen Birarda
777e375761 Merge pull request #1670 from AndrewMeadows/zero-length-penetrations 
Zero length penetrations
 2014-01-23 18:09:41 -08:00
Andrzej Kapolka
c4254cd423 Fix OS X warning. 2014-01-23 18:08:45 -08:00
Philip Rosedale
2dee6426e9 Merge pull request #1672 from ZappoMan/bugfixes 
fix crash on shutdown of interface
 2014-01-23 17:27:07 -08:00
ZappoMan
5560a0fb4d fix crash on shutdown of interface 2014-01-23 17:03:11 -08:00
Andrew Meadows
93482d9d18 Fixing indentation. 2014-01-23 16:41:03 -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
ZappoMan
da58486fb1 Merge pull request #1668 from birarda/nodelist-patches 
cleanup deadlocking in NodeList methods, avatar-mixer debug
 2014-01-23 16:30:29 -08:00
Stephen Birarda
000bbccdf0 Merge pull request #1664 from ZappoMan/bugfixes 
fix random crash on interface shutdown
 2014-01-23 16:25:07 -08:00
Andrzej Kapolka
e80eb03ba9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2014-01-23 16:13:42 -08:00
Andrew Meadows
631c1d2c1b Merge branch 'master' of ssh://github.com/highfidelity/hifi into zero-length-penetrations 2014-01-23 16:07:16 -08:00
Andrew Meadows
70c675e9be Adding comments and minor cleanup after tracking down some NaN's that were showing up in collision sound triggers. 2014-01-23 16:03:52 -08:00
Stephen Birarda
80106979a5 replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
Stephen Birarda
ed9118fd67 more NodeList QSet changes, closes #1660 2014-01-23 15:28:46 -08:00
Stephen Birarda
ba7a73e347 add a missing break, don't double activate sockets 2014-01-23 15:11:09 -08:00
Stephen Birarda
761bcb9825 allow recursive locking on the NodeHashMutex 2014-01-23 15:11:02 -08:00
ZappoMan
9de99ce6a8 removed commented out debug 2014-01-23 15:07:17 -08:00
ZappoMan
bdcca9cbf4 fix random crash on interface shutdown 2014-01-23 14:57:32 -08:00
AndrewMeadows
d556581842 Merge pull request #1663 from PhilipRosedale/master 
New drumstick sounds, markers at origin, rolling voxels make no sound
 2014-01-23 14:05:03 -08:00
Philip Rosedale
29f33a4e79 Balls rolling on voxels don’t make sound 2014-01-23 13:54:45 -08:00
Philip Rosedale
5d1a320dd0 fixed merge 2014-01-23 13:50:44 -08:00
Philip Rosedale
7e216443e9 Merge pull request #1662 from ZappoMan/bugfixes 
set default particle lifetime to 10 seconds, make sure lifetime is always honored
 2014-01-23 13:48:30 -08:00
ZappoMan
d2bf3a2a5d set default particle lifetime to 10 seconds, make sure lifetime is always honored 2014-01-23 13:46:12 -08:00
Philip Rosedale
e4e2bb3854 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 13:09:36 -08:00
Philip Rosedale
9363671f1e Merge pull request #1661 from ZappoMan/bugfixes 
another attempt to fix particle-server crash
 2014-01-23 13:07:36 -08:00
ZappoMan
599475b797 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-01-23 13:01:17 -08:00
ZappoMan
8aa7a915e7 ok, one more shot at fixing particle-server crash 2014-01-23 13:01:07 -08:00
Philip Rosedale
f0417d187f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 12:40:56 -08:00
Philip Rosedale
8c92c0b663 Merge pull request #1658 from ey6es/master 
Remove eyes' hovering on mouse avatar, voxels.  Closes #1643.
 2014-01-23 12:26:21 -08:00
Andrzej Kapolka
61d97454d7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-23 11:54:08 -08:00
Philip Rosedale
86e37f8fc2 new sounds for drumsticks 2014-01-23 11:53:46 -08:00
Andrzej Kapolka
b32b0a495a Remove eyes' hovering on mouse avatar, voxels. Closes #1643. 2014-01-23 11:49:34 -08:00
Philip Rosedale
c882104046 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 11:43:08 -08:00
Philip Rosedale
5e77f5643d Merge pull request #1630 from birarda/nodelist-set 
change node types of interest to a QSet
 2014-01-23 11:42:37 -08:00
Philip Rosedale
d34bb53d53 Merge pull request #1657 from birarda/master 
more NL repairs for concurrency issues, fix audio starve display
 2014-01-23 11:41:34 -08:00
Philip Rosedale
8bba7b65eb Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 11:23:53 -08:00
Andrzej Kapolka
b5cba2786e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-23 11:21:07 -08:00
Andrzej Kapolka
4e3988f843 Have the drag-out box show up in the selected color. 2014-01-23 11:20:07 -08:00
Stephen Birarda
c54eacbf36 make sure starve is displayed even if ring buffer just received data 2014-01-23 11:15:21 -08:00
Stephen Birarda
24bed09473 DatagramProcessor need not be a pointer in Application 2014-01-23 11:13:03 -08:00
Stephen Birarda
b5a72ef669 more nodelist repairs for concurrency issues 2014-01-23 11:11:22 -08:00
Philip Rosedale
9a8e978733 Merge pull request #1654 from AndrewMeadows/hand-vs-avatar 
Adding option to disable hand collisions against their own avatar.
 2014-01-23 11:08:37 -08:00
Andrew Meadows
c9c6c99fa2 Merge branch 'master' of ssh://github.com/highfidelity/hifi into hand-vs-avatar 2014-01-23 10:58:28 -08:00
Andrew Meadows
fa3c3448f4 Adding option to disable hand collisions against their own avatar. 2014-01-23 10:55:51 -08:00
Philip Rosedale
f4aefa2fe4 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 10:52:50 -08:00
Andrzej Kapolka
a5b0fe38ec Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-23 10:52:03 -08:00
Philip Rosedale
f6cfa5d213 Merge pull request #1651 from birarda/master 
use NodeHash getter for methods that can be called from other threads
 2014-01-23 10:51:35 -08:00
Philip Rosedale
007d31b092 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 10:50:22 -08:00