Changesets: fs2open

karajorma r5074

2009-02-25 15:02

karajorma


Ported: N/A

Details Diff
Sync up project files with Trunk
mod - /branches/karajorma/projects/MSVC_2003/Freespace2.vcproj Diff File
mod - /branches/karajorma/projects/MSVC_2003/code.vcproj Diff File
mod - /branches/karajorma/projects/MSVC_2003/fred2_open.vcproj Diff File
mod - /branches/karajorma/projects/MSVC_2005/Fred2.vcproj Diff File
mod - /branches/karajorma/projects/MSVC_2005/Freespace2.vcproj Diff File
mod - /branches/karajorma/projects/MSVC_6/Fred2.dsp Diff File
mod - /branches/karajorma/projects/MSVC_6/Freespace2.dsp Diff File
mod - /branches/karajorma/projects/MSVC_6/code.dsp Diff File
mod - /branches/karajorma/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File

karajorma r5073

2009-02-25 14:56

karajorma


Ported: N/A

Details Diff
Sync with Trunk
mod - /branches/karajorma/code/ai/aiturret.cpp Diff File
mod - /branches/karajorma/code/fred2/fred.rc Diff File
mod - /branches/karajorma/code/fred2/fredstubs.cpp Diff File
mod - /branches/karajorma/code/fred2/management.cpp Diff File
mod - /branches/karajorma/code/fred2/missionsave.cpp Diff File
mod - /branches/karajorma/code/fred2/sexp_tree.cpp Diff File
mod - /branches/karajorma/code/graphics/gropenglstate.cpp Diff File
mod - /branches/karajorma/code/mission/missionparse.cpp Diff File
mod - /branches/karajorma/code/mission/missionparse.h Diff File
mod - /branches/karajorma/code/model/modelread.cpp Diff File
mod - /branches/karajorma/code/network/multi_pmsg.cpp Diff File
mod - /branches/karajorma/code/parse/parselo.cpp Diff File
mod - /branches/karajorma/code/parse/parselo.h Diff File
mod - /branches/karajorma/code/ship/ship.cpp Diff File
mod - /branches/karajorma/code/ship/ship.h Diff File
mod - /branches/karajorma/code/stats/scoring.cpp Diff File
mod - /branches/karajorma/code/vcodec/codec1.cpp Diff File

wanderer r5072

2009-02-25 11:21

Wanderer


Ported: N/A

Details Diff
add beginnings of lua control system.
allow lua controls to override normal controls.
allow lua to use network variables.
add option for lua to retrieve current mp status of the cpu.
mod - /branches/wanderer/code/parse/lua.cpp Diff File
mod - /branches/wanderer/code/playerman/player.h Diff File
mod - /branches/wanderer/code/playerman/playercontrol.cpp Diff File

wanderer r5071

2009-02-25 11:17

Wanderer


Ported: N/A

Details Diff
sync with trunk (r5070)
mod - /branches/wanderer/code/fred2/fredstubs.cpp Diff File
mod - /branches/wanderer/code/fred2/missionsave.cpp Diff File
mod - /branches/wanderer/code/graphics/gropenglstate.cpp Diff File
mod - /branches/wanderer/code/mission/missionparse.cpp Diff File
mod - /branches/wanderer/code/mission/missionparse.h Diff File
mod - /branches/wanderer/code/model/modelread.cpp Diff File
mod - /branches/wanderer/code/parse/sexp.cpp Diff File
mod - /branches/wanderer/code/ship/ship.cpp Diff File
mod - /branches/wanderer/code/ship/ship.h Diff File
mod - /branches/wanderer/code/vcodec/codec1.cpp Diff File

trunk r5070

2009-02-25 10:41

karajorma


Ported: N/A

Details Diff
Some minor fixes including getting rid of the vestigial Determination setting from everything except the mission file itself.
mod - /trunk/fs2_open/code/fred2/fredstubs.cpp Diff File
mod - /trunk/fs2_open/code/fred2/missionsave.cpp 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/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.h Diff File
mod - /trunk/fs2_open/code/vcodec/codec1.cpp Diff File

