← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~7010622-q/widelands/topple-sounds-1 into lp:widelands

 

toptopple has proposed merging lp:~7010622-q/widelands/topple-sounds-1 into lp:widelands.

Commit message:
Added sounds for sheep, fox, elk, wolf, stag, boar. Removed "human sheep" sound.
Added silence sound files to mitigate noise.


Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-sounds-1/+merge/296902

Date: 09.06.16 
--------------

== Added new sound files ==
data/sound/animals
   (some of these files have added 10 sec of silence)
   boar_01.ogg
   elk_01.ogg
   elk_02.ogg
   stag_01.ogg
   stag_02.ogg
   wolf_01.ogg
   wolf_02.ogg
   wolf_03.ogg
   coyote_01.ogg plus 90 sec silence
   coyote_02.ogg

data/sound/farm
   sheep_01.ogg
   sheep_02.ogg
   sheep_03.ogg

== Added silence files (10 seconds) ==
   wolf_10.ogg
   wolf_11.ogg
   wolf_12.ogg
   wolf_13.ogg
   wolf_14.ogg
   elk_10.ogg
   elk_11.ogg
   stag_10.ogg
   stag_11.ogg
   stag_12.ogg
   stag_13.ogg

== Modified LUA script file (added sound) ==
data/world/critters
   stag/init.lua
   fox/init.lua
   wildboar/init.lua
   elk/init.lua
   wolf/init.lua

-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-sounds-1 into lp:widelands.
=== added file 'data/sound/animals/boar_01.ogg'
Binary files data/sound/animals/boar_01.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/boar_01.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/coyote_01.ogg'
Binary files data/sound/animals/coyote_01.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/coyote_01.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/coyote_02.ogg'
Binary files data/sound/animals/coyote_02.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/coyote_02.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/elk_01.ogg'
Binary files data/sound/animals/elk_01.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/elk_01.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/elk_02.ogg'
Binary files data/sound/animals/elk_02.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/elk_02.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/elk_10.ogg'
Binary files data/sound/animals/elk_10.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/elk_10.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/elk_11.ogg'
Binary files data/sound/animals/elk_11.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/elk_11.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/stag_01.ogg'
Binary files data/sound/animals/stag_01.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/stag_01.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/stag_02.ogg'
Binary files data/sound/animals/stag_02.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/stag_02.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/stag_10.ogg'
Binary files data/sound/animals/stag_10.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/stag_10.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/stag_11.ogg'
Binary files data/sound/animals/stag_11.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/stag_11.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/stag_12.ogg'
Binary files data/sound/animals/stag_12.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/stag_12.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/stag_13.ogg'
Binary files data/sound/animals/stag_13.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/stag_13.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/wolf_01.ogg'
Binary files data/sound/animals/wolf_01.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/wolf_01.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/wolf_02.ogg'
Binary files data/sound/animals/wolf_02.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/wolf_02.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/wolf_03.ogg'
Binary files data/sound/animals/wolf_03.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/wolf_03.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/wolf_10.ogg'
Binary files data/sound/animals/wolf_10.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/wolf_10.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/wolf_11.ogg'
Binary files data/sound/animals/wolf_11.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/wolf_11.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/wolf_12.ogg'
Binary files data/sound/animals/wolf_12.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/wolf_12.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/wolf_13.ogg'
Binary files data/sound/animals/wolf_13.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/wolf_13.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/animals/wolf_14.ogg'
Binary files data/sound/animals/wolf_14.ogg	1970-01-01 00:00:00 +0000 and data/sound/animals/wolf_14.ogg	2016-06-09 07:45:59 +0000 differ
=== removed file 'data/sound/farm/sheep_00.ogg'
Binary files data/sound/farm/sheep_00.ogg	2008-10-25 16:12:52 +0000 and data/sound/farm/sheep_00.ogg	1970-01-01 00:00:00 +0000 differ
=== added file 'data/sound/farm/sheep_01.ogg'
Binary files data/sound/farm/sheep_01.ogg	1970-01-01 00:00:00 +0000 and data/sound/farm/sheep_01.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/farm/sheep_02.ogg'
Binary files data/sound/farm/sheep_02.ogg	1970-01-01 00:00:00 +0000 and data/sound/farm/sheep_02.ogg	2016-06-09 07:45:59 +0000 differ
=== added file 'data/sound/farm/sheep_03.ogg'
Binary files data/sound/farm/sheep_03.ogg	1970-01-01 00:00:00 +0000 and data/sound/farm/sheep_03.ogg	2016-06-09 07:45:59 +0000 differ
=== modified file 'data/world/critters/elk/init.lua'
--- data/world/critters/elk/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/elk/init.lua	2016-06-09 07:45:59 +0000
@@ -5,6 +5,10 @@
       pictures = path.list_files(dirname .. "elk_idle_??.png"),
       hotspot = { 15, 27 },
       fps = 20,
