Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:11:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6618 commits 75 branches 59 tags 1.2 GiB
Commit graph

6618 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Philip Rosedale
5509324ffd Change particles to use vertex arrays, further speedups 2013-10-09 17:18:22 -07:00
Stephen Birarda
fb39ad0a55 comment out data-server packet queueing until sequencing is implemented 2013-10-09 17:03:02 -07:00
Stephen Birarda
4c148c6f3a ask data-server for domain + position of user from goToUser 2013-10-09 16:58:27 -07:00
Stephen Birarda
cd504e2293 use QString for DataServerClient keys 2013-10-09 16:50:54 -07:00
Stephen Birarda
3231776e76 add API for Profile userString and multiple value requests 2013-10-09 16:45:02 -07:00
Philip Rosedale
cabb5112dd Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 16:03:38 -07:00
Philip Rosedale
ab4b09ca39 More coding standard fixes to particle cloud 2013-10-09 16:03:06 -07:00
Stephen Birarda
d66137e314 add a Go To User option to the menu 2013-10-09 15:36:33 -07:00
Stephen Birarda
f7a0dd514e load NodeList and Profile settings with menu settings load 2013-10-09 15:23:07 -07:00
Andrzej Kapolka
cbd9dae886 Merge pull request #1035 from ey6es/master 
Fix for non-Faceshift eye and mouth movement.
 2013-10-09 15:13:34 -07:00
Andrzej Kapolka
083c5e34b2 Fix for non-Faceshift eye and mouth movement. 2013-10-09 15:11:14 -07:00
Philip Rosedale
4afa82d626 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 15:10:16 -07:00
Philip Rosedale
85a15a22fa Further code cleanup on particle cloud 2013-10-09 15:10:03 -07:00
Stephen Birarda
d3b95d19a1 send the user's last domain and position to data-server 2013-10-09 15:09:57 -07:00
Andrzej Kapolka
8949cb595c Merge pull request #1034 from ey6es/master 
Try reversing the eye offset z component so that leaning forward makes things bigger.
 2013-10-09 14:50:32 -07:00
Andrzej Kapolka
dfa3ea78da Reverse direction of eye offset. 2013-10-09 14:38:05 -07:00
Philip Rosedale
58d6c4c97a Cleaning up particle code 2013-10-09 14:28:00 -07:00
ZappoMan
d939d3aaae Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-09 14:02:40 -07:00
ZappoMan
c25b03dd58 first cut at keeping local voxels 2013-10-09 14:02:31 -07:00
Andrzej Kapolka
59c62b6873 Merge pull request #1033 from ey6es/master 
Fix for mouse ray with off axis projection.
 2013-10-09 13:43:19 -07:00
Andrzej Kapolka
aa353a57ad Fix for mouse ray with off axis projection. 2013-10-09 13:38:06 -07:00
Stephen Birarda
9112efaa36 move username change to Login, add lastPosition and lastDomain 2013-10-09 13:00:05 -07:00
Philip Rosedale
bcb3e082f6 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 12:17:43 -07:00
Philip Rosedale
e437ae888b Merge pull request #1032 from ey6es/master 
Various fixes from Basecamp, etc.
 2013-10-09 12:17:26 -07:00
Andrzej Kapolka
604d6399eb Fix for grow/shrink rates. 2013-10-09 11:58:27 -07:00
Andrzej Kapolka
5511c02449 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:53:08 -07:00
Andrzej Kapolka
0a54c2f1e9 Tweaking the growing heads. 2013-10-09 11:52:56 -07:00
Philip Rosedale
8dc84fc841 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:44:56 -07:00
Philip Rosedale
3a92856386 Merge pull request #1029 from birarda/nameserver 
initial revision of storing user data in data-server
 2013-10-09 11:36:36 -07:00
Philip Rosedale
939a145d90 Merge pull request #1031 from birarda/avatar-mixer-dopplegangers 
fix for avatar-mixer agent drops and double adds
 2013-10-09 11:15:01 -07:00
Stephen Birarda
478214f9da fix Profile include from DataServerClient 2013-10-09 11:14:26 -07:00
Andrzej Kapolka
a679517596 Fix for jaundiced eyes. 2013-10-09 11:10:51 -07:00
Stephen Birarda
36a57e2a98 remove more debugging in NodeList 2013-10-09 10:42:33 -07:00
Stephen Birarda
7d69c6f211 remove extraneous debugging in NodeList 2013-10-09 10:41:33 -07:00
Andrzej Kapolka
dfd5f7d53e Fix for screwy view when you lean too far forward. 2013-10-09 10:40:20 -07:00
Stephen Birarda
6fe0b0b124 don’t have AvatarMixer ask DS for agents 2013-10-09 10:40:19 -07:00
Stephen Birarda
2013f9f051 Merge branch 'master' of github.com:worklist/hifi 2013-10-09 10:40:00 -07:00
Stephen Birarda
ee1bf4ffcc remove eve as a target 2013-10-09 10:31:10 -07:00
Stephen Birarda
268a64d3d5 change data-server hostname to hifi global data-server 2013-10-09 10:27:02 -07:00
Stephen Birarda
f09888dd1b Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-09 10:21:25 -07:00
Andrzej Kapolka
1b4daa8eb9 No glow on own avatar, only on others when farther than five units away. 2013-10-09 10:17:41 -07:00
Philip Rosedale
906f3c8c60 got basic cloud working 2013-10-08 23:15:29 -07:00
Philip Rosedale
afd553330a Merge branch 'master' of https://github.com/worklist/hifi 2013-10-08 22:24:34 -07:00