All Projects FSSCP  wxFRED

Changesets: fs2open

Search Browse Back to Index

karajorma r5299

2009-05-21 10:59

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/resource.h Diff File
mod - /branches/karajorma/code/mission/missionparse.h Diff File

trunk r5298

2009-05-21 10:57

karajorma


Ported: N/A

Details Diff		 Bobboau's Skybox flags code (via Wanderer then me)
mod - /trunk/fs2_open/code/fred2/bgbitmapdlg.cpp Diff File
mod - /trunk/fs2_open/code/fred2/bgbitmapdlg.h Diff File
mod - /trunk/fs2_open/code/fred2/fred.rc Diff File
mod - /trunk/fs2_open/code/fred2/management.cpp 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/model/model.h Diff File
mod - /trunk/fs2_open/code/model/modelinterp.cpp Diff File
mod - /trunk/fs2_open/code/model/modelread.cpp 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/starfield/starfield.cpp Diff File
mod - /trunk/fs2_open/code/starfield/starfield.h Diff File
mod - /trunk/fs2_open/code/weapon/weapon.h Diff File

trunk r5297

2009-05-21 10:15

karajorma


Ported: N/A

Details Diff		 A piece of WMC's warp code that somehow missed being committed.
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File

karajorma r5296

2009-05-21 10:02

karajorma


Ported: N/A

Details Diff		 Fix a newline issue with skybox flags.
mod - /branches/karajorma/code/fred2/missionsave.cpp Diff File

karajorma r5295

2009-05-21 09:50

karajorma


Ported: N/A

Details Diff		 Sync with trunk
mod - /branches/karajorma/code/Makefile.am Diff File
mod - /branches/karajorma/code/ai/ai_profiles.cpp Diff File
mod - /branches/karajorma/code/ai/ai_profiles.h Diff File
mod - /branches/karajorma/code/ai/aibig.cpp Diff File
mod - /branches/karajorma/code/ai/aigoals.cpp Diff File
mod - /branches/karajorma/code/ai/aiturret.cpp Diff File
mod - /branches/karajorma/code/fred2/fredrender.cpp Diff File
mod - /branches/karajorma/code/freespace2/freespace.cpp Diff File
mod - /branches/karajorma/code/globalincs/def_files.cpp Diff File
mod - /branches/karajorma/code/graphics/2d.h Diff File
mod - /branches/karajorma/code/graphics/gropengldraw.cpp Diff File
mod - /branches/karajorma/code/graphics/gropengldraw.h Diff File
mod - /branches/karajorma/code/graphics/gropenglstate.cpp Diff File
mod - /branches/karajorma/code/graphics/gropengltexture.cpp Diff File
mod - /branches/karajorma/code/graphics/gropengltnl.cpp Diff File
mod - /branches/karajorma/code/graphics/grstub.cpp Diff File
mod - /branches/karajorma/code/graphics/tmapper.h Diff File
mod - /branches/karajorma/code/hud/hud.cpp Diff File
mod - /branches/karajorma/code/hud/hudtarget.cpp Diff File
mod - /branches/karajorma/code/hud/hudtargetbox.cpp Diff File
mod - /branches/karajorma/code/iff_defs/iff_defs.cpp Diff File
mod - /branches/karajorma/code/iff_defs/iff_defs.h Diff File
mod - /branches/karajorma/code/math/vecmat.cpp Diff File
mod - /branches/karajorma/code/math/vecmat.h Diff File
mod - /branches/karajorma/code/mission/missionlog.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/model.h Diff File
mod - /branches/karajorma/code/model/modelread.cpp Diff File
mod - /branches/karajorma/code/network/multi.cpp Diff File
mod - /branches/karajorma/code/network/multi.h Diff File
mod - /branches/karajorma/code/network/multi_sexp.cpp Diff File
mod - /branches/karajorma/code/network/multi_sexp.h Diff File
mod - /branches/karajorma/code/network/multimsgs.cpp Diff File
mod - /branches/karajorma/code/network/multimsgs.h Diff File
mod - /branches/karajorma/code/object/collideweaponweapon.cpp Diff File
mod - /branches/karajorma/code/object/objcollide.cpp Diff File
mod - /branches/karajorma/code/object/objectsnd.cpp Diff File
mod - /branches/karajorma/code/object/objectsnd.h Diff File
mod - /branches/karajorma/code/parse/parselo.cpp Diff File
mod - /branches/karajorma/code/parse/sexp.cpp Diff File
mod - /branches/karajorma/code/parse/sexp.h Diff File
mod - /branches/karajorma/code/playerman/playercontrol.cpp Diff File
mod - /branches/karajorma/code/radar/radar.cpp Diff File
mod - /branches/karajorma/code/radar/radar.h Diff File
mod - /branches/karajorma/code/radar/radarorb.cpp Diff File
mod - /branches/karajorma/code/radar/radarorb.h Diff File
mod - /branches/karajorma/code/radar/radarsetup.cpp Diff File
mod - /branches/karajorma/code/radar/radarsetup.h Diff File
mod - /branches/karajorma/code/render/3ddraw.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/ship/shipfx.cpp Diff File
mod - /branches/karajorma/code/ship/shiphit.cpp Diff File
mod - /branches/karajorma/code/weapon/beam.cpp Diff File
mod - /branches/karajorma/code/weapon/emp.cpp Diff File
mod - /branches/karajorma/code/weapon/trails.cpp Diff File
mod - /branches/karajorma/code/weapon/trails.h Diff File
mod - /branches/karajorma/code/weapon/weapon.h Diff File
mod - /branches/karajorma/code/weapon/weapons.cpp Diff File
mod - /branches/karajorma/configure.ac Diff File