trunk r5069

2009-02-25 09:50

Wanderer


Ported: N/A

Details Diff
possible fix for the missing thruster glow names.
changed phrasing of unrecognized type subsystem issue to less severe.
forced game to warn only once if exceeding max ship classes.
mod - /trunk/fs2_open/code/model/modelread.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File

trunk r5068

2009-02-23 12:10

chief1983


Ported: N/A

Details Diff
Taylor's fix for the OpenGL error in the debug log
http://www.hard-light.net/forums/index.php/topic,61170.msg1207696/topicseen.html#msg1207696
mod - /trunk/fs2_open/code/graphics/gropenglstate.cpp Diff File

karajorma r5067

2009-02-14 18:38

karajorma


Ported: N/A

Details Diff
Sync with trunk
mod - /branches/karajorma/code/fred2/campaigntreewnd.cpp Diff File
mod - /branches/karajorma/code/fred2/freddoc.cpp Diff File
mod - /branches/karajorma/code/fred2/fredview.cpp Diff File
mod - /branches/karajorma/code/fred2/management.cpp Diff File
mod - /branches/karajorma/code/fred2/management.h Diff File
mod - /branches/karajorma/code/fred2/missionsave.cpp Diff File
mod - /branches/karajorma/code/fred2/shipeditordlg.cpp Diff File
mod - /branches/karajorma/code/fred2/shipgoalsdlg.cpp Diff File
mod - /branches/karajorma/code/fred2/waypointpathdlg.cpp Diff File
mod - /branches/karajorma/code/fred2/wing_editor.cpp Diff File
mod - /branches/karajorma/code/freespace2/freespace.cpp Diff File
mod - /branches/karajorma/code/hud/hudbrackets.cpp Diff File
mod - /branches/karajorma/code/hud/hudtargetbox.cpp Diff File
mod - /branches/karajorma/code/mission/missionparse.cpp Diff File
mod - /branches/karajorma/code/parse/parselo.h Diff File
mod - /branches/karajorma/code/parse/sexp.cpp Diff File
mod - /branches/karajorma/code/parse/sexp.h Diff File
mod - /branches/karajorma/code/ship/ship.cpp Diff File

karajorma r5066

2009-02-14 16:47

karajorma


Ported: N/A

Details Diff
Fix Mantis 1486 (Pressing F4 locks multiplayer). Since this fix breaks compatibility I'll save up a few similar breaks and commit them all to trunk at the same time.
mod - /branches/karajorma/code/network/multimsgs.cpp Diff File

phreak r5065

2009-02-09 17:27

phreak


Ported: N/A

Details Diff
Missed some merge errors
add - /branches/phreak/code/freespace2/app_icon_glow.ico File
add - /branches/phreak/code/graphics/gropengldraw.cpp File
add - /branches/phreak/code/graphics/gropengldraw.h File
mod - /branches/phreak/code/hud/hudtarget.cpp Diff File
mod - /branches/phreak/code/ship/ship.cpp Diff File
mod - /branches/phreak/code/ship/ship.h Diff File

phreak r5064

2009-02-09 00:26

phreak


Ported: N/A

