Changesets: fs2open
|
fs2_open_3_6_14 r8476 2012-02-13 16:15 Ported: N/A Details Diff |
Backport: Trunk r8395; Fix for mantis 0002591: add braces based on code indentation |
Affected Issues 0002591 |
|
| mod - /branches/fs2_open_3_6_14/code/ui/window.cpp | Diff File | ||
|
fs2_open_3_6_14 r8475 2012-02-13 16:15 Ported: N/A Details Diff |
Backport: Trunk r8394; remove another four warnings | ||
| mod - /branches/fs2_open_3_6_14/code/fred2/weaponeditordlg.cpp | Diff File | ||
|
fs2_open_3_6_14 r8474 2012-02-13 16:14 Ported: N/A Details Diff |
Backport: Trunk r8393; remove warning | ||
| mod - /branches/fs2_open_3_6_14/code/fred2/orienteditor.cpp | Diff File | ||
|
fs2_open_3_6_14 r8473 2012-02-13 16:13 Ported: N/A Details Diff |
Backport: Trunk r8389 + r8390 + r8391 + r8392; wait until animation finishes before separating during undocking && VA says this might work? && derp fixes | ||
| mod - /branches/fs2_open_3_6_14/code/model/modelanim.h | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/model/modelanim.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 r8472 2012-02-13 16:11 Ported: N/A Details Diff |
Backport: Trunk r8388; Fix for Mantis 2521: Don't use the ship list for updating when we're in the middle of creating it. |
Affected Issues 0002521 |
|
| mod - /branches/fs2_open_3_6_14/code/fred2/ship_select.h | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/fred2/ship_select.cpp | Diff File | ||
|
fs2_open_3_6_14 r8471 2012-02-13 16:10 Ported: N/A Details Diff |
Backport: Trunk r8385; Fix for Mantis 2538: From Eli2, corrects for looping fade issue reported by FelixJim. |
Affected Issues 0002538 |
|
| mod - /branches/fs2_open_3_6_14/code/freespace2/freespace.cpp | Diff File | ||
|
fs2_open_3_6_14 r8470 2012-02-13 16:09 Ported: N/A Details Diff |
Backport: Trunk r8383; Fix for mantis 0002370: ignore missing starting wing indexes during mission restart |
Affected Issues 0002370 |
|
| mod - /branches/fs2_open_3_6_14/code/missionui/missionscreencommon.cpp | Diff File | ||
|
fs2_open_3_6_14 r8469 2012-02-13 16:08 Ported: N/A Details Diff |
Backport: Trunk r8382; two new sexps, signum and trigger-submodel-animation. also, fix a smattering of missing sexp stuff from other people's commits such as argument types, validity checking, putting things in submenus, and using is_sexp_true | ||
| 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.h | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/fred2/sexp_tree.cpp | Diff File | ||
|
fs2_open_3_6_14 r8468 2012-02-13 16:07 Ported: N/A Details Diff |
Backport: Trunk r8378 + r8379 + r8381; enhancement for bug 2582: trigger animations on BOTH ships undergoing docking && docking code some more. add code logic to (theoretically) set submodels instantly to initial or final positions && Fix to Trunk r8379, for want of a ; a compile was lost. | ||
| mod - /branches/fs2_open_3_6_14/code/model/modelanim.h | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/model/modelanim.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/ai/aicode.cpp | Diff File | ||
|
fs2_open_3_6_14 r8467 2012-02-13 16:05 Ported: N/A Details Diff |
Backport: Trunk r8377; remove unnecessary warning | ||
| mod - /branches/fs2_open_3_6_14/code/freespace2/freespace.cpp | Diff File | ||
|
antipodes r8466 2012-02-12 18:10 Ported: N/A Details Diff |
Trunk Sync: r8465 | ||
| mod - /branches/antipodes/code/hud/hudtargetbox.cpp | Diff File | ||
|
trunk r8465 2012-02-11 11:42 Ported: N/A Details Diff |
Proper way to fix what was attempted in r8439. | ||
| mod - /trunk/fs2_open/code/hud/hudtargetbox.cpp | Diff File | ||
|
antipodes r8464 2012-02-11 08:40 Ported: N/A Details Diff |
Not only did rev 8439 not do what it was supposed to, it also broke subsystem scanning | ||
| mod - /branches/antipodes/code/hud/hudtargetbox.cpp | Diff File | ||
|
trunk r8463 2012-02-11 07:37 Ported: N/A Details Diff |
Not only did rev 8439 not do what it was supposed to, it also broke subsystem scanning | ||
| mod - /trunk/fs2_open/code/hud/hudtargetbox.cpp | Diff File | ||
|
antipodes r8462 2012-02-10 20:42 Ported: N/A Details Diff |
Anomalous whitespace/tab and alignment cleanup. | ||
| mod - /branches/antipodes/code/menuui/mainhallmenu.cpp | Diff File | ||
|
antipodes r8461 2012-02-10 20:36 Ported: N/A Details Diff |
From CommanderDJ: The Pi?\195?\168ce de r?\195?\169sistance, MainHall.tbl is now modular. | ||
| mod - /branches/antipodes/code/menuui/mainhallmenu.h | Diff File | ||
| mod - /branches/antipodes/code/menuui/mainhallmenu.cpp | Diff File | ||
| mod - /branches/antipodes/code/freespace2/freespace.cpp | Diff File | ||
|
antipodes r8460 2012-02-10 14:05 Ported: N/A Details Diff |
Trunk Sync: r8456-8459 | ||
| mod - /branches/antipodes/code/ship/ship.h | Diff File | ||
| mod - /branches/antipodes/code/ship/ship.cpp | Diff File | ||
| mod - /branches/antipodes/code/parse/lua.cpp | Diff File | ||
| mod - /branches/antipodes/code/osapi/osapi.cpp | Diff File | ||
| mod - /branches/antipodes/code/network/multimsgs.cpp | Diff File | ||
|
trunk r8459 2012-02-10 13:45 Ported: N/A Details Diff |
Fix for Mantis 2603: Fullscreen_window window not centered. |
Affected Issues 0002603 |
|
| mod - /trunk/fs2_open/code/osapi/osapi.cpp | Diff File | ||
|
trunk r8458 2012-02-10 13:09 Ported: N/A Details Diff |
Given that hitting this assert can cause crashes in release builds, it's probably better if it's turned into an Error() instead. | ||
| mod - /trunk/fs2_open/code/network/multimsgs.cpp | Diff File | ||
|
trunk r8457 2012-02-09 14:51 Ported: N/A Details Diff |
Added subsystem:getModelName() scripting function, returning the original subsystem name as it appears in the model file, which is useful for example as a unique subsystem identifier. | ||
| mod - /trunk/fs2_open/code/parse/lua.cpp | Diff File | ||
|
trunk r8456 2012-02-09 11:06 Ported: N/A Details Diff |
Made subsystems contain an objnum reference to their parent ship. | ||
| mod - /trunk/fs2_open/code/ship/ship.h | Diff File | ||
| mod - /trunk/fs2_open/code/ship/ship.cpp | Diff File | ||
|
antipodes r8455 2012-02-09 09:48 Ported: N/A Details Diff |
Trunk Sync: r8452, r8454 | ||
| mod - /branches/antipodes/code/weapon/weapons.cpp | Diff File | ||
| mod - /branches/antipodes/code/lab/lab.cpp | Diff File | ||
| mod - /branches/antipodes/code/hud/hudshield.h | Diff File | ||
| mod - /branches/antipodes/code/hud/hudshield.cpp | Diff File | ||
| mod - /branches/antipodes/code/ai/ai_profiles.h | Diff File | ||
| mod - /branches/antipodes/code/ai/ai_profiles.cpp | Diff File | ||
|
trunk r8454 2012-02-09 09:40 Ported: N/A Details Diff |
Amendment to 8431: Introduces AI Profiles flag "$countermeasures affect aspect seekers:", which governs the behaviour in 8431 |
||
| mod - /trunk/fs2_open/code/weapon/weapons.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/ai/ai_profiles.h | Diff File | ||
| mod - /trunk/fs2_open/code/ai/ai_profiles.cpp | Diff File | ||
|
antipodes r8453 2012-02-09 07:56 Ported: N/A Details Diff |
From CommanderDJ: Introduces +Name identifiers for mainhall.tbl entries: - +Name identifiers only need to be added to the lo-res (640x480) entry of the mainhall. If you really must add a +Name to both res versions, the two resolutions must have the exact same name. - +Name identifiers are added immediately under the $Main Hall string Vectorises Main_hall_defines, thus removing the MAIN_HALLS_MAX limit. Main halls are now loaded based purely on campaign files. Hall indexes are no longer stored in the player struct, and thus this patch changes the pilot file version. |
||
| mod - /branches/antipodes/code/playerman/player.h | Diff File | ||
| mod - /branches/antipodes/code/playerman/managepilot.cpp | Diff File | ||
| mod - /branches/antipodes/code/pilotfile/pilotfile_convert.h | Diff File | ||
| mod - /branches/antipodes/code/pilotfile/csg_convert.cpp | Diff File | ||
| mod - /branches/antipodes/code/pilotfile/csg.cpp | Diff File | ||
| mod - /branches/antipodes/code/parse/lua.h | Diff File | ||
| mod - /branches/antipodes/code/parse/lua.cpp | Diff File | ||
| mod - /branches/antipodes/code/mission/missioncampaign.h | Diff File | ||
| mod - /branches/antipodes/code/mission/missioncampaign.cpp | Diff File | ||
| mod - /branches/antipodes/code/menuui/readyroom.cpp | Diff File | ||
| mod - /branches/antipodes/code/menuui/playermenu.cpp | Diff File | ||
| mod - /branches/antipodes/code/menuui/mainhallmenu.h | Diff File | ||
| mod - /branches/antipodes/code/menuui/mainhallmenu.cpp | Diff File | ||
| mod - /branches/antipodes/code/freespace2/freespace.cpp | Diff File | ||
| mod - /branches/antipodes/code/fred2/missionsave.cpp | Diff File | ||
| mod - /branches/antipodes/code/fred2/fred.rc | Diff File | ||
| mod - /branches/antipodes/code/fred2/campaigneditordlg.h | Diff File | ||
| mod - /branches/antipodes/code/fred2/campaigneditordlg.cpp | Diff File | ||
|
trunk r8452 2012-02-09 07:40 Ported: N/A Details Diff |
From CommanderDJ: Makes MAX_SHIELD_ICONS dynamic | ||
| mod - /trunk/fs2_open/code/lab/lab.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/hud/hudshield.h | Diff File | ||
| mod - /trunk/fs2_open/code/hud/hudshield.cpp | Diff File | ||
