Commit Graph

21001 Commits (e62cdc50f446fb1d171498fa62693a929ebaffe2)

Author SHA1 Message Date
ubit e62cdc50f4 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-09 03:58:25 +02:00
UbitUmarov 5ef48c5980 temporary debug code 2012-10-09 02:57:51 +01:00
ubit 4b386760fe Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-09 02:06:05 +02:00
UbitUmarov 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
ubit 7be1b30914 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-09 01:45:11 +02:00
UbitUmarov 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
ubit 61cc62eac9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-09 01:29:09 +02:00
UbitUmarov 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
ubit 2d2c4e3a86 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-08 00:55:44 +02:00
UbitUmarov a1fcfe8677 a few changes/fix (?) 2012-10-07 23:54:15 +01:00
ubit 398d92dc40 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-07 09:54:48 +02:00
UbitUmarov 48d8fbc9ae bug fix + make costs visible for testing 2012-10-07 08:53:55 +01:00
ubit 1af4d8b7f8 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-07 07:34:17 +02:00
UbitUmarov a0b4e68060 refix so we can compile it, loosing alpha scultps fix on core meshmerizer 2012-10-07 06:33:13 +01:00
UbitUmarov c42df1259f fix wrong file commited 2012-10-07 06:16:47 +01:00
UbitUmarov 03ef125ba0 Merge branch 'avination' into ubitwork
Conflicts:
	OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-10-07 06:13:24 +01:00
UbitUmarov 4a87a8f3b9 comment out a spam coment on core Meshmerizer 2012-10-07 06:11:51 +01:00
UbitUmarov 4efc90ef37 i update core ode plugin and make it load is meshs (i hope) 2012-10-07 05:53:52 +01:00
ubit 7e1eecdf73 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-07 02:22:28 +02:00
UbitUmarov 78ce7a0a04 [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
now
2012-10-07 01:20:52 +01:00
ubit ceb33b24f7 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-05 07:04:58 +02:00
UbitUmarov 5254c0de8f Merge branch 'avination' into ubitwork 2012-10-05 06:00:45 +01:00
UbitUmarov db00402fa8 make sure a buffer is closed, and changed a misleading log msg 2012-10-05 00:14:49 +01:00
Melanie d5ea203f93 Fix threading in remote asset connector 2012-10-05 00:15:55 +02:00
Melanie efb9b7014e Allow default animation to be stopped to be replaced with another one.
Fixes Mantis #6327
2012-10-04 15:20:04 +02:00
ubit 717802ab09 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 09:16:21 +02:00
UbitUmarov 89d342b5ce more changes and more non active code 2012-10-04 08:14:52 +01:00
ubit 840d56dcec Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 06:30:51 +02:00
UbitUmarov 113549c2e9 apply cmic fix to multi layer wearables 2012-10-04 05:29:32 +01:00
ubit fa5fd77823 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 06:06:21 +02:00
UbitUmarov 893b44497d Merge branch 'avination' into ubitwork 2012-10-04 05:05:57 +01:00
ubit 5bf8c54207 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 05:59:03 +02:00
UbitUmarov 51e1830f86 more changes. Most code not in use 2012-10-04 04:55:53 +01:00
ubit 57bfd38e2a Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 00:18:57 +02:00
UbitUmarov a9f2bc150f missing changed file 2012-10-03 23:18:35 +01:00
ubit d657c48abf Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 00:17:19 +02:00
UbitUmarov 9988558ec1 meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled
for all physics engines)
2012-10-03 23:14:56 +01:00
ubit 33b2096c5f Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-03 21:38:35 +02:00
UbitUmarov 4f51cc325c making meshworker have more work.. 2012-10-03 20:36:41 +01:00
ubit 149c2adf7d Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-03 20:35:29 +02:00
UbitUmarov 7137b234b4 introduce a ODEMeshWorker class, should be pure cosmetic changes for now 2012-10-03 19:33:28 +01:00
Melanie fdacb88b29 Fix a viewer crash issue 2012-10-03 17:11:02 +02:00
Melanie f433ee317b Attempt to fix Mantis #6311. Honor a destination folder if one is given 2012-10-02 23:03:52 +01:00
ubit acdbe6e9dd Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-28 00:16:22 +02:00
Melanie f05ca1a0fe Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-28 00:15:58 +02:00
Melanie 7e21ddeeff Fix a possible NRE 2012-09-28 00:15:14 +02:00
UbitUmarov 58e55ae075 make some forgotten changes be done by simulation thread not by caller 2012-09-27 23:14:42 +01:00
Melanie 285039949c Update the Http server with a few additional properties. Adapt the test
server code to match.
2012-09-27 18:27:49 +01:00
ubit 5482c086f0 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-27 01:16:22 +02:00
UbitUmarov a0065ad616 create a new PollServiceHttpRequest req per loop since they can be sent to
another working thread
2012-09-27 00:14:50 +01:00