Commit Graph
266 Commits
Author SHA1 Message Date
chief1983 31f014ed5c Trunk sync r9456 2012-12-21 21:02:47 +00:00
Zacam d0e450cfd1 Trunk Sync: r9418 2012-12-09 23:16:22 +00:00
Zacam 55bf45393e Trunk Sync: r9408 2012-12-09 00:48:01 +00:00
Zacam 3fdae2e3c1 Trunk Sync: r9386 2012-12-02 02:24:53 +00:00
Zacam ba68ceca3f Trunk Sync: r9326 and set revision properties to this commit, tagged as 3.6.17 to eliminate any later fiddling or missing it for merge to Trunk. 2012-11-11 00:50:47 +00:00
chief1983 ac44f7c59d Trunk Sync: r9193 2012-09-13 15:14:56 +00:00
Zacam 362c8e4169 Trunk Sync: r9134 2012-08-22 21:44:43 +00:00
The_E 05d5744477 TRunk sync r9104 2012-08-12 07:44:05 +00:00
The_E 79b714ea12 Trunk sync r9092 2012-08-04 06:27:35 +00:00
The_E 68be57e92b Trunk sync r9031 2012-07-22 11:41:28 +00:00
Zacam 2eb9357312 Trunk Sync r8980 2012-07-04 05:13:33 +00:00
CommanderDJ edcdfacdc9 Trunk sync r8915 2012-06-27 05:34:53 +00:00
Zacam 5dc5f82e43 Trunk Sync r8897 2012-06-18 00:44:03 +00:00
CommanderDJ 9abcb1e43c Trunk sync r8799 2012-05-20 03:13:27 +00:00
The_E a60c8f52db trunk sync r8786 2012-05-15 11:34:21 +00:00
The_E 4bd9093125 Trunk sync r8753 2012-05-05 14:09:52 +00:00
The_E 3f364d8718 trunk sync r8644 2012-04-01 16:21:23 +00:00
chief1983 c505fed7c0 Trunk sync: r8577 2012-03-05 20:36:27 +00:00
The_E 02d8bd64c4 Trunk sync r8545 2012-03-02 16:05:44 +00:00
Zacam e2ea4f01e1 Trunk Sync: r8428-8432
r8427 not needed in Antipodes due to changes in Pilot data.
2012-02-04 17:36:23 +00:00
Zacam 2b0c9c20b7 Trunk Sync: r8423, r8424 2012-02-03 15:41:02 +00:00
Zacam ca926da3f3 Trunk Sync: r8373, r8376-8379 2012-01-28 06:53:43 +00:00
Zacam b925d70617 Trunk Sync: 8341. 8344. 8350. 8361-8363 2012-01-24 03:58:22 +00:00
chief1983 05792b8029 Trunk Sync: r8326-8327 2012-01-23 01:36:02 +00:00
The_E 9f209d5d5d Trunk sync r8131 2012-01-05 22:49:11 +00:00
Zacam 7eb3b95751 Trunk Sync r8028 2011-11-23 01:23:54 +00:00
The_E 465b3296ae Trunk sync r7997 2011-11-16 18:16:55 +00:00
Zacam 9f8c2061c8 Trunk Sync r7986 2011-11-13 10:15:32 +00:00
Zacam f64c5ea811 Trunk Sync r7946 2011-11-05 09:36:17 +00:00
Zacam d380153ed9 Trunk Sync r7895 2011-10-11 20:33:05 +00:00
Zacam 31ccffef1c Trunk Sync r7853 2011-10-03 11:28:19 +00:00
Zacam 8a587f1a50 Trunk r7703: Allow customization of the thruster distortion effect in species_defs.tbl and ships.tbl 2011-09-12 04:02:17 +00:00
Zacam c9e53a41bc Copy of: Trunk 7693 2011-09-09 15:23:34 +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
Zacam a4635437ec "zbuffer_save" in 'void model_render_children_buffers' is declared but not used. 2011-09-07 08:05:23 +00:00
The_E b725ff7e21 trunk sync r7657 2011-09-06 21:22:39 +00:00
Zacam 37735762bc From Trunk 7595: Shipp can be NULL, which would lead to a crash. This resolves that crash from happening. 2011-08-30 23:00:56 +00:00
The_E d8a728d5f1 Trunk sync r7593 2011-08-30 18:17:09 +00:00
Zacam 61ae987752 Trunk Sync r7513 2011-08-22 18:22:17 +00:00
Zacam 1452c349ee Trunk Sync r7502 2011-08-21 04:10:52 +00:00
Zacam 844bd02cbf Trunk Sync r7496 More Justice 2011-08-20 23:40:54 +00:00
Zacam 4b6bfbc980 Trunk Sync r7496 for GREAT JUSTICE! 2011-08-20 22:25:04 +00:00
Zacam 33d3a759e3 Trunk Sync r7494 2011-08-20 19:15:54 +00:00
The_E b5a1b4c263 Trunk sync r7282 2011-07-26 22:16:22 +00:00
The_E e274c1b218 Trunk sync r7246 2011-07-13 09:04:47 +00:00
Zacam eca9a5380b Trunk Sync - r7315 2011-07-04 06:41:27 +00:00
The_E 58464ff04c Trunk sync r7080 2011-03-20 18:15:11 +00:00
Zacam de3846675f Trunk Sync - r6855 2010-12-16 07:01:53 +00:00
taylor dd0f58dffa better fix for warnings and messed up texture replacement 2010-10-14 04:15:34 +00:00