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

6616 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
cdfb232078 remove the Agent static instance 2013-10-11 17:40:02 -07:00
Stephen Birarda
0eae0f129c allow audio injection from javascript 2013-10-11 17:37:48 -07:00
Stephen Birarda
515e2d5a23 handle conflicts on merge with upstream master 2013-10-11 14:24:05 -07:00
ZappoMan
f2ef80b704 Merge pull request #1049 from stojce/19426 
Code Review for Job #19426
 2013-10-11 12:54:13 -07:00
ZappoMan
c6df36a40b Merge pull request #1047 from stojce/19434 
Code Review for Job #19434
 2013-10-11 12:52:13 -07:00
Stephen Birarda
2a5e672b5a Merge pull request #1050 from birarda/master 
remove a random sleep time debug
 2013-10-11 11:15:29 -07:00
Stephen Birarda
8be527f85d remove sleep time debug 2013-10-11 11:15:10 -07:00
ZappoMan
edaa67121f Merge pull request #1046 from birarda/master 
fix node kill bugs and add debugging
 2013-10-11 10:30:04 -07:00
Stephen Birarda
13ac5472ea fix an idiotic bug with silent node kill thread 2013-10-11 10:23:59 -07:00
Stephen Birarda
60095bcbca add debug on NodeList clear 2013-10-11 10:08:28 -07:00
Stephen Birarda
eebd38189b add killing of local voxels to domain change 2013-10-11 10:07:42 -07:00
stojce
a87346d39c Merge branch 'master' of https://github.com/worklist/hifi into 19426 2013-10-11 14:19:31 +02:00
Philip Rosedale
53e2486d4d Merge pull request #1045 from birarda/data-server 
fix bug with constant avatar kill/adds
 2013-10-10 18:05:23 -07:00
Stephen Birarda
7d68c79fd8 fix bug with constant avatar kill adds 2013-10-10 17:40:01 -07:00
Philip Rosedale
bf3f507301 Merge pull request #1043 from birarda/master 
fix domain jumping with goToUser, remove planet environments
 2013-10-10 17:25:43 -07:00
Philip Rosedale
77cf08b8f8 Merge pull request #1044 from birarda/data-server 
don't goToUser without domain and position
 2013-10-10 17:21:58 -07:00
Stephen Birarda
2c181011b3 don't attempt to go to user without domain AND position 2013-10-10 16:48:26 -07:00
Philip Rosedale
85e4c1ce72 Merge pull request #1041 from ZappoMan/keep_local_voxels 
Keep local voxels
 2013-10-10 16:40:48 -07:00
ZappoMan
fbcf66b232 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 
Conflicts:
	interface/src/Menu.h
 2013-10-10 16:37:07 -07:00
Stephen Birarda
9cf040780c remove the planets from the VS environment 2013-10-10 16:36:38 -07:00
Stephen Birarda
6f868a00eb reset environment on domain-server change 2013-10-10 16:34:35 -07:00
Stephen Birarda
aa0a97b959 use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread 2013-10-10 16:23:22 -07:00
Philip Rosedale
081f2da785 Merge pull request #1042 from ey6es/master 
When computing average model color, skip eyes and weight rest by number ...
 2013-10-10 16:16:22 -07:00
Andrzej Kapolka
6e012ea6d2 When computing average model color, skip eyes and weight rest by number of 
vertices.
 2013-10-10 16:04:42 -07:00
Philip Rosedale
43e01ee105 Merge pull request #1039 from birarda/data-server 
add ability to jump to a user's domain and location
 2013-10-10 15:37:21 -07:00
ZappoMan
c5d3f53bd6 Merge pull request #1037 from birarda/infoview 
fix InfoView full screen bug
 2013-10-10 15:29:55 -07:00
ZappoMan
3ad2a6edaa remove dead code 2013-10-10 15:28:55 -07:00
ZappoMan
f3aa82624f progress on keep local voxels 2013-10-10 15:28:06 -07:00
ZappoMan
0a6ddf108f progress on keep local voxels 2013-10-10 15:25:33 -07:00
ZappoMan
c86bad77c9 progress on keep local voxels 2013-10-10 15:23:22 -07:00
Andrzej Kapolka
adc6eb690d Merge pull request #1040 from ey6es/master 
Fix for seg fault on exit (no need to delete this explicitly, as it's a child of the Application).
 2013-10-10 15:16:49 -07:00
Andrzej Kapolka
d0e91967f1 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-10 15:15:44 -07:00
Andrzej Kapolka
42d3ee450b Fix for seg fault on exit. 2013-10-10 15:15:28 -07:00
Philip Rosedale
cddd4f4b4c Merge pull request #1038 from ey6es/master 
Have lean apply to first persion camera position, use average blend face color for ball-and-stick avatars.
 2013-10-10 15:11:54 -07:00
Stephen Birarda
33e6e1925e handle get of multiple values in single packet 2013-10-10 13:50:03 -07:00
Andrzej Kapolka
4c073426c8 Ball and cone color from average geometry colors. 2013-10-10 13:41:50 -07:00
Stephen Birarda
7851251e5d indicate number of values being put to data-server 2013-10-10 11:51:18 -07:00
Stephen Birarda
d37ae7da1b include the number of keys with data-server get 2013-10-10 11:49:14 -07:00
Andrzej Kapolka
14dfa72284 Rotation fix. 2013-10-10 11:25:11 -07:00
Stephen Birarda
11437054a6 add line to fix InfoView full screen bug 2013-10-10 11:01:07 -07:00
Andrzej Kapolka
052c8246fa Let's use the "eye level" position. 2013-10-10 10:49:19 -07:00
Andrzej Kapolka
0881cd4c92 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-10 10:32:19 -07:00
Andrzej Kapolka
ea639afe44 Use the head joint position so that lean affects camera position in first 
person mode.
 2013-10-10 10:31:34 -07:00
ZappoMan
3c212fb5f3 Merge pull request #1036 from PhilipRosedale/master 
Added back particle clouds, made faster (rendering options->particle cloud)
 2013-10-10 10:25:26 -07:00
Philip Rosedale
72273d1469 indent 2013-10-10 10:14:35 -07:00
Philip Rosedale
dd09d686fc indents 2013-10-10 09:53:43 -07:00
Philip Rosedale
d8dcb6aa44 bracket placement 2013-10-09 23:26:44 -07:00
Philip Rosedale
632dd2fa7d code review, added Doxygen style comments 2013-10-09 23:23:20 -07:00
Philip Rosedale
27a892fa55 Removed old head rotation code, menu items, added ability to turn off faceshift head rotation 2013-10-09 22:46:34 -07:00
Philip Rosedale
1d1e1f6d41 spacing 2013-10-09 17:21:39 -07:00