diff --git a/config/sounds.cfg b/config/sounds.cfg index 07d61cba..9530e2ff 100755 --- a/config/sounds.cfg +++ b/config/sounds.cfg @@ -58,9 +58,9 @@ registersound "misc/change_gun" // 46 - S_GUNCHANGE registersound "misc/impact_t" // 47 - S_HITSOUND registersound "player/gib" // 48 - S_GIB registersound "misc/headshot" 10 // 49 - S_HEADSHOT -registersound "misc/vote/vote_call" // 50 - S_CALLVOTE -registersound "misc/vote/vote_pass" // 51 - S_VOTEPASS -registersound "misc/vote/vote_fail" // 52 - S_VOTEFAIL +registersound "vote/vote_call" // 50 - S_CALLVOTE +registersound "vote/vote_pass" // 51 - S_VOTEPASS +registersound "vote/vote_fail" // 52 - S_VOTEFAIL registersound "player/footsteps" 40 1 20 // 53 - S_FOOTSTEPS registersound "player/crouch" 40 1 10 // 54 - S_FOOTSTEPSCROUCH registersound "player/watersteps" 40 1 20 // 55 - S_WATERFOOTSTEPS diff --git a/docs/package_copyrights.txt b/docs/package_copyrights.txt index 07462449..4398b22e 100644 --- a/docs/package_copyrights.txt +++ b/docs/package_copyrights.txt @@ -3,6 +3,10 @@ NOTED) OR it will tell you the place to find the licenses for works within Assau Please respect the authors reserved rights and permissions. +PLEASE, check any folder containing media for a "license" or "readme" file and use that for +information about licensing, etc... + + ------------MAPS---------------------- Check comments inside the *.cfg file included with the map for copyright information. The included maps remain intellectual property of their respective creators. @@ -205,13 +209,7 @@ MitaMAN for gathering resources). Note: Shame on me I didn't keep track of my exact sources here. If you recognize any sound or components of a sound that has copyright issues, please contact me so I can solve it. Thanks, makkE. -_____________________________________________________________________________________________________________ -..packages/audio/sounds/misc/vote - -Sounds by "wildweasel" - -These works are licensed under a Creative Commons Sampling Plus 1.0 License. _____________________________________________________________________________________________________________ ..packages/audio/sounds/player/gib.wav @@ -226,18 +224,6 @@ ________________________________________________________________________________ These sounds are from OpenArena and are licensed under the terms of the GNU General Public License (GPL) http://www.gnu.org/licenses/gpl-2.0.txt -------------MUSIC--------------------- - -../packages/audio/songs/ac.ogg - -End-of-match music: © 2005 Dietmar Pier, created for AssaultCube, all rights reserved. - - cube.dietmarpier.de -_____________________________________________________________________________________________________________ - -../packages/audio/songs/pingpong/ - -Please read ../packages/audio/songs/pingpong/license.txt for more information. - ------------OTHER LICENSES------------ AC readme: source/README.txt diff --git a/packages/audio/misc/vote/readme.txt b/packages/audio/misc/vote/readme.txt deleted file mode 100644 index 183f8ed7..00000000 --- a/packages/audio/misc/vote/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -Sounds by "wildweasel" - -These works are licensed under a Creative Commons Sampling Plus 1.0 License. - - diff --git a/packages/audio/vote/license.txt b/packages/audio/vote/license.txt new file mode 100644 index 00000000..1cddce3d --- /dev/null +++ b/packages/audio/vote/license.txt @@ -0,0 +1,29 @@ +vote_call.ogg is sourced from "cardlock-open.wav". + (Available from: http://www.freesound.org/samplesViewSingle.php?id=39028) + +vote_fail.ogg is sourced from "Dsswtchx1.wav". + (Available from: http://www.freesound.org/samplesViewSingle.php?id=39022) + +vote_pass.ogg is sourced from "Dsswtch1.wav". + (Available from: http://www.freesound.org/samplesViewSingle.php?id=39021) + +All created by wildweasel (http://www.freesound.org/usersViewSingle.php?id=54676) + + +These sounds are licensed under a "Creative Commons Sampling Plus 1.0" License: + http://creativecommons.org/licenses/sampling+/1.0/ + +This means you are free: + * To sample, mash-up, or otherwise creatively transform this work for + commercial or noncommercial purposes. + * To perform, display, and distribute copies of this whole work for + noncommercial purposes (e.g., file-sharing or noncommercial webcasting). + +Under the following conditions: + * You must attribute the work in the manner specified by the author or licensor + (but not in any way that suggests that they endorse you or your use of the work). + * You may not use this work to advertise for or promote anything but the work you create from it. + * For any reuse or distribution, you must make clear to others the license terms of this work. + * In no way are any of the following rights affected by the above: + o Your fair dealing or fair use rights, or other applicable copyright exceptions and limitations; + o Rights other persons may have either in the work itself or in how the work is used, such as publicity or privacy rights. diff --git a/packages/audio/misc/vote/vote_call.ogg b/packages/audio/vote/vote_call.ogg similarity index 100% rename from packages/audio/misc/vote/vote_call.ogg rename to packages/audio/vote/vote_call.ogg diff --git a/packages/audio/misc/vote/vote_fail.ogg b/packages/audio/vote/vote_fail.ogg similarity index 100% rename from packages/audio/misc/vote/vote_fail.ogg rename to packages/audio/vote/vote_fail.ogg diff --git a/packages/audio/misc/vote/vote_pass.ogg b/packages/audio/vote/vote_pass.ogg similarity index 100% rename from packages/audio/misc/vote/vote_pass.ogg rename to packages/audio/vote/vote_pass.ogg