Changesets: fs2open

trunk r7001

2011-02-05 03:59

The_E


Ported: N/A

Details Diff
Minor whoopsie. This shouldn't have been committed just yet.
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r7000

2011-02-04 12:18

The_E


Ported: N/A

Details Diff
Adding patch for Mantis 2385. This adds a "+sub_name" option to the animation code, which comes after/replaces "+sub_type" for a few triggers, such as the "weapon fired" trigger.
mod - /trunk/fs2_open/code/model/modelanim.h Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r6999

2011-02-04 12:12

The_E


Ported: N/A

Details Diff
Adding a bit of verification here to catch a very strange bug
mod - /trunk/fs2_open/code/ship/shield.cpp Diff File

trunk r6998

2011-02-04 12:02

The_E


Ported: N/A

Details Diff
Adding a few error messages
mod - /trunk/fs2_open/code/ai/aicode.cpp Diff File

trunk r6997

2011-02-04 10:31

Echelon9


Ported: N/A

Details Diff
Remove last references to the redundant Intel_anim_filenames array
mod - /trunk/fs2_open/code/menuui/techmenu.cpp Diff File

antipodes r6996

2011-02-04 10:15

Zacam


Ported: N/A

Details Diff
Nukes Particle Code.
mod - /branches/antipodes/code/weapon/weapon.h Diff File
mod - /branches/antipodes/code/weapon/weapons.cpp Diff File

trunk r6995

2011-02-04 09:10

Zacam


Ported: N/A

Details Diff
Nukes Particle Code update (for more particle types)
http://www.hard-light.net/forums/index.php?topic=74165.0
mod - /trunk/fs2_open/code/weapon/weapon.h Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

antipodes r6994

2011-02-03 22:50

Zacam


Ported: N/A

Details Diff
Trunk Sync - r6993
mod - /branches/antipodes/code/fred2/initialstatus.cpp Diff File
mod - /branches/antipodes/code/fred2/missionsave.cpp Diff File
mod - /branches/antipodes/code/freespace2/freespace.cpp Diff File
mod - /branches/antipodes/code/globalincs/systemvars.h Diff File
mod - /branches/antipodes/code/mission/missiongoals.cpp Diff File
mod - /branches/antipodes/code/mission/missionlog.cpp Diff File
mod - /branches/antipodes/code/mission/missionparse.cpp Diff File
mod - /branches/antipodes/code/network/multi.cpp Diff File
mod - /branches/antipodes/code/network/multi.h Diff File
mod - /branches/antipodes/code/network/multi_ping.cpp Diff File
mod - /branches/antipodes/code/network/multi_ping.h Diff File
mod - /branches/antipodes/code/network/multimsgs.cpp Diff File
mod - /branches/antipodes/code/network/multiui.cpp Diff File
mod - /branches/antipodes/code/parse/sexp.cpp Diff File
mod - /branches/antipodes/code/parse/sexp.h Diff File
mod - /branches/antipodes/code/playerman/playercontrol.cpp Diff File
mod - /branches/antipodes/code/ship/ship.cpp Diff File
mod - /branches/antipodes/code/ship/ship.h Diff File

trunk r6993

2011-02-03 02:41

Zacam


Ported: N/A

Details Diff
Karajorma's "Clean up" code. (Not for credit, but because I'm trying to reduce the "open" number of "Code Reviews" so that we don't get too backlogged with them)
http://www.hard-light.net/forums/index.php?topic=74066.0
mod - /trunk/fs2_open/code/freespace2/freespace.cpp Diff File
mod - /trunk/fs2_open/code/globalincs/systemvars.h Diff File
mod - /trunk/fs2_open/code/mission/missiongoals.cpp Diff File
mod - /trunk/fs2_open/code/network/multi.cpp Diff File
mod - /trunk/fs2_open/code/network/multi.h Diff File
mod - /trunk/fs2_open/code/network/multi_ping.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_ping.h Diff File
mod - /trunk/fs2_open/code/network/multimsgs.cpp Diff File
mod - /trunk/fs2_open/code/network/multiui.cpp Diff File
mod - /trunk/fs2_open/code/playerman/playercontrol.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.h Diff File

trunk r6992

2011-02-02 01:26

FUBAR-BDHR


Ported: N/A

Details Diff
Add node-targeted sexp
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.h Diff File

trunk r6991

2011-01-31 05:04