trunk r5294

2009-05-21 04:50

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - trail & contrail leading edge fade out option
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/trails.cpp Diff File
mod - /trunk/fs2_open/code/weapon/trails.h Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r5293

2009-05-21 04:37

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - emp protection option for weapon, emp resistant option for ships
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/emp.cpp Diff File
mod - /trunk/fs2_open/code/weapon/weapon.h Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r5292

2009-05-21 04:33

Goober5000


Ported: N/A

Details Diff		 add Taylor's fix for Mantis 1768 (cutscene bars)
mod - /trunk/fs2_open/code/freespace2/freespace.cpp Diff File

trunk r5291

2009-05-21 04:31

Goober5000


Ported: N/A

Details Diff		 fix ship-to-ship collisions; they should be disabled iff the ship has a no_collide flag, not iff the ship is a navbuoy
(fortunately, in retail, all navbuoys also have no_collide flags)
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File

trunk r5290

2009-05-21 04:19

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - fix inconsistencies with subobj_name and name
mod - /trunk/fs2_open/code/ai/aigoals.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudtargetbox.cpp Diff File
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
mod - /trunk/fs2_open/code/ship/shipfx.cpp Diff File
mod - /trunk/fs2_open/code/weapon/emp.cpp Diff File

trunk r5289

2009-05-21 04:05

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - additions to alt subsys name from r5125
mod - /trunk/fs2_open/code/hud/hud.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudtarget.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudtargetbox.cpp Diff File
mod - /trunk/fs2_open/code/ship/shiphit.cpp Diff File

trunk r5288

2009-05-21 03:31

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - alt subsys name for damage popup
mod - /trunk/fs2_open/code/hud/hud.cpp Diff File
mod - /trunk/fs2_open/code/model/model.h Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File

trunk r5287

2009-05-20 16:43

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - turret target priorities setup
mod - /trunk/fs2_open/code/ai/aibig.cpp Diff File
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/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.h Diff File

trunk r5286

2009-05-20 16:11

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch.
option to allow all hitpointed weapons to be hit.
allow 'safe from weapons' time of bombs be set.
mod - /trunk/fs2_open/code/ai/ai_profiles.cpp Diff File
mod - /trunk/fs2_open/code/ai/ai_profiles.h Diff File
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/object/collideweaponweapon.cpp Diff File
mod - /trunk/fs2_open/code/object/objcollide.cpp Diff File
mod - /trunk/fs2_open/code/weapon/emp.cpp Diff File
mod - /trunk/fs2_open/code/weapon/weapon.h Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r5285

