0886d99f1b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 23:37:25 +02:00
5986b4ee39
add mesh cache expire on region startup. Expires will be relative to
...
previus expire (assumed done only once at startup). File 'cntr' on cache
folder stores time. Deleting it will force a skip on expire. Default time
is 48hours before previus startup to account for failed ones etc.
2012-10-13 22:30:34 +01:00
eef92a9df6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 02:45:42 +02:00
666fb744a3
retouch mesh ids
2012-10-13 01:41:18 +01:00
4bd64c887d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 01:49:49 +02:00
9ada03bcdd
missing file (again)
2012-10-13 00:49:08 +01:00
fdd6e0361e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 01:43:44 +02:00
48d2258f41
longer meshs identification keys, so first part on disk cache is it's asset id
2012-10-13 00:41:19 +01:00
2034a096a6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 00:47:06 +02:00
13cb64a2c5
missing file
2012-10-12 23:46:48 +01:00
77b170f1f6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 00:40:07 +02:00
6e21796584
[TEST] disk cache meshs
2012-10-12 23:37:28 +01:00
711a736097
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-12 01:40:47 +02:00
a91be67a6e
commit the right files!
2012-10-12 00:39:58 +01:00
b0738e1c06
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-12 01:36:55 +02:00
d5cfe1c0be
remove some more debug spam on ode
2012-10-12 00:36:01 +01:00
280dc717ee
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-10 02:38:36 +02:00
d554c0d574
normalize quaternion.Slerp outputs
2012-10-10 01:37:59 +01:00
62fd29bd9a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-10 01:58:06 +02:00
8fa91686db
add some quaternion normalizations to keep errors under control
2012-10-10 00:57:33 +01:00
a271afa2aa
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-10 01:36:19 +02:00
c0cdeec4c0
debug
2012-10-10 00:36:06 +01:00
57122769de
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-10 00:02:05 +02:00
a19a189fec
fix debug :)
2012-10-09 23:01:26 +01:00
3f26cf9b62
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 23:58:15 +02:00
e238ece327
debug...
2012-10-09 22:57:28 +01:00
9ad670e82c
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 20:43:59 +02:00
ce497ce379
debug...
2012-10-09 19:43:06 +01:00
700ad535a2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 06:21:56 +02:00
315f3ee0e5
avoid crashing so debug is seen
2012-10-09 05:21:09 +01:00
005553e9d9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 06:10:05 +02:00
d0773dcd6a
another debug msg
2012-10-09 05:09:43 +01:00
d35a0b63e2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 05:32:58 +02:00
8717541288
force allocation of mesh data on creation ( messy code version )
2012-10-09 04:31:50 +01:00
e62cdc50f4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 03:58:25 +02:00
5ef48c5980
temporary debug code
2012-10-09 02:57:51 +01:00
4b386760fe
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 02:06:05 +02:00
4c512ada58
fire a extra terseupdate when stopping (like in loosing physics). In some
...
cases things seem not to stop
2012-10-09 01:04:29 +01:00
7be1b30914
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 01:45:11 +02:00
2e223c8ce2
Change ray to land colision range limitation so it has no impact on other
...
geom types
2012-10-09 00:44:02 +01:00
61cc62eac9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 01:29:09 +02:00
3bf7201fd4
move terrain geom to own ode space. Limit range on raycast if includes
...
terrain until ode doesn't eat all stack. Add a pre-simulation method to do
pending actors changes (except mesh assets still not ready to use), to be
optionaly called before firing heartbeat. [UNTESTED]
2012-10-09 00:18:39 +01:00
2d2c4e3a86
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-08 00:55:44 +02:00
a1fcfe8677
a few changes/fix (?)
2012-10-07 23:54:15 +01:00
398d92dc40
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 09:54:48 +02:00
48d8fbc9ae
bug fix + make costs visible for testing
2012-10-07 08:53:55 +01:00
1af4d8b7f8
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 07:34:17 +02:00
a0b4e68060
refix so we can compile it, loosing alpha scultps fix on core meshmerizer
2012-10-07 06:33:13 +01:00
c42df1259f
fix wrong file commited
2012-10-07 06:16:47 +01:00
03ef125ba0
Merge branch 'avination' into ubitwork
...
Conflicts:
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-10-07 06:13:24 +01:00
ubit