diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 36326c1e..022cdcc0 100755 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -10,7 +10,7 @@ mapmodelreset // start @ zero mapmodel 2 2 0 0 "nothing" //0 alter the values in your map.cfg and use to clip -// models that can´t be clipped properly otherwise +// models that can�t be clipped properly otherwise mapmodel 3 1 0 0 "comp_bridge" //1 mapmodel 0 7 0 0 "ladder_7x" //2 @@ -361,7 +361,7 @@ texture 0 "./mitaman/zastrow/sub_doors512A16.jpg" texture 0 "./mitaman/various/sub_doors256nf_01.jpg" texture 0 "./mitaman/3dcafe/objects08.jpg" -//------crates---------- +//------crates/boxes---------- texture 0 "./craig_fortune/crates/light_weathered.jpg" texture 0 "./craig_fortune/crates/light.jpg" @@ -379,4 +379,8 @@ texture 0 "./zastrow/wood_crate_10.jpg" texture 0 "./zastrow/wood_crate_12.jpg" texture 0 "./makke/box_2.jpg" texture 0 "./makke/box_4.jpg" -texture 0 "./makke/box_3.jpg" //241 \ No newline at end of file +texture 0 "./makke/box_3.jpg" //241 +texture 0 "./makke/smallsteelbox.jpg + +//------Start of 0.94 textures---------- + diff --git a/packages/maps/ac_depot.cfg b/packages/maps/ac_depot.cfg index f7a665fa..6cc48c14 100644 --- a/packages/maps/ac_depot.cfg +++ b/packages/maps/ac_depot.cfg @@ -44,7 +44,7 @@ mapmodel 0 2 0 0 "roadblock01" //29 use nothing mapmodels to clip mapmodel 0 2 0 0 "roadblock02" //30 mapmodel 0 0 0 0 "fag" //31 mapmodel 4 5 0 0 "nothing" //32 alter the values in your map.cfg and use to clip -// models that can´t be clipped properly otherwise +// models that can�t be clipped properly otherwise mapmodel 0 0 0 0 "wood01" //33 mapmodel 0 0 0 0 "hook" //34 mapmodel 0 0 0 0 "grass01" //35 @@ -282,7 +282,7 @@ texture 0 "./makke/stairtrim.jpg" texture 0 "./makke/stein.jpg //texture 0 "./noctua/textile/canvas01.jpg" -texture 0 "./ri-fix/makkedoorfix.jpg" +texture 0 "./makke/door.jpg" texture 0 "./boeck/rolltor.jpg" texture 0 "./makke/rock.jpg" @@ -387,9 +387,4 @@ texture 0 "./makke/klappe3.jpg" // texture 0 "./3wood_crate_12.jpg" // texture 0 "./3wood_crate_13.jpg" - - -// makkE's door texture shrunk to the right size by RandumIdiot so boxes using it look better. -// Please note: The normal one has also been shrunk as it was slightly too big. - -texture 0 "./ri-fix/makkedoorfix2.jpg" \ No newline at end of file +texture 0 "./makke/smallsteelbox.jpg" \ No newline at end of file diff --git a/packages/maps/ac_depot_test.cfg b/packages/maps/ac_depot_test.cfg index f7a665fa..5e22b563 100644 --- a/packages/maps/ac_depot_test.cfg +++ b/packages/maps/ac_depot_test.cfg @@ -44,7 +44,7 @@ mapmodel 0 2 0 0 "roadblock01" //29 use nothing mapmodels to clip mapmodel 0 2 0 0 "roadblock02" //30 mapmodel 0 0 0 0 "fag" //31 mapmodel 4 5 0 0 "nothing" //32 alter the values in your map.cfg and use to clip -// models that can´t be clipped properly otherwise +// models that can�t be clipped properly otherwise mapmodel 0 0 0 0 "wood01" //33 mapmodel 0 0 0 0 "hook" //34 mapmodel 0 0 0 0 "grass01" //35 @@ -282,7 +282,7 @@ texture 0 "./makke/stairtrim.jpg" texture 0 "./makke/stein.jpg //texture 0 "./noctua/textile/canvas01.jpg" -texture 0 "./ri-fix/makkedoorfix.jpg" +texture 0 "./makke/door.jpg" texture 0 "./boeck/rolltor.jpg" texture 0 "./makke/rock.jpg" @@ -388,8 +388,4 @@ texture 0 "./makke/klappe3.jpg" // texture 0 "./3wood_crate_13.jpg" - -// makkE's door texture shrunk to the right size by RandumIdiot so boxes using it look better. -// Please note: The normal one has also been shrunk as it was slightly too big. - -texture 0 "./ri-fix/makkedoorfix2.jpg" \ No newline at end of file +texture 0 "./makke/smallsteelbox.jpg" \ No newline at end of file diff --git a/packages/maps/ac_desert2.cfg b/packages/maps/ac_desert2.cfg index 465403d8..3d83be60 100644 --- a/packages/maps/ac_desert2.cfg +++ b/packages/maps/ac_desert2.cfg @@ -300,7 +300,7 @@ texture 0 "./boeck/gully.jpg" texture 0 "./boeck/aircon2.jpg" texture 0 "./makke/aircon.jpg" texture 0 "./makke/aircon_sm.jpg" //100 -texture 0 "./ri-fix/makkedoorfix.jpg" +texture 0 "./makke/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" texture 0 "./makke/klappe3.jpg" @@ -363,7 +363,4 @@ texture 0 "./makke/box_3.jpg" //241 -// makkE's door texture shrunk to the right size by RandumIdiot so boxes using it look better. -// Please note: The normal one has also been shrunk as it was slightly too big. - -texture 0 "./ri-fix/makkedoorfix2.jpg" +texture 0 "./makke/smallsteelbox.jpg" diff --git a/packages/maps/ac_toxic.cfg b/packages/maps/ac_toxic.cfg index 84f0393e..7f0e75b6 100644 --- a/packages/maps/ac_toxic.cfg +++ b/packages/maps/ac_toxic.cfg @@ -202,7 +202,7 @@ texture 0 "./noctua/wall/plast01.jpg" texture 0 "./noctua/wall/plast03.jpg" texture 0 "./noctua/wall/plast04.jpg" texture 0 "./mitaman/various/5sqtunnelroad.jpg" -texture 0 "./mitaman/various/027metal.jpg" +texture 0 "./makke/smallsteelbox.jpg" //---------metal---------- diff --git a/packages/textures/makke/door.jpg b/packages/textures/makke/door.jpg index 8cd6f611..8dd1a07e 100755 Binary files a/packages/textures/makke/door.jpg and b/packages/textures/makke/door.jpg differ diff --git a/packages/textures/mitaman/ri-fix/makkedoorfix2.jpg b/packages/textures/makke/smallsteelbox.jpg similarity index 100% rename from packages/textures/mitaman/ri-fix/makkedoorfix2.jpg rename to packages/textures/makke/smallsteelbox.jpg diff --git a/packages/textures/mitaman/ri-fix/makkedoorfix.jpg b/packages/textures/mitaman/ri-fix/makkedoorfix.jpg deleted file mode 100644 index 8dd1a07e..00000000 Binary files a/packages/textures/mitaman/ri-fix/makkedoorfix.jpg and /dev/null differ