+      sound_effect = {
+         directory = "sound/animals",
+         name = "elk",
+      },
    },
 }
 add_walking_animations(animations, dirname, "elk_walk", {21, 34}, 20)

=== modified file 'data/world/critters/fox/init.lua'
--- data/world/critters/fox/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/fox/init.lua	2016-06-09 07:45:59 +0000
@@ -3,6 +3,10 @@
 animations = {
    idle = {
       pictures = path.list_files(dirname .. "fox_idle_??.png"),
+      sound_effect = {
+         directory = "sound/animals",
+         name = "coyote",
+      },
       hotspot = { 10, 13 },
       fps = 10,
    },

=== modified file 'data/world/critters/stag/init.lua'
--- data/world/critters/stag/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/stag/init.lua	2016-06-09 07:45:59 +0000
@@ -3,6 +3,10 @@
 animations = {
    idle = {
       pictures = path.list_files(dirname .. "stag_idle_??.png"),
+      sound_effect = {
+         directory = "sound/animals",
+         name = "stag",
+      },
       hotspot = { 12, 26 },
       fps = 20,
    },

=== modified file 'data/world/critters/wildboar/init.lua'
--- data/world/critters/wildboar/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/wildboar/init.lua	2016-06-09 07:45:59 +0000
@@ -5,6 +5,10 @@
       pictures = path.list_files(dirname .. "wildboar_idle_??.png"),
       hotspot = { 10, 18 },
       fps = 20,
+      sound_effect = {
+         directory = "sound/animals",
+         name = "boar",
+      },
    },
 }
 add_walking_animations(animations, dirname, "wildboar_walk", {20, 22}, 20)

=== modified file 'data/world/critters/wolf/init.lua'
--- data/world/critters/wolf/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/wolf/init.lua	2016-06-09 07:45:59 +0000
@@ -5,6 +5,10 @@
       pictures = path.list_files(dirname .. "wolf_idle_??.png"),
       hotspot = { 8, 15 },
       fps = 10,
+      sound_effect = {
+         directory = "sound/animals",
+         name = "wolf",
+      },
    },
 }
 add_walking_animations(animations, dirname, "wolf_walk", {19, 19}, 20)

=== added file 'sound-changelog.txt'
--- sound-changelog.txt	1970-01-01 00:00:00 +0000
+++ sound-changelog.txt	2016-06-09 07:45:59 +0000
@@ -0,0 +1,50 @@
+Widelands Sound Changelog toptopple
+-----------------------------------
+
+Date: 09.06.16 
+--------------
+
+== Added sound files ==
+data/sound/animals
+   (some of these files have added 10 sec of silence)
+   boar_01.ogg
+   elk_01.ogg
+   elk_02.ogg
+   stag_01.ogg
+   stag_02.ogg
+   wolf_01.ogg
+   wolf_02.ogg
+   wolf_03.ogg
+   coyote_01.ogg plus 90 sec silence
+   coyote_02.ogg
+
+data/sound/farm
+   sheep_01.ogg
+   sheep_02.ogg
+   sheep_03.ogg
+
+== Added silence files (10 seconds) ==
+   wolf_10.ogg
+   wolf_11.ogg
+   wolf_12.ogg
+   wolf_13.ogg
+   wolf_14.ogg
+   elk_10.ogg
+   elk_11.ogg
+   stag_10.ogg
+   stag_11.ogg
+   stag_12.ogg
+   stag_13.ogg
+
+== Modified LUA script file (added sound) ==
+data/world/critters
+   stag/init.lua
+   fox/init.lua
+   wildboar/init.lua
+   elk/init.lua
+   wolf/init.lua
+
+   
+
+
+


Follow ups