Commit Graph

659 Commits

Author SHA1 Message Date
Orangutanz
a682ec6b7a Fixed TE_DLIGHT example Valve mistake! (P34nut) 2007-01-17 18:16:17 +00:00
Christian Hammacher
c5ccf7d2c8 fixed am48881 2007-01-02 13:04:56 +00:00
David Anderson
42f23a832a bumped version number for plugins 2006-12-19 14:24:01 +00:00
David Anderson
b762174c30 fixed bug am48275 2006-12-19 02:02:49 +00:00
David Anderson
86838bead1 Fixed bug am48294 2006-12-19 01:58:46 +00:00
Split
93cb2060dd fixed typo 2006-12-11 04:07:55 +00:00
David Anderson
1905ea7295 added info about console commands 2006-11-22 02:47:15 +00:00
David Anderson
8b8cc3dd6b Fixed bug am46630: rename_file did not have a relative location version 2006-10-31 20:18:44 +00:00
David Anderson
102c2b219f Fixed bug am46336 - could not compile TraceLn 2006-10-27 05:53:09 +00:00
David Anderson
4e1d420495 added AMX_ERR_GENERAL to the error list 2006-10-27 05:49:34 +00:00
David Anderson
e93e75fa39 Bumped version numbers 2006-10-27 05:47:38 +00:00
David Anderson
2a1dbf5247 Fixed bug am46350 2006-10-24 17:13:02 +00:00
David Anderson
d2ebca38a1 Experimental addition to CreateMultiForward() for bcompat 2006-10-22 03:49:23 +00:00
David Anderson
553a950b98 added comment :( yes we broke backwards compat 2006-10-21 20:20:44 +00:00
David Anderson
fe1ebfe7bb fix for 45337 and some other little things 2006-10-01 19:46:56 +00:00
Scott Ehlert
39d5ea94fb Added extra param to is_in_viewcone to switch between a 2D and 3D calculation
Neither is still as accurate as I want them to be though :\
2006-10-01 06:08:39 +00:00
Scott Ehlert
90f11b52bc Fixed am45318 - Some wrong constants from TraceResult enum 2006-10-01 02:39:59 +00:00
David Anderson
5ded9eef2a Bumped version numbers to 1.76a 2006-09-25 23:48:07 +00:00
David Anderson
3c923170a9 whoa, forgot a SEMICOLON 2006-09-14 08:06:08 +00:00
David Anderson
09beb4b81e Fixed bug am44776 2006-09-14 08:00:55 +00:00
Scott Ehlert
918e1c3195 Better, but still not perfect. :( 2006-09-13 13:44:37 +00:00
Scott Ehlert
6e56aed778 More tiny bcompat stuff. admincmd is now source compatible at least 2006-09-13 10:58:47 +00:00
Pavol Marko
d925dc6e41 bugfix: correct string length computation in replace_all 2006-09-12 13:26:40 +00:00
David Anderson
651c5d9f01 added more api to help with amxmod compat layer
cleaned up some more bcompat stuff
2006-09-12 07:59:56 +00:00
David Anderson
3c379469d5 added get_cmdaccess() 2006-09-10 22:16:04 +00:00
David Anderson
14aff9b19b added simple access level wrappers (Obbin) 2006-09-10 10:14:58 +00:00
David Anderson
d95f794844 rewrote replace_all()
added replace_all() tests
2006-09-10 08:15:00 +00:00
David Anderson
3754604686 Fixed a serious bug in replace_all() that could make replaces fail or corrupt random data 2006-09-10 07:23:08 +00:00
David Anderson
1b9ef4d268 2006-09-10 05:16:26 +00:00
David Anderson
f6f6bcc356 added a note to hostage natives for CZ 2006-09-10 04:36:44 +00:00
David Anderson
4f95899d2e Added request am44580 (simple query w/ formatting) 2006-09-10 03:46:35 +00:00
David Anderson
77e4d85002 fixed up a callfunc issue and added copyback parameter 2006-09-10 02:30:10 +00:00
David Anderson
4599b59834 corrected issue am44595 2006-09-10 00:51:35 +00:00
David Anderson
8df33abd70 initial import of the bcompat plugins (userland layer) 2006-09-08 14:49:54 +00:00
David Anderson
78956f3d89 merged bcompat changed into trunk
removed amxmod compat files for now
2006-09-01 03:29:27 +00:00
David Anderson
6a28bc602a Request am43716 - moved IVecFVec and FVecIVec around 2006-09-01 01:34:43 +00:00
David Anderson
9bd22661ff Added SQL_GetInsertId() 2006-08-28 19:17:26 +00:00
David Anderson
388711e969 Synced bcompat tree additions and fixes found so far 2006-08-28 11:08:18 +00:00
David Anderson
af5a7f5434 fixed am43858 (beta report) 2006-08-25 22:06:59 +00:00
Scott Ehlert
58abc3a655 Request am28110 - Added tfc_get_user_goalitem native to determine if player is carrying a goal item (such as a flag or keycard) 2006-08-22 21:50:27 +00:00
Scott Ehlert
74d3d23f13 Added tfc_get/setweaponammo to set ammo in weapon's clip (not backpack ammo) 2006-08-21 13:50:51 +00:00
David Anderson
d21a352167 expanded comment for get_players() 2006-08-21 03:07:25 +00:00
Borja Ferrer
4692335abb bumped version 2006-08-21 02:01:57 +00:00
David Anderson
deefc504e1 Added request am29544 (nvault_touch) 2006-08-20 21:23:38 +00:00
David Anderson
df7ee94b83 Committed sorting natives as per request am23838 2006-08-20 04:46:34 +00:00
Borja Ferrer
afe7df87d2 Added request am40169 2006-08-20 00:20:47 +00:00
Borja Ferrer
adad1384ff now it compiles 2006-08-19 23:18:11 +00:00
Borja Ferrer
fb0d728720 optimized a stock and created message_stocks.inc (am29627) 2006-08-19 23:02:01 +00:00
Borja Ferrer
a1e8701236 added request at40243 2006-08-19 22:33:02 +00:00
David Anderson
4fe8c71d62 Added request am41375 (animation toggling on silenced weapons) 2006-08-18 20:12:20 +00:00
David Anderson
659448ce29 clarified the API 2006-08-18 06:00:26 +00:00
David Anderson
d7d0d72ceb fixed a serious bug with byref values and callfunc_push*() where the heap was used incorrectly, causing passed data to be easily corrupted.
added callfunc_push_array() (am42810)
2006-08-18 05:52:21 +00:00
David Anderson
b7076fc572 Committed implementation of request am42697 2006-08-18 02:19:38 +00:00
David Anderson
a03cd1385d clarified this 2006-08-15 20:21:25 +00:00
Scott Ehlert
1a6f4e08b2 Added request am41585 (Orangutanz) 2006-07-19 04:23:00 +00:00
Scott Ehlert
db3beb9b98 Various pev issues fixed am41542 2006-07-17 20:01:11 +00:00
Christian Hammacher
2dc3f2bec9 fixed bug at41483 2006-07-17 12:42:59 +00:00
Scott Ehlert
895039308f Added CZ models to CsInternalModel enum (request at41295) 2006-07-13 03:07:24 +00:00
David Anderson
d3af14c957 experimental emsg natives 2006-06-28 10:01:55 +00:00
Scott Ehlert
bb609123fb Fixed comment next to zoom type enum 2006-06-12 10:08:54 +00:00
Zor
84ec8ef007 - Added new forwards as well as new stocks 2006-06-11 21:47:11 +00:00
Borja Ferrer
d4bfddc034 added 2 new natives 2006-06-10 20:46:12 +00:00
David Anderson
68e1937a5c got rid of debug msg 2006-06-07 06:28:32 +00:00
Scott Ehlert
e7858b4cd7 Oops, guess I forgot this one 2006-06-05 07:52:21 +00:00
Scott Ehlert
17fb06f7bb Moved vector natives from engine to core at29896
Moved precache_generic from engine to core at30469
2006-06-05 07:48:54 +00:00
David Anderson
56e97a2b60 updated this t00 2006-06-04 19:42:08 +00:00
David Anderson
73858b0fcd removed packing stuff 2006-06-04 06:43:48 +00:00
David Anderson
dafc10d878 added some more sqlx stocks
upgraded admin.sma to sqlx
fixed various amx_Addadmin bugs
2006-06-04 00:58:17 +00:00
Scott Ehlert
3cde89bc74 Don't look please 2006-06-03 19:45:03 +00:00
Scott Ehlert
75b6aa192d Wowzers, fixed :\ 2006-06-03 19:41:36 +00:00
Scott Ehlert
ab40f426c6 Added missing colon at30601 2006-06-02 02:18:15 +00:00
David Anderson
7ecdf75d0d fixed typo 2006-05-26 22:08:52 +00:00
Borja Ferrer
e6064af9fb added request at30290 (VEN)
fixed cs_get_user_buyzone returning true when user was in bombtarget zone or other specific areas
2006-05-26 18:26:59 +00:00
Scott Ehlert
ac1e3a9001 Added ClientPrintf engine function (request at30137) 2006-05-23 03:26:26 +00:00
Scott Ehlert
3d932c8a36 Removed take_damage at29909 2006-05-19 19:00:35 +00:00
Christian Hammacher
2e63e1316c fixed bug at29945 2006-05-19 18:40:17 +00:00
Scott Ehlert
b40f5e6637 request at29928
New callable engine function: AlertMessage
2006-05-19 06:01:55 +00:00
David Anderson
e0bed163ac added affinity stuff 2006-05-19 02:04:09 +00:00
Scott Ehlert
eafd402ead fixed *slaps himself* 2006-05-18 15:55:21 +00:00
Scott Ehlert
2d75dfe865 Even more include file changes...
1) Moved message_begin, message_end, and write_ natives to messages.inc
2) Moved MSG constants to message_const.inc
All completely backwards compatible with compiling older plugins of course :)
2006-05-17 20:08:04 +00:00
Scott Ehlert
635b681825 Gah, nothing to say about this one 2006-05-17 19:37:34 +00:00
Scott Ehlert
ef1347cb6c Oh, hello, one more constant 2006-05-17 19:36:42 +00:00
Scott Ehlert
c0334deae1 Added a whole bunch of constants at29843
Some minor changes to some other inc files that aren't even worth mentioning
2006-05-17 19:33:45 +00:00
Borja Ferrer
39a22813cb updated comment 2006-05-17 14:03:59 +00:00
David Anderson
b953f285d0 Tended to request at29593 2006-05-16 21:42:06 +00:00
Scott Ehlert
b6007e8223 Modified get_brush_entity_origin and ViewContents as per at29759 (Orangutanz) 2006-05-15 13:52:38 +00:00
Borja Ferrer
25a2b11198 oh hello PM, here is another optimization 2006-05-14 15:59:28 +00:00
Pavol Marko
a0923e21ed improved using pm's magic (patent pending) 2006-05-14 15:20:25 +00:00
Borja Ferrer
f7805623b0 added request at29591 2006-05-13 14:59:24 +00:00
David Anderson
b2b001c9e4 added M_ in front to match HLSDK and other things 2006-05-11 13:12:41 +00:00
David Anderson
793de6d8d2 added PI define (at29548) 2006-05-11 13:10:29 +00:00
David Anderson
19f2be0c96 updated 2006-05-11 10:22:18 +00:00
David Anderson
79f86bfabd updated comment 2006-05-11 10:07:32 +00:00
David Anderson
9b68c0678a merged register_message into core
request at29428
2006-05-11 08:45:06 +00:00
David Anderson
e0fa5227d6 merged register_message into core 2006-05-11 08:36:20 +00:00
Scott Ehlert
b2aff10e46 Added some comments to benefit all mankind :o 2006-05-10 12:35:21 +00:00
Scott Ehlert
302b759fc8 oops :( 2006-05-10 11:31:17 +00:00
Scott Ehlert
c6e8a356ee Added request at29487
1) New hookable Engine func: GetInfoKeyBuffer
2) New GameDLL func that can be called via engfunc: GetInfoKeyBuffer
3) New native: copy_infokey_buffer that copies data out of the specified info key buffer
4) EngFunc_InfoKeyValue, EngFunc_SetKeyValue, and EngFunc_SetClientKeyValue have been reworked
    so that they expect pointers to an info key buffer in order to work properly o_O
