Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-06-03 04:22:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6344 commits 18 branches 0 tags 1.1 GiB
Commit graph

6344 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
32314ad540 have VS send UUID with check in for static assignment behavior 2013-09-30 13:34:22 -07:00
Stephen Birarda
38873c0693 some assignment debug cleanup 2013-09-30 13:26:31 -07:00
Stephen Birarda
e63dfadcde allow repeated check ins from existing node 2013-09-30 13:24:55 -07:00
Stephen Birarda
0e5c5886b6 touchups to DS with static assignment file 2013-09-30 13:11:46 -07:00
Stephen Birarda
a8d55644e9 Assignment as LinkedData, add back to queue on node death 2013-09-30 11:04:42 -07:00
Stephen Birarda
fce97e2754 remove a space in DomainServer header 2013-09-30 10:44:34 -07:00
Stephen Birarda
1367396344 fix broken InfoView after removing fervor 2013-09-30 10:39:33 -07:00
Stephen Birarda
bb32da12f1 complete removal of fervor and C++11 array 2013-09-30 10:30:18 -07:00
Stephen Birarda
ef1ff01188 resolve conflicts on merge with upstream/master 2013-09-30 10:12:54 -07:00
ZappoMan
86b4b7079d Merge pull request #993 from PhilipRosedale/master 
Click on voxels as way of moving around
 2013-09-30 09:30:37 -07:00
Philip Rosedale
cb0046b52b Merge remote-tracking branch 'philip/master' 2013-09-28 15:26:57 -07:00
Philip Rosedale
9645cd9831 Click on voxels as way of moving around 2013-09-28 15:18:59 -07:00
Philip Rosedale
abee08c91a Merge pull request #987 from stojce/19422 
Code Review for Job #19422
 2013-09-28 11:52:30 -07:00
stojce
a0f23d409e Merging changes 2013-09-28 13:16:50 +02:00
stojce
bac228bdb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-28 12:47:47 +02:00
Stephen Birarda
6e99955e9d Merge pull request #991 from birarda/master 
initialize _shouldStop for Agent instance to false
 2013-09-27 16:28:14 -07:00
PhilipRosedale
39cf3375e5 small change to README 2013-09-27 16:27:42 -07:00
Stephen Birarda
ad8c676fea sensibly initialize _shouldStop to false 2013-09-27 16:23:07 -07:00
ZappoMan
5dd4d8a8e1 Merge pull request #990 from PhilipRosedale/master 
Smooth flying, fixed spinning problem, top speed about Mach 1
 2013-09-27 16:22:49 -07:00
Freddy
d63ead8727 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-27 15:13:43 -07:00
Philip Rosedale
1189ac2216 Merge pull request #989 from ZappoMan/voxel_geo_shader 
add support for global normals for voxels
 2013-09-27 15:10:53 -07:00
Freddy
c78aa591c5 Fix spinning while flying, top speed now about Mach 1 2013-09-27 15:08:10 -07:00
ZappoMan
8cffa8d872 add support for global normals for voxels 2013-09-27 15:04:44 -07:00
Freddy
d44961a175 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-27 13:50:56 -07:00
Philip Rosedale
549b863665 Merge pull request #988 from ZappoMan/voxel_geo_shader 
voxel rendering performance and debugging improvements
 2013-09-27 13:27:29 -07:00
ZappoMan
dbfc0956c1 added normals to voxel shader 2013-09-27 13:26:58 -07:00
Freddy
89404bb6a2 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-27 11:17:13 -07:00
ZappoMan
605c2f30cf add memory usage debugging 2013-09-27 10:17:10 -07:00
ZappoMan
eb6af1afbf fix byte normals, fix crashes in switching between voxel shader and normal mode 2013-09-27 09:02:51 -07:00
ZappoMan
fb85add6b4 Merge pull request #986 from PhilipRosedale/master 
Faceshift rotates body, slow near others for easier positioning
 2013-09-27 07:01:00 -07:00
Freddy
0816bdcd4a Merge branch 'master' of https://github.com/worklist/hifi 2013-09-27 00:53:56 -07:00
Philip Rosedale
1bd67d3243 Merge pull request #985 from ZappoMan/voxel_geo_shader 
add support for use of Byte normals
 2013-09-27 00:52:12 -07:00
Freddy
f88a3633a5 Slow down when near other avatars for easier positioning 2013-09-27 00:40:41 -07:00
Freddy
6b0f9314ba Faceshift drives body rotation, remove gyro-driven rotation 2013-09-26 23:52:44 -07:00
ZappoMan
2487a55be9 add support for use of Byte normals 2013-09-26 19:04:19 -07:00
Stephen Birarda
b5b43f86d1 begin to remove fervor + quazip 2013-09-26 17:39:33 -07:00
Freddy
462d0b90c1 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 17:26:59 -07:00
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader 
Voxel Geometry Shader Experiment
 2013-09-26 17:22:55 -07:00
Freddy
e74950db24 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 17:07:41 -07:00
Philip Rosedale
e02572fdbe Merge pull request #983 from ey6es/atropine 
Pupil dilation controlled by slider in preferences.
 2013-09-26 17:07:16 -07:00
ZappoMan
3ab92a592a fix comments in shaders 2013-09-26 17:05:04 -07:00
ZappoMan
07515d1c5f fix projection between shaders 2013-09-26 17:03:50 -07:00
ZappoMan
c0bfdfbc4f fix comment 2013-09-26 16:54:20 -07:00
ZappoMan
3f8e55da28 style cleanup 2013-09-26 16:46:34 -07:00
ZappoMan
57b30c13d8 style cleanup 2013-09-26 16:45:09 -07:00
ZappoMan
864c00c6e0 removed some dead code 2013-09-26 16:38:29 -07:00
ZappoMan
5695429a78 style fixes 2013-09-26 16:36:59 -07:00
ZappoMan
fd0cc3b417 style fixes 2013-09-26 16:33:37 -07:00
ZappoMan
7845340279 menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader 2013-09-26 16:26:49 -07:00
Freddy
ddcec39f04 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 15:58:06 -07:00