Goober5000


Ported: N/A

Details Diff
--the behavior of cargo index -1 (which can only happen for capships) and cargo index 0 is substantially the same, so let's standardize on index 0... this prevents crazy stuff happening with bitwise operators on negative numbers :-/
--also, remove the restriction on capship cargo where ships must have the "scannable" flag
--because of the above constraints, "nothing" cannot be a meaningful subsys cargo, but then again, scanning a subsystem with "nothing" didn't do anything in the old code, so this doesn't change anything
mod - /trunk/fs2_open/code/fred2/initialstatus.cpp Diff File
mod - /trunk/fs2_open/code/fred2/missionsave.cpp Diff File
mod - /trunk/fs2_open/code/mission/missionlog.cpp Diff File
mod - /trunk/fs2_open/code/mission/missionparse.cpp Diff File
mod - /trunk/fs2_open/code/playerman/playercontrol.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File

trunk r6990

2011-01-31 04:18

Goober5000


Ported: N/A

Details Diff
fix for Mantis 0002390
errors in handling the CARGO_NO_DEPLETE flag for ship subsystems
mod - /trunk/fs2_open/code/mission/missionlog.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File
mod - /trunk/fs2_open/code/playerman/playercontrol.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File

antipodes r6989

2011-01-30 12:56

Zacam


Ported: N/A

Details Diff
Trunk Sync - r6988
mod - /branches/antipodes/code/fred2/fred.rc Diff File
mod - /branches/antipodes/code/fred2/missionsave.cpp Diff File
mod - /branches/antipodes/code/fred2/resource.h Diff File
mod - /branches/antipodes/code/fred2/sexp_tree.cpp Diff File
mod - /branches/antipodes/code/fred2/shipflagsdlg.cpp Diff File
mod - /branches/antipodes/code/fred2/shipflagsdlg.h Diff File
mod - /branches/antipodes/code/fred2/voiceactingmanager.cpp Diff File
mod - /branches/antipodes/code/localization/localize.cpp Diff File
mod - /branches/antipodes/code/mission/missionparse.cpp Diff File
mod - /branches/antipodes/code/mission/missionparse.h Diff File
mod - /branches/antipodes/code/object/object.h Diff File
mod - /branches/antipodes/code/parse/sexp.cpp Diff File
mod - /branches/antipodes/code/parse/sexp.h Diff File
mod - /branches/antipodes/code/ship/ship.h Diff File
mod - /branches/antipodes/code/weapon/weapon.h Diff File
mod - /branches/antipodes/code/weapon/weapons.cpp Diff File
mod - /branches/antipodes/libjpeg/README Diff File
rm - /branches/antipodes/libjpeg/cderror.h File
rm - /branches/antipodes/libjpeg/cdjpeg.h File
add - /branches/antipodes/libjpeg/change.log File
add - /branches/antipodes/libjpeg/install.txt File
add - /branches/antipodes/libjpeg/jaricom.c File
mod - /branches/antipodes/libjpeg/jcapimin.c Diff File
rm - /branches/antipodes/libjpeg/jccoefct.c File
rm - /branches/antipodes/libjpeg/jccolor.c File
rm - /branches/antipodes/libjpeg/jcdctmgr.c File
rm - /branches/antipodes/libjpeg/jchuff.c File
rm - /branches/antipodes/libjpeg/jchuff.h File
rm - /branches/antipodes/libjpeg/jcinit.c File
rm - /branches/antipodes/libjpeg/jcmainct.c File
rm - /branches/antipodes/libjpeg/jcmarker.c File
rm - /branches/antipodes/libjpeg/jcmaster.c File
add - /branches/antipodes/libjpeg/jconfig.h File
add - /branches/antipodes/libjpeg/jconfig.txt File
rm - /branches/antipodes/libjpeg/jconfig_lnx.h File
rm - /branches/antipodes/libjpeg/jconfig_vc.h File
mod - /branches/antipodes/libjpeg/jcparam.c Diff File
rm - /branches/antipodes/libjpeg/jcphuff.c File
rm - /branches/antipodes/libjpeg/jcprepct.c File
rm - /branches/antipodes/libjpeg/jcsample.c File
mod - /branches/antipodes/libjpeg/jctrans.c Diff File
mod - /branches/antipodes/libjpeg/jdapimin.c Diff File
mod - /branches/antipodes/libjpeg/jdapistd.c Diff File
add - /branches/antipodes/libjpeg/jdarith.c File
rm - /branches/antipodes/libjpeg/jdatadst.c File
mod - /branches/antipodes/libjpeg/jdatasrc.c Diff File
mod - /branches/antipodes/libjpeg/jdcoefct.c Diff File
mod - /branches/antipodes/libjpeg/jdct.h Diff File
mod - /branches/antipodes/libjpeg/jddctmgr.c Diff File
mod - /branches/antipodes/libjpeg/jdhuff.c Diff File
rm - /branches/antipodes/libjpeg/jdhuff.h File
mod - /branches/antipodes/libjpeg/jdinput.c Diff File
mod - /branches/antipodes/libjpeg/jdmainct.c Diff File
mod - /branches/antipodes/libjpeg/jdmarker.c Diff File
mod - /branches/antipodes/libjpeg/jdmaster.c Diff File
rm - /branches/antipodes/libjpeg/jdphuff.c File
mod - /branches/antipodes/libjpeg/jdsample.c Diff File
mod - /branches/antipodes/libjpeg/jdtrans.c Diff File
mod - /branches/antipodes/libjpeg/jerror.h Diff File
rm - /branches/antipodes/libjpeg/jfdctflt.c File
rm - /branches/antipodes/libjpeg/jfdctfst.c File
rm - /branches/antipodes/libjpeg/jfdctint.c File
mod - /branches/antipodes/libjpeg/jidctflt.c Diff File
mod - /branches/antipodes/libjpeg/jidctint.c Diff File
rm - /branches/antipodes/libjpeg/jidctred.c File
mod - /branches/antipodes/libjpeg/jinclude.h Diff File
rm - /branches/antipodes/libjpeg/jmemansi.c File
add - /branches/antipodes/libjpeg/jmemnobs.c File
mod - /branches/antipodes/libjpeg/jmorecfg.h Diff File
mod - /branches/antipodes/libjpeg/jpegint.h Diff File
mod - /branches/antipodes/libjpeg/jpeglib.h Diff File
mod - /branches/antipodes/libjpeg/jutils.c Diff File
mod - /branches/antipodes/libjpeg/jversion.h Diff File
add - /branches/antipodes/libjpeg/libjpeg.txt File
rm - /branches/antipodes/libjpeg/transupp.h File
mod - /branches/antipodes/projects/MSVC_2005/libjpeg.vcproj Diff File
mod - /branches/antipodes/projects/MSVC_2008/libjpeg.vcproj Diff File
mod - /branches/antipodes/projects/MSVC_2010/libjpeg.vcxproj Diff File
mod - /branches/antipodes/projects/MSVC_2010/libjpeg.vcxproj.filters Diff File
mod - /branches/antipodes/projects/MSVC_6/libjpeg.dsp Diff File
mod - /branches/antipodes/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File

