All Projects FSSCP  wxFRED

Changesets: fs2open

Search Browse Back to Index

antipodes r8201

2012-01-13 12:53

Zacam


Ported: N/A

Details Diff		 Trunk 8199: Various scripting patches from m!m:
--Eyepoint access to the model handle
--getCollisionDistance() to the collision info handle to get the precomputed distance to the hit point
--A Disabled variable for the ship handle
--getTimeUntilExplosion() for the ship handle to get the time until the ship finally explodes
--A change to the documentation of ad.play3DSound() to reflect that the function also takes position parameters
mod - /branches/antipodes/code/parse/lua.cpp Diff File

antipodes r8200

2012-01-13 12:49

Zacam


Ported: N/A

Details Diff		 Synchronization of differences between Antipodes and Trunk. Cause unknown, just commit drift issues. Regular auditing will catch these faster, but people need to pay more attention when syncing Trunk changes over to Antipodes.
mod - /trunk/fs2_open/code/stats/medals.h Diff File
mod - /trunk/fs2_open/code/stats/medals.cpp Diff File
mod - /trunk/fs2_open/code/object/objectsort.cpp Diff File
mod - /trunk/fs2_open/code/nebula/neblightning.cpp Diff File
mod - /trunk/fs2_open/code/iff_defs/iff_defs.cpp Diff File
mod - /trunk/fs2_open/code/bmpman/bmpman.cpp Diff File
mod - /branches/antipodes/code/stats/medals.cpp Diff File
mod - /branches/antipodes/code/ship/ship.h Diff File
mod - /branches/antipodes/code/playerman/managepilot.h Diff File
mod - /branches/antipodes/code/parse/sexp.cpp Diff File
mod - /branches/antipodes/code/palman/palman.cpp Diff File
mod - /branches/antipodes/code/iff_defs/iff_defs.h Diff File
mod - /branches/antipodes/code/iff_defs/iff_defs.cpp Diff File
mod - /branches/antipodes/code/graphics/gropenglbmpman.cpp Diff File
mod - /branches/antipodes/code/globalincs/globals.h Diff File
mod - /branches/antipodes/code/bmpman/bmpman.h Diff File
mod - /branches/antipodes/code/bmpman/bmpman.cpp Diff File

trunk r8199

2012-01-13 12:46

The_E


Ported: N/A

Details Diff		 Various scripting patches from m!m:
--Eyepoint access to the model handle
--getCollisionDistance() to the collision info handle to get the precomputed distance to the hit point
--A Disabled variable for the ship handle
--getTimeUntilExplosion() for the ship handle to get the time until the ship finally explodes
--A change to the documentation of ad.play3DSound() to reflect that the function also takes position parameters
mod - /trunk/fs2_open/code/parse/lua.cpp Diff File

antipodes r8198

2012-01-13 12:46

Zacam


Ported: N/A

Details Diff		 Wrong EOLs.
mod - /branches/antipodes/code/pilotfile/plr_convert.cpp Diff File
mod - /branches/antipodes/code/pilotfile/plr.cpp Diff File
mod - /branches/antipodes/code/pilotfile/pilotfile_convert.h Diff File
mod - /branches/antipodes/code/pilotfile/pilotfile_convert.cpp Diff File
mod - /branches/antipodes/code/pilotfile/pilotfile.h Diff File
mod - /branches/antipodes/code/pilotfile/pilotfile.cpp Diff File
mod - /branches/antipodes/code/pilotfile/csg_convert.cpp Diff File
mod - /branches/antipodes/code/pilotfile/csg.cpp Diff File

antipodes r8197

2012-01-13 12:21

Zacam


Ported: N/A

Details Diff		 Wrong EOL
mod - /branches/antipodes/code/graphics/gropenglpostprocessing.cpp Diff File

antipodes r8196

2012-01-13 11:49

chief1983


Ported: N/A

Details Diff		 Trunk sync r8195
mod - /branches/antipodes/code/model/modelread.cpp Diff File

trunk r8195

2012-01-13 05:44

The_E


Ported: N/A

Details Diff		 Fix for Mantis 2561: Rotating guns don't rotate. Allows gun rotation property to be set by using "$gun_rotation".
mod - /trunk/fs2_open/code/model/modelread.cpp Diff File

fs2_open_3_6_14 r8194

2012-01-12 17:25

Zacam


Ported: N/A

Details Diff		 RC3 BUILD STAGE COMMIT: Sets Revision and Version properties to this commit version.
mod - /branches/fs2_open_3_6_14/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File
mod - /branches/fs2_open_3_6_14/configure.ac Diff File
mod - /branches/fs2_open_3_6_14/code/globalincs/version.h Diff File
mod - /branches/fs2_open_3_6_14/code/freespace2/freespace.rc Diff File
mod - /branches/fs2_open_3_6_14/code/fred2/fred.rc Diff File

