# HG changeset patch # User Wuzzy # Date 1531666957 -7200 # Node ID c7d413fe2db3d0db1becb76d25863a9c20f0e02e # Parent 5cad5459ba1b28f9c0f5bd5f49fd22053704beb2# Parent 48469c3d512f736054045a2cd772fd5338bb306e Merge diff -r 5cad5459ba1b -r c7d413fe2db3 Taunts.wiki --- a/Taunts.wiki Sun Jul 15 17:01:59 2018 +0200 +++ b/Taunts.wiki Sun Jul 15 17:02:37 2018 +0200 @@ -4,7 +4,7 @@ All files have to be in the Ogg Vorbis format. Make sure the file names you use match the case as used on this page to ensure your voicepacks also work on case-sensitive systems. -Here is an overview of all taunts available in Hedgewars, as of version 0.9.23. There is also a brief description when these taunts are _usually_ (!) played in normal mode, but note that this is only a guideline. Lastly, there is a transscription of the taunt for the Default voicepack for better orientation. +Here is an overview of all taunts available in Hedgewars, as of version 0.9.24. There is also a brief description when these taunts are _usually_ (!) played in normal mode, but note that this is only a guideline. Lastly, there is a transscription of the taunt for the Default voicepack for better orientation. When playing taunts, there is often a bit of randomness involved, especially if there are multiple taunts for the same events. Additionally, scripts can play these sounds at any occacion. If you are a script author, it is recommended that you try to stick as close to the intended meaning as possible but this is not a requirement, of course. @@ -15,7 +15,7 @@ || `sndBoring` || `Boring.ogg` || … an opposing team is skipping their turn with Skip. || “This is so boring.” || || `sndByeBye` || `Byebye.ogg` || … a hedgehog dies or is removed from the game because the a player left the room in online play. || “See ya!” || || `sndComeonthen` || `Comeonthen.ogg` || … when the ready timer ran out and the player still didn’t made any decisions. || “I’m waiting.” || -|| `sndCoward` || `Coward.ogg` || … in 0.9.23 and an opposing team ended their turn with Skip. || “Wimp!” || +|| `sndCoward` || `Coward.ogg` || … an opposing team ended their turn with Skip. || “Wimp!” || || `sndEnemyDown` || `Enemydown.ogg` || … an enemy hedgehog died. || “Got one!” || || `sndFirePunch1` || `Firepunch1.ogg` || … hedgehog does a shoryuken. || “Firepunch!” || || `sndFirePunch2` || `Firepunch2.ogg` || … hedgehog does a shoryuken. || “Take this!” || @@ -25,7 +25,7 @@ || `sndFirePunch6` || `Firepunch6.ogg` || … hedgehog does a shoryuken. || “Ha-dee-wooztee-wooztee-woo!” || || `sndFirstBlood` || `Firstblood.ogg` || … a hedgehog dealt damage to an enemy hedgehog the first time in this round. || “This is only the beginning.” || || `sndFlawless` || `Flawless.ogg` || … a team won without any damage taken. || “Flawless victory!” || -|| `sndHello` || `Hello.ogg` || … a hedgehog is in the !TimeBox or a player enters a room in online play. || “Hi!” || +|| `sndHello` || `Hello.ogg` || … greeting, i.e. a hedgehog is in the time box and waves hello or a player enters a room in online play. || “Hi!” || || `sndHurry` || `Hurry.ogg` || … 5 seconds on the clock are remaining. || “Hurry!” || || `sndIllGetYou` || `Illgetyou.ogg` || … (roughly) after a hedgehog has been attacked. Also played instead of `Yessir.ogg` for computer-controlled teams and teams over the net. || “You’ve ticked off the wrong hog, buddy.” || || `sndIncoming` || `Incoming.ogg` || … an airborne attack is ordered. || “This is going to hurt.” || diff -r 5cad5459ba1b -r c7d413fe2db3 WikiSyntax.wiki --- a/WikiSyntax.wiki Sun Jul 15 17:01:59 2018 +0200 +++ b/WikiSyntax.wiki Sun Jul 15 17:02:37 2018 +0200 @@ -283,7 +283,7 @@ = HTML support = To aid in the presentation of a wiki page there is some support for HTML. HTML tags are only supported in wiki pages, not in page comments. -HTML syntax can be used in conjunction with wiki syntax, but it is recommended against doing so where possible.Also, avoid blank lines between list items. +HTML syntax can be used in conjunction with wiki syntax, but it is recommended against doing so where possible. The following HTML tags and attributes are currently supported: @@ -343,17 +343,6 @@ -= Comments = - -The wiki supports embedded comments to help explain the contents of a wiki page. Anything inside the comment block is removed from the rendered page, but is visible when editing or viewing the source for that page. - -{{{ - -This text will be removed from the rendered page. - -}}} - - = Navigation = == Table of Contents ==