Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-22 13:41:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8887 commits 72 branches 59 tags 1.2 GiB
Commit graph

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
7772b91aa8 Merge pull request #1001 from birarda/forked-js-ac 
use libcurl to download JS in forked ACs
 2013-10-01 13:10:56 -07:00
ZappoMan
df4b64447b cleanup calls to markWithChangedTime() to happen after all changes made 2013-10-01 13:02:32 -07:00
ZappoMan
1aa7855166 cleanup 2013-10-01 12:43:30 -07:00
ZappoMan
f1b28b929d fix a couple crashes disable emitting import progress in non-import case 2013-10-01 12:25:34 -07:00
ZappoMan
8ceee2ec1e more cleanup of faster voxel pipeline 2013-10-01 11:51:25 -07:00
Philip Rosedale
4cd3abfb86 Merge pull request #1000 from birarda/master 
some deletions and cleanup
 2013-10-01 11:44:28 -07:00
Stephen Birarda
d401cf39ce expose Agent.stop() to JS to complete execution 2013-10-01 11:44:07 -07:00
Stephen Birarda
bb0d28141a use libcurl to download JS in forked ACs 2013-10-01 11:41:01 -07:00
Andrzej Kapolka
3c3cf0b002 Basic geometry sharing/texture loading. 2013-10-01 10:50:09 -07:00
ZappoMan
793a14e25a first cut at new faster voxel pipeline 2013-10-01 10:37:14 -07:00
PhilipRosedale
4b1bbf7046 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-30 16:13:27 -07:00
ZappoMan
0f74d4bda9 change nodeDeleted() to voxelDeleted() to improve readability 2013-09-30 15:50:31 -07:00
Stephen Birarda
43eed32e1d end is important, put it back 2013-09-30 15:42:07 -07:00
Stephen Birarda
ca68846c1b some deletions and cleanup based on Xcode analysis 2013-09-30 15:36:23 -07:00
Philip Rosedale
19e20f64b4 Merge pull request #999 from ZappoMan/master 
fix hang on preference dialog box
 2013-09-30 15:28:20 -07:00
ZappoMan
865bb7555f fix hang on preference dialog box 2013-09-30 15:27:02 -07:00
Philip Rosedale
2a6ad30d96 Merge pull request #998 from birarda/voxel-delete 
add deletion of voxels to VS scripting
 2013-09-30 15:20:39 -07:00
Stephen Birarda
29ae5beb54 add a voxel delete to VoxelScriptingInterface 2013-09-30 15:11:02 -07:00
Stephen Birarda
617b905385 Merge pull request #996 from ey6es/master 
Transformation rejiggery to support Ryan's alien model.
 2013-09-30 14:34:26 -07:00
Stephen Birarda
8b27a4c0a1 Merge pull request #995 from PhilipRosedale/master 
Touch-look much smoother when flying
 2013-09-30 14:32:40 -07:00
Stephen Birarda
94f7b98a5c handle mutli-VS config in DS when creating static file 2013-09-30 14:27:54 -07:00
Stephen Birarda
fb27e37607 have AC making create request use its own UUID 2013-09-30 14:09:46 -07:00
Stephen Birarda
3449ddc9a0 remove an added ga 2013-09-30 14:03:17 -07:00
Stephen Birarda
e2d68f5538 have DS clear config file is new config is passed 2013-09-30 14:03:02 -07:00
Stephen Birarda
b3bd159d09 don't send create assignment request until connection to DS 2013-09-30 13:57:42 -07:00
Stephen Birarda
774eef1c12 logging touchups in voxel-server 2013-09-30 13:36:36 -07:00
Stephen Birarda
32314ad540 have VS send UUID with check in for static assignment behavior 2013-09-30 13:34:22 -07:00
Andrzej Kapolka
71d68796f3 Remove whitespace. 2013-09-30 13:27:10 -07:00
Stephen Birarda
38873c0693 some assignment debug cleanup 2013-09-30 13:26:31 -07:00
Stephen Birarda
e63dfadcde allow repeated check ins from existing node 2013-09-30 13:24:55 -07:00
Andrzej Kapolka
5dc7b64c03 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-30 13:22:59 -07:00
Andrzej Kapolka
40d195595f Include the neck pivot when we get the eye locations. 2013-09-30 13:20:28 -07:00
Andrzej Kapolka
d4c4cbc981 Get the neck joint and position blend face relative to that. 2013-09-30 13:15:59 -07:00
Stephen Birarda
0e5c5886b6 touchups to DS with static assignment file 2013-09-30 13:11:46 -07:00
Philip Rosedale
a22b3d28bf Merge branch 'master' of https://github.com/worklist/hifi 2013-09-30 12:44:07 -07:00
Philip Rosedale
f30ff1704a Fix to make touch-look MUCH smoother for flying around 2013-09-30 12:43:25 -07:00
Andrzej Kapolka
d4203ff3d3 Pivot fix. 2013-09-30 12:01:27 -07:00
Philip Rosedale
7a74432bef Merge pull request #994 from ZappoMan/voxel_geo_shader 
removed old normal support from voxel system only using global normals
 2013-09-30 11:37:09 -07:00
Andrzej Kapolka
1592aac177 Getting closer to the correct set of transforms. 2013-09-30 11:24:41 -07:00
Stephen Birarda
a8d55644e9 Assignment as LinkedData, add back to queue on node death 2013-09-30 11:04:42 -07:00
Stephen Birarda
fce97e2754 remove a space in DomainServer header 2013-09-30 10:44:34 -07:00
Stephen Birarda
1367396344 fix broken InfoView after removing fervor 2013-09-30 10:39:33 -07:00
Stephen Birarda
bb32da12f1 complete removal of fervor and C++11 array 2013-09-30 10:30:18 -07:00
Stephen Birarda
ef1ff01188 resolve conflicts on merge with upstream/master 2013-09-30 10:12:54 -07:00
ZappoMan
86b4b7079d Merge pull request #993 from PhilipRosedale/master 
Click on voxels as way of moving around
 2013-09-30 09:30:37 -07:00
ZappoMan
b6fe8befdc removed old normal support from voxel system only using global normals 2013-09-30 09:29:04 -07:00
stojce
0c30fc3e4d Merge branch 'master' of https://github.com/worklist/hifi 2013-09-29 20:47:53 +02:00
Philip Rosedale
cb0046b52b Merge remote-tracking branch 'philip/master' 2013-09-28 15:26:57 -07:00
Philip Rosedale
9645cd9831 Click on voxels as way of moving around 2013-09-28 15:18:59 -07:00
Philip Rosedale
abee08c91a Merge pull request #987 from stojce/19422 
Code Review for Job #19422
 2013-09-28 11:52:30 -07:00