Zacam
3fdae2e3c1
Trunk Sync: r9386
2012-12-02 02:24:53 +00:00
Zacam
dc82a0c7f8
Trunk Sync: r9351
...
You may see other sync's, but none have taken place during a live Feed Dump on Desert Bus!
2012-11-17 23:47:11 +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
73ab64e3da
Trunk sync r9300 (last was actually synced with 9284, skipped 9296 since we don't have an Xcode4 project in Antipodes yet).
2012-11-02 20:28:04 +00:00
The_E
e2fb98b862
Trunk sync r9275
2012-10-27 14:25:44 +00:00
The_E
ce05f3a88a
Trunk sync r9274
2012-10-21 07:58:11 +00:00
The_E
3ed94d11f9
Trunk sync r9230
2012-09-29 11:46:20 +00:00
The_E
1d75b96d5c
Trunk sync r9215
2012-09-20 16:34:15 +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
79b714ea12
Trunk sync r9092
2012-08-04 06:27:35 +00:00
The_E
1a4fd2f7dd
Backport of trunk 9091
2012-08-04 06:21:36 +00:00
The_E
b6bdffd23a
Trunk sync r9082
2012-08-01 16:43:44 +00:00
The_E
1640d066a1
Trunk sync r9064
2012-07-29 11:40:49 +00:00
The_E
2c729eee15
Trunk sync r9057
2012-07-28 21:09:28 +00:00
The_E
68be57e92b
Trunk sync r9031
2012-07-22 11:41:28 +00:00
The_E
8c8302a064
Trunk sync r9006
2012-07-11 17:25:38 +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
The_E
2d60cabe4a
Trunk sync r8813
2012-05-22 10:39:23 +00:00
The_E
45bd1d1d99
Trunk sync r8679
2012-04-15 11:41:31 +00:00
The_E
3f364d8718
trunk sync r8644
2012-04-01 16:21:23 +00:00
chief1983
50c090b724
Trunk sync: r8603 (skip 8606, already handled by hand)
2012-03-09 18:34:29 +00:00
The_E
b44c33abc5
Trunk sync r8587
2012-03-06 12:30:49 +00:00
The_E
af9261af10
Trunk sync r8575
2012-03-05 11:53:22 +00:00
The_E
4b013ac6ab
Trunk sync r8515
2012-02-18 11:56:09 +00:00
Zacam
3a62c1bb23
From CommanderDJ:
...
Introduces +Name identifiers for mainhall.tbl entries:
- +Name identifiers only need to be added to the lo-res (640x480) entry of the mainhall. If you really must add a +Name to both res versions, the two resolutions must have the exact same name.
- +Name identifiers are added immediately under the $Main Hall string
Vectorises Main_hall_defines, thus removing the MAIN_HALLS_MAX limit.
Main halls are now loaded based purely on campaign files. Hall indexes are no longer stored in the player struct, and thus this patch changes the pilot file version.
2012-02-09 12:56:10 +00:00
Zacam
feba1296d8
Trunk Sync: r8406-8410
2012-01-30 18:27:55 +00:00
Zacam
2191b124fe
Trunk Sync: r8387-8403
2012-01-29 17:20:25 +00:00
The_E
cb243c3f5c
trunk sync r8382 - 8385
2012-01-28 17:45:57 +00:00
Zacam
2a641ffff7
Trunk Sync: r8304-8308
2012-01-22 12:15:42 +00:00
Zacam
cb2e53c6c0
Trunk Sync: r8222-8225
2012-01-15 08:31:47 +00:00
Zacam
cba78496b6
Trunk Sync: r8214-8216
2012-01-14 19:45:44 +00:00
Zacam
16e4c568fe
Meh. Let's do this right. svn:eol-type set to LF for all of these as well. *sighs*
2012-01-13 18:35:09 +00:00
chief1983
ed2d5e0f76
Trunk sync r8164
2012-01-11 18:03:01 +00:00
karajorma
cf2cac5796
Switch from the directive-is-variable SEXP to the more powerful directive-value one.
2011-12-31 06:20:10 +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
Zacam
6e648f5205
Trunk Sync r8013
2011-11-19 16:32:50 +00:00
Zacam
6c6849405d
Trunk Sync r7891
2011-10-11 09:04:55 +00:00
Zacam
56f5a4c726
Trunk Sync r7882
2011-10-09 10:39:19 +00:00
Zacam
ac5e5cdc6f
Trunk Sync r7856
2011-10-03 13:40:33 +00:00
The_E
f77910e72e
Trunk sync r7842
2011-10-02 07:54:02 +00:00
Zacam
f20499a45a
Copy of Trunk 7815: Add set-docked SEXP.
2011-09-27 05:53:27 +00:00
Zacam
c607d9844e
Part One: Synchronization pass of Antipodes and Trunk Differences.
...
Whitespace/tab mostly and to catch any drift.
2011-09-09 09:38:52 +00:00
Zacam
17b3c8be17
Trunk Sync r7677
2011-09-08 05:47:44 +00:00
Zacam
02412812e2
Trunk Sync r7660
2011-09-07 07:41:50 +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
61c81e2a99
Trunk Sync r7542
2011-08-27 23:17:45 +00:00
Zacam