# HG changeset patch # User Wuzzy # Date 1506986837 -7200 # Node ID 317eb3210f7cd57cd38ab1868e33005c4956d05e # Parent 00b55c1424d1454262522c1c7152c08234051947 Add 6 hats from the hat thread, the TheMadCharles' barrelhider hat (CC BY 3.0) and 12 hairless hat variants diff -r 00b55c1424d1 -r 317eb3210f7c CREDITS --- a/CREDITS Mon Oct 02 23:08:12 2017 +0200 +++ b/CREDITS Tue Oct 03 01:27:17 2017 +0200 @@ -5,6 +5,8 @@ IF NOT OTHERWISE SPECIFIED, ALL OTHER CONTENT IS PROPERTY OF Andrey Korotaev . IF NO LICENSE IS SPECIFIED, THE LICENSE IS THE SAME AS MENTIONED IN README.md. +Note: The asterisk is a placeholder which stands for any sequence of characters. + ========== = FONTS ========== @@ -33,17 +35,22 @@ ========== = HATS ========== -- Robinator -> Terminator (2010) -- shingo666 -> Samus (2010) +- Robinator -> Terminator_Glasses (2010) +- shingo666 -> ntd_Samus (2010) - MeinCookie95 -> InfernalHorns (2010), Mummy (2010), war_* (2010-2011) - thuban -> Elvis (2010) - Miphica -> Disguise (2010) -- Blayde -> Deer (2010), Moose (2010) +- Blayde -> zoo_Deer (2010), zoo_Moose (2010) - hillis -> AkuAku (2010) -- Lortinak -> OldMan (2010), ShortHair (2010) -- chujoii -> BrainSlug (2010), Dragon (2010), Ladle (2010), Laminaria (2010), Pantsu (2010), Pig (2010), Plunger (2010), SauceBoat (2010), ShaggyYeti (2010), SleepWalker (2010), SunWukong (2010), Teapot (2010), Teacup (2010), Zombi (2010) -- Randy Broda -> Cyclops (2011), Soldier (2011) -- Wohlstand -> PoliceGirl [based on policecap and sm_daisy] (2014) +- Lortinak -> OldMan (2010), ShortHair_* (2010) +- chujoii -> scif_BrainSlug (2010), scif_BrainSlug2 (2010), Dragon (2010), dish_Ladle (2010), Laminaria (2010), Pantsu (2010), zoo_Pig (2010), Plunger (2010), dish_SauceBoatSilver (2010), ShaggyYeti (2010), Sleepwalker (2010), SunWukong (2010), dish_Teapot (2010), dish_Teacup (2010), Zombi (2010) +- Randy Broda -> cyclops (2011), TeamSoldier (2011) +- Zav -> zoo_octopus (2009) +- Star and Moon -> bishop (2011) +- Gimo -> leprechaun [based on tophats] (2011) +- Terrington_Snyde -> pirate_eyepatch (2013), jester (2013) +- Wohlstand -> policegirl [based on policecap and sm_daisy] (2014) +- TheMadCharles -> barrelhider (CC BY 3.0) (2015) ========== = GRAVESTONES @@ -101,7 +108,7 @@ http://www.freesound.org/people/Jovica/sounds/38317/ - Cleaver impact sound remixed from http://www.freesound.org/people/sethlind/sounds/265021/ -- Extra Time sound originally by uair01 (CC-BY), remixed from +- Extra Time sound originally by uair01 (CC-BY 3.0), remixed from http://www.freesound.org/people/uair01/sounds/65291/ - Air mine impact sound by Wuzzy (WTFPL), based on http://www.freesound.org/people/batchku/sounds/10479/ @@ -119,3 +126,11 @@ - Portal opening sound by Wuzzy (WTFPL) - Invulnerable sound: remix based on a sound by pepingrillin (CC-0) https://www.freesound.org/people/pepingrillin/sounds/252079/ + +====================== += LICENSE REFERENCES = +====================== + +- CC-BY 3.0: https://creativecommons.org/licenses/by/3.0/ +- CC0: https://creativecommons.org/publicdomain/zero/1.0/ +- WTFPL: http://www.wtfpl.net/txt/copying/ diff -r 00b55c1424d1 -r 317eb3210f7c ChangeLog.txt --- a/ChangeLog.txt Mon Oct 02 23:08:12 2017 +0200 +++ b/ChangeLog.txt Tue Oct 03 01:27:17 2017 +0200 @@ -7,8 +7,10 @@ + New theme: Beach + Completely new Cheese map; replaces the old one + New forts: Lonely_Island, Octopus, Olympic, Snail - + New hat: "tf_scout" (this time for real) - + Many new random hedgehog names + + Many new random hedgehog and team names + + Add hats: barrelhider, bishop, jester, leprechaun, pirate_eyepatch, tf_scout, zoo_octopus + + Add hair-less variants of old hats: beefeaterhat, lambdahat, nursehat, pirate_bandana, pirate_hat, poke_ash_hat, RamboClean, sf_vega_hat, sf_guile_hat, simple_red, simple_yellow, simple_green, thugclean + * Remove hat: tf_scount (this was a duplicate of tf_demoman) * Redo flags: cm_pentagram, cm_soviet, armenia, ireland, nepal, suisse, sweden, turkey Game engine: diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/RamboClean.png Binary file share/hedgewars/Data/Graphics/Hats/RamboClean.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/barrelhider.png Binary file share/hedgewars/Data/Graphics/Hats/barrelhider.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/beefeaterhat.png Binary file share/hedgewars/Data/Graphics/Hats/beefeaterhat.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/bishop.png Binary file share/hedgewars/Data/Graphics/Hats/bishop.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/jester.png Binary file share/hedgewars/Data/Graphics/Hats/jester.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/lambdahat.png Binary file share/hedgewars/Data/Graphics/Hats/lambdahat.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/leprechaun.png Binary file share/hedgewars/Data/Graphics/Hats/leprechaun.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/nursehat.png Binary file share/hedgewars/Data/Graphics/Hats/nursehat.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/pirate_bandana.png Binary file share/hedgewars/Data/Graphics/Hats/pirate_bandana.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/pirate_eyepatch.png Binary file share/hedgewars/Data/Graphics/Hats/pirate_eyepatch.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/pirate_hat.png Binary file share/hedgewars/Data/Graphics/Hats/pirate_hat.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/poke_ash_hat.png Binary file share/hedgewars/Data/Graphics/Hats/poke_ash_hat.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/sf_guile_hat.png Binary file share/hedgewars/Data/Graphics/Hats/sf_guile_hat.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/sf_vega_hat.png Binary file share/hedgewars/Data/Graphics/Hats/sf_vega_hat.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/simple_green.png Binary file share/hedgewars/Data/Graphics/Hats/simple_green.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/simple_red.png Binary file share/hedgewars/Data/Graphics/Hats/simple_red.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/simple_yellow.png Binary file share/hedgewars/Data/Graphics/Hats/simple_yellow.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/thugclean.png Binary file share/hedgewars/Data/Graphics/Hats/thugclean.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Graphics/Hats/zoo_octopus.png Binary file share/hedgewars/Data/Graphics/Hats/zoo_octopus.png has changed diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Names/Joker.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Names/Joker.cfg Tue Oct 03 01:27:17 2017 +0200 @@ -0,0 +1,1 @@ +clown diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Names/beefeater.cfg --- a/share/hedgewars/Data/Names/beefeater.cfg Mon Oct 02 23:08:12 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -generic diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Names/jester.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Names/jester.cfg Tue Oct 03 01:27:17 2017 +0200 @@ -0,0 +1,2 @@ +whysoserious +clown diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Names/nursehat.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Names/nursehat.cfg Tue Oct 03 01:27:17 2017 +0200 @@ -0,0 +1,2 @@ +generic +female diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Names/pirate_bandana.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Names/pirate_bandana.cfg Tue Oct 03 01:27:17 2017 +0200 @@ -0,0 +1,1 @@ +pirate diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Names/pirate_eyepatch.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Names/pirate_eyepatch.cfg Tue Oct 03 01:27:17 2017 +0200 @@ -0,0 +1,3 @@ +pirate +pirate +generic diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Names/pirate_hat.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Names/pirate_hat.cfg Tue Oct 03 01:27:17 2017 +0200 @@ -0,0 +1,1 @@ +pirate diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Names/thugclean.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Names/thugclean.cfg Tue Oct 03 01:27:17 2017 +0200 @@ -0,0 +1,2 @@ +bandit +generic diff -r 00b55c1424d1 -r 317eb3210f7c share/hedgewars/Data/Names/types.ini --- a/share/hedgewars/Data/Names/types.ini Mon Oct 02 23:08:12 2017 +0200 +++ b/share/hedgewars/Data/Names/types.ini Tue Oct 03 01:27:17 2017 +0200 @@ -709,7 +709,10 @@ Wild Windjammers ##### pirate_jack +pirate_jack pirate_jack_bandana +pirate_jack_bandana +pirate_eyepatch ##### Bandits Gangsters @@ -1614,14 +1617,22 @@ Club ##### pinksunhat +pinksunhat +tophats tophats beefeater +beefeaterhat Moustache Moustache_glasses tiara +tiara +Elvis Elvis touhou_marisa +touhou_marisa touhou_remelia +touhou_remelia +touhou_yukari touhou_yukari ##### Builders @@ -1711,9 +1722,18 @@ Sokoban Fake Crates Fake +Invisible +Hidden +Barrel Hiders +Bush Hiders +Crate Hiders +Hiders +Cowards ##### bushhider +bushhider cratehider +barrelhider ##### Restaurant Restaurant Team @@ -2371,6 +2391,7 @@ zoo_Sheep zoo_snail zoo_turtle +zoo_octopus ##### Hospital Team Health @@ -2402,7 +2423,9 @@ Caregivers ##### doctor +doctor nurse +nursehat ##### Sparta Ancient Greece @@ -2448,7 +2471,7 @@ Glasses lambda lambda -lambda +lambdahat NoHat NoHat Einstein