Details Diff
Sync with trunk. Haven't tried to compile yet. Will do that later...
mod - /branches/phreak/code/ai/ai_profiles.cpp Diff File
mod - /branches/phreak/code/ai/ai_profiles.h Diff File
mod - /branches/phreak/code/ai/aicode.cpp Diff File
mod - /branches/phreak/code/ai/aigoals.cpp Diff File
mod - /branches/phreak/code/ai/aiturret.cpp Diff File
mod - /branches/phreak/code/asteroid/asteroid.cpp Diff File
mod - /branches/phreak/code/autopilot/autopilot.cpp Diff File
mod - /branches/phreak/code/cfile/cfile.cpp Diff File
mod - /branches/phreak/code/cfile/cfilesystem.cpp Diff File
mod - /branches/phreak/code/cmdline/cmdline.cpp Diff File
mod - /branches/phreak/code/cmdline/cmdline.h Diff File
mod - /branches/phreak/code/cutscene/cutscenes.cpp Diff File
mod - /branches/phreak/code/cutscene/cutscenes.h Diff File
mod - /branches/phreak/code/cutscene/mveplayer.cpp Diff File
mod - /branches/phreak/code/cutscene/oggplayer.cpp Diff File
mod - /branches/phreak/code/fireball/fireballs.cpp Diff File
mod - /branches/phreak/code/fred2/briefingeditordlg.cpp Diff File
mod - /branches/phreak/code/fred2/campaignfilelistbox.cpp Diff File
mod - /branches/phreak/code/fred2/campaigntreewnd.cpp Diff File
mod - /branches/phreak/code/fred2/fred.rc Diff File
mod - /branches/phreak/code/fred2/freddoc.cpp Diff File
mod - /branches/phreak/code/fred2/fredview.cpp Diff File
mod - /branches/phreak/code/fred2/fredview.h Diff File
mod - /branches/phreak/code/fred2/management.cpp Diff File
mod - /branches/phreak/code/fred2/management.h Diff File
mod - /branches/phreak/code/fred2/missionnotesdlg.cpp Diff File
mod - /branches/phreak/code/fred2/missionsave.cpp Diff File
mod - /branches/phreak/code/fred2/resource.h Diff File
mod - /branches/phreak/code/fred2/sexp_tree.cpp Diff File
mod - /branches/phreak/code/fred2/shipeditordlg.cpp Diff File
mod - /branches/phreak/code/fred2/shipgoalsdlg.cpp Diff File
mod - /branches/phreak/code/fred2/voiceactingmanager.cpp Diff File
mod - /branches/phreak/code/fred2/waypointpathdlg.cpp Diff File
mod - /branches/phreak/code/fred2/wing.cpp Diff File
mod - /branches/phreak/code/fred2/wing_editor.cpp Diff File
mod - /branches/phreak/code/freespace2/freespace.cpp Diff File
mod - /branches/phreak/code/freespace2/freespace.rc Diff File
mod - /branches/phreak/code/freespace2/freespaceresource.h Diff File
mod - /branches/phreak/code/fs2netd/fs2netd_client.cpp Diff File
mod - /branches/phreak/code/fs2netd/fs2netd_client.h Diff File
mod - /branches/phreak/code/fs2netd/protocol.h Diff File
mod - /branches/phreak/code/fs2netd/tcp_client.cpp Diff File
mod - /branches/phreak/code/fs2netd/tcp_client.h Diff File
mod - /branches/phreak/code/fs2netd/tcp_socket.cpp Diff File
mod - /branches/phreak/code/fs2netd/tcp_socket.h Diff File
mod - /branches/phreak/code/gamehelp/contexthelp.cpp Diff File
mod - /branches/phreak/code/gamesnd/eventmusic.cpp Diff File
mod - /branches/phreak/code/gamesnd/gamesnd.cpp Diff File
mod - /branches/phreak/code/globalincs/def_files.cpp Diff File
mod - /branches/phreak/code/globalincs/pstypes.h Diff File
mod - /branches/phreak/code/globalincs/systemvars.cpp Diff File
mod - /branches/phreak/code/globalincs/windebug.cpp Diff File
mod - /branches/phreak/code/graphics/2d.cpp Diff File
mod - /branches/phreak/code/graphics/gropengl.cpp Diff File
mod - /branches/phreak/code/graphics/gropengllight.cpp Diff File
mod - /branches/phreak/code/graphics/gropengllight.h Diff File
mod - /branches/phreak/code/graphics/gropenglstate.cpp Diff File
mod - /branches/phreak/code/graphics/gropenglstate.h Diff File
mod - /branches/phreak/code/graphics/gropengltexture.cpp Diff File
mod - /branches/phreak/code/graphics/gropengltexture.h Diff File
mod - /branches/phreak/code/graphics/gropengltnl.cpp Diff File
mod - /branches/phreak/code/graphics/grstub.cpp Diff File
mod - /branches/phreak/code/hud/hudartillery.cpp Diff File
mod - /branches/phreak/code/hud/hudbrackets.cpp Diff File
mod - /branches/phreak/code/hud/hudparse.cpp Diff File
mod - /branches/phreak/code/hud/hudtarget.cpp Diff File
mod - /branches/phreak/code/hud/hudtarget.h Diff File
mod - /branches/phreak/code/hud/hudtargetbox.cpp Diff File
mod - /branches/phreak/code/iff_defs/iff_defs.cpp Diff File
mod - /branches/phreak/code/io/keycontrol.cpp Diff File
mod - /branches/phreak/code/io/mouse.cpp Diff File
mod - /branches/phreak/code/io/mouse.h Diff File
mod - /branches/phreak/code/io/timer.cpp Diff File
mod - /branches/phreak/code/io/timer.h Diff File
mod - /branches/phreak/code/io/trackir.cpp Diff File
mod - /branches/phreak/code/io/trackir.h Diff File
mod - /branches/phreak/code/lab/wmcgui.h Diff File
mod - /branches/phreak/code/localization/localize.cpp Diff File
mod - /branches/phreak/code/menuui/barracks.cpp Diff File
mod - /branches/phreak/code/menuui/credits.cpp Diff File
mod - /branches/phreak/code/menuui/mainhallmenu.cpp Diff File
mod - /branches/phreak/code/menuui/playermenu.cpp Diff File
mod - /branches/phreak/code/menuui/techmenu.cpp Diff File
mod - /branches/phreak/code/mission/missionbriefcommon.cpp Diff File
mod - /branches/phreak/code/mission/missioncampaign.cpp Diff File
mod - /branches/phreak/code/mission/missionlog.cpp Diff File
mod - /branches/phreak/code/mission/missionlog.h Diff File
mod - /branches/phreak/code/mission/missionmessage.cpp Diff File
mod - /branches/phreak/code/mission/missionparse.cpp Diff File
mod - /branches/phreak/code/missionui/missiondebrief.cpp Diff File
mod - /branches/phreak/code/missionui/missionshipchoice.cpp Diff File
mod - /branches/phreak/code/missionui/missionweaponchoice.cpp Diff File
mod - /branches/phreak/code/missionui/redalert.cpp Diff File
mod - /branches/phreak/code/model/model.h Diff File
mod - /branches/phreak/code/model/modelinterp.cpp Diff File
mod - /branches/phreak/code/model/modelread.cpp Diff File
mod - /branches/phreak/code/nebula/neb.cpp Diff File
mod - /branches/phreak/code/nebula/neblightning.cpp Diff File
mod - /branches/phreak/code/network/chat_api.cpp Diff File
mod - /branches/phreak/code/network/multi.cpp Diff File
mod - /branches/phreak/code/network/multi.h Diff File
mod - /branches/phreak/code/network/multi_endgame.cpp Diff File
mod - /branches/phreak/code/network/multi_log.cpp Diff File
mod - /branches/phreak/code/network/multi_obj.cpp Diff File
mod - /branches/phreak/code/network/multi_options.cpp Diff File
mod - /branches/phreak/code/network/multi_options.h Diff File
mod - /branches/phreak/code/network/multi_pinfo.cpp Diff File
mod - /branches/phreak/code/network/multi_pxo.cpp Diff File
mod - /branches/phreak/code/network/multi_respawn.cpp Diff File
mod - /branches/phreak/code/network/multimsgs.cpp Diff File
mod - /branches/phreak/code/network/multimsgs.h Diff File
mod - /branches/phreak/code/network/multiteamselect.cpp Diff File
mod - /branches/phreak/code/network/multiui.cpp Diff File
mod - /branches/phreak/code/network/multiutil.cpp Diff File
mod - /branches/phreak/code/network/psnet2.cpp Diff File
mod - /branches/phreak/code/network/psnet2.h Diff File
mod - /branches/phreak/code/network/stand_gui-unix.cpp Diff File
mod - /branches/phreak/code/network/stand_gui.cpp Diff File
mod - /branches/phreak/code/object/collideshipweapon.cpp Diff File
mod - /branches/phreak/code/osapi/osapi.cpp Diff File
mod - /branches/phreak/code/palman/palman.cpp Diff File
mod - /branches/phreak/code/parse/parselo.h Diff File
mod - /branches/phreak/code/parse/scripting.cpp Diff File
mod - /branches/phreak/code/parse/sexp.cpp Diff File
mod - /branches/phreak/code/parse/sexp.h Diff File
mod - /branches/phreak/code/playerman/playercontrol.cpp Diff File
mod - /branches/phreak/code/ship/ship.cpp Diff File
mod - /branches/phreak/code/ship/shipfx.cpp Diff File
mod - /branches/phreak/code/ship/shiphit.cpp Diff File
mod - /branches/phreak/code/species_defs/species_defs.cpp Diff File
mod - /branches/phreak/code/starfield/starfield.cpp Diff File
mod - /branches/phreak/code/stats/medals.cpp Diff File
mod - /branches/phreak/code/stats/scoring.cpp Diff File
mod - /branches/phreak/code/weapon/beam.cpp Diff File
mod - /branches/phreak/code/weapon/beam.h Diff File
mod - /branches/phreak/code/weapon/emp.cpp Diff File
mod - /branches/phreak/code/weapon/muzzleflash.cpp Diff File
mod - /branches/phreak/code/weapon/shockwave.cpp Diff File
mod - /branches/phreak/code/weapon/weapon.h Diff File
mod - /branches/phreak/code/weapon/weapons.cpp Diff File
mod - /branches/phreak/code/windows_stub/config.h Diff File
mod - /branches/phreak/code/windows_stub/stubs.cpp Diff File
mod - /branches/phreak/configure.ac Diff File
mod - /branches/phreak/projects/MSVC_2003/Freespace2.vcproj Diff File
mod - /branches/phreak/projects/MSVC_2003/fred2_open.vcproj Diff File
mod - /branches/phreak/projects/MSVC_2005/Fred2.vcproj Diff File
mod - /branches/phreak/projects/MSVC_2005/Freespace2.vcproj Diff File
mod - /branches/phreak/projects/MSVC_2008/Fred2.vcproj Diff File
mod - /branches/phreak/projects/MSVC_2008/Freespace2.sln Diff File
mod - /branches/phreak/projects/MSVC_2008/Freespace2.vcproj Diff File
mod - /branches/phreak/projects/MSVC_6/Fred2.dsp Diff File
mod - /branches/phreak/projects/MSVC_6/Freespace2.dsp Diff File
mod - /branches/phreak/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File

