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

3456 commits

This branch
This branch
All branches
Author SHA1 Message Date
birarda
69ed86de59 Merge pull request #488 from ZappoMan/master 
support file:// urls for avitar voxles
 2013-06-05 09:37:24 -07:00
ZappoMan
3bce3f7a62 support file:// urls for avitar voxles 2013-06-05 00:53:27 -07:00
Andrzej Kapolka
40b7672843 Merge pull request #487 from ey6es/master 
Fix for loading avatar voxels from the web.
 2013-06-04 18:03:12 -07:00
Andrzej Kapolka
c953fc743d Merge branch 'master' of https://github.com/worklist/hifi 2013-06-04 18:00:01 -07:00
Andrzej Kapolka
c0915a91cc Merge pull request #482 from ZappoMan/avatardata_optimization 
Avatardata optimization
 2013-06-04 17:59:25 -07:00
ZappoMan
b75bd80de7 fix build busters 2013-06-04 17:54:48 -07:00
Andrzej Kapolka
f708649546 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-04 17:44:53 -07:00
Andrzej Kapolka
b30b64c5b5 Use downloadProgress rather than isFinished (which worked on files, but didn't 
on HTTP URLs).
 2013-06-04 17:44:19 -07:00
ZappoMan
f66641f1b4 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 17:41:41 -07:00
ZappoMan
26542d44c9 Merge pull request #478 from Atlante45/master 
Settings handling with QSettings
 2013-06-04 17:41:02 -07:00
ZappoMan
726a0cecf2 fixed build issue 2013-06-04 17:40:34 -07:00
ZappoMan
4f2af717f2 Fixed merge issue with new orientation vectors, migrated to common identity names 2013-06-04 17:27:40 -07:00
Andrzej Kapolka
f403fc33f7 Merge pull request #486 from ey6es/voxeltars 
Fix for glGenBuffers issue.
 2013-06-04 17:27:16 -07:00
Andrzej Kapolka
ad377e6256 We can't initialize avatars from the network thread; they need access to the 
OpenGL context.
 2013-06-04 17:25:04 -07:00
atlante45
d539ea283e Merge 19358 with upstream Master 2013-06-05 01:43:47 +02:00
ZappoMan
6e70f3b187 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 16:21:20 -07:00
ZappoMan
82c1ee2062 Merge pull request #484 from ey6es/voxeltars 
Voxeltars!  Much tweaking still to be done, and they currently only show on the local avatar.
 2013-06-04 16:20:35 -07:00
Andrzej Kapolka
93b50f44f5 Add a reasonable minimum size for the URL field. 2013-06-04 15:59:07 -07:00
Andrzej Kapolka
b856af505a Adjusted default bind radius, spring vector threshold. 2013-06-04 15:52:39 -07:00
ZappoMan
a12353e112 hopefully fix unix build buster 2013-06-04 11:38:47 -07:00
Andrzej Kapolka
d09700adde Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/Skeleton.h
	interface/src/VoxelSystem.h
 2013-06-04 11:00:59 -07:00
Andrzej Kapolka
90a53bc518 Only bind vertices within an adjustable radius. 2013-06-04 10:40:08 -07:00
Andrzej Kapolka
bc8eadd526 More work on voxeltars; separated default pose from bind pose. 2013-06-04 10:22:58 -07:00
atlante45
c199190666 Fixes asked by ZappoMan on QSettings' commit. 2013-06-04 19:00:38 +02:00
ZappoMan
edf6e767f0 removed unused variable 2013-06-04 09:35:38 -07:00
ZappoMan
026fb5b344 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 09:34:37 -07:00
Philip Rosedale
b71b7f5414 Merge pull request #483 from ZappoMan/copy_and_paste_voxels 
add cut voxels
 2013-06-04 09:07:41 -07:00
ZappoMan
ce499f925a add cut voxels 2013-06-04 09:02:34 -07:00
Philip Rosedale
6e0c3a2be6 Merge pull request #481 from ZappoMan/copy_and_paste_voxels 
Copy and Paste Voxels
 2013-06-04 08:55:18 -07:00
ZappoMan
626874f9ec add delete key support while in select mode 2013-06-04 08:47:57 -07:00
ZappoMan
743e1a433c make import/export default to desktop 2013-06-04 01:24:35 -07:00
ZappoMan
4f3872c18f CR feedback 2013-06-04 01:13:58 -07:00
ZappoMan
37cc436b2b CR feedback 2013-06-04 01:08:18 -07:00
ZappoMan
0a9b3bf5ce changed file name and exention to Sparse Voxel Octree and svo 2013-06-04 01:07:18 -07:00
ZappoMan
1f3de3e12b CR feedback 2013-06-04 01:03:26 -07:00
ZappoMan
435791f28c CR feedback 2013-06-04 01:02:10 -07:00
ZappoMan
ceb15d407d removed assert 2013-06-03 22:08:19 -07:00
ZappoMan
eef0636655 some cleanup 2013-06-03 21:53:06 -07:00
ZappoMan
510dfc7353 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-03 21:43:38 -07:00
ZappoMan
05e8c8806c Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-06-03 21:28:23 -07:00
ZappoMan
03f79f5cab fixed delete voxel 2013-06-03 21:04:42 -07:00
ZappoMan
cf3ff53e2c copy and paste working 2013-06-03 18:08:11 -07:00
birarda
c7921c4be9 Merge pull request #479 from Ventrella/master 
preparing avatar balls for extended touch capabilities
 2013-06-03 17:57:48 -07:00
Jeffrey Ventrella
cee2244364 fixed formatting things 2013-06-03 17:55:48 -07:00
Andrzej Kapolka
6552a64bb4 Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-06-03 17:17:24 -07:00
Jeffrey Ventrella
da09dd3259 test 2013-06-03 17:16:52 -07:00
ZappoMan
0b7f4b21f4 Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
3ff11d0eb8 test 2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
b73eb66492 temp test 2013-06-03 16:31:39 -07:00
Jeffrey Ventrella
26bbb9917b more work on avatar touch 2013-06-03 16:23:55 -07:00