trunk r6988

2011-01-30 04:17

Goober5000


Ported: N/A

Details Diff
fix some errors with sexp numbering that free up 2 Change slots
merge the Nav operators into other categories
add the new Change2 category and set up hacks so that its operators will display in Change's menu
mod - /trunk/fs2_open/code/fred2/sexp_tree.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.h Diff File

trunk r6987

2011-01-30 03:19

Goober5000


Ported: N/A

Details Diff
commit the "immobile" flag, requested by Black Wolf, Diaspora, etc. This is just the infrastructure; the flag doesn't actually do anything yet.
mod - /trunk/fs2_open/code/fred2/fred.rc Diff File
mod - /trunk/fs2_open/code/fred2/missionsave.cpp Diff File
mod - /trunk/fs2_open/code/fred2/resource.h Diff File
mod - /trunk/fs2_open/code/fred2/shipflagsdlg.cpp Diff File
mod - /trunk/fs2_open/code/fred2/shipflagsdlg.h Diff File
mod - /trunk/fs2_open/code/mission/missionparse.cpp Diff File
mod - /trunk/fs2_open/code/mission/missionparse.h Diff File
mod - /trunk/fs2_open/code/object/object.h Diff File
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.h Diff File

trunk r6986

2011-01-30 03:12

Goober5000


Ported: N/A

Details Diff
fix ship flag dlg layout, which got messed up in The E's commit
mod - /trunk/fs2_open/code/fred2/fred.rc Diff File

trunk r6985

