scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-12 02:01:29 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
Files
a115bdf2875de118bb3160bb7d2176fb772fd592
fs2open.github.com/code
T
History
Zacam a115bdf287 Trunk Sync -r7359
2011-07-19 22:10:23 +00:00
..
ai
Trunk Sync -r7356
2011-07-19 19:27:13 +00:00
anim
Trunk Sync - r7182
2011-05-16 09:16:44 +00:00
asteroid
Trunk sync r6949
2011-01-18 16:26:37 +00:00
autopilot
Trunk Sync - r6975
2011-01-25 16:49:43 +00:00
bmpman
Removing platform #ifdef from the limits.h include as un-necessary.
2011-03-29 19:49:05 +00:00
camera
Trunk Sync - r6875
2010-12-21 06:51:15 +00:00
cfile
Trunk Sync - r7328
2011-07-06 05:23:54 +00:00
cfilearchiver
Trunk Sync - r6875
2010-12-21 06:51:15 +00:00
cfileextractor
Trunk Sync - r6875
2010-12-21 06:51:15 +00:00
cmdline
Trunk sync r7230
2011-07-06 10:51:40 +00:00
cmeasure
Trunk Sync - r7030
2011-02-26 01:50:36 +00:00
controlconfig
Trunk Sync -r7171
2011-05-01 15:13:24 +00:00
cryptstring
Trunk Sync - r6865
2010-12-19 06:05:54 +00:00
cutscene
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
ddsutils
Trunk Sync - r6684
2010-10-25 04:09:33 +00:00
debris
Trunk Sync - r6898
2010-12-27 13:01:43 +00:00
debugconsole
Trunk Sync - r7315
2011-07-04 06:41:27 +00:00
directx
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
exceptionhandler
Trunk Sync
2009-09-12 15:18:09 +00:00
external_dll
Trunk Sync - r5792
2010-01-08 02:50:10 +00:00
fireball
Trunk Sync -r7336
2011-07-09 17:11:53 +00:00
fred2
Trunk Sync - r7315
2011-07-04 06:41:27 +00:00
freespace2
Trunk Sync - r7315
2011-07-04 06:41:27 +00:00
fs2netd
Trunk sync r6711
2010-11-05 00:47:58 +00:00
gamehelp
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
gamesequence
Let's try "GS_EVENT_END_CAMPAIGN (59)" instead of "GS_EVENT_EMD_CAMPAIGN (59)"
2011-05-19 11:34:48 +00:00
gamesnd
Trunk Sync - r6875
2010-12-21 06:51:15 +00:00
globalincs
Trunk Sync -r7359
2011-07-19 22:10:23 +00:00
graphics
Trunk Syn - r7350
2011-07-17 04:44:46 +00:00
hud
Trunk Sync - r7315
2011-07-04 06:41:27 +00:00
iff_defs
Trunk Sync
2009-09-12 15:18:09 +00:00
inetfile
Trunk Sync - r6684
2010-10-25 04:09:33 +00:00
io
Trunk sync r7219
2011-05-30 18:51:00 +00:00
jpgutils
safe_strings changes
2009-07-26 05:15:24 +00:00
jumpnode
Trunk Sync -r7171
2011-05-01 15:13:24 +00:00
lab
Trunk Sync - r7197
2011-05-19 21:34:28 +00:00
lighting
Replace most instances of std::vector with SCP_vector. Memory is now all run through vm_malloc and vm_free.
2009-07-11 07:07:57 +00:00
localization
Trunk Sync - r7025
2011-02-25 04:30:55 +00:00
math
Trunk Sync -r7171
2011-05-01 15:13:24 +00:00
menuui
Trunk Sync - r7240
2011-06-13 21:52:07 +00:00
mission
Trunk Syn - r7350
2011-07-17 04:44:46 +00:00
missionui
Update to r7260 from pyro3d
2011-06-20 13:18:16 +00:00
mm
remove PreProcDefine #includes in FS2
2005-07-13 03:26:00 +00:00
model
Trunk sync r7246
2011-07-13 09:04:47 +00:00
nebula
Trunk Sync - r7289
2011-06-28 22:43:33 +00:00
network
Trunk Sync - r7289
2011-06-28 22:43:33 +00:00
object
Trunk Sync - r7328
2011-07-06 05:23:54 +00:00
observer
Code cleanup: Remove redundant Num_observer_obs ahead of converting Observers array to an STL container
2010-09-26 10:39:03 +00:00
osapi
From Trunk: Standalone now makes it's own log file.
2011-06-21 23:09:41 +00:00
palman
safe_strings changes
2009-07-26 05:15:24 +00:00
parse
Trunk Sync -r7356
2011-07-19 19:27:13 +00:00
particle
Trunk Sync - r7224
2011-06-01 21:24:46 +00:00
pcxutils
safe_strings changes
2009-07-26 05:15:24 +00:00
physics
Trunk Sync - r6865
2010-12-19 06:05:54 +00:00
pilotfile
Comment out a few warnings that are unnecessarily alarming.
2011-05-19 11:27:13 +00:00
playerman
Trunk Sync - r7255
2011-06-18 19:40:53 +00:00
pngutils
Update:
2011-07-01 17:06:16 +00:00
popup
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
radar
Trunk Sync - r6945
2011-01-15 09:27:20 +00:00
render
Trunk Sync - r7182
2011-05-16 09:16:44 +00:00
scramble
Trunk Sync - r6865
2010-12-19 06:05:54 +00:00
ship
From Trunk 7295: Swifty's collision detection improvements.
2011-07-01 18:08:54 +00:00
sound
Trunk Sync - r7204
2011-05-24 15:12:06 +00:00
species_defs
Trunk Sync - r7235
2011-06-07 02:33:03 +00:00
starfield
Trunk Sync - r6945
2011-01-15 09:27:20 +00:00
stats
Trunk Sync - r7277
2011-06-28 04:04:47 +00:00
tgautils
Trunk Sync - r4290
2010-09-22 22:39:29 +00:00
ui
Trunk sync to 5769
2010-01-05 09:19:55 +00:00
variables
Trunk Sync - r6875
2010-12-21 06:51:15 +00:00
weapon
Trunk Sync -r7359
2011-07-19 22:10:23 +00:00
windows_stub
Copy of Trunk 6844.
2010-12-13 05:52:25 +00:00
wxfred2
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
Makefile.am
Reported by rsaxvc:
2011-03-29 13:54:07 +00:00