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

5934 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
ef7e7ae4c5 store senderSocket with assignment to be passed to requestor 2013-08-22 12:08:49 -07:00
Stephen Birarda
2804d286d5 send correctly sized packet for assignment 2013-08-22 11:52:59 -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
Stephen Birarda
f52c1c909b send assignment from domain server for audio mixer if it isn't present 2013-08-22 11:38:57 -07:00
Andrzej Kapolka
7da9556815 Glow when moving. 2013-08-22 11:23:28 -07:00
Stephen Birarda
f3e4196a81 add an assignment class and begin to hookup AS 2013-08-22 11:21:55 -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
ZappoMan
bb9a81939c threads for persist and packet processing 2013-08-21 15:17:32 -07:00
Grayson Stebbins
d6edf958e3 Removed "I'm ready" from last section header to prevent ugly wrapping 2013-08-21 15:05:28 -07:00
Grayson Stebbins
747008c229 Significant updates to README to make it more useful 2013-08-21 15:03:12 -07:00
ZappoMan
e524ed889e Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 
Conflicts:
	libraries/voxels/src/VoxelTree.cpp
	libraries/voxels/src/VoxelTree.h
 2013-08-21 13:48:23 -07:00
LionTurtle
a6109d411b Remove unnecessary comments and spaces. 2013-08-21 13:47:19 -07:00
ZappoMan
18dbfd5cc7 Merge pull request #877 from Atlante45/separate_import_with_preview 
New paste behaviour
 2013-08-21 13:44:17 -07:00
LionTurtle
bb9af3103c Remove unused setNoise() function in MyAvatar.h that was causing 
build error.
 2013-08-21 13:44:01 -07:00
LionTurtle
de9bd9e1b8 Add MyAvatar and resolve merge conflicts. 2013-08-21 13:38:23 -07:00
LionTurtle
1300bf7de2 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
 2013-08-21 13:36:28 -07:00
LionTurtle
f4109b3fb4 Add MyAvatar subclass. For functions such as render() and simulate(), 
they have been edited so that there are MyAvatar and Avatar specific
versions in their respective classes. isMyAvatar() has been removed.
 2013-08-21 13:24:54 -07:00
atlante45
bae0f7fa1b New paste behaviour 2013-08-21 13:21:15 -07:00
Stephen Birarda
1995788c2b Merge pull request #870 from ZappoMan/animation_server_jurisdictions 
Improve Animation Server to support Jurisdictions in Multi-voxel-server environment
 2013-08-21 13:18:19 -07:00
ZappoMan
4fd23a0cd9 CR feedback 2013-08-21 13:09:51 -07:00
ZappoMan
4bdaf7589f Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-21 12:16:09 -07:00