diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 1c1caef4..3aead222 100644 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -690,7 +690,17 @@ texture 0 "makke/rb_window.jpg" // texture 0 "nieb/vents0076.jpg" // END: Nieb's new textures... // texture 0 "3dcafe/door07_a.jpg" // texture 0 "3dcafe/door10_a.jpg" - +// texture 0 "toca/patchygrass.jpg" +// texture 0 "toca/pebbles1.jpg" +// texture 0 "toca/pebbles2.jpg" +// texture 0 "toca/pebbles3.jpg" +// texture 0 "toca/frozenground1.jpg" +// texture 0 "toca/snow1.jpg" +// texture 0 "toca/frozenground2.jpg" +// texture 0 "toca/dirt1.jpg" +// texture 0 "toca/sand1.jpg" +// texture 0 "toca/ice1.jpg" +// texture 0 "toca/oldwall.jpg" mapsoundreset // Ambient sounds. Leave this command here, or else your sounds will mess up! diff --git a/packages/maps/new.cfg b/packages/maps/new.cfg index 2b86798a..0867d32f 100644 --- a/packages/maps/new.cfg +++ b/packages/maps/new.cfg @@ -37,6 +37,7 @@ mapmodel 0 0 0 0 "toca/plants/smaltree" // 31 mapmodel 0 0 0 0 "toca/plants/grass" // 32 mapmodel 0 0 0 0 "cleaner/traffic_cones/up" // 33 mapmodel 0 0 0 0 "cleaner/traffic_cones/down" // 34 +mapmodel 0 0 0 0 "toca/decals/manhole/1" // 35 @@ -52,13 +53,13 @@ texture 0 "toca/patchygrass.jpg" texture 0 "toca/pebbles1.jpg" texture 0 "toca/pebbles2.jpg" texture 0 "toca/pebbles3.jpg" -texture 0 "arcitool/archibrick06.jpg" -texture 0 "arcitool/archibrick07.jpg" -texture 0 "arcitool/rohbaubims.jpg" -texture 0 "mitaman/grsites/brick051.jpg" -texture 0 "mitaman/grsites/brick065.jpg" -texture 0 "boeck/stone_022.jpg" -texture 0 "DigitalFlux/gray_bricks_02.jpg" +texture 0 "toca/frozenground1.jpg" +texture 0 "toca/snow1.jpg" +texture 0 "toca/frozenground2.jpg" +texture 0 "toca/dirt1.jpg" +texture 0 "toca/sand1.jpg" +texture 0 "toca/ice1.jpg" +texture 0 "toca/oldwall.jpg" texture 0 "DigitalFlux/gray_bricks_01.jpg" texture 0 "makke/bricks_2.jpg" texture 0 "makke/bricks_3.jpg" diff --git a/packages/maps/new.cgz b/packages/maps/new.cgz index 646b7f70..d74e8679 100644 Binary files a/packages/maps/new.cgz and b/packages/maps/new.cgz differ diff --git a/packages/models/mapmodels/toca/cautionsign/skin.jpg b/packages/models/mapmodels/toca/cautionsign/skin.jpg index b05a35a7..d934f919 100644 Binary files a/packages/models/mapmodels/toca/cautionsign/skin.jpg and b/packages/models/mapmodels/toca/cautionsign/skin.jpg differ diff --git a/packages/models/mapmodels/toca/decals/manhole/md3.cfg b/packages/models/mapmodels/toca/decals/manhole/md3.cfg new file mode 100644 index 00000000..ad46dd32 --- /dev/null +++ b/packages/models/mapmodels/toca/decals/manhole/md3.cfg @@ -0,0 +1,3 @@ +md3load tris.md3 +md3skin mesh ../skin.png +mdlalphatest 30 \ No newline at end of file diff --git a/packages/models/mapmodels/toca/decals/manhole/skin.png b/packages/models/mapmodels/toca/decals/manhole/skin.png new file mode 100644 index 00000000..1706bda5 Binary files /dev/null and b/packages/models/mapmodels/toca/decals/manhole/skin.png differ diff --git a/packages/models/mapmodels/toca/decals/manhole/tris.md3 b/packages/models/mapmodels/toca/decals/manhole/tris.md3 new file mode 100644 index 00000000..4a7c8133 Binary files /dev/null and b/packages/models/mapmodels/toca/decals/manhole/tris.md3 differ diff --git a/packages/textures/toca/dirt1.jpg b/packages/textures/toca/dirt1.jpg new file mode 100644 index 00000000..66e2485d Binary files /dev/null and b/packages/textures/toca/dirt1.jpg differ diff --git a/packages/textures/toca/frozenground1.jpg b/packages/textures/toca/frozenground1.jpg new file mode 100644 index 00000000..72fec4c2 Binary files /dev/null and b/packages/textures/toca/frozenground1.jpg differ diff --git a/packages/textures/toca/frozenground2.jpg b/packages/textures/toca/frozenground2.jpg new file mode 100644 index 00000000..eec267ef Binary files /dev/null and b/packages/textures/toca/frozenground2.jpg differ diff --git a/packages/textures/toca/greybricks.jpg b/packages/textures/toca/greybricks.jpg index e064069f..7a61da90 100644 Binary files a/packages/textures/toca/greybricks.jpg and b/packages/textures/toca/greybricks.jpg differ diff --git a/packages/textures/toca/ice1.jpg b/packages/textures/toca/ice1.jpg new file mode 100644 index 00000000..2fb34e67 Binary files /dev/null and b/packages/textures/toca/ice1.jpg differ diff --git a/packages/textures/toca/license.txt b/packages/textures/toca/license.txt index 6ed37640..d1cc030e 100644 --- a/packages/textures/toca/license.txt +++ b/packages/textures/toca/license.txt @@ -1,11 +1,17 @@ -Some of this textures are originally by CGTextures.com and are sourced from: +The following textures are originally by CGTextures.com and are sourced from: +oldwall.jpg: http://cgtextures.com/texview.php?id=54137 +ice1.jpg: http://cgtextures.com/texview.php?id=8536 +sand1.jpg: http://cgtextures.com/texview.php?id=32630 +frozenground1.jpg: http://cgtextures.com/texview.php?id=30324 +frozenground2.jpg: http://cgtextures.com/texview.php?id=30379 +snow1.jpg: http://cgtextures.com/texview.php?id=8537 +snow1.jpg: http://cgtextures.com/texview.php?id=72446 pebbles1.jpg: http://cgtextures.com/texview.php?id=53799 pebbles2.jpg: http://cgtextures.com/texview.php?id=66840 pebbles3.jpg: http://cgtextures.com/texview.php?id=9524 greybricks.jpg: http://cgtextures.com/texview.php?id=2725 - And are used under a complex license, to which we've been able to adhere: http://www.cgtextures.com/content.php?action=license @@ -49,4 +55,3 @@ It is NOT permitted to: or attempt to gain unauthorized access to the CGTextures website or any system resources or networks connected to this website. - Release the Textures or derivative products under Open Source Licences - diff --git a/packages/textures/toca/oldwall.jpg b/packages/textures/toca/oldwall.jpg new file mode 100644 index 00000000..b288fe57 Binary files /dev/null and b/packages/textures/toca/oldwall.jpg differ diff --git a/packages/textures/toca/patchygrass.jpg b/packages/textures/toca/patchygrass.jpg index a4fc620d..c5fa8dd3 100644 Binary files a/packages/textures/toca/patchygrass.jpg and b/packages/textures/toca/patchygrass.jpg differ diff --git a/packages/textures/toca/pebbles1.jpg b/packages/textures/toca/pebbles1.jpg index 9d6f5bcd..4a671515 100644 Binary files a/packages/textures/toca/pebbles1.jpg and b/packages/textures/toca/pebbles1.jpg differ diff --git a/packages/textures/toca/pebbles2.jpg b/packages/textures/toca/pebbles2.jpg index c7be858c..04eee6d7 100644 Binary files a/packages/textures/toca/pebbles2.jpg and b/packages/textures/toca/pebbles2.jpg differ diff --git a/packages/textures/toca/pebbles3.jpg b/packages/textures/toca/pebbles3.jpg index 04e5fc62..65e8b366 100644 Binary files a/packages/textures/toca/pebbles3.jpg and b/packages/textures/toca/pebbles3.jpg differ diff --git a/packages/textures/toca/sand1.jpg b/packages/textures/toca/sand1.jpg new file mode 100644 index 00000000..02746e0c Binary files /dev/null and b/packages/textures/toca/sand1.jpg differ diff --git a/packages/textures/toca/snow1.jpg b/packages/textures/toca/snow1.jpg new file mode 100644 index 00000000..257b720e Binary files /dev/null and b/packages/textures/toca/snow1.jpg differ diff --git a/packages/textures/toca/snow2.jpg b/packages/textures/toca/snow2.jpg new file mode 100644 index 00000000..0b5888d3 Binary files /dev/null and b/packages/textures/toca/snow2.jpg differ