 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
|
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
|
1d75b96d5c
|
Trunk sync r9215
|
2012-09-20 16:34:15 +00:00 |
|
|
The_E
|
68be57e92b
|
Trunk sync r9031
|
2012-07-22 11:41:28 +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
|
cc7a648fac
|
Trunk sync r8766
|
2012-05-10 10:03:39 +00:00 |
|
|
The_E
|
eee0c96fc1
|
Trunk sync r8696
|
2012-04-30 14:57:21 +00:00 |
|
|
The_E
|
02d8bd64c4
|
Trunk sync r8545
|
2012-03-02 16:05:44 +00:00 |
|
|
Zacam
|
c7b77c2974
|
Fix for Mantis 2609: Resolves segmentation fault under linux caused by memsets clobbering the pointer that SCP_string used to check its length before assignment.
|
2012-02-21 15:20:15 +00:00 |
|
|
Zacam
|
55996169ff
|
Trunk Sync: r8456-8459
|
2012-02-10 19:05:36 +00:00 |
|
|
Zacam
|
45d55d5c75
|
Trunk Sync: r8297-8302
|
2012-01-22 07:52:20 +00:00 |
|
|
Zacam
|
cb2e53c6c0
|
Trunk Sync: r8222-8225
|
2012-01-15 08:31:47 +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 |
|
|
Zacam
|
832999fbbd
|
Trunk Sync r8104
|
2011-12-21 08:52:59 +00:00 |
|
|
Zacam
|
6e648f5205
|
Trunk Sync r8013
|
2011-11-19 16:32:50 +00:00 |
|
|
Zacam
|
ac5e5cdc6f
|
Trunk Sync r7856
|
2011-10-03 13:40:33 +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 |
|
|
Echelon9
|
116f14d1c3
|
PVS-Studio fix: V568 It's odd that the argument of sizeof() operator is the '(ushort) sc->m_okKills [idx]' expression.
Please note that this will break multiplayer compatibility with prior versions of Antipodes 8. See further http://www.hard-light.net/forums/index.php?topic=73257.msg1550632#msg1550632
|
2011-10-01 07:53:04 +00:00 |
|
|
Zacam
|
176f307316
|
Trunk Sync r7799
|
2011-09-25 04:10:42 +00:00 |
|
|
The_E
|
15afdd864a
|
Trunk sync r7792
|
2011-09-24 17:44:49 +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
|
e9e29e3ae6
|
Trunk Sync r7674
|
2011-09-08 05:05:01 +00:00 |
|
|
Zacam
|
6e6aa1975c
|
Trunk Sync r7665
|
2011-09-07 10:20:10 +00:00 |
|
|
The_E
|
60758c5e82
|
And a few things that went wrong while merging
|
2011-09-06 21:44:54 +00:00 |
|
|
The_E
|
b725ff7e21
|
trunk sync r7657
|
2011-09-06 21:22:39 +00:00 |
|
|
The_E
|
86e99817a4
|
Ooops, messed up the merge here
|
2011-08-31 19:44:14 +00:00 |
|
|
The_E
|
75f66ee174
|
Trunk sync r7607
|
2011-08-31 19:36:54 +00:00 |
|
|
The_E
|
d8a728d5f1
|
Trunk sync r7593
|
2011-08-30 18:17:09 +00:00 |
|
|
Zacam
|
ad3b01c2f2
|
Trunk Sync r7563
|
2011-08-29 00:21:43 +00:00 |
|
|
Zacam
|
61c81e2a99
|
Trunk Sync r7542
|
2011-08-27 23:17:45 +00:00 |
|
|
Zacam
|
2f6d659147
|
Trunk Sync r7529
|
2011-08-24 20:41:13 +00:00 |
|
|
Zacam
|
1452c349ee
|
Trunk Sync r7502
|
2011-08-21 04:10:52 +00:00 |
|
|
Zacam
|
e3dcfbe59a
|
Trunk Sync r7490
|
2011-08-19 22:11:28 +00:00 |
|
|
Zacam
|
037a418a62
|
Trunk Sync r7483
|
2011-08-18 20:22:52 +00:00 |
|
|
Zacam
|
78e2500d9e
|
Some additional PVS-Studio fixes as placed in the thread on Aug 10th:
http://www.hard-light.net/forums/index.php?topic=77590.msg1538811#msg1538811
|
2011-08-14 14:08:09 +00:00 |
|
|
Echelon9
|
67eb406443
|
PVS-Studio: Fix V805. Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) > 0' construct
|
2011-08-14 13:14:35 +00:00 |
|
|
Zacam
|
61d7289888
|
Trunk Sync r7458
|
2011-08-12 12:48:38 +00:00 |
|
|
Zacam
|
d3bb5578e3
|
From Echelon9: For testing, PVS-Studio output corrections.
|
2011-08-09 07:45:09 +00:00 |
|
|
Zacam
|
efa75b4a22
|
Trunk Sync - r7289
|
2011-06-28 22:43:33 +00:00 |
|
|
Zacam
|
a8f9b2a15e
|
Trunk Sync - r7277
|
2011-06-28 04:04:47 +00:00 |
|
|
The_E
|
d226931506
|
Trunk sync r7107
|
2011-04-05 12:07:21 +00:00 |
|
|
Zacam
|
4ab313e1b6
|
Trunk Sync - r7014
|
2011-02-14 17:03:01 +00:00 |
|
|
Zacam
|
5abaa37b7f
|
Trunk Sync -r7002
|
2011-02-06 03:26:41 +00:00 |
|
|
Zacam
|
8afa55a716
|
Trunk Sync - r6993
|
2011-02-04 03:50:54 +00:00 |
|