Changesets: fs2open
trunk r5274 2009-05-19 15:29 Ported: N/A Details Diff |
merge from wanderer branch - smart spawn weapon flag | ||
mod - /trunk/fs2_open/code/ai/aiturret.cpp | Diff File | ||
mod - /trunk/fs2_open/code/weapon/weapon.h | Diff File | ||
mod - /trunk/fs2_open/code/weapon/weapons.cpp | Diff File | ||
trunk r5273 2009-05-19 14:17 Ported: N/A Details Diff |
Add SEXP stuff to Linux Makefile.am | ||
mod - /trunk/fs2_open/code/Makefile.am | Diff File | ||
trunk r5272 2009-05-19 13:20 Ported: N/A Details Diff |
merge from wanderer branch '$Turrets prioritize ship target:' objecttypes flag | ||
mod - /trunk/fs2_open/code/ai/aiturret.cpp | Diff File | ||
mod - /trunk/fs2_open/code/globalincs/def_files.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/ship.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/ship.h | Diff File | ||
trunk r5271 2009-05-19 12:53 Ported: N/A Details Diff |
quick jury rigging to prevent stream of null vec warnings caused by r5261 | ||
mod - /trunk/fs2_open/code/ship/shipfx.cpp | Diff File | ||
trunk r5270 2009-05-18 18:08 Ported: N/A Details Diff |
merge from wanderer branch. 2d and 3d radar images support | ||
mod - /trunk/fs2_open/code/graphics/2d.h | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropengldraw.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropengldraw.h | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglstate.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropengltexture.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropengltnl.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/grstub.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/tmapper.h | Diff File | ||
mod - /trunk/fs2_open/code/radar/radar.cpp | Diff File | ||
mod - /trunk/fs2_open/code/radar/radar.h | Diff File | ||
mod - /trunk/fs2_open/code/radar/radarorb.cpp | Diff File | ||
mod - /trunk/fs2_open/code/radar/radarorb.h | Diff File | ||
mod - /trunk/fs2_open/code/radar/radarsetup.h | Diff File | ||
mod - /trunk/fs2_open/code/render/3ddraw.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/ship.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/ship.h | Diff File | ||
trunk r5269 2009-05-18 18:00 Ported: N/A Details Diff |
Fix Mantis 1926 (Piranha submunitions home in on the ship that fired them in dogfight mode) | ||
mod - /trunk/fs2_open/code/weapon/weapons.cpp | Diff File | ||
karajorma r5268 2009-05-18 17:41 Ported: N/A Details Diff |
Fix Mantis 1926 (Piranha submunitions home in on the ship that fired them in dogfight mode) | ||
mod - /branches/karajorma/code/weapon/weapon.h | Diff File | ||
mod - /branches/karajorma/code/weapon/weapons.cpp | Diff File | ||
trunk r5267 2009-05-18 16:36 Ported: N/A Details Diff |
initial merge from wanderer branch - fixes to corkscrew missile effects | ||
mod - /trunk/fs2_open/code/radar/radar.cpp | Diff File | ||
mod - /trunk/fs2_open/code/radar/radarorb.cpp | Diff File | ||
mod - /trunk/fs2_open/code/weapon/weapons.cpp | Diff File | ||
trunk r5266 2009-05-17 08:35 Ported: N/A Details Diff |
Fix Mantis 1925 (Loadout lists may contain ships and weapons which are not been flagged as player allowed). | ||
mod - /trunk/fs2_open/code/parse/parselo.cpp | Diff File | ||
karajorma r5265 2009-05-17 08:08 Ported: N/A Details Diff |
Sync with trunk | ||
mod - /branches/karajorma/code/ai/ai_profiles.cpp | Diff File | ||
mod - /branches/karajorma/code/ai/aicode.cpp | Diff File | ||
mod - /branches/karajorma/code/ai/aigoals.cpp | Diff File | ||
mod - /branches/karajorma/code/asteroid/asteroid.cpp | Diff File | ||
mod - /branches/karajorma/code/autopilot/autopilot.cpp | Diff File | ||
mod - /branches/karajorma/code/cmdline/cmdline.cpp | Diff File | ||
mod - /branches/karajorma/code/cutscene/cutscenes.cpp | Diff File | ||
mod - /branches/karajorma/code/cutscene/decoder16.cpp | Diff File | ||
mod - /branches/karajorma/code/cutscene/decoder8.cpp | Diff File | ||
mod - /branches/karajorma/code/cutscene/mvelib.cpp | Diff File | ||
mod - /branches/karajorma/code/debugconsole/console.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/fred.rc | 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/sexp_tree.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/shipflagsdlg.cpp | Diff File | ||
mod - /branches/karajorma/code/gamesnd/eventmusic.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/gropengl.cpp | Diff File | ||
mod - /branches/karajorma/code/hud/hudbrackets.cpp | Diff File | ||
mod - /branches/karajorma/code/hud/hudsquadmsg.cpp | Diff File | ||
mod - /branches/karajorma/code/hud/hudtarget.cpp | Diff File | ||
mod - /branches/karajorma/code/io/keycontrol.cpp | Diff File | ||
mod - /branches/karajorma/code/lab/lab.cpp | Diff File | ||
mod - /branches/karajorma/code/lighting/lighting.cpp | Diff File | ||
mod - /branches/karajorma/code/localization/localize.cpp | Diff File | ||
mod - /branches/karajorma/code/math/vecmat.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/object/object.cpp | Diff File | ||
mod - /branches/karajorma/code/osapi/osapi.cpp | Diff File | ||
mod - /branches/karajorma/code/parse/lua.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/parse/sexp.cpp | Diff File | ||
mod - /branches/karajorma/code/popup/popup.cpp | Diff File | ||
mod - /branches/karajorma/code/ship/ship.cpp | Diff File | ||
mod - /branches/karajorma/code/sound/sound.cpp | Diff File | ||
mod - /branches/karajorma/projects/Xcode/Info.plist | Diff File | ||
trunk r5264 2009-05-17 07:50 Ported: N/A Details Diff |
Portej05's preFAST warning fixes. | ||
mod - /trunk/fs2_open/code/ai/ai_profiles.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ai/aicode.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ai/aigoals.cpp | Diff File | ||
mod - /trunk/fs2_open/code/asteroid/asteroid.cpp | Diff File | ||
mod - /trunk/fs2_open/code/autopilot/autopilot.cpp | Diff File | ||
mod - /trunk/fs2_open/code/cmdline/cmdline.cpp | Diff File | ||
mod - /trunk/fs2_open/code/cutscene/cutscenes.cpp | Diff File | ||
mod - /trunk/fs2_open/code/cutscene/decoder16.cpp | Diff File | ||
mod - /trunk/fs2_open/code/cutscene/decoder8.cpp | Diff File | ||
mod - /trunk/fs2_open/code/cutscene/mvelib.cpp | Diff File | ||
mod - /trunk/fs2_open/code/debugconsole/console.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/fredview.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/management.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/sexp_tree.cpp | Diff File | ||
mod - /trunk/fs2_open/code/gamesnd/eventmusic.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropengl.cpp | Diff File | ||
mod - /trunk/fs2_open/code/hud/hudbrackets.cpp | Diff File | ||
mod - /trunk/fs2_open/code/hud/hudsquadmsg.cpp | Diff File | ||
mod - /trunk/fs2_open/code/hud/hudtarget.cpp | Diff File | ||
mod - /trunk/fs2_open/code/io/keycontrol.cpp | Diff File | ||
mod - /trunk/fs2_open/code/lab/lab.cpp | Diff File | ||
mod - /trunk/fs2_open/code/lighting/lighting.cpp | Diff File | ||
mod - /trunk/fs2_open/code/localization/localize.cpp | Diff File | ||
mod - /trunk/fs2_open/code/math/vecmat.cpp | Diff File | ||
mod - /trunk/fs2_open/code/mission/missionparse.cpp | Diff File | ||
mod - /trunk/fs2_open/code/object/object.cpp | Diff File | ||
mod - /trunk/fs2_open/code/osapi/osapi.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/lua.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
mod - /trunk/fs2_open/code/popup/popup.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/ship.cpp | Diff File | ||
mod - /trunk/fs2_open/code/sound/sound.cpp | Diff File | ||
trunk r5263 2009-05-16 15:41 Ported: N/A Details Diff |
Commit Wanderer's Salvo Fire mode changes. | ||
mod - /trunk/fs2_open/code/ai/aiturret.cpp | Diff File | ||
mod - /trunk/fs2_open/code/model/model.h | Diff File | ||
mod - /trunk/fs2_open/code/network/multi.cpp | 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/weapon/swarm.cpp | Diff File | ||
mod - /trunk/fs2_open/code/weapon/swarm.h | Diff File | ||
trunk r5262 2009-05-16 15:09 Ported: N/A Details Diff |
Update Xcode's Info.plist to 3.6.11 | ||
mod - /trunk/fs2_open/projects/Xcode/Info.plist | Diff File | ||
trunk r5261 2009-05-16 14:01 Ported: N/A Details Diff |
WMC's shipFX changes. Some other minor fixes. | ||
mod - /trunk/fs2_open/code/fred2/management.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/playerstarteditor.cpp | Diff File | ||
mod - /trunk/fs2_open/code/mission/missionmessage.cpp | Diff File | ||
mod - /trunk/fs2_open/code/mission/missionparse.cpp | Diff File | ||
mod - /trunk/fs2_open/code/network/multi_pmsg.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/ship.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/shipfx.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/shipfx.h | Diff File | ||
trunk r5260 2009-05-16 13:32 Ported: N/A Details Diff |
AddAdd support for multiple builtins of the same type and new builtin message types Praise Self, High Praise and Primaries Low |
||
mod - /trunk/fs2_open/code/mission/missionmessage.cpp | Diff File | ||
mod - /trunk/fs2_open/code/mission/missionmessage.h | 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 | ||
mod - /trunk/fs2_open/code/ship/shiphit.cpp | Diff File | ||
trunk r5259 2009-05-16 12:58 Ported: N/A Details Diff |
Switch network variables over to the SEXP packet except for when called from lua | ||
mod - /trunk/fs2_open/code/parse/lua.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.h | Diff File | ||
trunk r5258 2009-05-16 12:38 Ported: N/A Details Diff |
Add the set-ambient-light SEXP | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.h | Diff File | ||
trunk r5257 2009-05-16 12:29 Ported: N/A Details Diff |
Allow multi-docking in multiplayer. | ||
mod - /trunk/fs2_open/code/ai/aicode.cpp | Diff File | ||
mod - /trunk/fs2_open/code/network/multimsgs.cpp | Diff File | ||
mod - /trunk/fs2_open/code/network/multimsgs.h | Diff File | ||
trunk r5256 2009-05-16 12:20 Ported: N/A Details Diff |
More minor fixes. | ||
mod - /trunk/fs2_open/code/network/multi_sexp.cpp | Diff File | ||
mod - /trunk/fs2_open/code/object/object.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
trunk r5255 2009-05-16 10:06 Ported: N/A Details Diff |
Add a ship and parse flag to lock all turrets initially. Fix the Lock Primary/Secondary checkboxes to work for multi-selection. Add a checkbox for lock afterburner. Add the weapon fired since SEXPs | ||
mod - /trunk/fs2_open/code/fred2/fred.rc | Diff File | ||
mod - /trunk/fs2_open/code/fred2/initialstatus.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/initialstatus.h | 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/mission/missionparse.cpp | Diff File | ||
mod - /trunk/fs2_open/code/mission/missionparse.h | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.h | Diff File | ||
mod - /trunk/fs2_open/code/ship/ship.h | Diff File | ||
trunk r5254 2009-05-16 09:03 Ported: N/A Details Diff |
Break up the status SEXPs into sub-categories. | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.h | Diff File | ||
trunk r5253 2009-05-16 08:56 Ported: N/A Details Diff |
Fix a bug where the order of SEXP arguments was reversed. | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
trunk r5252 2009-05-16 08:55 Ported: N/A Details Diff |
Add SEXPs to set weapon, shield and afterburner energy. | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.h | Diff File | ||
karajorma r5251 2009-05-16 08:36 Ported: N/A Details Diff |
Sync with trunk | ||
mod - /branches/karajorma/code/ai/aicode.cpp | Diff File | ||
mod - /branches/karajorma/code/mission/missionmessage.cpp | Diff File | ||
mod - /branches/karajorma/code/mission/missionparse.cpp | Diff File | ||
mod - /branches/karajorma/code/radar/radarorb.cpp | Diff File | ||
trunk r5250 2009-05-16 08:32 Ported: N/A Details Diff |
Echelon 9's fix for a potential buffer overrun. | ||
mod - /trunk/fs2_open/code/mission/missionparse.cpp | Diff File |