Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 01:16:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4709 commits 76 branches 59 tags 1.2 GiB
Commit graph

4709 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
01b7f3868b Merge pull request #672 from birarda/domain-switch 
add an option in preferences to dynamically switch domain servers
 2013-07-15 17:10:18 -07:00
ZappoMan
31875abcab Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:05:10 -07:00
Stephen Birarda
c27cd7ae42 couple of type squishes in NodeList 2013-07-15 16:49:36 -07:00
ZappoMan
099fa4b4b1 fixed server persistance issue 2013-07-15 16:40:00 -07:00
ZappoMan
dc0b4d3e99 Merge pull request #676 from birarda/master 
make randIntInRange and randomColorValue inclusive on max side
 2013-07-15 16:31:25 -07:00
Philip Rosedale
eee8c3e570 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-15 16:27:51 -07:00
Philip Rosedale
26c0eb2dea Start to add heartbeat 2013-07-15 16:27:46 -07:00
ZappoMan
1fb1622beb added sleep to sendVoxelOperation() to keep from overwhelming server 2013-07-15 16:27:23 -07:00
Stephen Birarda
7f6009bb4a make randIntInRange inclusive on the max side 2013-07-15 16:25:09 -07:00
Philip Rosedale
7075258317 Merge pull request #673 from Atlante45/better_import 
Better import
 2013-07-15 16:20:01 -07:00
ZappoMan
ca06af779b Merge pull request #675 from birarda/high-agent-IDs 
fix the high node IDs in avatar mixer
 2013-07-15 16:19:23 -07:00
Stephen Birarda
d3f40033f9 fix the node ID unpack for avatar data 2013-07-15 16:17:08 -07:00
Andrzej Kapolka
90794caf67 Merge pull request #674 from ey6es/master 
Fix for iris rendering.
 2013-07-15 16:13:33 -07:00
Andrzej Kapolka
4f1e786392 Fix for iris rendering; was broken by scale change. 2013-07-15 16:12:23 -07:00
atlante45
bf328c8532 Improved import system copying to clipboard 2013-07-15 16:07:50 -07:00
Stephen Birarda
081a44dbff only process new domain list if it comes from current DS 2013-07-15 16:05:23 -07:00
Stephen Birarda
33ddda2558 correct reference to audio mixer sockaddr_in 2013-07-15 16:02:36 -07:00
Stephen Birarda
a204a8b872 lock the audioMixer to avoid crash when grabbing socket 2013-07-15 16:01:05 -07:00
Stephen Birarda
9fe1c7c63d lock the voxel server when receiving data to avoid race crash 2013-07-15 15:59:31 -07:00
Stephen Birarda
6c2682833e lock on the solo voxelServer before deleting local voxels 2013-07-15 15:53:25 -07:00
Stephen Birarda
6b83f95f9e conditionally set a new hostname on preferences save 2013-07-15 15:46:04 -07:00
Jeffrey Ventrella
56d0c7d7e4 added array of finger emitters for particle system 2013-07-15 15:45:31 -07:00
Stephen Birarda
e3d1e5db5d correct reference to mutex to lock in Node 2013-07-15 15:45:27 -07:00
Stephen Birarda
94b6bfccf6 update the private mutex node variable to standard 2013-07-15 15:17:53 -07:00
Stephen Birarda
d389dc6e3a add method to NodeList to set domain IP to local, move mutex lock to node 2013-07-15 15:17:10 -07:00
atlante45
6dcd4edfcb Merge branch 'master' of https://github.com/worklist/hifi 2013-07-15 14:48:57 -07:00
Jeffrey Ventrella
408edc7dca Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 14:36:32 -07:00
Jeffrey Ventrella
c0f319f077 merge 2013-07-15 14:36:11 -07:00
Stephen Birarda
e8f7d32ec5 Merge pull request #671 from machinelevel/dev4 
Build fail fix when Leap libs are not present.
 2013-07-15 14:34:08 -07:00
atlante45
98ae23a72c Merge branch 'master' of https://github.com/worklist/hifi into master-old 2013-07-15 14:33:33 -07:00
Eric Johnston
e937f86822 Build fail fix when Leap libs are not present. 2013-07-15 14:33:09 -07:00
Jeffrey Ventrella
f75ce72aca Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 14:30:19 -07:00
Stephen Birarda
12697c6b14 add method to clear the NodeList 2013-07-15 14:30:13 -07:00
Jeffrey Ventrella
1886df880d Merge pull request #669 from machinelevel/dev4 
Added fake Leap finger generation so that Ryan and Jeffrey can work on L...
 2013-07-15 14:29:30 -07:00
Eric Johnston
0239341127 updated per feedback 2013-07-15 14:27:58 -07:00
Philip Rosedale
f8f6b29559 Audio collision sounds are played locally as well as injected 2013-07-15 14:24:21 -07:00
Eric Johnston
c61966ebcd made Leap unit-conversion method public 2013-07-15 14:12:52 -07:00
Jeffrey Ventrella
83c779ad76 merge 2013-07-15 14:08:04 -07:00
Jeffrey Ventrella
7d5ade33a3 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 13:58:12 -07:00
Jeffrey Ventrella
84b6adf5b0 more work on particle emitter API 2013-07-15 13:57:39 -07:00
Eric Johnston
86faa33f83 Added fake Leap finger generation so that Ryan and Jeffrey can work on Leap glove-code without needing a Leap sensor at all times. 2013-07-15 13:56:37 -07:00
atlante45
1e13ad6123 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-15 12:51:14 -07:00
ZappoMan
4f0e472868 Merge pull request #668 from Atlante45/the_midget_are_coming 
The midget are coming
 2013-07-15 12:43:54 -07:00
atlante45
423a0eaac8 Fixed typo 2013-07-15 12:28:22 -07:00
atlante45
fbcacc8cf7 Few pre-review change for avatar resizing 2013-07-15 12:11:29 -07:00
atlante45
bf3c4fa1f8 Avatar resizing final commit 2013-07-15 12:04:24 -07:00
atlante45
078a47b006 Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 2013-07-15 12:03:04 -07:00
Stephen Birarda
7a73554a45 Merge pull request #667 from ZappoMan/bug_fixes 
Fixed a bug in LOD boundary behavior
 2013-07-15 09:30:20 -07:00
ZappoMan
8d4f7f8a2a CR feedback 2013-07-15 09:26:19 -07:00
ZappoMan
64681fa1e4 CR feedback 2013-07-15 09:21:47 -07:00