Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 01:10:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6399 commits 71 branches 59 tags 1.2 GiB
Commit graph

6399 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
eb5c48c6ac Merge pull request #1007 from ey6es/master 
Shared geometry/textures between instances and download/apply diffuse texture maps.  Also some transform work.
 2013-10-02 14:04:17 -07:00
Andrzej Kapolka
c98dec8a65 Dilate our network-downloaded textures. 2013-10-02 11:59:14 -07:00
Andrzej Kapolka
d87fe204e0 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-02 10:23:43 -07:00
Andrzej Kapolka
97cbef1d59 Avoid warnings on invalid URLs, delete reply when reference is deleted. 2013-10-02 10:23:04 -07:00
ZappoMan
bac16cc5cf Merge pull request #1006 from birarda/master 
fix DS bug with AC talking on restart
 2013-10-01 20:42:32 -07:00
Andrzej Kapolka
40a3268d7c Fixed an OS X warning and a misplaced parenthesis. 2013-10-01 16:31:57 -07:00
Stephen Birarda
e5c5bb7552 completion of fix for requesting AC on DS restart 2013-10-01 16:15:07 -07:00
Stephen Birarda
dc3756d81c check if there are static assignments to queue while serving request 2013-10-01 16:11:10 -07:00
Stephen Birarda
8d5146a050 Merge pull request #1005 from birarda/master 
remove a bad comment and add extra debug
 2013-10-01 16:04:17 -07:00
Stephen Birarda
74ec83d8ed add an extra debug to track down HQ issue 2013-10-01 16:03:53 -07:00
Stephen Birarda
63d41d85de remove a bad comment 2013-10-01 16:00:10 -07:00
Stephen Birarda
5d1091db3d Merge pull request #1004 from birarda/master 
debug line to track down HQ issue:
 2013-10-01 15:59:24 -07:00
Stephen Birarda
b548567744 add a debug line to track down HQ issue 2013-10-01 15:59:10 -07:00
Stephen Birarda
ee06a9b6e1 Merge pull request #1003 from birarda/master 
attempt to fix timing const in DS
 2013-10-01 15:50:06 -07:00
Stephen Birarda
f3acb53835 use uint64_t for timing const in DS 2013-10-01 15:49:48 -07:00
Andrzej Kapolka
6ccd406a35 Experimenting with the pivot points. 2013-10-01 15:20:18 -07:00
Andrzej Kapolka
3c6fb2914f Use inheritance type flags. Getting closer to the correct transforms. 2013-10-01 15:03:29 -07:00
Philip Rosedale
cebd8e5f4b Merge pull request #997 from birarda/assignment 
file of static assignments for DS
 2013-10-01 13:47:10 -07:00
Philip Rosedale
64151975f2 Merge pull request #1002 from ZappoMan/voxel_render_pipeline_improvement 
Voxel render pipeline improvement
 2013-10-01 13:13:11 -07:00
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
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