From zenex at icculus.org Thu Jun 8 01:53:04 2006 From: zenex at icculus.org (zenex at icculus.org) Date: 8 Jun 2006 01:53:04 -0400 Subject: r723 - trunk/base/maps Message-ID: <20060608055304.25038.qmail@icculus.org> Author: zenex Date: 2006-06-08 01:53:04 -0400 (Thu, 08 Jun 2006) New Revision: 723 Added: trunk/base/maps/west.ent Log: Added: trunk/base/maps/west.ent =================================================================== --- trunk/base/maps/west.ent 2006-06-01 03:51:15 UTC (rev 722) +++ trunk/base/maps/west.ent 2006-06-08 05:53:04 UTC (rev 723) @@ -0,0 +1,51 @@ +{ + "origin" "0 0 0" + "classname" "model_sky" + "model" "maps/west/skybox.md5mesh" +} +{ + "origin" "-300 -140 18.93" + "classname" "spawninfantry" +} +{ + "light" "5000" + "color" "1 1 1" + "origin" "-5000 0 10000" + "scale" "40000 40000 40000" + "classname" "light" +} + +{ + "origin" "0 -24 5" + "classname" "vehicle_tank" +} + +{ + "origin" "-318 -98 18.9" + "classname" "model" + "model" "maps/west/telegraph.md5mesh" +} +{ + "origin" "-300 -134 18.9" + "classname" "model" + "model" "maps/west/gallows.md5mesh" +} +{ + "origin" "0 0 0" + "classname" "model" + "model" "maps/west/west_ground.md5mesh" +} +{ + "light" "360" + "color" "1 1 1" + "origin" "-320 -98 21.7" + "scale" "5 5 5" + "classname" "light" +} +{ + "light" "360" + "color" "1 1 1" + "origin" "-315.5 -98 21.7" + "scale" "5 5 5" + "classname" "light" +} From zenex at icculus.org Thu Jun 8 02:03:01 2006 From: zenex at icculus.org (zenex at icculus.org) Date: 8 Jun 2006 02:03:01 -0400 Subject: r724 - in trunk/base: . textures textures/urban textures/urban/floors textures/urban/walls Message-ID: <20060608060301.28221.qmail@icculus.org> Author: zenex Date: 2006-06-08 01:59:10 -0400 (Thu, 08 Jun 2006) New Revision: 724 Added: trunk/base/textures/ trunk/base/textures/urban/ trunk/base/textures/urban/floors/ trunk/base/textures/urban/floors/concretetiles-01.tga trunk/base/textures/urban/walls/ trunk/base/textures/urban/walls/redbricks-01.tga trunk/base/textures/urban/walls/wood-01.tga Log: Added some unfinished but useful textures, all 1024x1024. Added: trunk/base/textures/urban/floors/concretetiles-01.tga =================================================================== (Binary files differ) Property changes on: trunk/base/textures/urban/floors/concretetiles-01.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/base/textures/urban/walls/redbricks-01.tga =================================================================== (Binary files differ) Property changes on: trunk/base/textures/urban/walls/redbricks-01.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/base/textures/urban/walls/wood-01.tga =================================================================== (Binary files differ) Property changes on: trunk/base/textures/urban/walls/wood-01.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From sajt at icculus.org Wed Jun 28 04:14:10 2006 From: sajt at icculus.org (sajt at icculus.org) Date: 28 Jun 2006 04:14:10 -0400 Subject: r725 - trunk Message-ID: <20060628081410.6910.qmail@icculus.org> Author: sajt Date: 2006-06-28 04:14:10 -0400 (Wed, 28 Jun 2006) New Revision: 725 Modified: trunk/matrixlib.c Log: Fixed a bug in Matrix4x4_CopyTranslateOnly... which is never called. Oh well. Modified: trunk/matrixlib.c =================================================================== --- trunk/matrixlib.c 2006-06-08 05:59:10 UTC (rev 724) +++ trunk/matrixlib.c 2006-06-28 08:14:10 UTC (rev 725) @@ -27,17 +27,17 @@ void Matrix4x4_CopyTranslateOnly(matrix4x4_t *out, const matrix4x4_t *in) { - out->m[0][0] = 0.0f; + out->m[0][0] = 1.0f; out->m[0][1] = 0.0f; out->m[0][2] = 0.0f; out->m[0][3] = in->m[0][3]; out->m[1][0] = 0.0f; - out->m[1][1] = 0.0f; + out->m[1][1] = 1.0f; out->m[1][2] = 0.0f; out->m[1][3] = in->m[1][3]; out->m[2][0] = 0.0f; out->m[2][1] = 0.0f; - out->m[2][2] = 0.0f; + out->m[2][2] = 1.0f; out->m[2][3] = in->m[2][3]; out->m[3][0] = 0.0f; out->m[3][1] = 0.0f;