2011-01-30 02:55

Goober5000


Ported: N/A

Details Diff
someone made a bug here!
mod - /trunk/fs2_open/code/fred2/missionsave.cpp Diff File

trunk r6984

2011-01-30 02:07

Goober5000


Ported: N/A

Details Diff
fix compilation
mod - /trunk/fs2_open/code/fred2/shipflagsdlg.cpp Diff File
mod - /trunk/fs2_open/code/fred2/voiceactingmanager.cpp Diff File

trunk r6983

2011-01-30 01:09

Zacam


Ported: N/A

Details Diff
It would have been NICE if Tortoise had actually _deleted_ the files when it asked if I wanted them removed. Stupid !@$^*&# Tortoise.
rm - /trunk/fs2_open/code/network/multi_oo.cpp File
rm - /trunk/fs2_open/code/network/multi_oo.h File
rm - /trunk/fs2_open/code/network/psnet.cpp File
rm - /trunk/fs2_open/code/network/psnet.h File

trunk r6982

2011-01-30 00:59

Zacam


Ported: N/A

Details Diff
Resolves LNK4221 under MSVC. multi_oo and psnet are not actually linked/used, so references pointing to them now go to multi_obj and psnet2 respectively. (Same as Antipodes 6881)
http://www.hard-light.net/forums/index.php?topic=73147.0
mod - /trunk/fs2_open/code/Makefile.am Diff File
mod - /trunk/fs2_open/code/fred2/fredstubs.cpp Diff File
mod - /trunk/fs2_open/code/network/multi.cpp Diff File
mod - /trunk/fs2_open/code/network/multi.h Diff File
mod - /trunk/fs2_open/code/network/multi_obj.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_obj.h Diff File
mod - /trunk/fs2_open/code/network/multi_options.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_xfer.cpp Diff File
mod - /trunk/fs2_open/code/network/multilag.cpp Diff File
mod - /trunk/fs2_open/code/network/multiui.cpp Diff File
mod - /trunk/fs2_open/code/network/multiutil.h Diff File
mod - /trunk/fs2_open/code/network/psnet2.cpp Diff File
mod - /trunk/fs2_open/code/network/psnet2.h Diff File
mod - /trunk/fs2_open/code/playerman/playercontrol.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.h Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/code.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/code.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/code.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/code.vcxproj.filters Diff File
mod - /trunk/fs2_open/projects/MSVC_6/code.dsp Diff File
mod - /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File
mod - /trunk/fs2_open/projects/codeblocks/code/code.cbp Diff File

trunk r6981

2011-01-29 20:40

Zacam


Ported: N/A

Details Diff
Microsoft Visual Studio 6/2005/2008/2010 project updates to use newer libjpeg code committed on 6980.
mod - /trunk/fs2_open/projects/MSVC_2005/libjpeg.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/libjpeg.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/libjpeg.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/libjpeg.vcxproj.filters Diff File
mod - /trunk/fs2_open/projects/MSVC_6/libjpeg.dsp Diff File

trunk r6980

2011-01-29 20:33

Echelon9


Ported: N/A

