From 39cb2063bf7cd771514e4d69da1dab55a6a511a2 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 7 Jun 2012 19:02:43 +0200
Subject: Add collision sounds to the asset set
---
bin/assets/AssetSets.xml | 6 +
.../CollisionSoundsAssetSet.xml | 341 +++++++++++++++++++++
bin/assets/CollisionSoundsAssetSet/attribution.txt | 8 +
.../CollisionSoundsAssetSet/snd_FleshFlesh.ogg | Bin 0 -> 8829 bytes
.../CollisionSoundsAssetSet/snd_FleshGlass.ogg | Bin 0 -> 8537 bytes
.../CollisionSoundsAssetSet/snd_FleshMetal.ogg | Bin 0 -> 12830 bytes
.../CollisionSoundsAssetSet/snd_FleshPlastic.ogg | Bin 0 -> 8858 bytes
.../CollisionSoundsAssetSet/snd_FleshRubber.ogg | Bin 0 -> 10037 bytes
.../CollisionSoundsAssetSet/snd_FleshStone.ogg | Bin 0 -> 10985 bytes
.../CollisionSoundsAssetSet/snd_FleshWood.ogg | Bin 0 -> 8835 bytes
.../CollisionSoundsAssetSet/snd_GlassFlesh.ogg | Bin 0 -> 8579 bytes
.../CollisionSoundsAssetSet/snd_GlassGlass.ogg | Bin 0 -> 5456 bytes
.../CollisionSoundsAssetSet/snd_GlassMetal.ogg | Bin 0 -> 13092 bytes
.../CollisionSoundsAssetSet/snd_GlassPlastic.ogg | Bin 0 -> 6797 bytes
.../CollisionSoundsAssetSet/snd_GlassRubber.ogg | Bin 0 -> 9760 bytes
.../CollisionSoundsAssetSet/snd_GlassStone.ogg | Bin 0 -> 11185 bytes
.../CollisionSoundsAssetSet/snd_GlassWood.ogg | Bin 0 -> 7048 bytes
.../CollisionSoundsAssetSet/snd_MetalFlesh.ogg | Bin 0 -> 12917 bytes
.../CollisionSoundsAssetSet/snd_MetalGlass.ogg | Bin 0 -> 13500 bytes
.../CollisionSoundsAssetSet/snd_MetalMetal.ogg | Bin 0 -> 13513 bytes
.../CollisionSoundsAssetSet/snd_MetalPlastic.ogg | Bin 0 -> 12814 bytes
.../CollisionSoundsAssetSet/snd_MetalRubber.ogg | Bin 0 -> 13008 bytes
.../CollisionSoundsAssetSet/snd_MetalStone.ogg | Bin 0 -> 13578 bytes
.../CollisionSoundsAssetSet/snd_MetalWood.ogg | Bin 0 -> 13040 bytes
.../CollisionSoundsAssetSet/snd_PlasticFlesh.ogg | Bin 0 -> 8510 bytes
.../CollisionSoundsAssetSet/snd_PlasticGlass.ogg | Bin 0 -> 6797 bytes
.../CollisionSoundsAssetSet/snd_PlasticMetal.ogg | Bin 0 -> 12814 bytes
.../CollisionSoundsAssetSet/snd_PlasticPlastic.ogg | Bin 0 -> 6635 bytes
.../CollisionSoundsAssetSet/snd_PlasticRubber.ogg | Bin 0 -> 9648 bytes
.../CollisionSoundsAssetSet/snd_PlasticStone.ogg | Bin 0 -> 10640 bytes
.../CollisionSoundsAssetSet/snd_PlasticWood.ogg | Bin 0 -> 6845 bytes
.../CollisionSoundsAssetSet/snd_RubberFlesh.ogg | Bin 0 -> 9758 bytes
.../CollisionSoundsAssetSet/snd_RubberGlass.ogg | Bin 0 -> 9871 bytes
.../CollisionSoundsAssetSet/snd_RubberMetal.ogg | Bin 0 -> 12797 bytes
.../CollisionSoundsAssetSet/snd_RubberPlastic.ogg | Bin 0 -> 9648 bytes
.../CollisionSoundsAssetSet/snd_RubberRubber.ogg | Bin 0 -> 9647 bytes
.../CollisionSoundsAssetSet/snd_RubberStone.ogg | Bin 0 -> 10850 bytes
.../CollisionSoundsAssetSet/snd_RubberWood.ogg | Bin 0 -> 9716 bytes
.../CollisionSoundsAssetSet/snd_StoneFlesh.ogg | Bin 0 -> 10896 bytes
.../CollisionSoundsAssetSet/snd_StoneGlass.ogg | Bin 0 -> 11188 bytes
.../CollisionSoundsAssetSet/snd_StoneMetal.ogg | Bin 0 -> 13517 bytes
.../CollisionSoundsAssetSet/snd_StonePlastic.ogg | Bin 0 -> 11196 bytes
.../CollisionSoundsAssetSet/snd_StoneRubber.ogg | Bin 0 -> 10885 bytes
.../CollisionSoundsAssetSet/snd_StoneStone.ogg | Bin 0 -> 11040 bytes
.../CollisionSoundsAssetSet/snd_StoneWood.ogg | Bin 0 -> 10947 bytes
.../CollisionSoundsAssetSet/snd_TerrainFlesh.ogg | Bin 0 -> 8750 bytes
.../CollisionSoundsAssetSet/snd_TerrainGlass.ogg | Bin 0 -> 8126 bytes
.../CollisionSoundsAssetSet/snd_TerrainMetal.ogg | Bin 0 -> 12839 bytes
.../CollisionSoundsAssetSet/snd_TerrainPlastic.ogg | Bin 0 -> 7920 bytes
.../CollisionSoundsAssetSet/snd_TerrainRubber.ogg | Bin 0 -> 9480 bytes
.../CollisionSoundsAssetSet/snd_TerrainStone.ogg | Bin 0 -> 10807 bytes
.../CollisionSoundsAssetSet/snd_TerrainWood.ogg | Bin 0 -> 7999 bytes
.../CollisionSoundsAssetSet/snd_WoodFlesh.ogg | Bin 0 -> 8827 bytes
.../CollisionSoundsAssetSet/snd_WoodGlass.ogg | Bin 0 -> 7057 bytes
.../CollisionSoundsAssetSet/snd_WoodMetal.ogg | Bin 0 -> 12818 bytes
.../CollisionSoundsAssetSet/snd_WoodPlastic.ogg | Bin 0 -> 6990 bytes
.../CollisionSoundsAssetSet/snd_WoodRubber.ogg | Bin 0 -> 9626 bytes
.../CollisionSoundsAssetSet/snd_WoodStone.ogg | Bin 0 -> 10931 bytes
.../CollisionSoundsAssetSet/snd_WoodWood.ogg | Bin 0 -> 6696 bytes
59 files changed, 355 insertions(+)
create mode 100644 bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
create mode 100644 bin/assets/CollisionSoundsAssetSet/attribution.txt
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_FleshFlesh.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_FleshGlass.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_FleshMetal.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_FleshPlastic.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_FleshRubber.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_FleshStone.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_FleshWood.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_GlassFlesh.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_GlassGlass.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_GlassMetal.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_GlassPlastic.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_GlassRubber.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_GlassStone.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_GlassWood.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_MetalFlesh.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_MetalGlass.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_MetalMetal.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_MetalPlastic.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_MetalRubber.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_MetalStone.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_MetalWood.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_PlasticFlesh.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_PlasticGlass.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_PlasticMetal.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_PlasticPlastic.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_PlasticRubber.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_PlasticStone.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_PlasticWood.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_RubberFlesh.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_RubberGlass.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_RubberMetal.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_RubberPlastic.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_RubberRubber.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_RubberStone.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_RubberWood.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_StoneFlesh.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_StoneGlass.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_StoneMetal.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_StonePlastic.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_StoneRubber.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_StoneStone.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_StoneWood.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_TerrainFlesh.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_TerrainGlass.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_TerrainMetal.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_TerrainPlastic.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_TerrainRubber.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_TerrainStone.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_TerrainWood.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_WoodFlesh.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_WoodGlass.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_WoodMetal.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_WoodPlastic.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_WoodRubber.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_WoodStone.ogg
create mode 100644 bin/assets/CollisionSoundsAssetSet/snd_WoodWood.ogg
diff --git a/bin/assets/AssetSets.xml b/bin/assets/AssetSets.xml
index c13ea42..829f845 100644
--- a/bin/assets/AssetSets.xml
+++ b/bin/assets/AssetSets.xml
@@ -68,6 +68,12 @@
+
+
+
+
diff --git a/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml b/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
new file mode 100644
index 0000000..7498ae0
--- /dev/null
+++ b/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
@@ -0,0 +1,341 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/assets/CollisionSoundsAssetSet/attribution.txt b/bin/assets/CollisionSoundsAssetSet/attribution.txt
new file mode 100644
index 0000000..876419b
--- /dev/null
+++ b/bin/assets/CollisionSoundsAssetSet/attribution.txt
@@ -0,0 +1,8 @@
+thanvannispen - http://www.freesound.org/people/thanvannispen/sounds/30012/
+hoobtastic - http://www.freesound.org/people/hoobtastic/sounds/132627/
+kbnevel - http://www.freesound.org/people/kbnevel/sounds/119859/
+adcbicycle - http://www.freesound.org/people/adcbicycle/sounds/13856/
+adcbicycle - http://www.freesound.org/people/adcbicycle/sounds/13855/
+110110010 - http://www.freesound.org/people/110110010/sounds/66397/
+qubodup - http://www.freesound.org/people/qubodup/sounds/50941/
+vibe_crc - http://www.freesound.org/people/vibe_crc/sounds/59317/
\ No newline at end of file
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshFlesh.ogg
new file mode 100644
index 0000000..5f3aeb7
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_FleshFlesh.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshGlass.ogg
new file mode 100644
index 0000000..3a322c6
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_FleshGlass.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshMetal.ogg
new file mode 100644
index 0000000..edcf17a
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_FleshMetal.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshPlastic.ogg
new file mode 100644
index 0000000..acf53e5
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_FleshPlastic.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshRubber.ogg
new file mode 100644
index 0000000..6373610
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_FleshRubber.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshStone.ogg
new file mode 100644
index 0000000..eccbbb8
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_FleshStone.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshWood.ogg
new file mode 100644
index 0000000..6713380
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_FleshWood.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassFlesh.ogg
new file mode 100644
index 0000000..6951d44
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_GlassFlesh.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassGlass.ogg
new file mode 100644
index 0000000..1806a55
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_GlassGlass.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassMetal.ogg
new file mode 100644
index 0000000..f147024
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_GlassMetal.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassPlastic.ogg
new file mode 100644
index 0000000..204a4c6
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_GlassPlastic.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassRubber.ogg
new file mode 100644
index 0000000..243f185
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_GlassRubber.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassStone.ogg
new file mode 100644
index 0000000..0852135
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_GlassStone.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassWood.ogg
new file mode 100644
index 0000000..2c13690
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_GlassWood.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalFlesh.ogg
new file mode 100644
index 0000000..c11d19f
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_MetalFlesh.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalGlass.ogg
new file mode 100644
index 0000000..36348e1
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_MetalGlass.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalMetal.ogg
new file mode 100644
index 0000000..957b3c2
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_MetalMetal.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalPlastic.ogg
new file mode 100644
index 0000000..5674907
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_MetalPlastic.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalRubber.ogg
new file mode 100644
index 0000000..0f9ba2e
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_MetalRubber.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalStone.ogg
new file mode 100644
index 0000000..dc489d8
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_MetalStone.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalWood.ogg
new file mode 100644
index 0000000..de04317
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_MetalWood.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticFlesh.ogg
new file mode 100644
index 0000000..a9d6983
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_PlasticFlesh.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticGlass.ogg
new file mode 100644
index 0000000..c7dcdf1
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_PlasticGlass.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticMetal.ogg
new file mode 100644
index 0000000..4dd270f
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_PlasticMetal.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticPlastic.ogg
new file mode 100644
index 0000000..9994745
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_PlasticPlastic.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticRubber.ogg
new file mode 100644
index 0000000..e5c408f
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_PlasticRubber.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticStone.ogg
new file mode 100644
index 0000000..9865c6e
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_PlasticStone.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticWood.ogg
new file mode 100644
index 0000000..9f921b9
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_PlasticWood.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberFlesh.ogg
new file mode 100644
index 0000000..b56f7dc
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_RubberFlesh.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberGlass.ogg
new file mode 100644
index 0000000..9f44fca
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_RubberGlass.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberMetal.ogg
new file mode 100644
index 0000000..9ff064a
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_RubberMetal.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberPlastic.ogg
new file mode 100644
index 0000000..8e601b1
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_RubberPlastic.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberRubber.ogg
new file mode 100644
index 0000000..c84f8e5
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_RubberRubber.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberStone.ogg
new file mode 100644
index 0000000..d398f6f
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_RubberStone.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberWood.ogg
new file mode 100644
index 0000000..ebb24e3
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_RubberWood.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneFlesh.ogg
new file mode 100644
index 0000000..90275ad
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_StoneFlesh.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneGlass.ogg
new file mode 100644
index 0000000..b2b33cf
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_StoneGlass.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneMetal.ogg
new file mode 100644
index 0000000..accdfdf
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_StoneMetal.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StonePlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StonePlastic.ogg
new file mode 100644
index 0000000..15f93b6
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_StonePlastic.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneRubber.ogg
new file mode 100644
index 0000000..4b756ff
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_StoneRubber.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneStone.ogg
new file mode 100644
index 0000000..88b8033
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_StoneStone.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneWood.ogg
new file mode 100644
index 0000000..4a5b7f3
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_StoneWood.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainFlesh.ogg
new file mode 100644
index 0000000..1d3038a
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_TerrainFlesh.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainGlass.ogg
new file mode 100644
index 0000000..637fa16
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_TerrainGlass.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainMetal.ogg
new file mode 100644
index 0000000..919c59b
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_TerrainMetal.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainPlastic.ogg
new file mode 100644
index 0000000..23fa329
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_TerrainPlastic.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainRubber.ogg
new file mode 100644
index 0000000..c18d242
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_TerrainRubber.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainStone.ogg
new file mode 100644
index 0000000..6bd9e09
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_TerrainStone.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainWood.ogg
new file mode 100644
index 0000000..f405517
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_TerrainWood.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodFlesh.ogg
new file mode 100644
index 0000000..02621c2
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_WoodFlesh.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodGlass.ogg
new file mode 100644
index 0000000..03b7fb5
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_WoodGlass.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodMetal.ogg
new file mode 100644
index 0000000..e26afae
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_WoodMetal.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodPlastic.ogg
new file mode 100644
index 0000000..abe419b
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_WoodPlastic.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodRubber.ogg
new file mode 100644
index 0000000..30ccc32
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_WoodRubber.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodStone.ogg
new file mode 100644
index 0000000..ad96818
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_WoodStone.ogg differ
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodWood.ogg
new file mode 100644
index 0000000..76ae52c
Binary files /dev/null and b/bin/assets/CollisionSoundsAssetSet/snd_WoodWood.ogg differ
--
cgit v1.1
From b56673c920603022fce9cb479b714f6fbd0f1311 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 8 Jun 2012 00:18:25 +0100
Subject: Fix bug with "kick user" reducing agent counts by 2 instead of 1.
This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close()
DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()
---
OpenSim/Region/Application/OpenSim.cs | 4 +--
OpenSim/Region/Framework/Scenes/Scene.cs | 31 ++++++++++++----------
.../Framework/Scenes/SceneCommunicationService.cs | 11 ++++----
3 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index caba236..1d00522 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -486,10 +486,10 @@ namespace OpenSim
else
presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
- // ...and close on our side
- presence.Scene.IncomingCloseAgent(presence.UUID);
+ presence.ControllingClient.Close();
}
}
+
MainConsole.Instance.Output("");
}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 939c8fa..17503b1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -940,7 +940,7 @@ namespace OpenSim.Region.Framework.Scenes
else
{
m_log.InfoFormat(
- "[INTERGRID]: Got notice about far away Region: {0} at ({1}, {2})",
+ "[SCENE]: Got notice about far away Region: {0} at ({1}, {2})",
otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY);
}
}
@@ -3235,6 +3235,22 @@ namespace OpenSim.Region.Framework.Scenes
{
isChildAgent = avatar.IsChildAgent;
+ // Don't do this to root agents, it's not nice for the viewer
+ if (closeChildAgents && isChildAgent)
+ {
+ // Tell a single agent to disconnect from the region.
+ IEventQueue eq = RequestModuleInterface();
+ if (eq != null)
+ {
+ eq.DisableSimulator(RegionInfo.RegionHandle, avatar.UUID);
+ }
+ else
+ {
+ avatar.ControllingClient.SendShutdownConnectionNotice();
+ }
+ }
+
+ // Only applies to root agents.
if (avatar.ParentID != 0)
{
avatar.StandUp();
@@ -4033,19 +4049,6 @@ namespace OpenSim.Region.Framework.Scenes
m_sceneGraph.removeUserCount(true);
}
- // Don't do this to root agents on logout, it's not nice for the viewer
- if (presence.IsChildAgent)
- {
- // Tell a single agent to disconnect from the region.
- IEventQueue eq = RequestModuleInterface();
- if (eq != null)
- {
- eq.DisableSimulator(RegionInfo.RegionHandle, agentID);
- }
- else
- presence.ControllingClient.SendShutdownConnectionNotice();
- }
-
presence.ControllingClient.Close();
return true;
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index b8616e8..eff635b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -84,16 +84,16 @@ namespace OpenSim.Region.Framework.Scenes
if (neighbourService != null)
neighbour = neighbourService.HelloNeighbour(regionhandle, region);
else
- m_log.DebugFormat("[SCS]: No neighbour service provided for informing neigbhours of this region");
+ m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: No neighbour service provided for informing neigbhours of this region");
if (neighbour != null)
{
- m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize);
+ m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize);
m_scene.EventManager.TriggerOnRegionUp(neighbour);
}
else
{
- m_log.InfoFormat("[INTERGRID]: Failed to inform neighbour {0}-{1} that I'm here.", x / Constants.RegionSize, y / Constants.RegionSize);
+ m_log.InfoFormat("[SCENE COMMUNICATION SERVICE]: Failed to inform neighbour {0}-{1} that I'm here.", x / Constants.RegionSize, y / Constants.RegionSize);
}
}
@@ -102,7 +102,7 @@ namespace OpenSim.Region.Framework.Scenes
//m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
List neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
- m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count);
+ m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: Informing {0} neighbours that this region is up", neighbours.Count);
foreach (GridRegion n in neighbours)
{
InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
@@ -196,8 +196,7 @@ namespace OpenSim.Region.Framework.Scenes
GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y);
m_log.DebugFormat(
- "[INTERGRID]: Sending close agent {0} to region at {1}-{2}",
- agentID, destination.RegionCoordX, destination.RegionCoordY);
+ "[SCENE COMMUNICATION SERVICE]: Sending close agent ID {0} to {1}", agentID, destination.RegionName);
m_scene.SimulationService.CloseAgent(destination, agentID);
}
--
cgit v1.1