2009-05-20 15:44

Wanderer


Ported: N/A

Details Diff		 fix swarm issue - again
mod - /trunk/fs2_open/code/weapon/swarm.cpp Diff File

trunk r5284

2009-05-20 14:03

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - limited rotation turrets, reset idle turrets option
mod - /trunk/fs2_open/code/ai/aibig.cpp Diff File
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/model/modelread.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/beam.cpp Diff File

trunk r5283

2009-05-20 10:23

Wanderer


Ported: N/A

Details Diff		 addition to the rotate sound to toggle it on if rotation is re-enabled via sexps
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File

trunk r5282

2009-05-20 10:13

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - autoaim/convergence improvements and variants
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.h Diff File

trunk r5281

2009-05-20 09:24

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - fixed firingpoint and 'fire on target' subsystem flags
mod - /trunk/fs2_open/code/ai/aiturret.cpp Diff File
mod - /trunk/fs2_open/code/math/vecmat.cpp Diff File
mod - /trunk/fs2_open/code/math/vecmat.h Diff File
mod - /trunk/fs2_open/code/model/modelread.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

trunk r5280

2009-05-20 08:24

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - subsys/turret sounds
mod - /trunk/fs2_open/code/ai/aiturret.cpp Diff File
mod - /trunk/fs2_open/code/math/vecmat.cpp Diff File
mod - /trunk/fs2_open/code/math/vecmat.h Diff File
mod - /trunk/fs2_open/code/model/model.h Diff File
mod - /trunk/fs2_open/code/model/modelread.cpp Diff File
mod - /trunk/fs2_open/code/object/objectsnd.cpp Diff File
mod - /trunk/fs2_open/code/object/objectsnd.h Diff File
mod - /trunk/fs2_open/code/parse/sexp.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 r5279

2009-05-20 05:46

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - no subsystem targeting flag for turrets
mod - /trunk/fs2_open/code/ai/aiturret.cpp 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.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.h Diff File

trunk r5278

2009-05-19 18:13

chief1983


Ported: N/A

Details Diff		 Bump linux version to 3.6.11
mod - /trunk/fs2_open/configure.ac Diff File

trunk r5277

2009-05-19 18:02

chief1983


Ported: N/A

Details Diff		 Convert these to UNIX again, hope they compile this time...
mod - /trunk/fs2_open/code/network/multi_sexp.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_sexp.h Diff File

trunk r5276

2009-05-19 17:17

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - alt iff colors
mod - /trunk/fs2_open/code/fred2/fredrender.cpp Diff File
mod - /trunk/fs2_open/code/hud/hud.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudtargetbox.cpp Diff File
mod - /trunk/fs2_open/code/iff_defs/iff_defs.cpp Diff File
mod - /trunk/fs2_open/code/iff_defs/iff_defs.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/network/multi.cpp Diff File
mod - /trunk/fs2_open/code/network/multi.h Diff File
mod - /trunk/fs2_open/code/network/multimsgs.cpp Diff File
mod - /trunk/fs2_open/code/network/multimsgs.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/radar/radar.cpp Diff File
mod - /trunk/fs2_open/code/radar/radarorb.cpp Diff File
mod - /trunk/fs2_open/code/radar/radarsetup.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.h Diff File

trunk r5275

2009-05-19 15:40

Wanderer


Ported: N/A

Details Diff		 merge from wanderer branch - phreak's inherit parent target weapon flag
mod - /trunk/fs2_open/code/weapon/weapon.h Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File
 First  Prev  1 2 3 ... 40 ... 80 ... 120 ... 160 ... 200 ... 225 226 227 228 229 230 231 ... 240 ... 280 ... 320 ... 360 ... 400 ... 437 438 439  Next  Last