Melanie
75010e5e1c
Merge branch 'master' into careminster-presence-refactor
2010-12-25 00:04:46 +00:00
Diva Canto
b23b29a53e
This fixes mantis #5198 and related. Physics is not my expertise, so I'm not 100% sure of what all the consequences of this change are. Pushing up, so others can take a look.
2010-12-24 16:23:00 -08:00
Melanie
2cc07de0ba
Merge branch 'master' into careminster-presence-refactor
2010-12-23 12:08:38 +00:00
Teravus Ovares (Dan Olivares)
46db73b62b
* Re-Adding Scene TimeDilation to Object Update Packets.
...
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
Melanie
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01:00
Jeff Ames
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
Melanie
fd56fd2ce8
Merge branch 'master' into careminster-presence-refactor
2010-10-02 19:51:43 +01:00
Melanie
f220a2c5eb
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:24:16 +01:00
Melanie
b40c91777c
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:19:30 +02:00
Melanie
d0c271adc6
Typo fixes
2010-09-26 18:06:23 +01:00
Melanie
aecac9bba9
Typo fixes
2010-09-26 18:05:55 +01:00
Melanie
6f689f591a
Merge Master
2010-09-26 17:56:31 +01:00
BlueWall
b0b4782a2b
adding configurable j2kDecodeCache path
...
allowing the decoded sculpt map cache path to be defined in
the configuration files.
Use DecodedSculpMapPath in the [Startup] section to set
the path. The default is still ./bin/j2kDecodeCache
2010-09-26 17:04:11 +01:00
Melanie
4fbdcb95a0
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:19:26 +01:00
Justin Clark-Casey (justincc)
30d3e8a13e
Add prim name to OdePrim Error and Warning messages.
...
This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over.
2010-09-25 01:07:37 +01:00
Melanie
ba38c697e8
Merge branch 'master' into careminster-presence-refactor
2010-06-27 20:05:55 +01:00
Justin Clark-Casey (justincc)
4a5979c311
minor: remove some mono compiler warnings
2010-06-25 21:09:15 +01:00
Melanie
04b60aa490
Merge branch 'master' into careminster-presence-refactor
2010-06-19 20:32:01 +01:00
Diva Canto
1e7ce6dbce
Hunting for the problem in #4777
2010-06-19 09:44:02 -07:00
Diva Canto
9b410f5e94
Reverting my last two commits, putting back Melanie's exception handler. Doesn't solve #4777 .
2010-06-19 09:25:36 -07:00
Diva Canto
f0f684161e
Reinstated the behavior of AddPrimShape *exactly* as it was as of December. Trying to fix mantis #4777
2010-06-19 08:57:58 -07:00
Melanie
891214c65b
Merge branch 'master' into careminster-presence-refactor
2010-06-18 20:49:21 +01:00
Melanie
47d5f90629
Remove an error in meshing error reporting. Now doesn't double-bomb
...
anymore on a bad sculpt
2010-06-18 19:49:14 +01:00
Melanie
d2342319da
Merge branch 'master' into careminster-presence-refactor
2010-06-12 16:27:37 +01:00
Melanie
ceac35bac1
Log and eat sculpt meshing exceptions caused by bad jp2 data.
2010-06-12 16:25:40 +01:00
Melanie
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
John Hurliman
3036aba875
* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
...
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
2010-03-12 14:28:31 -08:00
Kitto Flora
7bd48d383d
Resolved merge
2010-03-12 13:48:31 -05:00
Melanie
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
Jeff Ames
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
Revolution
9821c4f566
Revolution is on the roll again! :)
...
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).
Direct flames and kudos to Revolution, please
Signed-off-by: Melanie <melanie@t-data.com >
2010-02-14 22:18:46 +00:00
Melanie
c8f3bb56ff
Merge branch 'master' into careminster
2010-02-08 22:11:38 +00:00
John Hurliman
8556a9f1a8
Applying patch #4534 by Misterblue to fix ODE physics stickiness
2010-02-04 13:31:06 -08:00
Kitto Flora
1abb70cc73
Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associated methods.
2010-01-21 19:31:02 -05:00
Melanie
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
Jeff Ames
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
Kitto Flora
93b930b937
Fix conflicts
2009-12-22 00:33:31 -05:00
Kitto Flora
0a29842caf
Include ChOdePlugin
2009-12-22 00:20:04 -05:00
Melanie
fa0621b486
Merge branch 'master' into careminster
2009-12-22 00:41:56 +00:00
Melanie
e530180c1e
Glue code for a couple of new LSL function implementations
2009-12-22 00:26:12 +00:00
Kitto Flora
6483470ec5
Fix GetWorldRotation(), and a host of related Sit fixes.
2009-12-17 02:54:02 -05:00
Melanie
b310efc50f
Merge branch 'master' into careminster
2009-12-12 12:54:43 +00:00
Teravus Ovares (Dan Olivares)
2f8b9cbf2b
* Commit some sit code that's commented out for now.
2009-12-08 11:28:13 -05:00
Melanie
09bbfc1d56
Merge branch 'master' into careminster
2009-12-06 03:01:58 +00:00
Teravus Ovares (Dan Olivares)
8d196dbd14
* Adds Normal to the fields returned by the Physics Raycaster
...
* Fixes recognizing when a sit target is and isn't set.
* * 1. Vector3.Zero.
* * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION
* * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion
* * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it
2009-12-05 22:18:00 -05:00
Melanie
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
Teravus Ovares (Dan Olivares)
c4b6010fb3
* Fixes mantis 4416. Animator is dereferenced on logout
2009-12-05 13:01:21 -05:00
Teravus Ovares (Dan Olivares)
781db43a76
* Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set this for each region in your Regions.ini[PhysicalPrimMax = 10(default)])
...
* Adds a configurable maximum object mass before the mass is clamped. Default is 10000.01. Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section.
* Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations. Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'.
2009-12-03 20:21:10 -05:00
Melanie
cc18ab12f8
Merge branch 'master' into careminster
2009-11-27 00:40:56 +00:00
Teravus Ovares (Dan Olivares)
e2200026ca
* Fixes a case of d.BodyEnable with IntPtr.Zero passed as the parameter in linkset where EnableBody was called and the body is immediately disabled. The previous functionality assumed that a body was received in EnableBody but.. in some cases, it wasn't.
2009-11-26 17:03:00 -05:00
