Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 10:47:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3431 commits 25 branches 0 tags 1.1 GiB
Commit graph

1718 commits

Author SHA1 Message Date
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
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
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
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
ZappoMan
ce499f925a add cut voxels 2013-06-04 09:02:34 -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
0a9b3bf5ce changed file name and exention to Sparse Voxel Octree and svo 2013-06-04 01:07:18 -07:00
ZappoMan
435791f28c CR feedback 2013-06-04 01:02:10 -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
cf3ff53e2c copy and paste working 2013-06-03 18:08:11 -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
ZappoMan
0f2b736130 cleanup 2013-06-03 13:50:42 -07:00
ZappoMan
ea965f2290 fixed issue with sendVoxelsOperataion, some other cleanup 2013-06-03 13:46:21 -07:00
ZappoMan
c4b3b568e7 make import and export properly rebase 2013-06-03 13:13:52 -07:00
Andrzej Kapolka
73f8fca2af More work on voxeltars; added rotations. 2013-06-03 13:00:54 -07:00
Jeffrey Ventrella
e96503de0d Merge remote-tracking branch 'upstream/master' 2013-06-03 12:26:51 -07:00
Jeffrey Ventrella
6479a41206 more ball prep 2013-06-03 12:26:20 -07:00
ZappoMan
78fe89172a eyedropper mode, and import work 2013-06-03 12:23:16 -07:00
Stephen Birarda
0fedf354e0 don't attempt to send microphone audio if AgentList is NULL 2013-06-03 12:10:18 -07:00
Jeffrey Ventrella
00dce6b59e fix 2013-06-03 12:01:01 -07:00
Jeffrey Ventrella
8d031b5c2d preparation for extending the avatar ball array to accommodate more touch capabilities 2013-06-03 11:53:00 -07:00
ZappoMan
7dd217b318 more work on copy and paste 2013-06-03 10:57:18 -07:00
Andrzej Kapolka
a6daa296ff Slight fix to capsule/box penetration test: we should use the smaller distance 
to the diagonal, not the first one we find.
 2013-06-03 10:08:42 -07:00
Jeffrey Ventrella
9e046b74e6 working on avatar touch 2013-06-03 08:09:27 -07:00
Andrzej Kapolka
8d757e148f More work on voxeltars; basic skinning works. 2013-06-02 19:55:51 -07:00
Andrzej Kapolka
35ae08def0 Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-06-01 15:07:00 -07:00
Andrzej Kapolka
6c975f9c6f More work on avatar voxels. 2013-06-01 15:06:29 -07:00
Andrzej Kapolka
7425b39237 Working on avatar voxel system. 2013-05-31 17:55:30 -07:00
Jeffrey Ventrella
de49d7fc6c more fixes 2013-05-31 17:32:30 -07:00
Jeffrey Ventrella
d92471860d cleanup 2013-05-31 16:58:58 -07:00
Jeffrey Ventrella
4f49f1769e separated springy balls from skeleton 2013-05-31 16:54:56 -07:00
Jeffrey Ventrella
1061b3eb4d cleanup 2013-05-31 15:05:05 -07:00
Jeffrey Ventrella
303643e921 cleanup 2013-05-31 15:01:08 -07:00
Jeffrey Ventrella
e33c11bb48 Merge remote-tracking branch 'upstream/master' 2013-05-31 14:52:46 -07:00
Andrzej Kapolka
929797516d Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-05-31 14:52:39 -07:00
Andrzej Kapolka
e4bc7af6b4 Working on avatar voxels. 2013-05-31 14:52:29 -07:00
Jeffrey Ventrella
f1fc3fe704 merge 2013-05-31 14:52:24 -07:00
Andrzej Kapolka
8f377349ef Merge pull request #474 from PhilipRosedale/master 
Smooth gravity fields when flying
 2013-05-31 14:52:00 -07:00
Jeffrey Ventrella
3ce051bff7 merge 2013-05-31 14:11:46 -07:00