Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 12:16:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3417 commits 74 branches 59 tags 1.2 GiB
Commit graph

3417 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
d02fb65a13 Merge remote-tracking branch 'upstream/master' into cube-injector 2013-06-04 11:25:39 -07:00
Stephen Birarda
eaaeedab68 refactor calculations for audio 2013-06-04 11:24:07 -07:00
Stephen Birarda
3f7fbb5c1e change injector from cube to sphere 2013-06-04 10:57:53 -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
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
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
Stephen Birarda
c55b6a20d7 parse the desired cube side length for injected audio source 2013-06-03 15:38:12 -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
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
f3ce68e5e4 remove space at the top of PacketHeaders 2013-06-03 12:21:44 -07:00
birarda
d1f491d3ce Merge pull request #480 from birarda/master 
simple fix for AgentList getInstance crash
 2013-06-03 12:13:45 -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
Jeffrey Ventrella
cf67f28b57 merge 2013-06-03 08:10:41 -07:00
Jeffrey Ventrella
6a14ae1eb9 Merge remote-tracking branch 'upstream/master' 2013-06-03 08:10:19 -07:00
Jeffrey Ventrella
9e046b74e6 working on avatar touch 2013-06-03 08:09:27 -07:00
Philip Rosedale
f840103ef2 Merge pull request #477 from Geenz/19351 
#19351  Atmosphere shaders should be handled per-pixel instead of per-vertex.
 2013-06-02 20:01:02 -07:00
Geenz
de76851207 Remove unnecessary normalize. 2013-05-31 20:35:26 -04:00
Jeffrey Ventrella
1786c9f9e1 Merge pull request #475 from Ventrella/master 
this pull request is mostly about the skeleton code
 2013-05-31 17:35:10 -07:00
Jeffrey Ventrella
de49d7fc6c more fixes 2013-05-31 17:32:30 -07:00
Geenz
d98b28d4ab So apparently, this was a scale problem the entire time. 2013-05-31 20:30:42 -04: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
Jeffrey Ventrella
f1fc3fe704 merge 2013-05-31 14:52:24 -07:00