ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-14 19:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,641 Commits 5 Branches 86 Tags
df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2
Commit Graph

1211 Commits

Author SHA1 Message Date
Melanie
1120a2cf36 Merge branch 'avination' into careminster 2012-05-07 12:07:42 +01:00
UbitUmarov
2ab9588c9a UbitODE: reduced the diference btw dinamic and static friction, making dinamic larger more identical to static. 2012-05-05 11:03:38 +01:00
UbitUmarov
3b78e33d16 ubitODE prims: - moved outbounds checking back to UpdatePositionAndVelocity() from move() so it's done at end of each ode step and when it reports positions to core. There should be no need to check in both places. - Addforce() and AddAngularForce now apply a force if parameter pushforce is true or apply a impulse if false as it's actually needed (the prims grab case should be a force) 2012-05-05 10:40:03 +01:00
Melanie
b62cc3ce0a Merge branch 'avination' into careminster 2012-05-05 10:32:22 +01:00
UbitUmarov
163a86517a force lower avatar density for testing 2012-05-05 03:28:35 +01:00
UbitUmarov
6b3135aa4d UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any significant change like new 'velocity' or new position, etc, requests 2012-05-04 22:24:04 +01:00
Melanie
8b1cc0dd29 Merge branch 'avination' 2012-05-03 00:15:45 +02:00
UbitUmarov
a135e51d23 Improved sitted avatars crossings ( plus tests on vehicles) 2012-05-02 22:08:09 +01:00
Melanie
58d460542d Merge branch 'avination' 2012-05-02 00:33:56 +02:00
UbitUmarov
303739622c ubitODE fix applyROtationImpulse, let vehicle hover be relative to root prim and not center of mass ( as SL docs said) updated some flags to current ones 2012-04-29 11:46:16 +01:00
UbitUmarov
be176b1e49 ubitode fix inertia for same cases. Added a nasty lock on llGetCenterOfMass and simulate 2012-04-29 08:24:41 +01:00
Melanie
174fa4a70f Merge branch 'avination' 2012-04-29 01:33:40 +02:00
UbitUmarov
dd745f60c2 fix llGetCenterOfMass ( checked with ubitODE only) 2012-04-28 21:36:38 +01:00
UbitUmarov
e48fa38ff5 Oooops don't hover underground but do hover 2012-04-27 23:18:54 +01:00
UbitUmarov
f5cb403e7e reorder priority of vehicle hover flags 2012-04-27 22:59:57 +01:00
UbitUmarov
ee237fc5df test 2012-04-27 12:19:22 +01:00
UbitUmarov
8ef7df5a56 test 2012-04-27 11:01:34 +01:00
UbitUmarov
fedc9eb105 itest 2012-04-27 09:50:53 +01:00
UbitUmarov
1c735facee test 2012-04-27 09:23:20 +01:00
UbitUmarov
7a7f4b7722 testing 2012-04-27 09:00:30 +01:00
UbitUmarov
03450dee39 testing.... 2012-04-27 08:11:18 +01:00
UbitUmarov
6edbbdc83a ubitODE fix don't report colisions with a volume detector ( only report to it ) 2012-04-27 06:00:50 +01:00
UbitUmarov
e974d493c6 testing 2012-04-27 03:44:15 +01:00
UbitUmarov
d8f691664a testing 2012-04-27 03:36:49 +01:00
UbitUmarov
76d9040ed4 testing 2012-04-27 02:54:39 +01:00
UbitUmarov
911bc81b00 testing 2012-04-27 02:13:54 +01:00
UbitUmarov
a64a9e48de TESTING 2012-04-27 01:43:27 +01:00
Melanie
db31c9fe58 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-04-25 19:15:40 +01:00
UbitUmarov
3da613adf5 fix chODE loosing some part positions when doing isPhysical false 2012-04-24 23:13:57 +01:00
Melanie
c5520dc83f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-04-24 21:30:12 +01:00
Justin Clark-Casey (justincc)
c6f30e044b Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed from ODEPrim.SetGeom. 
This occurred in 7a574be3fd from Sat 21 Apr 2012.
This should fix collision detection.
Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988
 2012-04-24 20:15:10 +01:00
UbitUmarov
a4b76a42cc let objects/avas push avas 2012-04-24 06:56:34 +01:00
Melanie
159b3b27ca Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-04-23 21:13:08 +01:00
Melanie
e903709847 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2012-04-23 20:44:41 +01:00
UbitUmarov
5a8fdc8a0b ubitODE - do own timing control (as chODE does) until heartbeat does it right 2012-04-23 20:16:53 +01:00
UbitUmarov
e0f81e2400 ubitODE - several changes... 2012-04-23 01:47:11 +01:00
Justin Clark-Casey (justincc)
49ed68e98c refactor: simply some properties code in BasicPhysicsPlugin 2012-04-22 20:28:12 +01:00
Justin Clark-Casey (justincc)
8205fe79ce Fix bug where setting phantom on a prim would result in a server log message rather than setting phantom. 
This was an oversight when removing some race conditions from PhysicsActor setting recently.
Regression tests extended to probe this code path.
Extending regression tests required implementation of a BasicPhysicsPrim (there was none before).  However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
 2012-04-22 19:51:51 +01:00
Melanie
8df4bd14f5 Merge branch 'master' into careminster 2012-04-22 15:06:06 +01:00
UbitUmarov
190e7a4334 ubitODE: - don't try to hover underground unless volumedetector (that doesn't colide with it) 2012-04-21 05:16:54 +01:00
Justin Clark-Casey (justincc)
ae2b8f7007 Comment out spurious Body != IntPtr.Zero code after disableBody(), since disableBody() sets Body == IntPtr.Zero on all code paths. 2012-04-21 03:42:54 +01:00
Justin Clark-Casey (justincc)
f609594595 refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate. 2012-04-21 03:23:51 +01:00
Justin Clark-Casey (justincc)
7a574be3fd Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim. 
prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock.
Therefore, we can remove these checks which were not consistently applied anyway.
If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug.
 2012-04-21 00:12:07 +01:00
Justin Clark-Casey (justincc)
566327a948 If a physical prim is manually moved (e.g. by a user) then set the geometry position as well as the body position 
This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once
This resolves http://opensimulator.org/mantis/view.php?id=5966
 2012-04-20 23:24:24 +01:00
Melanie
31c5a7241e Merge branch 'master' into careminster 2012-04-20 23:17:29 +01:00
UbitUmarov
2c7f035925 ubitODE: - Change triangles used in terrain height estimation 2012-04-20 04:49:23 +01:00
UbitUmarov
ec6347f987 ubitODE - again avatar/terrain collision. Reduce new viewers interpolators efects reporting null velocity and aceleration when stopped near the right position, where they can still have instantanius large values that can get magnified by interpolators, specially using diferent timing estimation. 2012-04-20 03:17:36 +01:00
UbitUmarov
9b02e1cf4a Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-04-19 01:52:23 +01:00
UbitUmarov
08714a0d38 ubitODE still retouching character pid 2012-04-18 03:59:38 +01:00
UbitUmarov
7f42069295 ubitODE - retouch character PIDs 2012-04-18 03:02:28 +01:00