Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 03:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3689 commits 71 branches 56 tags 1.2 GiB
Commit graph

3689 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
57fcaceec2 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-11 11:10:41 -07:00
Philip Rosedale
b1e3a0984b Improved mouse look behavior to be smoother, removed transmitter debug. 2013-06-11 11:10:09 -07:00
ZappoMan
74d63cdd1d Merge pull request #522 from birarda/conditional-ds 
allow agents to specify which agent types they want to hear about
 2013-06-11 00:47:36 -07:00
birarda
cd82a08144 Merge pull request #521 from ZappoMan/master 
Fixed issue with corrupt settings file, added offset camera details to settings
 2013-06-10 14:56:33 -07:00
ZappoMan
27f8f5dcb8 fix CR feedback 2013-06-10 14:50:04 -07:00
Stephen Birarda
b15f5a721b remove hacked method to keep servers alive 2013-06-10 14:03:34 -07:00
Stephen Birarda
a8075e44ca Merge remote-tracking branch 'upstream/master' into conditional-ds 2013-06-10 14:01:54 -07:00
Stephen Birarda
ae0ef412a3 hook up voxel-server to domain-server interest list 2013-06-10 13:54:18 -07:00
Stephen Birarda
2e99ae199e hook injector up to new domain-server interest list 2013-06-10 13:48:51 -07:00
Stephen Birarda
7fb42dcb8a fix bug with sent and received agent interest packets 2013-06-10 13:48:34 -07:00
Stephen Birarda
ed79a9f72a prepend the agent types of interest with the number that follow 2013-06-10 12:18:25 -07:00
ZappoMan
fc3fb7d3f0 fixed bug with loading of corrupt settings file where NaN returned for avatar position details 2013-06-10 11:46:06 -07:00
Philip Rosedale
cf7946abf0 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-10 08:24:47 -07:00
Philip Rosedale
297a78188a removed const values per code review 2013-06-10 08:10:51 -07:00
Philip Rosedale
fb97d3e04b Merge pull request #520 from tschw/19367 
Code Review for Job #19367
 2013-06-10 08:04:16 -07:00
ZappoMan
008ac5b357 Merge pull request #517 from PhilipRosedale/master 
Added voxel system physical 'density' for better/correct appearance of objects at distance
 2013-06-09 21:27:15 -07:00
ZappoMan
537e7902f0 Merge pull request #519 from Geenz/master 
Tweak atmospheric shaders assuming the values are intended to be linear to give them a seemingly "softer" appearance.
 2013-06-09 21:21:45 -07:00
ZappoMan
a0b54683f3 Merge pull request #518 from Atlante45/19369 
Code Review for Job #19369
 2013-06-09 21:20:14 -07:00
Geenz
d512b414ee Correct after blending. 2013-06-09 22:48:14 -04:00
atlante45
c96e01ef51 Fixed merge conflict 2013-06-09 23:15:49 +02:00
atlante45
b1aabc2c1f Added shortcup for gravity use 2013-06-09 23:02:45 +02:00
Philip Rosedale
02c62a82d1 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-09 12:48:52 -07:00
Philip Rosedale
3ec16695f4 Finished adding concept of density to the voxel server, objects now appear more visible at a distance in an appealing way. 2013-06-09 12:48:22 -07:00
ZappoMan
5efe323c5e Merge pull request #511 from Geenz/19361 
#19361  Don't select voxels when in motion or displaying other window on top, and don't show if too
 2013-06-08 23:11:05 -07:00
Geenz
8dea00052d Merge branch 'master' of https://github.com/worklist/hifi into 19361 2013-06-09 02:08:29 -04:00
ZappoMan
b60df9ce89 Merge pull request #512 from ey6es/gyroquat 
Fixes for preferences: store avatar voxel URL along with other avatar settings, use QAction rather than separate boolean for autosave.
 2013-06-08 21:36:07 -07:00
ZappoMan
f60dfe6730 Merge pull request #515 from ZappoMan/keyhole_frustum 
Keyhole frustum - CR feedback fix
 2013-06-08 17:29:32 -07:00
ZappoMan
6fa8c23cca Merge branch 'master' of https://github.com/worklist/hifi into keyhole_frustum 2013-06-08 17:28:27 -07:00
ZappoMan
b69cfd4e06 fixed CR spacing issue 2013-06-08 17:27:48 -07:00
Philip Rosedale
b7c680e3e7 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-08 15:15:27 -07:00
Philip Rosedale
769383582b Adding density to nodes 2013-06-08 14:24:29 -07:00
Philip Rosedale
55a5531eb7 Merge pull request #514 from ZappoMan/keyhole_frustum 
Keyhole frustum
 2013-06-08 14:22:06 -07:00
tosh
4736e95761 Merge branch 'master' of git://github.com/worklist/hifi into 19367 2013-06-08 02:37:16 +02:00
tosh
9ca0b5e7a7 removes blank lines that slipped in 2013-06-08 02:35:55 +02:00
tosh
d39b25a17b adds menu option to set whether ground plane gets rendered 2013-06-08 02:31:23 +02:00
ZappoMan
a175ad8fda fix spacing 2013-06-07 17:25:05 -07:00
ZappoMan
46c66c39e5 implement keyhole frustum 2013-06-07 17:23:23 -07:00
atlante45
5c07638ce2 19369 - Added "Use Gravity" option 2013-06-08 02:05:54 +02:00
Stephen Birarda
5efff3857a hook eve up to new domain server check in method 2013-06-07 15:39:46 -07:00
Stephen Birarda
dae8032cd8 hook the avatar mixer up to the new domain server check in method 2013-06-07 15:35:33 -07:00
Stephen Birarda
d95d3eba3b hook audio-mixer up to new domain server check in method 2013-06-07 15:35:17 -07:00
Stephen Birarda
0585d6756d if an agent doesn't send a list of types of interest assume it wants to hear about nobody 2013-06-07 15:34:30 -07:00
Stephen Birarda
4715dbf412 ask only for agents of type AGENT_TYPE_VOXEL_SERVER 2013-06-07 15:29:26 -07:00
Stephen Birarda
d33f3e43bd agentTypesOfInterest need not be unsigned and remove debugging 2013-06-07 15:28:30 -07:00
Stephen Birarda
8c30c3ff7f use new non-threaded method to checkin with domain server 2013-06-07 15:20:43 -07:00
Andrzej Kapolka
ac2b7d7f48 Fix for initial camera transition. 2013-06-07 15:20:26 -07:00
Stephen Birarda
1e05936aea unthread DS check in, allow agents to tell DS who they want to hear about 2013-06-07 15:19:12 -07:00
Stephen Birarda
17750bd5d2 remove ShareAudioFactors struct from audio-mixer 2013-06-07 15:00:33 -07:00
Andrzej Kapolka
096dcd089a Merge branch 'master' of https://github.com/worklist/hifi into gyroquat 2013-06-07 14:28:22 -07:00
Stephen Birarda
fc27c2c7bb more renaming for AGENT_TYPE_VOXEL_SERVER 2013-06-07 14:14:13 -07:00