diff options
67 files changed, 467 insertions, 122 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index ddc2a07..fdef9d8 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -61,6 +61,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
61 | public event ChangeDelegate OnEstateInfoChange; | 61 | public event ChangeDelegate OnEstateInfoChange; |
62 | public event MessageDelegate OnEstateMessage; | 62 | public event MessageDelegate OnEstateMessage; |
63 | 63 | ||
64 | private int m_delayCount = 0; | ||
65 | |||
64 | #region Packet Data Responders | 66 | #region Packet Data Responders |
65 | 67 | ||
66 | private void clientSendDetailedEstateData(IClientAPI remote_client, UUID invoice) | 68 | private void clientSendDetailedEstateData(IClientAPI remote_client, UUID invoice) |
@@ -270,7 +272,11 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
270 | { | 272 | { |
271 | if (timeInSeconds == -1) | 273 | if (timeInSeconds == -1) |
272 | { | 274 | { |
273 | restartModule.AbortRestart("Restart aborted by region manager"); | 275 | m_delayCount++; |
276 | if (m_delayCount > 3) | ||
277 | return; | ||
278 | |||
279 | restartModule.DelayRestart(3600, "Restart delayed by region manager"); | ||
274 | return; | 280 | return; |
275 | } | 281 | } |
276 | 282 | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 2fa0b3f..51dcb67 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1101,8 +1101,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1101 | { | 1101 | { |
1102 | if (!temp.Contains(currentParcel)) | 1102 | if (!temp.Contains(currentParcel)) |
1103 | { | 1103 | { |
1104 | currentParcel.ForceUpdateLandInfo(); | 1104 | if (!currentParcel.IsEitherBannedOrRestricted(remote_client.AgentId)) |
1105 | temp.Add(currentParcel); | 1105 | { |
1106 | currentParcel.ForceUpdateLandInfo(); | ||
1107 | temp.Add(currentParcel); | ||
1108 | } | ||
1106 | } | 1109 | } |
1107 | } | 1110 | } |
1108 | } | 1111 | } |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 16792b3..f32e4d8 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -50,6 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
50 | private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax]; | 50 | private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax]; |
51 | 51 | ||
52 | private int m_lastSeqId = 0; | 52 | private int m_lastSeqId = 0; |
53 | private int m_expiryCounter = 0; | ||
53 | 54 | ||
54 | protected LandData m_landData = new LandData(); | 55 | protected LandData m_landData = new LandData(); |
55 | protected Scene m_scene; | 56 | protected Scene m_scene; |
@@ -135,6 +136,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
135 | else | 136 | else |
136 | LandData.GroupID = UUID.Zero; | 137 | LandData.GroupID = UUID.Zero; |
137 | LandData.IsGroupOwned = is_group_owned; | 138 | LandData.IsGroupOwned = is_group_owned; |
139 | |||
140 | m_scene.EventManager.OnFrame += OnFrame; | ||
138 | } | 141 | } |
139 | 142 | ||
140 | #endregion | 143 | #endregion |
@@ -1199,6 +1202,17 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1199 | 1202 | ||
1200 | #endregion | 1203 | #endregion |
1201 | 1204 | ||
1205 | private void OnFrame() | ||
1206 | { | ||
1207 | m_expiryCounter++; | ||
1208 | |||
1209 | if (m_expiryCounter >= 50) | ||
1210 | { | ||
1211 | ExpireAccessList(); | ||
1212 | m_expiryCounter = 0; | ||
1213 | } | ||
1214 | } | ||
1215 | |||
1202 | private void ExpireAccessList() | 1216 | private void ExpireAccessList() |
1203 | { | 1217 | { |
1204 | List<LandAccessEntry> delete = new List<LandAccessEntry>(); | 1218 | List<LandAccessEntry> delete = new List<LandAccessEntry>(); |
@@ -1209,7 +1223,22 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1209 | delete.Add(entry); | 1223 | delete.Add(entry); |
1210 | } | 1224 | } |
1211 | foreach (LandAccessEntry entry in delete) | 1225 | foreach (LandAccessEntry entry in delete) |
1226 | { | ||
1212 | LandData.ParcelAccessList.Remove(entry); | 1227 | LandData.ParcelAccessList.Remove(entry); |
1228 | ScenePresence presence; | ||
1229 | |||
1230 | if (m_scene.TryGetScenePresence(entry.AgentID, out presence) && (!presence.IsChildAgent)) | ||
1231 | { | ||
1232 | ILandObject land = m_scene.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y); | ||
1233 | if (land.LandData.LocalID == LandData.LocalID) | ||
1234 | { | ||
1235 | Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land); | ||
1236 | presence.TeleportWithMomentum(pos); | ||
1237 | presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); | ||
1238 | } | ||
1239 | } | ||
1240 | m_log.DebugFormat("[LAND]: Removing entry {0} because it has expired", entry.AgentID); | ||
1241 | } | ||
1213 | 1242 | ||
1214 | if (delete.Count > 0) | 1243 | if (delete.Count > 0) |
1215 | m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this); | 1244 | m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this); |
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs index 65180b5a..287738a 100644 --- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs +++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs | |||
@@ -59,6 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
59 | protected bool m_Notice = false; | 59 | protected bool m_Notice = false; |
60 | protected IDialogModule m_DialogModule = null; | 60 | protected IDialogModule m_DialogModule = null; |
61 | protected string m_MarkerPath = String.Empty; | 61 | protected string m_MarkerPath = String.Empty; |
62 | private int[] m_CurrentAlerts = null; | ||
62 | 63 | ||
63 | public void Initialise(IConfigSource config) | 64 | public void Initialise(IConfigSource config) |
64 | { | 65 | { |
@@ -141,6 +142,7 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
141 | m_Message = message; | 142 | m_Message = message; |
142 | m_Initiator = initiator; | 143 | m_Initiator = initiator; |
143 | m_Notice = notice; | 144 | m_Notice = notice; |
145 | m_CurrentAlerts = alerts; | ||
144 | m_Alerts = new List<int>(alerts); | 146 | m_Alerts = new List<int>(alerts); |
145 | m_Alerts.Sort(); | 147 | m_Alerts.Sort(); |
146 | m_Alerts.Reverse(); | 148 | m_Alerts.Reverse(); |
@@ -152,12 +154,12 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
152 | return; | 154 | return; |
153 | } | 155 | } |
154 | 156 | ||
155 | int nextInterval = DoOneNotice(); | 157 | int nextInterval = DoOneNotice(true); |
156 | 158 | ||
157 | SetTimer(nextInterval); | 159 | SetTimer(nextInterval); |
158 | } | 160 | } |
159 | 161 | ||
160 | public int DoOneNotice() | 162 | public int DoOneNotice(bool sendOut) |
161 | { | 163 | { |
162 | if (m_Alerts.Count == 0 || m_Alerts[0] == 0) | 164 | if (m_Alerts.Count == 0 || m_Alerts[0] == 0) |
163 | { | 165 | { |
@@ -182,34 +184,37 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
182 | 184 | ||
183 | m_Alerts.RemoveAt(0); | 185 | m_Alerts.RemoveAt(0); |
184 | 186 | ||
185 | int minutes = currentAlert / 60; | 187 | if (sendOut) |
186 | string currentAlertString = String.Empty; | ||
187 | if (minutes > 0) | ||
188 | { | 188 | { |
189 | if (minutes == 1) | 189 | int minutes = currentAlert / 60; |
190 | currentAlertString += "1 minute"; | 190 | string currentAlertString = String.Empty; |
191 | else | 191 | if (minutes > 0) |
192 | currentAlertString += String.Format("{0} minutes", minutes); | 192 | { |
193 | if (minutes == 1) | ||
194 | currentAlertString += "1 minute"; | ||
195 | else | ||
196 | currentAlertString += String.Format("{0} minutes", minutes); | ||
197 | if ((currentAlert % 60) != 0) | ||
198 | currentAlertString += " and "; | ||
199 | } | ||
193 | if ((currentAlert % 60) != 0) | 200 | if ((currentAlert % 60) != 0) |
194 | currentAlertString += " and "; | 201 | { |
195 | } | 202 | int seconds = currentAlert % 60; |
196 | if ((currentAlert % 60) != 0) | 203 | if (seconds == 1) |
197 | { | 204 | currentAlertString += "1 second"; |
198 | int seconds = currentAlert % 60; | 205 | else |
199 | if (seconds == 1) | 206 | currentAlertString += String.Format("{0} seconds", seconds); |
200 | currentAlertString += "1 second"; | 207 | } |
201 | else | ||
202 | currentAlertString += String.Format("{0} seconds", seconds); | ||
203 | } | ||
204 | 208 | ||
205 | string msg = String.Format(m_Message, currentAlertString); | 209 | string msg = String.Format(m_Message, currentAlertString); |
206 | 210 | ||
207 | if (m_DialogModule != null && msg != String.Empty) | 211 | if (m_DialogModule != null && msg != String.Empty) |
208 | { | 212 | { |
209 | if (m_Notice) | 213 | if (m_Notice) |
210 | m_DialogModule.SendGeneralAlert(msg); | 214 | m_DialogModule.SendGeneralAlert(msg); |
211 | else | 215 | else |
212 | m_DialogModule.SendNotificationToUsersInRegion(m_Initiator, "System", msg); | 216 | m_DialogModule.SendNotificationToUsersInRegion(m_Initiator, "System", msg); |
217 | } | ||
213 | } | 218 | } |
214 | 219 | ||
215 | return currentAlert - nextAlert; | 220 | return currentAlert - nextAlert; |
@@ -226,7 +231,25 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
226 | 231 | ||
227 | private void OnTimer(object source, ElapsedEventArgs e) | 232 | private void OnTimer(object source, ElapsedEventArgs e) |
228 | { | 233 | { |
229 | int nextInterval = DoOneNotice(); | 234 | int nextInterval = DoOneNotice(true); |
235 | |||
236 | SetTimer(nextInterval); | ||
237 | } | ||
238 | |||
239 | public void DelayRestart(int seconds, string message) | ||
240 | { | ||
241 | if (m_CountdownTimer == null) | ||
242 | return; | ||
243 | |||
244 | m_CountdownTimer.Stop(); | ||
245 | m_CountdownTimer = null; | ||
246 | |||
247 | m_Alerts = new List<int>(m_CurrentAlerts); | ||
248 | m_Alerts.Add(seconds); | ||
249 | m_Alerts.Sort(); | ||
250 | m_Alerts.Reverse(); | ||
251 | |||
252 | int nextInterval = DoOneNotice(false); | ||
230 | 253 | ||
231 | SetTimer(nextInterval); | 254 | SetTimer(nextInterval); |
232 | } | 255 | } |
@@ -240,9 +263,9 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
240 | if (m_DialogModule != null && message != String.Empty) | 263 | if (m_DialogModule != null && message != String.Empty) |
241 | m_DialogModule.SendGeneralAlert(message); | 264 | m_DialogModule.SendGeneralAlert(message); |
242 | } | 265 | } |
243 | if (m_MarkerPath != String.Empty) | 266 | if (m_MarkerPath != String.Empty) |
244 | File.Delete(Path.Combine(m_MarkerPath, | 267 | File.Delete(Path.Combine(m_MarkerPath, |
245 | m_Scene.RegionInfo.RegionID.ToString())); | 268 | m_Scene.RegionInfo.RegionID.ToString())); |
246 | } | 269 | } |
247 | 270 | ||
248 | private void HandleRegionRestart(string module, string[] args) | 271 | private void HandleRegionRestart(string module, string[] args) |
diff --git a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs index c68550f..9b25beb 100644 --- a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs | |||
@@ -35,5 +35,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
35 | TimeSpan TimeUntilRestart { get; } | 35 | TimeSpan TimeUntilRestart { get; } |
36 | void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice); | 36 | void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice); |
37 | void AbortRestart(string message); | 37 | void AbortRestart(string message); |
38 | void DelayRestart(int seconds, string message); | ||
38 | } | 39 | } |
39 | } | 40 | } |
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs index de82ddc..a95e75a 100644 --- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs +++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs | |||
@@ -27,9 +27,11 @@ | |||
27 | // Ubit 2012 | 27 | // Ubit 2012 |
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Reflection; | ||
30 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
31 | using OpenMetaverse; | 32 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using log4net; | ||
33 | 35 | ||
34 | namespace OpenSim.Region.Framework.Scenes | 36 | namespace OpenSim.Region.Framework.Scenes |
35 | { | 37 | { |
@@ -42,9 +44,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
42 | 44 | ||
43 | public static class CollisionSounds | 45 | public static class CollisionSounds |
44 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | |||
45 | private const int MaxMaterials = 7; | 49 | private const int MaxMaterials = 7; |
46 | // part part | 50 | // part part |
47 | /* | 51 | |
48 | private static UUID snd_StoneStone = new UUID("be7295c0-a158-11e1-b3dd-0800200c9a66"); | 52 | private static UUID snd_StoneStone = new UUID("be7295c0-a158-11e1-b3dd-0800200c9a66"); |
49 | private static UUID snd_StoneMetal = new UUID("be7295c0-a158-11e1-b3dd-0800201c9a66"); | 53 | private static UUID snd_StoneMetal = new UUID("be7295c0-a158-11e1-b3dd-0800201c9a66"); |
50 | private static UUID snd_StoneGlass = new UUID("be7295c0-a158-11e1-b3dd-0800202c9a66"); | 54 | private static UUID snd_StoneGlass = new UUID("be7295c0-a158-11e1-b3dd-0800202c9a66"); |
@@ -53,7 +57,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
53 | private static UUID snd_StonePlastic = new UUID("be7295c0-a158-11e1-b3dd-0800205c9a66"); | 57 | private static UUID snd_StonePlastic = new UUID("be7295c0-a158-11e1-b3dd-0800205c9a66"); |
54 | private static UUID snd_StoneRubber = new UUID("be7295c0-a158-11e1-b3dd-0800206c9a66"); | 58 | private static UUID snd_StoneRubber = new UUID("be7295c0-a158-11e1-b3dd-0800206c9a66"); |
55 | 59 | ||
56 | private static UUID snd_MetalStone = new UUID("be7295c0-a158-11e1-b3dd-0801200c9a66"); | ||
57 | private static UUID snd_MetalMetal = new UUID("be7295c0-a158-11e1-b3dd-0801201c9a66"); | 60 | private static UUID snd_MetalMetal = new UUID("be7295c0-a158-11e1-b3dd-0801201c9a66"); |
58 | private static UUID snd_MetalGlass = new UUID("be7295c0-a158-11e1-b3dd-0801202c9a66"); | 61 | private static UUID snd_MetalGlass = new UUID("be7295c0-a158-11e1-b3dd-0801202c9a66"); |
59 | private static UUID snd_MetalWood = new UUID("be7295c0-a158-11e1-b3dd-0801203c9a66"); | 62 | private static UUID snd_MetalWood = new UUID("be7295c0-a158-11e1-b3dd-0801203c9a66"); |
@@ -61,44 +64,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
61 | private static UUID snd_MetalPlastic = new UUID("be7295c0-a158-11e1-b3dd-0801205c9a66"); | 64 | private static UUID snd_MetalPlastic = new UUID("be7295c0-a158-11e1-b3dd-0801205c9a66"); |
62 | private static UUID snd_MetalRubber = new UUID("be7295c0-a158-11e1-b3dd-0801206c9a66"); | 65 | private static UUID snd_MetalRubber = new UUID("be7295c0-a158-11e1-b3dd-0801206c9a66"); |
63 | 66 | ||
64 | private static UUID snd_GlassStone = new UUID("be7295c0-a158-11e1-b3dd-0802200c9a66"); | ||
65 | private static UUID snd_GlassMetal = new UUID("be7295c0-a158-11e1-b3dd-0802201c9a66"); | ||
66 | private static UUID snd_GlassGlass = new UUID("be7295c0-a158-11e1-b3dd-0802202c9a66"); | 67 | private static UUID snd_GlassGlass = new UUID("be7295c0-a158-11e1-b3dd-0802202c9a66"); |
67 | private static UUID snd_GlassWood = new UUID("be7295c0-a158-11e1-b3dd-0802203c9a66"); | 68 | private static UUID snd_GlassWood = new UUID("be7295c0-a158-11e1-b3dd-0802203c9a66"); |
68 | private static UUID snd_GlassFlesh = new UUID("be7295c0-a158-11e1-b3dd-0802204c9a66"); | 69 | private static UUID snd_GlassFlesh = new UUID("be7295c0-a158-11e1-b3dd-0802204c9a66"); |
69 | private static UUID snd_GlassPlastic = new UUID("be7295c0-a158-11e1-b3dd-0802205c9a66"); | 70 | private static UUID snd_GlassPlastic = new UUID("be7295c0-a158-11e1-b3dd-0802205c9a66"); |
70 | private static UUID snd_GlassRubber = new UUID("be7295c0-a158-11e1-b3dd-0802206c9a66"); | 71 | private static UUID snd_GlassRubber = new UUID("be7295c0-a158-11e1-b3dd-0802206c9a66"); |
71 | 72 | ||
72 | private static UUID snd_WoodStone = new UUID("be7295c0-a158-11e1-b3dd-0803200c9a66"); | ||
73 | private static UUID snd_WoodMetal = new UUID("be7295c0-a158-11e1-b3dd-0803201c9a66"); | ||
74 | private static UUID snd_WoodGlass = new UUID("be7295c0-a158-11e1-b3dd-0803202c9a66"); | ||
75 | private static UUID snd_WoodWood = new UUID("be7295c0-a158-11e1-b3dd-0803203c9a66"); | 73 | private static UUID snd_WoodWood = new UUID("be7295c0-a158-11e1-b3dd-0803203c9a66"); |
76 | private static UUID snd_WoodFlesh = new UUID("be7295c0-a158-11e1-b3dd-0803204c9a66"); | 74 | private static UUID snd_WoodFlesh = new UUID("be7295c0-a158-11e1-b3dd-0803204c9a66"); |
77 | private static UUID snd_WoodPlastic = new UUID("be7295c0-a158-11e1-b3dd-0803205c9a66"); | 75 | private static UUID snd_WoodPlastic = new UUID("be7295c0-a158-11e1-b3dd-0803205c9a66"); |
78 | private static UUID snd_WoodRubber = new UUID("be7295c0-a158-11e1-b3dd-0803206c9a66"); | 76 | private static UUID snd_WoodRubber = new UUID("be7295c0-a158-11e1-b3dd-0803206c9a66"); |
79 | 77 | ||
80 | private static UUID snd_FleshStone = new UUID("be7295c0-a158-11e1-b3dd-0804200c9a66"); | ||
81 | private static UUID snd_FleshMetal = new UUID("be7295c0-a158-11e1-b3dd-0804201c9a66"); | ||
82 | private static UUID snd_FleshGlass = new UUID("be7295c0-a158-11e1-b3dd-0804202c9a66"); | ||
83 | private static UUID snd_FleshWood = new UUID("be7295c0-a158-11e1-b3dd-0804203c9a66"); | ||
84 | private static UUID snd_FleshFlesh = new UUID("be7295c0-a158-11e1-b3dd-0804204c9a66"); | 78 | private static UUID snd_FleshFlesh = new UUID("be7295c0-a158-11e1-b3dd-0804204c9a66"); |
85 | private static UUID snd_FleshPlastic = new UUID("be7295c0-a158-11e1-b3dd-0804205c9a66"); | 79 | private static UUID snd_FleshPlastic = new UUID("be7295c0-a158-11e1-b3dd-0804205c9a66"); |
86 | private static UUID snd_FleshRubber = new UUID("be7295c0-a158-11e1-b3dd-0804206c9a66"); | 80 | private static UUID snd_FleshRubber = new UUID("be7295c0-a158-11e1-b3dd-0804206c9a66"); |
87 | 81 | ||
88 | private static UUID snd_PlasticStone = new UUID("be7295c0-a158-11e1-b3dd-0805200c9a66"); | ||
89 | private static UUID snd_PlasticMetal = new UUID("be7295c0-a158-11e1-b3dd-0805201c9a66"); | ||
90 | private static UUID snd_PlasticGlass = new UUID("be7295c0-a158-11e1-b3dd-0805202c9a66"); | ||
91 | private static UUID snd_PlasticWood = new UUID("be7295c0-a158-11e1-b3dd-0805203c9a66"); | ||
92 | private static UUID snd_PlasticFlesh = new UUID("be7295c0-a158-11e1-b3dd-0805204c9a66"); | ||
93 | private static UUID snd_PlasticPlastic = new UUID("be7295c0-a158-11e1-b3dd-0805205c9a66"); | 82 | private static UUID snd_PlasticPlastic = new UUID("be7295c0-a158-11e1-b3dd-0805205c9a66"); |
94 | private static UUID snd_PlasticRubber = new UUID("be7295c0-a158-11e1-b3dd-0805206c9a66"); | 83 | private static UUID snd_PlasticRubber = new UUID("be7295c0-a158-11e1-b3dd-0805206c9a66"); |
95 | 84 | ||
96 | private static UUID snd_RubberStone = new UUID("be7295c0-a158-11e1-b3dd-0806200c9a66"); | ||
97 | private static UUID snd_RubberMetal = new UUID("be7295c0-a158-11e1-b3dd-0806201c9a66"); | ||
98 | private static UUID snd_RubberGlass = new UUID("be7295c0-a158-11e1-b3dd-0806202c9a66"); | ||
99 | private static UUID snd_RubberWood = new UUID("be7295c0-a158-11e1-b3dd-0806203c9a66"); | ||
100 | private static UUID snd_RubberFlesh = new UUID("be7295c0-a158-11e1-b3dd-0806204c9a66"); | ||
101 | private static UUID snd_RubberPlastic = new UUID("be7295c0-a158-11e1-b3dd-0806205c9a66"); | ||
102 | private static UUID snd_RubberRubber = new UUID("be7295c0-a158-11e1-b3dd-0806206c9a66"); | 85 | private static UUID snd_RubberRubber = new UUID("be7295c0-a158-11e1-b3dd-0806206c9a66"); |
103 | 86 | ||
104 | // terrain part | 87 | // terrain part |
@@ -109,50 +92,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
109 | private static UUID snd_TerrainFlesh = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66"); | 92 | private static UUID snd_TerrainFlesh = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66"); |
110 | private static UUID snd_TerrainPlastic = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66"); | 93 | private static UUID snd_TerrainPlastic = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66"); |
111 | private static UUID snd_TerrainRubber = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66"); | 94 | private static UUID snd_TerrainRubber = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66"); |
112 | */ | ||
113 | private static UUID snd_StoneStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
114 | private static UUID snd_StoneMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
115 | private static UUID snd_StoneGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
116 | private static UUID snd_StoneWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
117 | private static UUID snd_StoneFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
118 | private static UUID snd_StonePlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
119 | private static UUID snd_StoneRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
120 | |||
121 | private static UUID snd_MetalMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
122 | private static UUID snd_MetalGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
123 | private static UUID snd_MetalWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
124 | private static UUID snd_MetalFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
125 | private static UUID snd_MetalPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
126 | private static UUID snd_MetalRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
127 | |||
128 | private static UUID snd_GlassGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
129 | private static UUID snd_GlassWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
130 | private static UUID snd_GlassFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
131 | private static UUID snd_GlassPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
132 | private static UUID snd_GlassRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
133 | |||
134 | private static UUID snd_WoodWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
135 | private static UUID snd_WoodFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
136 | private static UUID snd_WoodPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
137 | private static UUID snd_WoodRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
138 | |||
139 | private static UUID snd_FleshFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
140 | private static UUID snd_FleshPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
141 | private static UUID snd_FleshRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
142 | |||
143 | private static UUID snd_PlasticPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
144 | private static UUID snd_PlasticRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
145 | |||
146 | private static UUID snd_RubberRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
147 | |||
148 | // terrain part | ||
149 | private static UUID snd_TerrainStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
150 | private static UUID snd_TerrainMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
151 | private static UUID snd_TerrainGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
152 | private static UUID snd_TerrainWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
153 | private static UUID snd_TerrainFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
154 | private static UUID snd_TerrainPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
155 | private static UUID snd_TerrainRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); | ||
156 | 95 | ||
157 | public static UUID[] m_TerrainPart = { | 96 | public static UUID[] m_TerrainPart = { |
158 | snd_TerrainStone, | 97 | snd_TerrainStone, |
@@ -163,18 +102,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
163 | snd_TerrainPlastic, | 102 | snd_TerrainPlastic, |
164 | snd_TerrainRubber | 103 | snd_TerrainRubber |
165 | }; | 104 | }; |
166 | /* | 105 | |
167 | //full assimetric sounds | ||
168 | public static UUID[] m_PartPart = { | ||
169 | snd_StoneStone, snd_StoneMetal, snd_StoneGlass, snd_StoneWood, snd_StoneFlesh, snd_StonePlastic, snd_StoneRubber, | ||
170 | snd_MetalStone, snd_MetalMetal, snd_MetalGlass, snd_MetalWood, snd_MetalFlesh, snd_MetalPlastic, snd_MetalRubber, | ||
171 | snd_GlassStone, snd_GlassMetal, snd_GlassGlass, snd_GlassWood, snd_GlassFlesh, snd_GlassPlastic, snd_GlassRubber, | ||
172 | snd_WoodStone, snd_WoodMetal, snd_WoodGlass, snd_WoodWood, snd_WoodFlesh, snd_WoodPlastic, snd_WoodRubber, | ||
173 | snd_FleshStone, snd_FleshMetal, snd_FleshGlass, snd_FleshWood, snd_FleshFlesh, snd_FleshPlastic, snd_FleshRubber, | ||
174 | snd_PlasticStone, snd_PlasticMetal, snd_PlasticGlass, snd_PlasticWood, snd_PlasticFlesh, snd_PlasticPlastic, snd_PlasticRubber, | ||
175 | snd_RubberStone, snd_RubberMetal, snd_RubberGlass, snd_RubberWood, snd_RubberFlesh, snd_RubberPlastic, snd_RubberRubber | ||
176 | }; | ||
177 | */ | ||
178 | // simetric sounds | 106 | // simetric sounds |
179 | public static UUID[] m_PartPart = { | 107 | public static UUID[] m_PartPart = { |
180 | snd_StoneStone, snd_StoneMetal, snd_StoneGlass, snd_StoneWood, snd_StoneFlesh, snd_StonePlastic, snd_StoneRubber, | 108 | snd_StoneStone, snd_StoneMetal, snd_StoneGlass, snd_StoneWood, snd_StoneFlesh, snd_StonePlastic, snd_StoneRubber, |
@@ -188,9 +116,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
188 | 116 | ||
189 | public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist) | 117 | public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist) |
190 | { | 118 | { |
191 | // disable for now | ||
192 | return; | ||
193 | |||
194 | if (collidersinfolist.Count == 0 || part == null) | 119 | if (collidersinfolist.Count == 0 || part == null) |
195 | return; | 120 | return; |
196 | 121 | ||
@@ -300,9 +225,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
300 | 225 | ||
301 | public static void AvatarCollisionSound(ScenePresence av, List<CollisionForSoundInfo> collidersinfolist) | 226 | public static void AvatarCollisionSound(ScenePresence av, List<CollisionForSoundInfo> collidersinfolist) |
302 | { | 227 | { |
303 | // disable for now | ||
304 | return; | ||
305 | |||
306 | if (collidersinfolist.Count == 0 || av == null) | 228 | if (collidersinfolist.Count == 0 || av == null) |
307 | return; | 229 | return; |
308 | 230 | ||
@@ -346,10 +268,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
346 | volume = Math.Abs(colInfo.relativeVel); | 268 | volume = Math.Abs(colInfo.relativeVel); |
347 | if (volume < 0.2f) | 269 | if (volume < 0.2f) |
348 | continue; | 270 | continue; |
271 | m_log.DebugFormat("Collision speed was {0}", volume); | ||
349 | 272 | ||
350 | volume *= volume * .0625f; // 4m/s == full volume | 273 | // Cap to 0.2 times volume because climbing stairs should not be noisy |
351 | if (volume > 1.0f) | 274 | // Also changed scaling |
352 | volume = 1.0f; | 275 | volume *= volume * .0125f; // 4m/s == volume 0.2 |
276 | if (volume > 0.2f) | ||
277 | volume = 0.2f; | ||
353 | otherMaterial = (int)otherPart.Material; | 278 | otherMaterial = (int)otherPart.Material; |
354 | if (otherMaterial >= MaxMaterials) | 279 | if (otherMaterial >= MaxMaterials) |
355 | otherMaterial = 3; | 280 | otherMaterial = 3; |
@@ -374,4 +299,4 @@ namespace OpenSim.Region.Framework.Scenes | |||
374 | } | 299 | } |
375 | } | 300 | } |
376 | } | 301 | } |
377 | } \ No newline at end of file | 302 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 46a7e3d..904c896 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -3948,10 +3948,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3948 | scriptPosTarget target = m_targets[idx]; | 3948 | scriptPosTarget target = m_targets[idx]; |
3949 | if (Util.GetDistanceTo(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance) | 3949 | if (Util.GetDistanceTo(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance) |
3950 | { | 3950 | { |
3951 | at_target = true; | ||
3952 | |||
3951 | // trigger at_target | 3953 | // trigger at_target |
3952 | if (m_scriptListens_atTarget) | 3954 | if (m_scriptListens_atTarget) |
3953 | { | 3955 | { |
3954 | at_target = true; | ||
3955 | scriptPosTarget att = new scriptPosTarget(); | 3956 | scriptPosTarget att = new scriptPosTarget(); |
3956 | att.targetPos = target.targetPos; | 3957 | att.targetPos = target.targetPos; |
3957 | att.tolerance = target.tolerance; | 3958 | att.tolerance = target.tolerance; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e0b24dc..6af3c1e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4644,6 +4644,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4644 | { | 4644 | { |
4645 | m_host.CollisionSoundVolume = (float)impact_volume; | 4645 | m_host.CollisionSoundVolume = (float)impact_volume; |
4646 | m_host.CollisionSound = m_host.invalidCollisionSoundUUID; | 4646 | m_host.CollisionSound = m_host.invalidCollisionSoundUUID; |
4647 | m_host.CollisionSoundType = 0; | ||
4647 | return; | 4648 | return; |
4648 | } | 4649 | } |
4649 | // TODO: Parameter check logic required. | 4650 | // TODO: Parameter check logic required. |
@@ -4663,6 +4664,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4663 | } | 4664 | } |
4664 | m_host.CollisionSoundVolume = (float)impact_volume; | 4665 | m_host.CollisionSoundVolume = (float)impact_volume; |
4665 | m_host.CollisionSound = soundId; | 4666 | m_host.CollisionSound = soundId; |
4667 | m_host.CollisionSoundType = 1; | ||
4666 | } | 4668 | } |
4667 | 4669 | ||
4668 | public LSL_String llGetAnimation(string id) | 4670 | public LSL_String llGetAnimation(string id) |
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 @@ | |||
68 | <!----> | 68 | <!----> |
69 | 69 | ||
70 | <!----> | 70 | <!----> |
71 | <Section Name="Collision Sounds AssetSet"> | ||
72 | <Key Name="file" Value="CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml"/> | ||
73 | </Section> | ||
74 | <!----> | ||
75 | |||
76 | <!----> | ||
71 | <Section Name="Textures AssetSet"> | 77 | <Section Name="Textures AssetSet"> |
72 | <Key Name="file" Value="TexturesAssetSet/TexturesAssetSet.xml"/> | 78 | <Key Name="file" Value="TexturesAssetSet/TexturesAssetSet.xml"/> |
73 | </Section> | 79 | </Section> |
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 @@ | |||
1 | <Nini> | ||
2 | <!-- Ubit 2012 | ||
3 | using Nebadon collision sounds collection--> | ||
4 | |||
5 | <Section Name="snd_StoneStone"> | ||
6 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0800200c9a66" /> | ||
7 | <Key Name="name" Value="snd_StoneStone" /> | ||
8 | <Key Name="assetType" Value="1" /> | ||
9 | <Key Name="fileName" Value="snd_StoneStone.ogg" /> | ||
10 | </Section> | ||
11 | <Section Name="snd_StoneMetal"> | ||
12 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0800201c9a66" /> | ||
13 | <Key Name="name" Value="snd_StoneMetal" /> | ||
14 | <Key Name="assetType" Value="1" /> | ||
15 | <Key Name="fileName" Value="snd_StoneMetal.ogg" /> | ||
16 | </Section> | ||
17 | <Section Name="snd_StoneGlass"> | ||
18 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0800202c9a66" /> | ||
19 | <Key Name="name" Value="snd_StoneGlass" /> | ||
20 | <Key Name="assetType" Value="1" /> | ||
21 | <Key Name="fileName" Value="snd_StoneGlass.ogg" /> | ||
22 | </Section> | ||
23 | <Section Name="snd_StoneWood"> | ||
24 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0800203c9a66" /> | ||
25 | <Key Name="name" Value="snd_StoneWood" /> | ||
26 | <Key Name="assetType" Value="1" /> | ||
27 | <Key Name="fileName" Value="snd_StoneWood.ogg" /> | ||
28 | </Section> | ||
29 | <Section Name="snd_StoneFlesh"> | ||
30 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0800204c9a66" /> | ||
31 | <Key Name="name" Value="snd_StoneFlesh" /> | ||
32 | <Key Name="assetType" Value="1" /> | ||
33 | <Key Name="fileName" Value="snd_StoneFlesh.ogg" /> | ||
34 | </Section> | ||
35 | <Section Name="snd_StonePlastic"> | ||
36 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0800205c9a66" /> | ||
37 | <Key Name="name" Value="snd_StonePlastic" /> | ||
38 | <Key Name="assetType" Value="1" /> | ||
39 | <Key Name="fileName" Value="snd_StonePlastic.ogg" /> | ||
40 | </Section> | ||
41 | <Section Name="snd_StoneRubber"> | ||
42 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0800206c9a66" /> | ||
43 | <Key Name="name" Value="snd_StoneRubber" /> | ||
44 | <Key Name="assetType" Value="1" /> | ||
45 | <Key Name="fileName" Value="snd_StoneRubber.ogg" /> | ||
46 | </Section> | ||
47 | <Section Name="snd_MetalStone"> | ||
48 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0801200c9a66" /> | ||
49 | <Key Name="name" Value="snd_MetalStone" /> | ||
50 | <Key Name="assetType" Value="1" /> | ||
51 | <Key Name="fileName" Value="snd_MetalStone.ogg" /> | ||
52 | </Section> | ||
53 | <Section Name="snd_MetalMetal"> | ||
54 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0801201c9a66" /> | ||
55 | <Key Name="name" Value="snd_MetalMetal" /> | ||
56 | <Key Name="assetType" Value="1" /> | ||
57 | <Key Name="fileName" Value="snd_MetalMetal.ogg" /> | ||
58 | </Section> | ||
59 | <Section Name="snd_MetalGlass"> | ||
60 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0801202c9a66" /> | ||
61 | <Key Name="name" Value="snd_MetalGlass" /> | ||
62 | <Key Name="assetType" Value="1" /> | ||
63 | <Key Name="fileName" Value="snd_MetalGlass.ogg" /> | ||
64 | </Section> | ||
65 | <Section Name="snd_MetalWood"> | ||
66 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0801203c9a66" /> | ||
67 | <Key Name="name" Value="snd_MetalWood" /> | ||
68 | <Key Name="assetType" Value="1" /> | ||
69 | <Key Name="fileName" Value="snd_MetalWood.ogg" /> | ||
70 | </Section> | ||
71 | <Section Name="snd_MetalFlesh"> | ||
72 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0801204c9a66" /> | ||
73 | <Key Name="name" Value="snd_MetalFlesh" /> | ||
74 | <Key Name="assetType" Value="1" /> | ||
75 | <Key Name="fileName" Value="snd_MetalFlesh.ogg" /> | ||
76 | </Section> | ||
77 | <Section Name="snd_MetalPlastic"> | ||
78 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0801205c9a66" /> | ||
79 | <Key Name="name" Value="snd_MetalPlastic" /> | ||
80 | <Key Name="assetType" Value="1" /> | ||
81 | <Key Name="fileName" Value="snd_MetalPlastic.ogg" /> | ||
82 | </Section> | ||
83 | <Section Name="snd_MetalRubber"> | ||
84 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0801206c9a66" /> | ||
85 | <Key Name="name" Value="snd_MetalRubber" /> | ||
86 | <Key Name="assetType" Value="1" /> | ||
87 | <Key Name="fileName" Value="snd_MetalRubber.ogg" /> | ||
88 | </Section> | ||
89 | <Section Name="snd_GlassStone"> | ||
90 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0802200c9a66" /> | ||
91 | <Key Name="name" Value="snd_GlassStone" /> | ||
92 | <Key Name="assetType" Value="1" /> | ||
93 | <Key Name="fileName" Value="snd_GlassStone.ogg" /> | ||
94 | </Section> | ||
95 | <Section Name="snd_GlassMetal"> | ||
96 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0802201c9a66" /> | ||
97 | <Key Name="name" Value="snd_GlassMetal" /> | ||
98 | <Key Name="assetType" Value="1" /> | ||
99 | <Key Name="fileName" Value="snd_GlassMetal.ogg" /> | ||
100 | </Section> | ||
101 | <Section Name="snd_GlassGlass"> | ||
102 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0802202c9a66" /> | ||
103 | <Key Name="name" Value="snd_GlassGlass" /> | ||
104 | <Key Name="assetType" Value="1" /> | ||
105 | <Key Name="fileName" Value="snd_GlassGlass.ogg" /> | ||
106 | </Section> | ||
107 | <Section Name="snd_GlassWood"> | ||
108 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0802203c9a66" /> | ||
109 | <Key Name="name" Value="snd_GlassWood" /> | ||
110 | <Key Name="assetType" Value="1" /> | ||
111 | <Key Name="fileName" Value="snd_GlassWood.ogg" /> | ||
112 | </Section> | ||
113 | <Section Name="snd_GlassFlesh"> | ||
114 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0802204c9a66" /> | ||
115 | <Key Name="name" Value="snd_GlassFlesh" /> | ||
116 | <Key Name="assetType" Value="1" /> | ||
117 | <Key Name="fileName" Value="snd_GlassFlesh.ogg" /> | ||
118 | </Section> | ||
119 | <Section Name="snd_GlassPlastic"> | ||
120 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0802205c9a66" /> | ||
121 | <Key Name="name" Value="snd_GlassPlastic" /> | ||
122 | <Key Name="assetType" Value="1" /> | ||
123 | <Key Name="fileName" Value="snd_GlassPlastic.ogg" /> | ||
124 | </Section> | ||
125 | <Section Name="snd_GlassRubber"> | ||
126 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0802206c9a66" /> | ||
127 | <Key Name="name" Value="snd_GlassRubber" /> | ||
128 | <Key Name="assetType" Value="1" /> | ||
129 | <Key Name="fileName" Value="snd_GlassRubber.ogg" /> | ||
130 | </Section> | ||
131 | <Section Name="snd_WoodStone"> | ||
132 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0803200c9a66" /> | ||
133 | <Key Name="name" Value="snd_WoodStone" /> | ||
134 | <Key Name="assetType" Value="1" /> | ||
135 | <Key Name="fileName" Value="snd_WoodStone.ogg" /> | ||
136 | </Section> | ||
137 | <Section Name="snd_WoodMetal"> | ||
138 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0803201c9a66" /> | ||
139 | <Key Name="name" Value="snd_WoodMetal" /> | ||
140 | <Key Name="assetType" Value="1" /> | ||
141 | <Key Name="fileName" Value="snd_WoodMetal.ogg" /> | ||
142 | </Section> | ||
143 | <Section Name="snd_WoodGlass"> | ||
144 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0803202c9a66" /> | ||
145 | <Key Name="name" Value="snd_WoodGlass" /> | ||
146 | <Key Name="assetType" Value="1" /> | ||
147 | <Key Name="fileName" Value="snd_WoodGlass.ogg" /> | ||
148 | </Section> | ||
149 | <Section Name="snd_WoodWood"> | ||
150 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0803203c9a66" /> | ||
151 | <Key Name="name" Value="snd_WoodWood" /> | ||
152 | <Key Name="assetType" Value="1" /> | ||
153 | <Key Name="fileName" Value="snd_WoodWood.ogg" /> | ||
154 | </Section> | ||
155 | <Section Name="snd_WoodFlesh"> | ||
156 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0803204c9a66" /> | ||
157 | <Key Name="name" Value="snd_WoodFlesh" /> | ||
158 | <Key Name="assetType" Value="1" /> | ||
159 | <Key Name="fileName" Value="snd_WoodFlesh.ogg" /> | ||
160 | </Section> | ||
161 | <Section Name="snd_WoodPlastic"> | ||
162 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0803205c9a66" /> | ||
163 | <Key Name="name" Value="snd_WoodPlastic" /> | ||
164 | <Key Name="assetType" Value="1" /> | ||
165 | <Key Name="fileName" Value="snd_WoodPlastic.ogg" /> | ||
166 | </Section> | ||
167 | <Section Name="snd_WoodRubber"> | ||
168 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0803206c9a66" /> | ||
169 | <Key Name="name" Value="snd_WoodRubber" /> | ||
170 | <Key Name="assetType" Value="1" /> | ||
171 | <Key Name="fileName" Value="snd_WoodRubber.ogg" /> | ||
172 | </Section> | ||
173 | <Section Name="snd_FleshStone"> | ||
174 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0804200c9a66" /> | ||
175 | <Key Name="name" Value="snd_FleshStone" /> | ||
176 | <Key Name="assetType" Value="1" /> | ||
177 | <Key Name="fileName" Value="snd_FleshStone.ogg" /> | ||
178 | </Section> | ||
179 | <Section Name="snd_FleshMetal"> | ||
180 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0804201c9a66" /> | ||
181 | <Key Name="name" Value="snd_FleshMetal" /> | ||
182 | <Key Name="assetType" Value="1" /> | ||
183 | <Key Name="fileName" Value="snd_FleshMetal.ogg" /> | ||
184 | </Section> | ||
185 | <Section Name="snd_FleshGlass"> | ||
186 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0804202c9a66" /> | ||
187 | <Key Name="name" Value="snd_FleshGlass" /> | ||
188 | <Key Name="assetType" Value="1" /> | ||
189 | <Key Name="fileName" Value="snd_FleshGlass.ogg" /> | ||
190 | </Section> | ||
191 | <Section Name="snd_FleshWood"> | ||
192 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0804203c9a66" /> | ||
193 | <Key Name="name" Value="snd_FleshWood" /> | ||
194 | <Key Name="assetType" Value="1" /> | ||
195 | <Key Name="fileName" Value="snd_FleshWood.ogg" /> | ||
196 | </Section> | ||
197 | <Section Name="snd_FleshFlesh"> | ||
198 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0804204c9a66" /> | ||
199 | <Key Name="name" Value="snd_FleshFlesh" /> | ||
200 | <Key Name="assetType" Value="1" /> | ||
201 | <Key Name="fileName" Value="snd_FleshFlesh.ogg" /> | ||
202 | </Section> | ||
203 | <Section Name="snd_FleshPlastic"> | ||
204 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0804205c9a66" /> | ||
205 | <Key Name="name" Value="snd_FleshPlastic" /> | ||
206 | <Key Name="assetType" Value="1" /> | ||
207 | <Key Name="fileName" Value="snd_FleshPlastic.ogg" /> | ||
208 | </Section> | ||
209 | <Section Name="snd_FleshRubber"> | ||
210 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0804206c9a66" /> | ||
211 | <Key Name="name" Value="snd_FleshRubber" /> | ||
212 | <Key Name="assetType" Value="1" /> | ||
213 | <Key Name="fileName" Value="snd_FleshRubber.ogg" /> | ||
214 | </Section> | ||
215 | <Section Name="snd_PlasticStone"> | ||
216 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0805200c9a66" /> | ||
217 | <Key Name="name" Value="snd_PlasticStone" /> | ||
218 | <Key Name="assetType" Value="1" /> | ||
219 | <Key Name="fileName" Value="snd_PlasticStone.ogg" /> | ||
220 | </Section> | ||
221 | <Section Name="snd_PlasticMetal"> | ||
222 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0805201c9a66" /> | ||
223 | <Key Name="name" Value="snd_PlasticMetal" /> | ||
224 | <Key Name="assetType" Value="1" /> | ||
225 | <Key Name="fileName" Value="snd_PlasticMetal.ogg" /> | ||
226 | </Section> | ||
227 | <Section Name="snd_PlasticGlass"> | ||
228 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0805202c9a66" /> | ||
229 | <Key Name="name" Value="snd_PlasticGlass" /> | ||
230 | <Key Name="assetType" Value="1" /> | ||
231 | <Key Name="fileName" Value="snd_PlasticGlass.ogg" /> | ||
232 | </Section> | ||
233 | <Section Name="snd_PlasticWood"> | ||
234 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0805203c9a66" /> | ||
235 | <Key Name="name" Value="snd_PlasticWood" /> | ||
236 | <Key Name="assetType" Value="1" /> | ||
237 | <Key Name="fileName" Value="snd_PlasticWood.ogg" /> | ||
238 | </Section> | ||
239 | <Section Name="snd_PlasticFlesh"> | ||
240 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0805204c9a66" /> | ||
241 | <Key Name="name" Value="snd_PlasticFlesh" /> | ||
242 | <Key Name="assetType" Value="1" /> | ||
243 | <Key Name="fileName" Value="snd_PlasticFlesh.ogg" /> | ||
244 | </Section> | ||
245 | <Section Name="snd_PlasticPlastic"> | ||
246 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0805205c9a66" /> | ||
247 | <Key Name="name" Value="snd_PlasticPlastic" /> | ||
248 | <Key Name="assetType" Value="1" /> | ||
249 | <Key Name="fileName" Value="snd_PlasticPlastic.ogg" /> | ||
250 | </Section> | ||
251 | <Section Name="snd_PlasticRubber"> | ||
252 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0805206c9a66" /> | ||
253 | <Key Name="name" Value="snd_PlasticRubber" /> | ||
254 | <Key Name="assetType" Value="1" /> | ||
255 | <Key Name="fileName" Value="snd_PlasticRubber.ogg" /> | ||
256 | </Section> | ||
257 | <Section Name="snd_RubberStone"> | ||
258 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0806200c9a66" /> | ||
259 | <Key Name="name" Value="snd_RubberStone" /> | ||
260 | <Key Name="assetType" Value="1" /> | ||
261 | <Key Name="fileName" Value="snd_RubberStone.ogg" /> | ||
262 | </Section> | ||
263 | <Section Name="snd_RubberMetal"> | ||
264 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0806201c9a66" /> | ||
265 | <Key Name="name" Value="snd_RubberMetal" /> | ||
266 | <Key Name="assetType" Value="1" /> | ||
267 | <Key Name="fileName" Value="snd_RubberMetal.ogg" /> | ||
268 | </Section> | ||
269 | <Section Name="snd_RubberGlass"> | ||
270 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0806202c9a66" /> | ||
271 | <Key Name="name" Value="snd_RubberGlass" /> | ||
272 | <Key Name="assetType" Value="1" /> | ||
273 | <Key Name="fileName" Value="snd_RubberGlass.ogg" /> | ||
274 | </Section> | ||
275 | <Section Name="snd_RubberWood"> | ||
276 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0806203c9a66" /> | ||
277 | <Key Name="name" Value="snd_RubberWood" /> | ||
278 | <Key Name="assetType" Value="1" /> | ||
279 | <Key Name="fileName" Value="snd_RubberWood.ogg" /> | ||
280 | </Section> | ||
281 | <Section Name="snd_RubberFlesh"> | ||
282 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0806204c9a66" /> | ||
283 | <Key Name="name" Value="snd_RubberFlesh" /> | ||
284 | <Key Name="assetType" Value="1" /> | ||
285 | <Key Name="fileName" Value="snd_RubberFlesh.ogg" /> | ||
286 | </Section> | ||
287 | <Section Name="snd_RubberPlastic"> | ||
288 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0806205c9a66" /> | ||
289 | <Key Name="name" Value="snd_RubberPlastic" /> | ||
290 | <Key Name="assetType" Value="1" /> | ||
291 | <Key Name="fileName" Value="snd_RubberPlastic.ogg" /> | ||
292 | </Section> | ||
293 | <Section Name="snd_RubberRubber"> | ||
294 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0806206c9a66" /> | ||
295 | <Key Name="name" Value="snd_RubberRubber" /> | ||
296 | <Key Name="assetType" Value="1" /> | ||
297 | <Key Name="fileName" Value="snd_RubberRubber.ogg" /> | ||
298 | </Section> | ||
299 | <Section Name="snd_TerrainStone"> | ||
300 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" /> | ||
301 | <Key Name="name" Value="snd_TerrainStone" /> | ||
302 | <Key Name="assetType" Value="1" /> | ||
303 | <Key Name="fileName" Value="snd_TerrainStone.ogg" /> | ||
304 | </Section> | ||
305 | <Section Name="snd_TerrainMetal"> | ||
306 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" /> | ||
307 | <Key Name="name" Value="snd_TerrainMetal" /> | ||
308 | <Key Name="assetType" Value="1" /> | ||
309 | <Key Name="fileName" Value="snd_TerrainMetal.ogg" /> | ||
310 | </Section> | ||
311 | <Section Name="snd_TerrainGlass"> | ||
312 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" /> | ||
313 | <Key Name="name" Value="snd_TerrainGlass" /> | ||
314 | <Key Name="assetType" Value="1" /> | ||
315 | <Key Name="fileName" Value="snd_TerrainGlass.ogg" /> | ||
316 | </Section> | ||
317 | <Section Name="snd_TerrainWood"> | ||
318 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" /> | ||
319 | <Key Name="name" Value="snd_TerrainWood" /> | ||
320 | <Key Name="assetType" Value="1" /> | ||
321 | <Key Name="fileName" Value="snd_TerrainWood.ogg" /> | ||
322 | </Section> | ||
323 | <Section Name="snd_TerrainFlesh"> | ||
324 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" /> | ||
325 | <Key Name="name" Value="snd_TerrainFlesh" /> | ||
326 | <Key Name="assetType" Value="1" /> | ||
327 | <Key Name="fileName" Value="snd_TerrainFlesh.ogg" /> | ||
328 | </Section> | ||
329 | <Section Name="snd_TerrainPlastic"> | ||
330 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" /> | ||
331 | <Key Name="name" Value="snd_TerrainPlastic" /> | ||
332 | <Key Name="assetType" Value="1" /> | ||
333 | <Key Name="fileName" Value="snd_TerrainPlastic.ogg" /> | ||
334 | </Section> | ||
335 | <Section Name="snd_TerrainRubber"> | ||
336 | <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" /> | ||
337 | <Key Name="name" Value="snd_TerrainRubber" /> | ||
338 | <Key Name="assetType" Value="1" /> | ||
339 | <Key Name="fileName" Value="snd_TerrainRubber.ogg" /> | ||
340 | </Section> | ||
341 | </Nini> | ||
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 @@ | |||
1 | thanvannispen - http://www.freesound.org/people/thanvannispen/sounds/30012/ | ||
2 | hoobtastic - http://www.freesound.org/people/hoobtastic/sounds/132627/ | ||
3 | kbnevel - http://www.freesound.org/people/kbnevel/sounds/119859/ | ||
4 | adcbicycle - http://www.freesound.org/people/adcbicycle/sounds/13856/ | ||
5 | adcbicycle - http://www.freesound.org/people/adcbicycle/sounds/13855/ | ||
6 | 110110010 - http://www.freesound.org/people/110110010/sounds/66397/ | ||
7 | qubodup - http://www.freesound.org/people/qubodup/sounds/50941/ | ||
8 | 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 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_FleshFlesh.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshGlass.ogg new file mode 100644 index 0000000..3a322c6 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_FleshGlass.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshMetal.ogg new file mode 100644 index 0000000..edcf17a --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_FleshMetal.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshPlastic.ogg new file mode 100644 index 0000000..acf53e5 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_FleshPlastic.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshRubber.ogg new file mode 100644 index 0000000..6373610 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_FleshRubber.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshStone.ogg new file mode 100644 index 0000000..eccbbb8 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_FleshStone.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_FleshWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_FleshWood.ogg new file mode 100644 index 0000000..6713380 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_FleshWood.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassFlesh.ogg new file mode 100644 index 0000000..6951d44 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_GlassFlesh.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassGlass.ogg new file mode 100644 index 0000000..1806a55 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_GlassGlass.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassMetal.ogg new file mode 100644 index 0000000..f147024 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_GlassMetal.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassPlastic.ogg new file mode 100644 index 0000000..204a4c6 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_GlassPlastic.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassRubber.ogg new file mode 100644 index 0000000..243f185 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_GlassRubber.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassStone.ogg new file mode 100644 index 0000000..0852135 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_GlassStone.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_GlassWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_GlassWood.ogg new file mode 100644 index 0000000..2c13690 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_GlassWood.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalFlesh.ogg new file mode 100644 index 0000000..c11d19f --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_MetalFlesh.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalGlass.ogg new file mode 100644 index 0000000..36348e1 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_MetalGlass.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalMetal.ogg new file mode 100644 index 0000000..957b3c2 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_MetalMetal.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalPlastic.ogg new file mode 100644 index 0000000..5674907 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_MetalPlastic.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalRubber.ogg new file mode 100644 index 0000000..0f9ba2e --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_MetalRubber.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalStone.ogg new file mode 100644 index 0000000..dc489d8 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_MetalStone.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_MetalWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_MetalWood.ogg new file mode 100644 index 0000000..de04317 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_MetalWood.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticFlesh.ogg new file mode 100644 index 0000000..a9d6983 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_PlasticFlesh.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticGlass.ogg new file mode 100644 index 0000000..c7dcdf1 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_PlasticGlass.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticMetal.ogg new file mode 100644 index 0000000..4dd270f --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_PlasticMetal.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticPlastic.ogg new file mode 100644 index 0000000..9994745 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_PlasticPlastic.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticRubber.ogg new file mode 100644 index 0000000..e5c408f --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_PlasticRubber.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticStone.ogg new file mode 100644 index 0000000..9865c6e --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_PlasticStone.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_PlasticWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_PlasticWood.ogg new file mode 100644 index 0000000..9f921b9 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_PlasticWood.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberFlesh.ogg new file mode 100644 index 0000000..b56f7dc --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_RubberFlesh.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberGlass.ogg new file mode 100644 index 0000000..9f44fca --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_RubberGlass.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberMetal.ogg new file mode 100644 index 0000000..9ff064a --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_RubberMetal.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberPlastic.ogg new file mode 100644 index 0000000..8e601b1 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_RubberPlastic.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberRubber.ogg new file mode 100644 index 0000000..c84f8e5 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_RubberRubber.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberStone.ogg new file mode 100644 index 0000000..d398f6f --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_RubberStone.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_RubberWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_RubberWood.ogg new file mode 100644 index 0000000..ebb24e3 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_RubberWood.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneFlesh.ogg new file mode 100644 index 0000000..90275ad --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_StoneFlesh.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneGlass.ogg new file mode 100644 index 0000000..b2b33cf --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_StoneGlass.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneMetal.ogg new file mode 100644 index 0000000..accdfdf --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_StoneMetal.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StonePlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StonePlastic.ogg new file mode 100644 index 0000000..15f93b6 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_StonePlastic.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneRubber.ogg new file mode 100644 index 0000000..4b756ff --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_StoneRubber.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneStone.ogg new file mode 100644 index 0000000..88b8033 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_StoneStone.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_StoneWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_StoneWood.ogg new file mode 100644 index 0000000..4a5b7f3 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_StoneWood.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainFlesh.ogg new file mode 100644 index 0000000..1d3038a --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_TerrainFlesh.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainGlass.ogg new file mode 100644 index 0000000..637fa16 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_TerrainGlass.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainMetal.ogg new file mode 100644 index 0000000..919c59b --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_TerrainMetal.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainPlastic.ogg new file mode 100644 index 0000000..23fa329 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_TerrainPlastic.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainRubber.ogg new file mode 100644 index 0000000..c18d242 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_TerrainRubber.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainStone.ogg new file mode 100644 index 0000000..6bd9e09 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_TerrainStone.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_TerrainWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_TerrainWood.ogg new file mode 100644 index 0000000..f405517 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_TerrainWood.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodFlesh.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodFlesh.ogg new file mode 100644 index 0000000..02621c2 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_WoodFlesh.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodGlass.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodGlass.ogg new file mode 100644 index 0000000..03b7fb5 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_WoodGlass.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodMetal.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodMetal.ogg new file mode 100644 index 0000000..e26afae --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_WoodMetal.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodPlastic.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodPlastic.ogg new file mode 100644 index 0000000..abe419b --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_WoodPlastic.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodRubber.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodRubber.ogg new file mode 100644 index 0000000..30ccc32 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_WoodRubber.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodStone.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodStone.ogg new file mode 100644 index 0000000..ad96818 --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_WoodStone.ogg | |||
Binary files differ | |||
diff --git a/bin/assets/CollisionSoundsAssetSet/snd_WoodWood.ogg b/bin/assets/CollisionSoundsAssetSet/snd_WoodWood.ogg new file mode 100644 index 0000000..76ae52c --- /dev/null +++ b/bin/assets/CollisionSoundsAssetSet/snd_WoodWood.ogg | |||
Binary files differ | |||