Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 15:14:19 +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
Andrzej Kapolka
86561b98cc Merge branch 'master' of https://github.com/worklist/hifi into led 2013-08-30 15:16:22 -07:00
atlante45
f21a2798ff Fixed _sharedVoxelSystemTree deleted twice 2013-08-30 10:37:55 -07:00
Stephen Birarda
37e6b32741 Merge pull request #895 from birarda/master 
display the hand in first person
 2013-08-30 10:29:16 -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
Andrzej Kapolka
fe47c6c387 Thresholding, more transform tweaks. 2013-08-29 16:44:56 -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
Andrzej Kapolka
c23eb92da9 Tweaking the transforms. 2013-08-29 10:45:55 -07:00
Andrzej Kapolka
28431b4c57 Testing transformation with video from FreeTrack project. 2013-08-28 15:02:33 -07:00
Andrzej Kapolka
d224d95314 Merge branch 'master' of https://github.com/worklist/hifi into led 2013-08-28 11:18:23 -07:00
ZappoMan
d2de76d5c3 Merge pull request #892 from birarda/master 
require Qt5Script for avatars library
 2013-08-28 11:12:10 -07:00
Stephen Birarda
24a43c050c require Qt5Script for avatars library 2013-08-28 10:55:38 -07:00
Andrzej Kapolka
b01f6df408 Tweaks for better LED tracking. 2013-08-27 17:53:36 -07:00
Andrzej Kapolka
e5e2f7ca00 Bump up the line width to make it easier to see the blobs. 2013-08-27 17:00:55 -07:00
Andrzej Kapolka
4d9954b2f4 More work on getting the transform. 2013-08-27 13:56:23 -07:00
Andrzej Kapolka
614f7cd28b Merge branch 'master' of https://github.com/worklist/hifi into led 2013-08-27 13:12:54 -07:00
Andrzej Kapolka
18e91de7c6 Working on the code to get the transform from the blob locations. 2013-08-27 13:08:58 -07:00
Andrzej Kapolka
e124c164c1 Merge pull request #891 from ZappoMan/large_tree_scale 
Add "Go To Domain" and "Go To Location" to file menu
 2013-08-27 12:51:14 -07:00
ZappoMan
a3bf373ffa revert TREE_SCALE and VOXEL_SCALE_SIZE for now 2013-08-27 11:41:22 -07:00
Andrzej Kapolka
4720eac922 Use green rather than red for better blob visibility. 2013-08-26 17:01:04 -07:00
Andrzej Kapolka
799d2b487f Initialization order fix. 2013-08-26 16:53:12 -07:00
Andrzej Kapolka
455565a9b9 Basic blob tracking for LEDs. 2013-08-26 16:49:20 -07:00
Andrzej Kapolka
8d8ba532e1 These initializers are in the wrong order. 2013-08-26 14:52:21 -07:00
Andrzej Kapolka
4ca8a10296 Starting on LED tracking. 2013-08-26 14:36:19 -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
b870101d02 Merge pull request #890 from ZappoMan/master 
Update README to include details on running local domain, formated 80 char line wrap.
 2013-08-26 10:42:42 -07:00
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
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
e67aee4b74 Merge pull request #885 from ey6es/master 
Fix for network crash.
 2013-08-22 13:53:19 -07:00
atlante45
9224bca88b Fixed glBuffers not deleted in VoxelSystem 2013-08-22 13:52:24 -07:00
Andrzej Kapolka
2eaaee673f Argh, forgot to return the result of the superclass implementation. 2013-08-22 13:52:10 -07:00
Stephen Birarda
232f79489d decouple AM logic from main.cpp to be assignable 2013-08-22 13:12:53 -07:00
Stephen Birarda
97bee1eb82 add a stubbed assignment client to request assignments 2013-08-22 12:30:11 -07:00