Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 05:14:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5748 commits 71 branches 56 tags 1.2 GiB
Commit graph

5748 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
5cd085dae5 updated README to include details on running local domain 2013-08-26 10:41:10 -07:00
ZappoMan
7b6c99073a Merge branch 'master' of https://github.com/worklist/hifi 2013-08-23 21:39:29 -07:00
Andrzej Kapolka
193b37eaa5 Merge pull request #887 from ZappoMan/threaded_voxel_server 
Make separate per client threads for sending voxels to each client
 2013-08-23 16:39:44 -07:00
ZappoMan
f7fa172ab7 make temporary buffer bound to each sending thread object 2013-08-23 16:37:41 -07:00
ZappoMan
a9edf09f39 Merge pull request #889 from birarda/new-menu 
implementing @problem's refactored menu setup
 2013-08-23 16:30:44 -07:00
ZappoMan
0c03fdd366 CR feedback 2013-08-23 16:25:17 -07:00
Stephen Birarda
818355dc1a implementing @problem's proposed changes to menus 2013-08-23 15:18:06 -07:00
Andrzej Kapolka
9eb05d13de Merge pull request #888 from ey6es/master 
Render the ball heads with the voxeltar bodies.
 2013-08-23 14:23:51 -07:00
Andrzej Kapolka
28ffd8eca7 Render the ball heads with the voxeltar bodies. 2013-08-23 14:22:00 -07:00
ZappoMan
626fd5fcd9 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-23 10:29:30 -07:00
Stephen Birarda
c5ad3331f9 Merge branch 'master' of github.com:worklist/hifi 2013-08-23 10:26:15 -07:00
ZappoMan
69356f6fa1 Merge pull request #886 from ey6es/master 
Glowing "laser pointer" for transmitter, when not in drive mode.  Also, make the avatar spheres glow.
 2013-08-22 17:43:23 -07:00
Andrzej Kapolka
3682e32eb1 Yes, these should be consts. 2013-08-22 17:40:55 -07:00
ZappoMan
0693d0cbbd moved each client to its own sending thread 2013-08-22 17:09:25 -07:00
Andrzej Kapolka
2cff4b6b3a "Laser pointer" for transmitter. 2013-08-22 17:09:23 -07:00
Andrzej Kapolka
3dfefefeae Make the surrounding spheres glow when moving, too. 2013-08-22 14:00:50 -07:00
Andrzej Kapolka
e67aee4b74 Merge pull request #885 from ey6es/master 
Fix for network crash.
 2013-08-22 13:53:19 -07:00
Andrzej Kapolka
2eaaee673f Argh, forgot to return the result of the superclass implementation. 2013-08-22 13:52:10 -07:00
ZappoMan
a66fd2f466 Merge pull request #884 from ey6es/master 
Have the avatars glow when moving.
 2013-08-22 11:45:14 -07:00
Andrzej Kapolka
7da9556815 Glow when moving. 2013-08-22 11:23:28 -07:00
ZappoMan
07a2bedfb0 moved voxel sending into a GenericThread derived class/object 2013-08-22 11:17:17 -07:00
ZappoMan
f5cb760110 Revert "moved voxel sending into a GenericThread derived class/object" 
This reverts commit 533a8ff31f.
 2013-08-22 11:16:51 -07:00
ZappoMan
533a8ff31f moved voxel sending into a GenericThread derived class/object 2013-08-22 11:13:17 -07:00
Stephen Birarda
1591e11c77 Merge branch 'master' of github.com:worklist/hifi 2013-08-22 11:04:14 -07:00
Andrzej Kapolka
ff245427fd Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/avatar/Avatar.cpp
 2013-08-22 10:40:15 -07:00
Andrzej Kapolka
165342bcc3 Have the local avatar glow when moving. 2013-08-22 10:35:21 -07:00
Stephen Birarda
01d28c7852 Merge pull request #883 from ZappoMan/threaded_voxel_server 
fix issue with voxel server getting duplicate nodes
 2013-08-22 10:33:19 -07:00
ZappoMan
a0c3df048c fix issue with voxel server getting duplicate nodes 2013-08-22 10:32:18 -07:00
Stephen Birarda
e5074b6fb6 Merge branch 'master' of github.com:worklist/hifi 2013-08-22 09:06:08 -07:00
ZappoMan
5897ff37c0 Merge pull request #882 from birarda/oculus 
fix for collisions when wearing Oculus
 2013-08-21 21:03:49 -07:00
Stephen Birarda
a728ea8592 Merge pull request #880 from ZappoMan/threaded_voxel_server 
Threaded voxel server- Fix "freezing" on hq
 2013-08-21 17:51:35 -07:00
Stephen Birarda
6206d9e8db fix for collisions when wearing Oculus 2013-08-21 17:42:13 -07:00
Stephen Birarda
cbb64034b5 fix for collisions when wearing Oculus 2013-08-21 17:41:26 -07:00
Stephen Birarda
0db1b052c7 Merge branch 'master' of github.com:worklist/hifi 2013-08-21 17:13:16 -07:00
ZappoMan
38f54a3130 Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 2013-08-21 17:03:34 -07:00
ZappoMan
56f6b12fcd Merge pull request #881 from Atlante45/png_import_cleanup 
Png import cleanup
 2013-08-21 17:03:16 -07:00
ZappoMan
69842ef82f Merge pull request #878 from LionTurtle/master 
Add MyAvatar class, subclass of Avatar class.
 2013-08-21 16:55:24 -07:00
ZappoMan
535a9faef3 fix comment 2013-08-21 16:42:35 -07:00
atlante45
12459079e9 Fixed magic number 2013-08-21 16:41:24 -07:00
ZappoMan
aa5aa1fb49 fix comment 2013-08-21 16:41:10 -07:00
ZappoMan
213f04f55e fix comment 2013-08-21 16:37:58 -07:00
atlante45
447d9a65ce Fixed only square png import + reduced amount of code 2013-08-21 16:36:50 -07:00
LionTurtle
3eb0a1a190 Magic number removal... 2013-08-21 16:35:16 -07:00
LionTurtle
e252d3b2ac Style and spacing changes in MyAvatar/Avatar classes. 2013-08-21 16:32:06 -07:00
ZappoMan
25e21f862c flush delete queue after encode is complete 2013-08-21 16:23:55 -07:00
Stephen Birarda
ee0d965ed4 Merge pull request #879 from ey6es/master 
Fix for glow/ambient occlusion with Oculus, made lookat vectors glow and enabled by default.
 2013-08-21 16:04:30 -07:00
ZappoMan
f19477dd63 dead code cleanup 2013-08-21 15:57:25 -07:00
Andrzej Kapolka
6dbaedd921 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-08-21 15:46:14 -07:00
Andrzej Kapolka
d63bb3afaa Fixed glow/ambient occlusion with Oculus. 2013-08-21 15:44:57 -07:00
ZappoMan
bb5a432c74 removed old dead code 2013-08-21 15:21:58 -07:00