trunk r5063

2009-02-03 08:42

Wanderer


Ported: N/A

Details Diff
fix for mantis 1862
mod - /trunk/fs2_open/code/mission/missionparse.cpp Diff File

trunk r5062

2009-02-02 19:12

karajorma


Ported: N/A

Details Diff
Serves me right for saying it was working.
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File

trunk r5061

2009-02-02 12:17

karajorma


Ported: N/A

Details Diff
Argument SEXPs shouldn't be included when searching the tree for arguments.
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File

wanderer r5060

2009-02-01 08:59

Wanderer


Ported: N/A

Details Diff
copied from wrong patch... fix possible endless loop caused by r5059
mod - /branches/wanderer/code/weapon/emp.cpp Diff File

wanderer r5059

2009-02-01 08:56

Wanderer


Ported: N/A

Details Diff
option for setting emp resistance
mod - /branches/wanderer/code/ship/ship.cpp Diff File
mod - /branches/wanderer/code/ship/ship.h Diff File
mod - /branches/wanderer/code/weapon/emp.cpp Diff File

wanderer r5058

2009-02-01 08:48

Wanderer


Ported: N/A

Details Diff
option to allow weapons with hitpoints to ignore EMP
mod - /branches/wanderer/code/weapon/emp.cpp Diff File
mod - /branches/wanderer/code/weapon/weapon.h Diff File
mod - /branches/wanderer/code/weapon/weapons.cpp Diff File