Details Diff
Update libjpeg in source to v8c (16-Jan-11) from 6b (27-Mar-98). For more details see http://www.hard-light.net/forums/index.php?topic=74110.0
mod - /trunk/fs2_open/libjpeg/README Diff File
rm - /trunk/fs2_open/libjpeg/cderror.h File
rm - /trunk/fs2_open/libjpeg/cdjpeg.h File
add - /trunk/fs2_open/libjpeg/change.log File
add - /trunk/fs2_open/libjpeg/install.txt File
add - /trunk/fs2_open/libjpeg/jaricom.c File
mod - /trunk/fs2_open/libjpeg/jcapimin.c Diff File
rm - /trunk/fs2_open/libjpeg/jccoefct.c File
rm - /trunk/fs2_open/libjpeg/jccolor.c File
rm - /trunk/fs2_open/libjpeg/jcdctmgr.c File
rm - /trunk/fs2_open/libjpeg/jchuff.c File
rm - /trunk/fs2_open/libjpeg/jchuff.h File
rm - /trunk/fs2_open/libjpeg/jcinit.c File
rm - /trunk/fs2_open/libjpeg/jcmainct.c File
rm - /trunk/fs2_open/libjpeg/jcmarker.c File
rm - /trunk/fs2_open/libjpeg/jcmaster.c File
add - /trunk/fs2_open/libjpeg/jconfig.h File
add - /trunk/fs2_open/libjpeg/jconfig.txt File
rm - /trunk/fs2_open/libjpeg/jconfig_lnx.h File
rm - /trunk/fs2_open/libjpeg/jconfig_vc.h File
mod - /trunk/fs2_open/libjpeg/jcparam.c Diff File
rm - /trunk/fs2_open/libjpeg/jcphuff.c File
rm - /trunk/fs2_open/libjpeg/jcprepct.c File
rm - /trunk/fs2_open/libjpeg/jcsample.c File
mod - /trunk/fs2_open/libjpeg/jctrans.c Diff File
mod - /trunk/fs2_open/libjpeg/jdapimin.c Diff File
mod - /trunk/fs2_open/libjpeg/jdapistd.c Diff File
add - /trunk/fs2_open/libjpeg/jdarith.c File
rm - /trunk/fs2_open/libjpeg/jdatadst.c File
mod - /trunk/fs2_open/libjpeg/jdatasrc.c Diff File
mod - /trunk/fs2_open/libjpeg/jdcoefct.c Diff File
mod - /trunk/fs2_open/libjpeg/jdct.h Diff File
mod - /trunk/fs2_open/libjpeg/jddctmgr.c Diff File
mod - /trunk/fs2_open/libjpeg/jdhuff.c Diff File
rm - /trunk/fs2_open/libjpeg/jdhuff.h File
mod - /trunk/fs2_open/libjpeg/jdinput.c Diff File
mod - /trunk/fs2_open/libjpeg/jdmainct.c Diff File
mod - /trunk/fs2_open/libjpeg/jdmarker.c Diff File
mod - /trunk/fs2_open/libjpeg/jdmaster.c Diff File
rm - /trunk/fs2_open/libjpeg/jdphuff.c File
mod - /trunk/fs2_open/libjpeg/jdsample.c Diff File
mod - /trunk/fs2_open/libjpeg/jdtrans.c Diff File
mod - /trunk/fs2_open/libjpeg/jerror.h Diff File
rm - /trunk/fs2_open/libjpeg/jfdctflt.c File
rm - /trunk/fs2_open/libjpeg/jfdctfst.c File
rm - /trunk/fs2_open/libjpeg/jfdctint.c File
mod - /trunk/fs2_open/libjpeg/jidctflt.c Diff File
mod - /trunk/fs2_open/libjpeg/jidctint.c Diff File
rm - /trunk/fs2_open/libjpeg/jidctred.c File
mod - /trunk/fs2_open/libjpeg/jinclude.h Diff File
rm - /trunk/fs2_open/libjpeg/jmemansi.c File
add - /trunk/fs2_open/libjpeg/jmemnobs.c File
mod - /trunk/fs2_open/libjpeg/jmorecfg.h Diff File
mod - /trunk/fs2_open/libjpeg/jpegint.h Diff File
mod - /trunk/fs2_open/libjpeg/jpeglib.h Diff File
mod - /trunk/fs2_open/libjpeg/jutils.c Diff File
mod - /trunk/fs2_open/libjpeg/jversion.h Diff File
add - /trunk/fs2_open/libjpeg/libjpeg.txt File
rm - /trunk/fs2_open/libjpeg/transupp.h File
mod - /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File

trunk r6979

2011-01-29 04:41

Goober5000


Ported: N/A

Details Diff
this should fix the weird crashes in localization
mod - /trunk/fs2_open/code/localization/localize.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File

trunk r6978

2011-01-27 00:35

IssMneur


Ported: N/A

Details Diff
Allow a primary or secondary weapon shot be substituted with any other weapon in any arbitrary pattern.

http://www.hard-light.net/wiki/index.php/Weapons.tbl#.24Substitute:
mod - /trunk/fs2_open/code/ship/ship.h Diff File
mod - /trunk/fs2_open/code/weapon/weapon.h Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r6977

2011-01-26 06:30

Echelon9


Ported: N/A

Details Diff
Resolve circa 800 warnings that occur on Xcode due to symbol visibility scoping issue.
mod - /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File
 First  Prev  1 2 3 ... 40 ... 80 ... 120 ... 157 158 159 160 161 162 163 ... 200 ... 240 ... 280 ... 320 ... 360 ... 400 ... 437 438 439  Next  Last