diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 07ea2efa..02e45b13 100755 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -196,8 +196,8 @@ mapmodel 1 1 0 0 "rattrap/milkcrate2" // 135 // This model requires careful clipping to be used. // mapmodel 0 0 0 0 "nocamp" // No-camping sign, specific to ac_douze. // mapmodel 1 2 0 0 "rattrap/rbbox" // Box mapmodel, specific to ac_rattrap. -// mapmodel 1 3 0 0 "rattrap/barrel" // Steel barrel mapmodel, specific to ac_rattrap. -// mapmodel 1 2 0 0 "rattrap/barrel2" // Steel barrel mapmodel, specific to ac_rattrap. +// mapmodel 1 3 0 0 "rattrapbarrel" // Steel barrel mapmodel, specific to ac_rattrap. +// mapmodel 1 2 0 0 "rattrapbarrel2" // Steel barrel mapmodel, specific to ac_rattrap. // The skymap for this map. You can change this by commenting the one below, and then uncommenting one of your choosing diff --git a/packages/maps/official/ac_rattrap.cfg b/packages/maps/official/ac_rattrap.cfg index de1aaeee..865120df 100644 --- a/packages/maps/official/ac_rattrap.cfg +++ b/packages/maps/official/ac_rattrap.cfg @@ -185,8 +185,8 @@ mapmodel 1 1 0 0 "toca/tyre" mapmodel 1 0 0 0 "toca/wheel" mapmodel 1 1 0 0 "rattrap/milkcrate1" mapmodel 1 1 0 0 "rattrap/milkcrate2" -mapmodel 1 3 0 0 "rattrap/barrel" -mapmodel 1 2 0 0 "rattrap/barrel2" +mapmodel 1 3 0 0 "rattrapbarrel" +mapmodel 1 2 0 0 "rattrapbarrel2" mapmodel 0 0 0 0 "toca/platformmet" mapsoundreset mapsound "./ambience/distant_cars.ogg" -1 diff --git a/packages/models/mapmodels/rattrap/barrel/license.txt b/packages/models/mapmodels/rattrap/barrel/license.txt deleted file mode 100644 index 59d7230f..00000000 --- a/packages/models/mapmodels/rattrap/barrel/license.txt +++ /dev/null @@ -1,52 +0,0 @@ -This model is originally by makkE. - -by "makkE" -Markus Bekel -e-mail: makk_e@web.de - -Reskinned by "RatBoy". -Pablo "RatBoy" Ciamarra -e-mail: ratboymaps@gmail.com - -=================================================================================================== -These files have been licensed under a the -"Creative Commons Deed / Attribution Non-commercial Share-Alike ( at-nc-sa )" -=================================================================================================== - -You are free: - - * to copy, distribute, display, and perform the work - * to make derivative works - -Under the following conditions: - -"by" - -Attribution. You must give the original author credit. -"nc" - -Non-Commercial. You may not use this work for commercial purposes. -"sa" - -Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting - work only under a licence identical to this one. - - * For any reuse or distribution, you must make clear to others the licence terms of this work. - * Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. - -This is a human-readable summary of the Legal Code (the full licence). - -===================================================================================================== - -See: - -http://creativecommons.org/licenses/by-nc-sa/2.5/deed.en_GB - -for the original "human readable" document. - -http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode - -for the full legal code. - -visit creativecommons.org for general information and translations of the above documents. - -===================================================================================================== diff --git a/packages/models/mapmodels/rattrap/barrel2/license.txt b/packages/models/mapmodels/rattrap/barrel2/license.txt deleted file mode 100644 index 59d7230f..00000000 --- a/packages/models/mapmodels/rattrap/barrel2/license.txt +++ /dev/null @@ -1,52 +0,0 @@ -This model is originally by makkE. - -by "makkE" -Markus Bekel -e-mail: makk_e@web.de - -Reskinned by "RatBoy". -Pablo "RatBoy" Ciamarra -e-mail: ratboymaps@gmail.com - -=================================================================================================== -These files have been licensed under a the -"Creative Commons Deed / Attribution Non-commercial Share-Alike ( at-nc-sa )" -=================================================================================================== - -You are free: - - * to copy, distribute, display, and perform the work - * to make derivative works - -Under the following conditions: - -"by" - -Attribution. You must give the original author credit. -"nc" - -Non-Commercial. You may not use this work for commercial purposes. -"sa" - -Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting - work only under a licence identical to this one. - - * For any reuse or distribution, you must make clear to others the licence terms of this work. - * Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. - -This is a human-readable summary of the Legal Code (the full licence). - -===================================================================================================== - -See: - -http://creativecommons.org/licenses/by-nc-sa/2.5/deed.en_GB - -for the original "human readable" document. - -http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode - -for the full legal code. - -visit creativecommons.org for general information and translations of the above documents. - -===================================================================================================== diff --git a/packages/models/mapmodels/rattrap/license.txt b/packages/models/mapmodels/rattrap/license.txt index 246f20c1..9593f8be 100644 --- a/packages/models/mapmodels/rattrap/license.txt +++ b/packages/models/mapmodels/rattrap/license.txt @@ -14,14 +14,6 @@ milkcrate1 milkcrate2 -- Please see the license inside their respective folders. -===================================== -These models are originally by makkE: - Re-skinned by ratboy. -===================================== -barrel -barrel2 - -- Please see the license inside their respective folders. - ============================================================= For the model "rbbox". The model is originally by JCDPC. The model is: -- © 2004 by JCDPC, all rights reserved. diff --git a/packages/models/mapmodels/rattrap/barrel/md2.cfg b/packages/models/mapmodels/rattrapbarrel/md2.cfg similarity index 100% rename from packages/models/mapmodels/rattrap/barrel/md2.cfg rename to packages/models/mapmodels/rattrapbarrel/md2.cfg diff --git a/packages/models/mapmodels/rattrap/barrel/skin.jpg b/packages/models/mapmodels/rattrapbarrel/skin.jpg similarity index 100% rename from packages/models/mapmodels/rattrap/barrel/skin.jpg rename to packages/models/mapmodels/rattrapbarrel/skin.jpg diff --git a/packages/models/mapmodels/rattrap/barrel/tris.md2 b/packages/models/mapmodels/rattrapbarrel/tris.md2 similarity index 100% rename from packages/models/mapmodels/rattrap/barrel/tris.md2 rename to packages/models/mapmodels/rattrapbarrel/tris.md2 diff --git a/packages/models/mapmodels/rattrap/barrel2/md2.cfg b/packages/models/mapmodels/rattrapbarrel2/md2.cfg similarity index 100% rename from packages/models/mapmodels/rattrap/barrel2/md2.cfg rename to packages/models/mapmodels/rattrapbarrel2/md2.cfg diff --git a/packages/models/mapmodels/rattrap/barrel2/skin.jpg b/packages/models/mapmodels/rattrapbarrel2/skin.jpg similarity index 100% rename from packages/models/mapmodels/rattrap/barrel2/skin.jpg rename to packages/models/mapmodels/rattrapbarrel2/skin.jpg diff --git a/packages/models/mapmodels/rattrap/barrel2/tris.md2 b/packages/models/mapmodels/rattrapbarrel2/tris.md2 similarity index 100% rename from packages/models/mapmodels/rattrap/barrel2/tris.md2 rename to packages/models/mapmodels/rattrapbarrel2/tris.md2