wanderer r5057

2009-02-01 08:39

Wanderer


Ported: N/A

Details Diff
sync with trunk - r5056
mod - /branches/wanderer/code/fred2/campaigntreewnd.cpp Diff File
mod - /branches/wanderer/code/fred2/freddoc.cpp Diff File
mod - /branches/wanderer/code/fred2/fredview.cpp Diff File
mod - /branches/wanderer/code/fred2/management.cpp Diff File
mod - /branches/wanderer/code/fred2/management.h Diff File
mod - /branches/wanderer/code/fred2/missionsave.cpp Diff File
mod - /branches/wanderer/code/fred2/shipeditordlg.cpp Diff File
mod - /branches/wanderer/code/fred2/shipgoalsdlg.cpp Diff File
mod - /branches/wanderer/code/fred2/waypointpathdlg.cpp Diff File
mod - /branches/wanderer/code/fred2/wing_editor.cpp Diff File
mod - /branches/wanderer/code/freespace2/freespace.cpp Diff File
mod - /branches/wanderer/code/hud/hudbrackets.cpp Diff File
mod - /branches/wanderer/code/hud/hudtargetbox.cpp Diff File
mod - /branches/wanderer/code/mission/missionparse.cpp Diff File
mod - /branches/wanderer/code/network/multimsgs.cpp Diff File
mod - /branches/wanderer/code/parse/parselo.h Diff File
mod - /branches/wanderer/code/parse/sexp.cpp Diff File
mod - /branches/wanderer/code/parse/sexp.h Diff File
mod - /branches/wanderer/code/ship/ship.cpp Diff File

