Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 20:02:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5783 commits 71 branches 59 tags 1.2 GiB
Commit graph

3213 commits

Author SHA1 Message Date
Andrzej Kapolka
843d5656bd Fix for compile warnings on Linux: check return values on read/write. 2013-09-03 10:45:33 -07:00
atlante45
15a3a8d252 Some more code reformatting. 2013-09-03 10:32:38 -07:00
atlante45
26691118de Some code reformatting. 2013-09-03 10:30:46 -07:00
atlante45
77799fce54 Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports 2013-08-30 15:28:33 -07:00
atlante45
229821e211 Removed frustum display in preview mode 2013-08-30 15:28:10 -07:00
atlante45
f21a2798ff Fixed _sharedVoxelSystemTree deleted twice 2013-08-30 10:37:55 -07:00
Stephen Birarda
b46bd1fd41 display the Avatar's hand in first person 2013-08-30 10:28:30 -07:00
atlante45
fc991bf1ac Some code reformating 2013-08-29 18:11:16 -07:00
atlante45
1dc8d8dd0c Added LOD to preview + Shared voxelSystem for reduced memory consumption 2013-08-29 17:59:36 -07:00
atlante45
7d9d36a66e Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports 2013-08-29 11:23:06 -07:00
ZappoMan
0df11124b3 tweak to how activateWindow() is called after dialog boxes 2013-08-26 14:24:42 -07:00
ZappoMan
943e1f9110 added Go To Domain, Go To Location, and tweaks to TREE_SCALE settings 2013-08-26 14:06:23 -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
Stephen Birarda
818355dc1a implementing @problem's proposed changes to menus 2013-08-23 15:18:06 -07:00
Andrzej Kapolka
28ffd8eca7 Render the ball heads with the voxeltar bodies. 2013-08-23 14:22:00 -07:00
Andrzej Kapolka
3682e32eb1 Yes, these should be consts. 2013-08-22 17:40:55 -07:00
Andrzej Kapolka
2cff4b6b3a "Laser pointer" for transmitter. 2013-08-22 17:09:23 -07:00
atlante45
99321b3e09 Fixed VBOs not being deleted in VoxelSystem destructor 2013-08-22 15:43:58 -07:00
Andrzej Kapolka
3dfefefeae Make the surrounding spheres glow when moving, too. 2013-08-22 14:00:50 -07:00
Andrzej Kapolka
2eaaee673f Argh, forgot to return the result of the superclass implementation. 2013-08-22 13:52:10 -07:00
Andrzej Kapolka
7da9556815 Glow when moving. 2013-08-22 11:23:28 -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
6206d9e8db fix for collisions when wearing Oculus 2013-08-21 17:42:13 -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
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
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
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
ZappoMan
4bdaf7589f Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-21 12:16:09 -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
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