fs2_open_3_6_14 r8193

2012-01-12 17:05

Zacam


Ported: N/A

Details Diff		 And to finally clean up the compiler issues caused by TortoiseSVN being a wanker in merging across some of the backports. This returns .14 to being Stable again.
mod - /branches/fs2_open_3_6_14/code/stats/scoring.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/model/modelinterp.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/graphics/gropenglpostprocessing.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/graphics/gropengldraw.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/ai/aicode.cpp Diff File

fs2_open_3_6_14 r8192

2012-01-12 15:47

Zacam


Ported: N/A

Details Diff		 Fixes def_files merge of the 8171 Backport commit of Trunk 8109.
mod - /branches/fs2_open_3_6_14/code/globalincs/def_files.cpp Diff File

fs2_open_3_6_14 r8191

2012-01-12 15:11

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8056; zookeeper's addition of new scripting hook that runs right before entering mission.
(Required for Backport of Trunk 8102)
mod - /branches/fs2_open_3_6_14/code/parse/scripting.h Diff File
mod - /branches/fs2_open_3_6_14/code/parse/scripting.cpp Diff File

fs2_open_3_6_14 r8190

2012-01-12 15:01

Zacam


Ported: N/A

Details Diff		 Backport: Documentation Update. This copies the documentation related changes from Trunk as a unified commit.
mod - /branches/fs2_open_3_6_14/code/weapon/weapons.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/weapon/shockwave.h Diff File
mod - /branches/fs2_open_3_6_14/code/weapon/shockwave.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/weapon/beam.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/stats/medals.h Diff File
mod - /branches/fs2_open_3_6_14/code/stats/medals.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/starfield/starfield.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/species_defs/species_defs.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/sound/audiostr.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/ship/shiphit.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/ship/ship.h Diff File
mod - /branches/fs2_open_3_6_14/code/ship/ship.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/ship/shield.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/radar/radarsetup.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/popup/popupdead.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/physics/physics.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/parse/sexp.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/palman/palman.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/object/object.h Diff File
mod - /branches/fs2_open_3_6_14/code/object/object.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/network/psnet2.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/network/multiutil.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/network/multi_xfer.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/network/multi_obj.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/nebula/neblightning.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/model/modelread.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/model/modelinterp.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/model/modelcollide.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/model/model.h Diff File
mod - /branches/fs2_open_3_6_14/code/missionui/missionweaponchoice.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/mission/missionparse.h Diff File
mod - /branches/fs2_open_3_6_14/code/mission/missionparse.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/mission/missionlog.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/mission/missiongoals.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/mission/missioncampaign.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/math/fvi.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/lab/lab.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/io/keycontrol.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/io/key.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/iff_defs/iff_defs.h Diff File
mod - /branches/fs2_open_3_6_14/code/iff_defs/iff_defs.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/hud/hudtargetbox.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/hud/hudtarget.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/hud/hudbrackets.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/graphics/gropengltexture.h Diff File
mod - /branches/fs2_open_3_6_14/code/graphics/gropengltexture.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/graphics/gropenglshader.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/graphics/gropenglpostprocessing.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/graphics/gropenglbmpman.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/globalincs/pstypes.h Diff File
mod - /branches/fs2_open_3_6_14/code/globalincs/globals.h Diff File
mod - /branches/fs2_open_3_6_14/code/gamesnd/gamesnd.h Diff File
mod - /branches/fs2_open_3_6_14/code/freespace2/levelpaging.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/freespace2/freespace.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/fireball/fireballs.h Diff File
mod - /branches/fs2_open_3_6_14/code/fireball/fireballs.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/debris/debris.h Diff File
mod - /branches/fs2_open_3_6_14/code/debris/debris.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/cfileextractor/cfileextractor.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/cfile/cfile.h Diff File
mod - /branches/fs2_open_3_6_14/code/bmpman/bmpman.h Diff File
mod - /branches/fs2_open_3_6_14/code/bmpman/bmpman.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/asteroid/asteroid.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/ai/aiturret.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/ai/aigoals.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/ai/aicode.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/ai/aibig.cpp Diff File

fs2_open_3_6_14 r8189

2012-01-12 14:05

Zacam


Ported: N/A

