414 Commits

Include renames

Author	SHA1	Message	Date
The_E	cb243c3f5c	trunk sync r8382 - 8385	2012-01-28 17:45:57 +00:00
Zacam	ca926da3f3	Trunk Sync: r8373, r8376-8379	2012-01-28 06:53:43 +00:00
chief1983	b6e8dc552b	Trunk Sync: 8368-8369	2012-01-24 18:40:54 +00:00
Zacam	45d55d5c75	Trunk Sync: r8297-8302	2012-01-22 07:52:20 +00:00
The_E	b7db6702dc	TRunk sync r8270-8286, 8289	2012-01-21 12:12:25 +00:00
Zacam	e8da8b037c	Trunk Sync: r8230-8233	2012-01-15 19:28:50 +00:00
Zacam	c33bf8d031	Trunk Sync: r8218-8220	2012-01-15 06:05:06 +00:00
Zacam	832999fbbd	Trunk Sync r8104	2011-12-21 08:52:59 +00:00
The_E	ffc14f5d9e	Trunk sync r8082	2011-12-13 16:23:01 +00:00
The_E	3c38ce4737	Trunk sync r 8066	2011-12-04 17:42:52 +00:00
Zacam	9f8c2061c8	Trunk Sync r7986	2011-11-13 10:15:32 +00:00
Zacam	aba7c37634	Trunk Sync r7960	2011-11-08 04:53:02 +00:00
Zacam	d495ef5ca9	Trunk Sync r7926	2011-10-23 19:04:29 +00:00
Zacam	897eea19d2	Trunk Sync r7909	2011-10-16 18:03:37 +00:00
Zacam	31ccffef1c	Trunk Sync r7853	2011-10-03 11:28:19 +00:00
The_E	f77910e72e	Trunk sync r7842	2011-10-02 07:54:02 +00:00
Zacam	1508051685	From CommanderDJ: Fix for Mantis 2224 "Chat messages may end up unreadable due to unfortunate color choice" ... Allows for the specification of colors via a colors.tbl (Wiki Documentation here: http://www.hard-light.net/wiki/index.php/Colors.tbl )	2011-09-26 05:50:47 +00:00
Zacam	7bcb3907db	copy of Trunk r7795	2011-09-24 22:40:35 +00:00
Zacam	2c6a924a82	Copy's Trunk revert in r7794.	2011-09-24 19:55:31 +00:00
The_E	15afdd864a	Trunk sync r7792	2011-09-24 17:44:49 +00:00
Zacam	a4c59963ef	Trunk Sync (r7732, r7736, r7737)	2011-09-17 15:11:02 +00:00
Zacam	1356613dcd	Trunk Sync r7711	2011-09-12 12:42:59 +00:00
Zacam	3b085e8b83	Part Two: Synchronization pass of Antipodes and Trunk Differences. ... Trunk Sync r7685	2011-09-09 10:25:08 +00:00
Zacam	17b3c8be17	Trunk Sync r7677	2011-09-08 05:47:44 +00:00
The_E	b725ff7e21	trunk sync r7657	2011-09-06 21:22:39 +00:00
The_E	d8a728d5f1	Trunk sync r7593	2011-08-30 18:17:09 +00:00
Zacam	2f6d659147	Trunk Sync r7529	2011-08-24 20:41:13 +00:00
Zacam	4b6bfbc980	Trunk Sync r7496 for GREAT JUSTICE!	2011-08-20 22:25:04 +00:00
Zacam	de70737203	Trunk Sync r7474	2011-08-15 22:16:25 +00:00
Zacam	10a648755e	Logging update: Major/Minor/Build update so that "Build" will always be available/log correctly even when "0" (ex: 3.7.0) without also needing "Revision" present.	2011-08-10 14:22:34 +00:00
The_E	fb5c0d8b9e	Trunk sync r7246	2011-08-04 16:27:02 +00:00
Zacam	dcde3e4270	Trunk Sync r7420	2011-08-04 13:27:14 +00:00
The_E	a5cde74b9e	Reverting 7412	2011-08-02 13:03:42 +00:00
The_E	beda0ef100	Trunk sync r7411	2011-08-02 11:28:10 +00:00
The_E	5a072e0319	Moving ai_profiles parsing up a few lines to get them parsed before weapons and ships, to fix issue with $Default Weapon Selection	2011-07-31 20:16:17 +00:00
The_E	1159c2111c	Trunk sync r7391	2011-07-30 21:49:42 +00:00
Zacam	eca9a5380b	Trunk Sync - r7315	2011-07-04 06:41:27 +00:00
Zacam	519c80477b	Quick check for pyro3d's Mantis 2425 Patch.	2011-05-24 15:26:25 +00:00
Zacam	6e0f95ee0f	Trunk Sync - r7182	2011-05-16 09:16:44 +00:00
The_E	d226931506	Trunk sync r7107	2011-04-05 12:07:21 +00:00
Zacam	c60578f338	Trunk Sync - r7036	2011-03-03 03:49:54 +00:00
The_E	400383f901	Removing the nonfunctional demo code, part 2	2011-02-13 20:42:20 +00:00
Zacam	8afa55a716	Trunk Sync - r6993	2011-02-04 03:50:54 +00:00
The_E	f028c7a5f1	Trunk sync r6964	2011-01-23 16:25:29 +00:00
Zacam	1aab2c261e	Trunk Sync - r6898	2010-12-27 13:01:43 +00:00
Zacam	8c2e8ca45a	Trunk Sync - r6875	2010-12-21 06:51:15 +00:00
Zacam	a50f6a7a10	The E cleaned house on a slew of unused #IFDEFs, such as FS2_DEMO, MULTIPLAYER_BETA, OEM_BUILD, commented out code, etc.	2010-12-13 02:44:27 +00:00
Zacam	ea971a95a1	INF_BUILD #ifdef/#ifndef's and Inferno Build Configurations go away.	2010-12-13 02:33:41 +00:00
Zacam	d86f450c55	Antipodes 8: New Pilot code, from taylor.	2010-12-12 23:53:05 +00:00
Zacam	3662c33157	Trunk Sync - r6675	2010-10-24 20:50:24 +00:00