2006-05-10 11:28:00 +00:00
David Anderson
25d4b6aea3 added these include files k 2006-05-10 10:42:49 +00:00
Scott Ehlert
6b794d4a9d Version bump 2006-05-08 04:37:15 +00:00
David Anderson
7669ab02f6 fixed prototype error 2006-05-08 00:26:32 +00:00
David Anderson
7a533c7be5 Added vformat() 2006-05-07 00:25:30 +00:00
Borja Ferrer
4e5ada6ad1 added request at28200 2006-05-06 22:49:38 +00:00
Scott Ehlert
d7e53d7a81 Err, more descriptive param names? 2006-05-05 08:30:16 +00:00
Scott Ehlert
26ee3955b6 Another one of my stupid clarifications that shouldn't break anything (I hope...) 2006-05-05 08:27:58 +00:00
Scott Ehlert
21ffd88bdd More bugs?
1) FM_CreateInstancedBaselines has been renamed to FM_CreateInstBaselines
2) DLLFunc_CreateInstancedBaseline has been renamed to DLLFunc_CreateInstBaselines
(I'd be extremely surprised if someone complained about the above 2 changes)
3) New hookable GameDLL func: FM_CreateBaseline
4) New hookable Engine func: FM_CreateInstBaseline
5) New GameDLL func that can be called via dllfunc: CreateBaseline
6) New GameDLL func that can be called via engfunc: CreateInstancedBaseline
7) Added some comments to each member of various enums that correspond to special structs in the engine and/or game dll
2006-05-05 08:07:31 +00:00
Scott Ehlert
7cd10e4796 Another param change that I seemed to have missed... should be no problem 2006-05-04 22:39:23 +00:00
Scott Ehlert
ecd2d913e4 Err, gah... native one being changed didn't really matter 2006-05-04 22:12:16 +00:00
Scott Ehlert
53e84a13be gah 2006-05-04 22:10:23 +00:00
Scott Ehlert
eb55e1f4aa i prefix changed to ent because it looks nicer indeed 2006-05-04 19:59:05 +00:00
Scott Ehlert
6733ef9a79 Two extra params in cs_set_user_vip for determining whether or not model and scoreboard are updated at28699 2006-05-02 21:48:26 +00:00
Scott Ehlert
7dc4beae63 Removed set_user_deaths from inc file at29080
(Doesn't seem to be any easy general way to implement it)
2006-05-01 05:25:28 +00:00
Scott Ehlert
de33bb6a1d Oh goodness, let the bugs begin...
1) New hookable GameDLL funcs: UpdateClientData, AddToFullPack, CmdStart, CmdEnd (at28754)
2) New GameDLL funcs that can be called via dllfunc: UpdateClientData, AddToFullPack, CmdStart, CmdEnd
3) New natives to read/write special data structures associated with the above GameDLL funcs:
   get/set_cd (ClientData), get/set_es (EntityState), get/set_uc (UserCmd)
