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

5706 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
atlante45
12459079e9 Fixed magic number 2013-08-21 16:41:24 -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
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
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
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
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
ZappoMan
4e7b4bdbaa Merge pull request #876 from Atlante45/separate_import_with_preview 
Separate import with preview
 2013-08-21 12:15:50 -07:00
atlante45
bda6e03117 Changed name of copySubTreeIntoNewTree destinationTree argument 2013-08-21 12:11:34 -07:00
atlante45
9003a7d40b PR comments 2013-08-21 12:06:47 -07:00
Andrzej Kapolka
f39050ae28 Enable lookat vectors by default and make them glow. 2013-08-21 11:37:57 -07:00
atlante45
9fb864a699 Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview 2013-08-21 11:37:18 -07:00
atlante45
867303e673 Code cleanup 2013-08-21 11:33:10 -07:00
atlante45
27b0338294 Fixed clipboard not being previewed 2013-08-21 10:31:56 -07:00
atlante45
3eb5ace715 merge + few efficiency ameliorations to importDialog 2013-08-20 18:04:25 -07:00
ZappoMan
c320a87d5a Merge pull request #875 from ey6es/master 
Fix for diffuse glow with SSAO, made diffuse glow the default, improved performance, added debug statements.
 2013-08-20 18:04:10 -07:00
Andrzej Kapolka
571131d42e No glow effect on the avatar, fixed OS X warning. 2013-08-20 17:25:54 -07:00
Andrzej Kapolka
f3a32a7934 Might as well convert the divide to a multiply. 2013-08-20 17:04:29 -07:00
Andrzej Kapolka
590672d035 Fewer texture lookups when diffusing. 2013-08-20 17:02:35 -07:00
Andrzej Kapolka
49da612a4e Turns out we do have to initialize the "odd frame" field. 2013-08-20 16:37:23 -07:00
Andrzej Kapolka
ecc6d41523 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-20 16:07:54 -07:00
Andrzej Kapolka
d5c66f6b67 Default to diffuse/add mode, fix for interacting with ambient occlusion. 
Unfortunately, I managed to break the diffusion somehow.
 2013-08-20 16:07:12 -07:00
ZappoMan
86f2cbe8d4 Merge pull request #873 from birarda/master 
switch OS X base SDK to 10.7
 2013-08-20 15:45:46 -07:00
ZappoMan
a6a38b4ebe Merge pull request #872 from ey6es/ssao 
Performance improvement for the SSAO blur step, cleanup.
 2013-08-20 15:40:48 -07:00
ZappoMan
b61e2810b2 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-20 15:37:51 -07:00
ZappoMan
222849986e Merge pull request #874 from Atlante45/master 
Several VoxelSystems can have different view frustum
 2013-08-20 15:37:29 -07:00
atlante45
22a2603eaa Several VoxelSystems can have different view frustum 2013-08-20 15:28:08 -07:00
Stephen Birarda
9bcbce9715 Merge branch 'master' of github.com:worklist/hifi 2013-08-20 15:20:24 -07:00
Stephen Birarda
7e1b682663 switch OS X base SDK to 10.7 2013-08-20 14:55:29 -07:00
Andrzej Kapolka
5b923bc6f2 More cleanup. 2013-08-20 13:46:13 -07:00
Andrzej Kapolka
11be8c752b Cleanup. 2013-08-20 13:40:45 -07:00
Andrzej Kapolka
edd119ccdc Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-20 13:24:32 -07:00
Stephen Birarda
11311f33ba Merge pull request #871 from birarda/master 
fix for logitech USB reporting only one channel
 2013-08-20 13:07:22 -07:00
Stephen Birarda
146e9176eb switch to one channel from PortAudio to resolve USB error 2013-08-20 13:06:30 -07:00