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
Zacam
a5400e8e86
Trunk Sync - r6975
2011-01-25 16:49:43 +00:00
Zacam
2c5f54c319
MSVC LNK4221 Resolution.
...
multi_oo.cpp/.h and psnet.cpp/.h are not being used and have been removed.
Headers updated to point to multi_obj or psnet2 as appropriate.
Multi.cpp #ifdef PSNET2 made default. vecmat.h added to multi_obj.h.
2010-12-24 09:35:09 +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
6d9dedb2f8
Trunk Sync - r6830
2010-12-12 01:29:12 +00:00
Zacam
5357113acd
Trunk Sync - r6774
2010-11-24 02:59:12 +00:00
Zacam
fc0d8b53c8
Trunk Sync - r6760
2010-11-21 20:29:01 +00:00
Zacam
b28a2754cb
Trunk Sync - r6738
2010-11-14 19:41:45 +00:00
The_E
cb2a15ad1a
Trunk sync r6711
2010-11-05 00:47:58 +00:00
Zacam
1e4b61547c
Trunk Sync - r6684
2010-10-25 04:09:33 +00:00
Zacam
3662c33157
Trunk Sync - r6675
2010-10-24 20:50:24 +00:00
chief1983
48d5472738
Initial commit of HUD/Dradis code from Swifty's branch for Antipodes 7
2010-10-19 23:17:26 +00:00
Zacam
88377709f3
This is more like it. These files diff'd as different than Trunk versions, so I over-rode them with Trunk versions so that Antipodes and Trunk can finally have some 1:1 parity.
2010-09-23 02:14:26 +00:00
Zacam
585281635d
Trunk Sync - r4290
2010-09-22 22:39:29 +00:00
Zacam
3bebbbbcd0
Trunk Sync r6269. I hope this works. This is supposed to be a Trunk overlay merge into Antipodes, which should mean that Antipodes is now a copy of Trunk in all respects.
2010-06-29 22:09:34 +00:00
Zacam
7a399e1db3
Trunk Sync - r5931. Updated build output filenames to 6, MSVC 6 project also outputs _ant (instead of _trunk) so as not to over-write Trunk build compiles.
2010-02-22 21:37:43 +00:00
Flaming_Sword
c07b803065
$Alt name:
...
For ships and weapon tbms - renaming existing tbl entries in mods
2010-01-05 12:25:14 +00:00
portej05
31e620931e
Trunk Sync
2009-12-14 13:34:13 +00:00
Flaming_Sword
2ccdcbc0fe
Trunk sync
2009-11-19 12:14:17 +00:00
portej05
d1a1f39974
Trunk Sync
2009-11-03 08:21:16 +00:00
portej05
963d965699
Trunk Sync pending Zacams changes
2009-10-26 09:16:42 +00:00
portej05
d8b132d846
Antipodes3 from Flaming_Sword
2009-09-12 16:03:52 +00:00
portej05
b981f4147f
Trunk Sync
2009-09-12 15:18:09 +00:00
portej05
bc99d2520f
Trunk sync
2009-09-09 04:07:40 +00:00
Zacam