2006-04-30 07:37:31 +00:00
Scott Ehlert
f10ecbb239 Small bug fix and tiny optimizations in xs_get_maxmessages and xs_is_msg_valid
Added xs_vec_maked2d (at28754)
2006-04-28 21:10:29 +00:00
Scott Ehlert
1f8b9a8cd9 Renamed FM_ClientInfoChanged to FM_ClientUserInfoChanged for consistency with DLLFunc_ClientUserInfoChanged
(Also goes along with fix made in FakeMeta module itself, sort of :|)
2006-04-28 20:10:42 +00:00
David Anderson
62c096d7d3 updated comment as per at28188 2006-04-27 17:41:41 +00:00
David Anderson
f6cb8ab3bb fixed typo (at28930) 2006-04-27 17:31:55 +00:00
David Anderson
8da4987895 implemented request at28875 2006-04-27 17:31:38 +00:00
David Anderson
b65b8a1cf0 request at28581 2006-04-26 05:21:29 +00:00
Christian Hammacher
3f5bae615b added request at28199 2006-04-25 17:19:58 +00:00
Scott Ehlert
761e1f6fe1 Reverted a CreateInstancedBaselines change due to a 31 character limit to enum symbols that causes a compiler warning
(Real function that FM uses is called CreateInstancedBaselines and is different from CreateInstancedBaseline...
So something should be done, but I'm not sure what yet)
2006-04-20 08:49:49 +00:00
Scott Ehlert
a265189efa Modified param names for touch native and forward to correct values... makes it more clear to someone looking at it 2006-04-17 22:29:18 +00:00
Scott Ehlert
b57c752b1c Added get_orig_retval for retrieving the original return value of an engine function
Reformatted comments in fakemeta include files so they look a bit neater
2006-04-17 16:59:37 +00:00
David Anderson
b8ddd281aa hack fix for at28078 2006-04-11 06:30:59 +00:00
Scott Ehlert
cd7f15f112 Reverted one of my "fixes." Apparently this is intended functionality. Sorry :( 2006-04-10 16:13:02 +00:00
Scott Ehlert
4fb001ce50 Whoa, whoa, whoa. Three "bugs"
1) Fixed tag mismatches with fprintf when not using Float, Sql, or Result (comma was missing :o)
2) Fixed unlink from taking more than one argument o_O
3) Fixed filesize from taking more than one argument o_O
2006-04-10 14:02:37 +00:00
Borja Ferrer
15e137e266 time test 2006-04-02 18:50:35 +00:00
David Anderson
deccf7816c added rmdir() 2006-03-30 00:48:58 +00:00
David Anderson
fe971497cc synced to dll 2006-03-30 00:31:45 +00:00
David Anderson
16e53eded8 synced to dll 2006-03-29 23:57:54 +00:00
David Anderson
92be7f6791 synced to core 2006-03-29 22:58:11 +00:00
David Anderson
5395fc1280 updated constants 2006-03-20 19:36:57 +00:00
David Anderson
c15a86b454 added new TR/KVD stuffs 2006-03-20 18:08:51 +00:00
Borja Ferrer
7e97156fc4 added arrayset native 2006-03-16 00:13:13 +00:00
David Anderson
dc8e162e26 added menu_cancel 2006-03-14 17:50:38 +00:00
Borja Ferrer
d7bef2ae4b added get_global() 2006-03-14 17:15:52 +00:00
David Anderson
9c88ce1394 fixed bug at26581 2006-03-14 09:59:28 +00:00
David Anderson
d80b59e639 vers bump 2006-03-13 14:35:46 +00:00
Borja Ferrer
a9684fb81d fixed bug at26189 2006-03-07 12:58:39 +00:00
Christian Hammacher
982b22ab20 fixed bug in split() 2006-03-06 14:54:12 +00:00
David Anderson
446c5523f8 added back in two more old natives 2006-03-04 11:05:59 +00:00
David Anderson
74cd310504 bumped version 2006-03-04 06:53:06 +00:00
David Anderson
48377168b2 Added ClearSyncHud() 2006-03-01 02:17:20 +00:00
David Anderson
d4c2bf154f experimental fix for hud sync issue 2006-02-28 09:42:56 +00:00
David Anderson
1a03391347 omg updated these for sure. 2006-02-26 08:15:12 +00:00
David Anderson
1f2d9c8a92 typos, made language harsher 2006-02-24 10:12:55 +00:00
David Anderson
1d30d0831b i have a hat 2006-02-24 07:49:08 +00:00
Borja Ferrer
0852dfa112 added missing pcvar natives 2006-02-22 20:32:59 +00:00
David Anderson
7539751fc6 added pcvar funcs 2006-02-15 16:05:20 +00:00
Borja Ferrer
a8c01e4865 fixed forwards passing floats as cells to the core
fixed pfn_playbackevent missing a parameter
2006-02-13 20:03:39 +00:00
Borja Ferrer
323341f67a added request at22274 2006-02-13 14:23:43 +00:00
David Anderson
71c023f485 added CS_TEAM_UNASSIGNED at vittu's request 2006-02-11 22:57:34 +00:00
David Anderson
750b098e02 sigh... 2006-02-08 22:59:58 +00:00
David Anderson
208a57eaf8 added menu padding 2006-02-06 15:27:02 +00:00
David Anderson
2879c86d79 added more exit props 2006-02-06 13:24:26 +00:00
David Anderson
35e8a67a48 *** empty log message *** 2006-02-05 04:20:30 +00:00
David Anderson
2ad9a320de added unregister_forward() 2006-02-03 03:27:03 +00:00
David Anderson
3027b732a5 added player_menu_info 2006-02-03 03:00:27 +00:00
David Anderson
af939f4e8d new menu API 2006-02-03 02:55:27 +00:00
Borja Ferrer
0e3727573e added get_user_footsteps 2006-02-01 13:04:24 +00:00
David Anderson
f40ae48849 removed server_changelevel (at24675 - oneyed) 2006-02-01 12:33:31 +00:00
David Anderson
7070273616 patch at24690 (karlos) 2006-02-01 12:23:30 +00:00
David Anderson
923ecaa0e5 added pev_valid 2006-02-01 12:17:40 +00:00
David Anderson
2d0e12363f added include defs for new forward creation 2006-02-01 11:54:57 +00:00
David Anderson
85f14422cb re-added file natives 2006-01-06 22:49:42 +00:00
David Anderson
91c082878c wa 2006-01-06 14:44:32 +00:00
Pavol Marko
4b51565e3b hello my name is pm and i just fixed the bug described in 23888 2006-01-04 23:23:52 +00:00
Borja Ferrer
5d5d1e1a7c added request at19456 2005-12-07 00:13:13 +00:00
Borja Ferrer
2ebf822dea added new socket send native 2005-12-05 01:49:16 +00:00
David Anderson
83d2e1a510 *** empty log message *** 2005-12-01 13:45:30 +00:00
Borja Ferrer
8196ddd0b3 added replace_all stock (by jtp10181) 2005-11-21 21:47:54 +00:00
Borja Ferrer
bb292d13ad added remove_filepath stock 2005-11-20 23:45:53 +00:00
David Anderson
922a2f6006 bumped version numbers 2005-11-20 19:47:49 +00:00
Borja Ferrer
3938933384 added new time include file
added get_time_length stock (Brad)
2005-11-20 19:27:07 +00:00
David Anderson
62e7e22a93 Added functionality for the auto-channeler 2005-11-19 01:25:34 +00:00
Borja Ferrer
94308b208a fixed bug at19374 2005-11-17 21:12:50 +00:00
Borja Ferrer
34f12e76c4 added request at20855 2005-11-13 22:21:15 +00:00
Borja Ferrer
1e5c9b5ed7 added a new stock by Suicid3 (at20399) 2005-11-12 22:43:55 +00:00
Borja Ferrer
2931247559 fixed bug at19476 2005-10-29 18:19:23 +00:00
David Anderson
862ee2029a Bumped version 2005-09-22 03:42:43 +00:00
David Anderson
4b1769f457 Added feature request at18988 2005-09-15 17:53:02 +00:00
David Anderson
401ee3c97f Added another function or something 2005-09-11 03:55:48 +00:00
David Anderson
6e52ce7678 New natives 2005-09-11 03:13:45 +00:00
David Anderson
612a86dbef Added new debugging functions 2005-09-10 18:26:13 +00:00
David Anderson
cc37f479aa Added Phase 3 of the debugger (debug tracing from plugins) 2005-09-10 07:24:26 +00:00
David Anderson
de65e65854 added set_error_filter 2005-09-09 23:03:26 +00:00
Pavol Marko
afa1337e62 because gabe doesn't rollover, he just expands 2005-09-08 15:29:31 +00:00
Pavol Marko
cc34f468f0 Added a new math stock function. 2005-09-08 15:24:28 +00:00
Pavol Marko
3f9598fcbb Changed .amx in examples for pause() and callfunc_begin() to .amxx (as requested by XxAvalanchexX on the forums) 2005-09-08 13:05:44 +00:00
Pavol Marko
227c13d12c Added abs(x) stock 2005-09-08 12:58:17 +00:00
David Anderson
0552e5ef58 Deprecated jghg2 include 2005-09-07 15:40:46 +00:00
Pavol Marko
bece1e6d0c Added float_to_str and str_to_float natives 2005-09-06 16:34:17 +00:00
Pavol Marko
d3e2bad4e7 Added query_client_cvar native 2005-09-06 10:14:32 +00:00
David Anderson
ac4014ff5a Fixed bug at18473 (Greenberet). 2005-09-05 21:59:44 +00:00
David Anderson
4be88a5015 version bump 2005-09-02 07:10:56 +00:00
David Anderson
c5cc94ba98 Added new natives 2005-08-31 04:36:25 +00:00
David Anderson
12f628e3d7 Fixed bug at18162 (vittu) 2005-08-30 07:00:49 +00:00
David Anderson
160ab3572b Fixed typo at18108 (FireStorm) 2005-08-30 06:57:41 +00:00
David Anderson
2e22dde409 Removed extra forwards 2005-08-25 07:16:17 +00:00
David Anderson
4dad81af30 Merged in new ts includes 2005-08-25 07:13:48 +00:00