trunk r5056

2009-02-01 08:13

Wanderer


Ported: N/A

Details Diff
fix for mantis 1875
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File

trunk r5055

2009-01-28 17:41

karajorma


Ported: N/A

Details Diff
Fix a bug with in-sequence and invalidate-argument.
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File

karajorma r5054

2009-01-27 15:25

karajorma


Ported: N/A

Details Diff
Add Wanderer's Salvo Mode. Sync the 2008 project files up with Trunk.
mod - /branches/karajorma/code/ai/aiturret.cpp Diff File
mod - /branches/karajorma/code/fred2/AltShipClassDlg.cpp Diff File
mod - /branches/karajorma/code/model/model.h Diff File
mod - /branches/karajorma/code/network/multi.cpp Diff File
mod - /branches/karajorma/code/ship/ship.cpp Diff File
mod - /branches/karajorma/code/ship/ship.h Diff File
mod - /branches/karajorma/code/weapon/swarm.cpp Diff File
mod - /branches/karajorma/code/weapon/swarm.h Diff File
mod - /branches/karajorma/projects/MSVC_2008/Fred2.vcproj Diff File
mod - /branches/karajorma/projects/MSVC_2008/Freespace2.sln Diff File
mod - /branches/karajorma/projects/MSVC_2008/Freespace2.vcproj Diff File

trunk r5053

2009-01-24 17:36

karajorma


Ported: N/A

Details Diff
Fix Mantis 1867 (String-equals didn't work with nested arguments)
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File

trunk r5052

2009-01-20 00:49

Goober5000


Ported: N/A

Details Diff
being meticulous
mod - /trunk/fs2_open/code/network/multimsgs.cpp Diff File

trunk r5051

2009-01-20 00:19

phreak


Ported: N/A

Details Diff
Cutscene bars fix, try 0000002
mod - /trunk/fs2_open/code/freespace2/freespace.cpp Diff File

trunk r5050

2009-01-19 23:18

Goober5000


Ported: N/A

Details Diff
fix for Mantis 0001851
mod - /trunk/fs2_open/code/fred2/shipgoalsdlg.cpp Diff File
 First  Prev  1 2 3 ... 40 ... 80 ... 120 ... 160 ... 200 ... 234 235 236 237 238 239 240 ... 280 ... 320 ... 360 ... 400 ... 437 438 439  Next  Last