ubit
f392fa96c3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-09 18:03:04 +01:00
UbitUmarov
b528281018
stop endless loop in lGetLinkPrimitiveParams
2013-01-09 17:01:09 +00:00
Melanie
27b0914681
Prevent a null ref in llGetLinkPrimiteveParams. Still not a fix for the real
...
issue.
2013-01-09 16:01:00 +01:00
Melanie
7d519fde3b
Merge branch 'teravuswork' into avination
2013-01-09 09:19:52 +01:00
Justin Clark-Casey (justincc)
290dc274ec
minor: Remove unnecessary commented out code from last commit c28a2f05
and fix up code comment
2013-01-09 01:04:43 +00:00
Justin Clark-Casey (justincc)
c28a2f05ca
minor: make spacing consistent in console help output
2013-01-09 00:54:28 +00:00
Melanie
e4fad4a09d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-01-09 00:21:43 +00:00
Robert Adams
df1d7414ad
BulletSim: Fix hover height (boats float at the correct level).
...
Fix problem of vehicles going crazy when backing up.
2013-01-08 16:37:49 -08:00
Melanie
f16c4a254c
Revert "Prevent empty Anim Packs"
...
This reverts commit 5561333668
.
2013-01-09 00:20:24 +00:00
Melanie
c1c540f454
Revert "Fix sequence id fr default anim"
...
This reverts commit a775931a0c
.
2013-01-09 00:20:14 +00:00
Justin Clark-Casey (justincc)
3d5e3e35b7
minor: Fix command match of "debug script" command to "debug scripts" to match other scripts commands (and it's own short help text)
2013-01-09 00:08:08 +00:00
Justin Clark-Casey (justincc)
5fa4b8b144
minor: Allow "script *" console commands to take multiple script item ids
2013-01-09 00:01:48 +00:00
Melanie
a775931a0c
Fix sequence id fr default anim
2013-01-08 23:36:05 +00:00
Melanie
5561333668
Prevent empty Anim Packs
2013-01-08 23:12:32 +00:00
Melanie
92db4ef068
Revert "Prevent empty Anim Packs"
...
This reverts commit ab053df706
.
2013-01-09 00:11:08 +01:00
Melanie
be844030ce
Revert "Fix sequence id fr default anim"
...
This reverts commit 8f37f2ca7e
.
2013-01-09 00:10:57 +01:00
Melanie
2ac96dd181
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:52:14 +00:00
Melanie
8f37f2ca7e
Fix sequence id fr default anim
2013-01-08 23:24:34 +01:00
Melanie
ab053df706
Prevent empty Anim Packs
2013-01-08 23:01:09 +01:00
Melanie
0a393b317d
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:32:39 +01:00
ubit
e0074fe07b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 15:42:09 +01:00
ubit
152407f341
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 15:11:04 +01:00
UbitUmarov
fb088a48ac
also update m_lastSize in SendAvatarDataToAllAgents so more paths update
...
it
2013-01-08 14:09:01 +00:00
Melanie
0aabb93ef3
Remove now superfluous update of m_lastSize
2013-01-08 14:00:40 +01:00
Melanie
e1cfa846ea
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 13:58:42 +01:00
Melanie
ef8f03b711
Prevent avatar data from being sent during login when it's not valid and
...
crashes login on some viewers.
2013-01-08 13:57:45 +01:00
Melanie
09d41f4f78
Revert "Remove sending AvatarData because this also happens on login, where it chokes"
...
This reverts commit d1fa650c3f
.
2013-01-08 13:11:04 +01:00
Melanie
f86278e389
Merge branch 'teravuswork' into avination
2013-01-08 12:14:08 +01:00
Melanie
4cd1fd7485
Merge branch 'ubitwork' into avination
2013-01-08 12:14:01 +01:00
Melanie
d1fa650c3f
Remove sending AvatarData because this also happens on login, where it chokes
...
Firestorm, Singularity and other viewers with the new appearance pipeline.
2013-01-08 12:08:34 +01:00
Robert Adams
1603606f1d
BulletSim: improve vehicle angular banking and deflection computation. Rotate angular correction forces to be world relative rather than vehicle relative.
2013-01-07 22:00:50 -08:00
ubit
fed11e2665
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 03:31:50 +01:00
UbitUmarov
126e73c5ed
put back position and rot change check before sending releasing plane constrain
2013-01-08 02:29:21 +00:00
ubit
223c498637
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 02:18:53 +01:00
UbitUmarov
1bf553fd65
reduce sampling of camera raycasts to previus value
2013-01-08 01:12:00 +00:00
ubit
3a924b41c4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 01:24:30 +01:00
UbitUmarov
d5066ae678
* DAnger, TEST * change camera plane collision detection. Still bounces on
...
* prim edges due to camera lag
2013-01-08 00:21:09 +00:00
Robert Adams
8452c0a870
BulletSim: add function to push avatar up when hitting stairs.
...
It looks like BulletSim and ODE rely on penetration correction to cause
the avatar to move up and thus allowing walking up stairs. Object
penetration was minimized for walking and flying (so one doesn't go
through walls) and this stopped stairs from working. This commit
introduces avatar movement code to check for collisions at the
feet while walking and attempts to raise the avatar for the steps.
Not yet perfect but movement is better.
2013-01-07 16:05:02 -08:00
Robert Adams
599dbc3d95
BulletSim: fix exception when re-creating the terrain when loading an OAR file
2013-01-07 16:04:21 -08:00
Melanie
910a94d143
Merge branch 'ubitwork' into avination
2013-01-07 15:06:17 +01:00
ubit
42acd2d721
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-07 12:04:50 +01:00
UbitUmarov
d2cb2da790
also exclude land
2013-01-07 11:03:36 +00:00
UbitUmarov
982328b4ed
exclude avatars from unfiltered RaycastWorld
2013-01-07 10:56:30 +00:00
ubit
c9d39359bb
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-07 11:37:25 +01:00
UbitUmarov
ca40e656ab
in raycast for camera exclude self detection
2013-01-07 10:35:55 +00:00
Robert Adams
2e5222055f
BulletSim: comments and removing small compile errors introduced in last commit.
2013-01-06 22:56:16 -08:00
Robert Adams
9393403253
BulletSim: update DLLs and SOs with better debugging output.
...
Add definition of hand crafted avatar mesh. Not used yet.
Comments and cleanup.
2013-01-06 14:01:15 -08:00
ubit
aa44a65d24
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-06 13:08:48 +01:00
UbitUmarov
dc6b7bb5c9
don't try to read geom positions outside main ode thread :(
2013-01-06 12:07:16 +00:00
Melanie
083ac92b34
Merge branch 'avination' into careminster
2013-01-06 10:52:22 +00:00