Melanie 1c2b5d99c9 Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge

2011-10-12 00:10:15 +02:00

..

Animation

Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmerge

2011-10-11 23:28:06 +01:00

Scripting

…

Serialization

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

Tests

Reinstate option to land an npc when it reaches a target.

2011-09-22 00:16:05 +01:00

Types

remove unused BasicQuadTreeNode

2010-07-30 21:06:45 +01:00

AsyncInventorySender.cs

minor: remove mono compiler warning

2011-07-11 02:11:37 +01:00

AsyncSceneObjectGroupDeleter.cs

Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge

2011-10-11 23:08:18 +01:00

Border.cs

…

Cardinals.cs

…

CoalescedSceneObjects.cs

refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer.

2011-04-13 21:48:16 +01:00

EntityBase.cs

Remove unimplementated UpdateMovement() methods from SOG, SOP.

2011-10-01 01:26:50 +01:00

EntityManager.cs

remove mono compiler warnings

2010-12-17 22:35:08 +00:00

EventManager.cs

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

Prioritizer.cs

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

RegionStatsHandler.cs

…

ReturnInfo.cs

…

Scene.cs

Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge

2011-10-11 23:32:16 +01:00

Scene.Inventory.cs

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

2011-10-11 22:51:44 +01:00

Scene.PacketHandlers.cs

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

2011-10-11 21:21:44 +01:00

Scene.Permissions.cs

Add a new ViewObjectInventory permission to decouple viewing from

2011-01-14 18:26:41 +01:00

SceneBase.cs

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

SceneCommunicationService.cs

Merge branch 'master' into careminster-presence-refactor

2011-02-07 22:08:53 +00:00

SceneGraph.cs

Bring us up to date.

2011-09-14 19:11:32 -07:00

SceneManager.cs

Merge branch 'master' into bulletsim

2011-08-19 14:49:16 -07:00

SceneObjectGroup.cs

Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge

2011-10-12 00:10:15 +02:00

SceneObjectGroup.Inventory.cs

Bring us up to date.

2011-09-14 19:11:32 -07:00

SceneObjectPart.cs

Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge

2011-10-11 23:16:43 +01:00

SceneObjectPartInventory.cs

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

2011-10-11 21:21:44 +01:00

ScenePresence.cs

Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge

2011-10-11 23:16:43 +01:00

SceneViewer.cs

Bring us up to date.

2011-09-14 19:11:32 -07:00

SimStatsReporter.cs

Make SImStatsReporter pick ObjectCapacity striaght out of region info

2010-10-22 18:27:49 -04:00

TerrainChannel.cs

…

TerrainUtil.cs

…

UndoState.cs

Merge fixes, and fix the build

2011-09-14 18:46:42 -07:00

UuidGatherer.cs

Bring us up to date.

2011-09-14 19:11:32 -07:00