Changesets: fs2open
trunk r6776 2010-11-23 23:35 Ported: N/A Details Diff |
slight cleanup | ||
mod - /trunk/fs2_open/code/menuui/mainhallmenu.cpp | Diff File | ||
antipodes r6775 2010-11-23 21:59 Ported: N/A Details Diff |
Trunk Sync - r6774 | ||
mod - /branches/antipodes/code/ai/aibig.cpp | Diff File | ||
mod - /branches/antipodes/code/ai/aicode.cpp | Diff File | ||
mod - /branches/antipodes/code/bmpman/bmpman.cpp | Diff File | ||
mod - /branches/antipodes/code/globalincs/pstypes.h | Diff File | ||
mod - /branches/antipodes/code/graphics/gropenglbmpman.cpp | Diff File | ||
mod - /branches/antipodes/code/mission/missioncampaign.cpp | Diff File | ||
mod - /branches/antipodes/code/missionui/missionshipchoice.cpp | Diff File | ||
mod - /branches/antipodes/code/missionui/missionweaponchoice.cpp | Diff File | ||
mod - /branches/antipodes/code/network/multilag.cpp | Diff File | ||
mod - /branches/antipodes/code/network/multimsgs.cpp | Diff File | ||
mod - /branches/antipodes/code/object/collideshipship.cpp | Diff File | ||
mod - /branches/antipodes/code/object/objectsnd.cpp | Diff File | ||
mod - /branches/antipodes/code/parse/sexp.cpp | Diff File | ||
mod - /branches/antipodes/code/playerman/playercontrol.cpp | Diff File | ||
mod - /branches/antipodes/code/ship/shipfx.cpp | Diff File | ||
mod - /branches/antipodes/code/ship/shiphit.cpp | Diff File | ||
mod - /branches/antipodes/code/starfield/starfield.cpp | Diff File | ||
trunk r6774 2010-11-23 21:22 Ported: N/A Details Diff |
Fix issue with beams not doing damage due to the traitor beam fix. | ||
mod - /trunk/fs2_open/code/ship/shiphit.cpp | Diff File | ||
trunk r6773 2010-11-23 03:27 Ported: N/A Details Diff |
revert Echelon9's commit 6754 which needs to be discussed first | ||
mod - /trunk/fs2_open/code/ai/aicode.cpp | Diff File | ||
mod - /trunk/fs2_open/code/bmpman/bmpman.cpp | Diff File | ||
mod - /trunk/fs2_open/code/globalincs/pstypes.h | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglbmpman.cpp | Diff File | ||
mod - /trunk/fs2_open/code/mission/missioncampaign.cpp | Diff File | ||
mod - /trunk/fs2_open/code/missionui/missionshipchoice.cpp | Diff File | ||
mod - /trunk/fs2_open/code/missionui/missionweaponchoice.cpp | Diff File | ||
mod - /trunk/fs2_open/code/network/multilag.cpp | Diff File | ||
mod - /trunk/fs2_open/code/network/multimsgs.cpp | Diff File | ||
mod - /trunk/fs2_open/code/object/collideshipship.cpp | Diff File | ||
mod - /trunk/fs2_open/code/object/objectsnd.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/radar/radar.cpp | Diff File | ||
mod - /trunk/fs2_open/code/radar/radarorb.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/shipfx.cpp | Diff File | ||
mod - /trunk/fs2_open/code/starfield/starfield.cpp | Diff File | ||
trunk r6772 2010-11-23 03:20 The_E Ported: N/A Details Diff |
Fix two instances where an object instance number was used as an index into Weapon_info[] | ||
mod - /trunk/fs2_open/code/ai/aibig.cpp | Diff File | ||
trunk r6771 2010-11-23 03:11 Ported: N/A Details Diff |
corrected Echelon9's correction of Zacam's ... correction? Anyway, sexp variables are only ints or strings, not floats. Therefore we need to print them to the file correctly. |
||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
antipodes r6770 2010-11-23 03:06 The_E Ported: N/A Details Diff |
eval_sexp -> is_sexp_true |
||
mod - /branches/antipodes/code/parse/sexp.cpp | Diff File | ||
antipodes r6769 2010-11-23 02:41 Ported: N/A Details Diff |
Trunk Sync - r6768 | ||
mod - /branches/antipodes/code/parse/parselo.cpp | Diff File | ||
mod - /branches/antipodes/code/parse/sexp.cpp | Diff File | ||
mod - /branches/antipodes/code/parse/sexp.h | Diff File | ||
trunk r6768 2010-11-23 02:30 Ported: N/A Details Diff |
fix some things that Zacam noticed | ||
mod - /trunk/fs2_open/code/parse/parselo.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.h | Diff File | ||
antipodes r6767 2010-11-22 16:14 Ported: N/A Details Diff |
Trunk Sync - r6766 | ||
mod - /branches/antipodes/code/ai/ai_profiles.cpp | Diff File | ||
mod - /branches/antipodes/code/scramble/scramble.cpp | Diff File | ||
mod - /branches/antipodes/code/weapon/swarm.cpp | Diff File | ||
trunk r6766 2010-11-22 12:21 Ported: N/A Details Diff |
Finish matching vm_mallocs and vm_frees | ||
mod - /trunk/fs2_open/code/scramble/scramble.cpp | Diff File | ||
trunk r6765 2010-11-22 08:01 Ported: N/A Details Diff |
MAGIC numbers aren't for hiding in code... | ||
mod - /trunk/fs2_open/code/weapon/swarm.cpp | Diff File | ||
trunk r6764 2010-11-22 07:51 Ported: N/A Details Diff |
Fix: Local declaration of 'i' hides declaration of the same name in outer scope. | ||
mod - /trunk/fs2_open/code/ai/ai_profiles.cpp | Diff File | ||
antipodes r6763 2010-11-22 01:24 The_E Ported: N/A Details Diff |
Trunk sync r6762 | ||
mod - /branches/antipodes/code/ai/aicode.cpp | Diff File | ||
trunk r6762 2010-11-22 01:14 The_E Ported: N/A Details Diff |
Fix for commit 6756: -1 is a perfectly valid value for current_secondary_bank at that point. |
||
mod - /trunk/fs2_open/code/ai/aicode.cpp | Diff File | ||
antipodes r6761 2010-11-21 15:29 Ported: N/A Details Diff |
Trunk Sync - r6760 | ||
mod - /branches/antipodes/code/ai/aicode.cpp | Diff File | ||
mod - /branches/antipodes/code/bmpman/bmpman.cpp | Diff File | ||
mod - /branches/antipodes/code/cutscene/cutscenes.cpp | Diff File | ||
mod - /branches/antipodes/code/globalincs/pstypes.h | Diff File | ||
mod - /branches/antipodes/code/graphics/gropenglbmpman.cpp | Diff File | ||
mod - /branches/antipodes/code/mission/missioncampaign.cpp | Diff File | ||
mod - /branches/antipodes/code/missionui/missionshipchoice.cpp | Diff File | ||
mod - /branches/antipodes/code/missionui/missionweaponchoice.cpp | Diff File | ||
mod - /branches/antipodes/code/network/multilag.cpp | Diff File | ||
mod - /branches/antipodes/code/network/multimsgs.cpp | Diff File | ||
mod - /branches/antipodes/code/network/multiutil.cpp | Diff File | ||
mod - /branches/antipodes/code/object/collideshipship.cpp | Diff File | ||
mod - /branches/antipodes/code/object/objectdock.cpp | Diff File | ||
mod - /branches/antipodes/code/object/objectsnd.cpp | Diff File | ||
mod - /branches/antipodes/code/object/parseobjectdock.cpp | Diff File | ||
mod - /branches/antipodes/code/parse/lua.cpp | Diff File | ||
mod - /branches/antipodes/code/parse/parselo.cpp | Diff File | ||
mod - /branches/antipodes/code/parse/sexp.cpp | Diff File | ||
mod - /branches/antipodes/code/playerman/playercontrol.cpp | Diff File | ||
mod - /branches/antipodes/code/scramble/scramble.cpp | Diff File | ||
mod - /branches/antipodes/code/ship/shipfx.cpp | Diff File | ||
mod - /branches/antipodes/code/ship/shiphit.cpp | Diff File | ||
mod - /branches/antipodes/code/starfield/starfield.cpp | Diff File | ||
mod - /branches/antipodes/code/weapon/beam.cpp | Diff File | ||
mod - /branches/antipodes/code/weapon/beam.h | Diff File | ||
trunk r6760 2010-11-21 01:34 Ported: N/A Details Diff |
Fix for Mantis 2190 - Player beams do not cause traitor. | ||
mod - /trunk/fs2_open/code/ai/aicode.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/shiphit.cpp | Diff File | ||
mod - /trunk/fs2_open/code/weapon/beam.cpp | Diff File | ||
mod - /trunk/fs2_open/code/weapon/beam.h | Diff File | ||
antipodes r6759 2010-11-20 18:38 The_E Ported: N/A Details Diff |
More fixes for the "initial off" thing. |
||
mod - /branches/antipodes/code/hud/hud.cpp | Diff File | ||
mod - /branches/antipodes/code/hud/hud.h | Diff File | ||
mod - /branches/antipodes/code/hud/hudparse.cpp | Diff File | ||
mod - /branches/antipodes/code/hud/hudparse.h | Diff File | ||
mod - /branches/antipodes/code/mission/missionload.cpp | Diff File | ||
trunk r6758 2010-11-20 13:45 Ported: N/A Details Diff |
Fix: Local declaration of 'num_lines' hides declaration of the same name in outer scope. | ||
mod - /trunk/fs2_open/code/parse/lua.cpp | Diff File | ||
trunk r6757 2010-11-20 12:27 Ported: N/A Details Diff |
Corrected sprintf format, as 'Changed from 'int' to 'float' by Zacam 10/2010' | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
trunk r6756 2010-11-20 11:25 Ported: N/A Details Diff |
Fix: Use of swp->current_secondary_bank when equal to -1 as an array index. Very broken. | ||
mod - /trunk/fs2_open/code/ai/aicode.cpp | Diff File | ||
trunk r6755 2010-11-20 10:10 Ported: N/A Details Diff |
Fix: Invalid data: accessing 'Text_line_size', the readable size is '80' bytes, but '4194244' bytes might be read; Invalid data: accessing 'Text_lines', the readable size is '80' bytes, but '4194244' bytes might be read | ||
mod - /trunk/fs2_open/code/cutscene/cutscenes.cpp | Diff File | ||
trunk r6754 2010-11-20 07:22 Ported: N/A Details Diff |
Fix a range of potential NULL dereferences | ||
mod - /trunk/fs2_open/code/ai/aicode.cpp | Diff File | ||
mod - /trunk/fs2_open/code/bmpman/bmpman.cpp | Diff File | ||
mod - /trunk/fs2_open/code/globalincs/pstypes.h | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglbmpman.cpp | Diff File | ||
mod - /trunk/fs2_open/code/mission/missioncampaign.cpp | Diff File | ||
mod - /trunk/fs2_open/code/missionui/missionshipchoice.cpp | Diff File | ||
mod - /trunk/fs2_open/code/missionui/missionweaponchoice.cpp | Diff File | ||
mod - /trunk/fs2_open/code/network/multilag.cpp | Diff File | ||
mod - /trunk/fs2_open/code/network/multimsgs.cpp | Diff File | ||
mod - /trunk/fs2_open/code/object/collideshipship.cpp | Diff File | ||
mod - /trunk/fs2_open/code/object/objectsnd.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/radar/radar.cpp | Diff File | ||
mod - /trunk/fs2_open/code/radar/radarorb.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/shipfx.cpp | Diff File | ||
mod - /trunk/fs2_open/code/starfield/starfield.cpp | Diff File | ||
trunk r6753 2010-11-20 03:25 Ported: N/A Details Diff |
Fix a few malloc/vm_malloc changes to properly track memory usage; fix a potential NULL dereference in parse/lua.cpp | ||
mod - /trunk/fs2_open/code/network/multiutil.cpp | Diff File | ||
mod - /trunk/fs2_open/code/object/objectdock.cpp | Diff File | ||
mod - /trunk/fs2_open/code/object/parseobjectdock.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/lua.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/parselo.cpp | Diff File | ||
mod - /trunk/fs2_open/code/scramble/scramble.cpp | Diff File | ||
mod - /trunk/fs2_open/code/ship/shipfx.cpp | Diff File | ||
antipodes r6752 2010-11-19 16:22 The_E Ported: N/A Details Diff |
Logic is a good thing. If you don't reverse it. |
||
mod - /branches/antipodes/code/hud/hudreticle.cpp | Diff File |