Details Diff		 Back in Commit 7843 of this branch, a sync to Trunk 7842 took place.
This sync was incompletely done, resulting in the following to be missing:
7815 - Set-docked SEXP
7834/7835 - Update to ad.playMusic to allow control over whether or not to loop the passed sound file.
7841 - From m!m: Allows per-ship customization of ship sounds in ships.tbl. See Wiki for details.
mod - /branches/fs2_open_3_6_14/code/parse/sexp.h Diff File
mod - /branches/fs2_open_3_6_14/code/parse/sexp.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/parse/lua.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/hud/hud.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/fred2/sexp_tree.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/ai/aicode.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/ai/ai.h Diff File

fs2_open_3_6_14 r8188

2012-01-11 22:28

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8164; Fix for 0002559 - new frameworks file that strips the metadata files out of the archive.
mod - /branches/fs2_open_3_6_14/projects/Xcode/Frameworks.tgz Diff File

fs2_open_3_6_14 r8187

2012-01-11 22:26

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8163; Make sure the FXAA pass only draws to COLOR_ATTACHMENT0
mod - /branches/fs2_open_3_6_14/code/graphics/gropenglpostprocessing.cpp Diff File

fs2_open_3_6_14 r8186

2012-01-11 22:25

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8160; Change the define to one that is a little less confusing.
mod - /branches/fs2_open_3_6_14/code/network/multiui.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/network/multi.h Diff File

fs2_open_3_6_14 r8185

2012-01-11 22:24

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8159; Not that it matters much since it's that's what it's ending up as anyway but since the variable that uses it was switched to unsigned we might as well change this.
mod - /branches/fs2_open_3_6_14/code/network/multi_sexp.cpp Diff File

fs2_open_3_6_14 r8184

2012-01-11 22:23

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8158; Fix for Mantis 0002558 : Resolves the issue by updating the libpng provided to version 1.5.7.
mod - /branches/fs2_open_3_6_14/libpng/pngwutil.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngwtran.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngwrite.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngtrans.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngstruct.h Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngset.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngrutil.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngrtran.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngread.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngpriv.h Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngpread.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngmem.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pnglibconf.h Diff File
mod - /branches/fs2_open_3_6_14/libpng/pnginfo.h Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngget.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngerror.c Diff File
mod - /branches/fs2_open_3_6_14/libpng/pngconf.h Diff File
mod - /branches/fs2_open_3_6_14/libpng/png.h Diff File
mod - /branches/fs2_open_3_6_14/libpng/png.c Diff File

fs2_open_3_6_14 r8183

2012-01-11 22:22

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8157; Made WIF2_SMALL_ONLY weapons on turrets not fire on HUGE ships when grouped with other weapons that are not WIF2_SMALL_ONLY
mod - /branches/fs2_open_3_6_14/code/ai/aiturret.cpp Diff File

fs2_open_3_6_14 r8182

2012-01-11 22:21

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8155; Another Assert->Assertion change. Also changes parsing code to throw warnings when a shockwaves' inner radius is zero.
mod - /branches/fs2_open_3_6_14/code/weapon/weapons.cpp Diff File

fs2_open_3_6_14 r8181

2012-01-11 22:16

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8128; Removed an unused #define
mod - /branches/fs2_open_3_6_14/code/ship/ship.h Diff File

fs2_open_3_6_14 r8180

2012-01-11 22:15

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8126; Remove a magic number. This number will probably become something defined in mod.tbl eventually but for now at least it's easy to find again.
mod - /branches/fs2_open_3_6_14/code/mission/missiontraining.cpp Diff File

fs2_open_3_6_14 r8179

2012-01-11 22:13

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8125; Training weapons shouldn't cause smoke to come off of ships which haven't really taken any damage.
mod - /branches/fs2_open_3_6_14/code/ship/shiphit.cpp Diff File

fs2_open_3_6_14 r8178

2012-01-11 22:12

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8124; Switch from the directive-is-variable SEXP to the more powerful directive-value one.
mod - /branches/fs2_open_3_6_14/code/parse/sexp.h Diff File
mod - /branches/fs2_open_3_6_14/code/parse/sexp.cpp Diff File
mod - /branches/fs2_open_3_6_14/code/fred2/sexp_tree.cpp Diff File

fs2_open_3_6_14 r8177

2012-01-11 22:11

Zacam


Ported: N/A

Details Diff		 Backport: Trunk 8120; Fixed font rendering at high resolutions
mod - /branches/fs2_open_3_6_14/code/graphics/gropengldraw.cpp Diff File
 First  Prev  1 2 3 ... 40 ... 80 ... 109 110 111 112 113 114 115 ... 120 ... 160 ... 200 ... 240 ... 280 ... 320 ... 360 ... 400 ... 437 438 439  Next  Last