Changesets: fs2open
|
trunk r8376 2012-01-26 09:25 Ported: N/A Details Diff |
Added support for the $detail_sphere submodel prop. | ||
| mod - /trunk/fs2_open/code/model/modelread.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/model/modelinterp.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/model/model.h | Diff File | ||
|
fs2_open_3_6_14 r8375 2012-01-26 00:47 Ported: N/A Details Diff |
RC4 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/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 r8374 2012-01-26 00:27 Ported: N/A Details Diff |
Backport: Trunk 8373; partial fix for Mantis 0002582: --add Vasudan Admiral's fix for setting submodels to their initial positions --add trigger for moving submodels to their docked positions when an initially-docked ship arrives |
Affected Issues 0002582 |
|
| 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 | ||
|
trunk r8373 2012-01-25 22:57 Ported: N/A Details Diff |
partial fix for Mantis 0002582: --add Vasudan Admiral's fix for setting submodels to their initial positions --add trigger for moving submodels to their docked positions when an initially-docked ship arrives |
Affected Issues 0002582 |
|
| mod - /trunk/fs2_open/code/model/modelanim.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/ai/aicode.cpp | Diff File | ||
|
fs2_open_3_6_14 r8372 2012-01-25 16:37 Ported: N/A Details Diff |
Backport: Trunk 8369; From Eli2: Mantis 0002538: Fade-in time limitation. Testing in Multiplayer as well, no drastic incompatibility found. (If the host is patched but the client is not, then the timing returns are a little funny, but it doesn't cause for any crashes) |
Affected Issues 0002538 |
|
| mod - /branches/fs2_open_3_6_14/code/parse/sexp.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/globalincs/systemvars.h | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/globalincs/systemvars.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/freespace2/freespace.cpp | Diff File | ||
|
fs2_open_3_6_14 r8371 2012-01-25 16:19 Ported: N/A Details Diff |
Backport: Trunk 8368; Fix for Mantis 2556: Check if the mouse cursor is really there before drawing it. |
Affected Issues 0002556 |
|
| mod - /branches/fs2_open_3_6_14/code/graphics/gropengl.cpp | Diff File | ||
|
antipodes r8370 2012-01-24 13:40 Ported: N/A Details Diff |
Trunk Sync: 8368-8369 | ||
| mod - /branches/antipodes/code/parse/sexp.cpp | Diff File | ||
| mod - /branches/antipodes/code/graphics/gropengl.cpp | Diff File | ||
| mod - /branches/antipodes/code/globalincs/systemvars.h | Diff File | ||
| mod - /branches/antipodes/code/globalincs/systemvars.cpp | Diff File | ||
| mod - /branches/antipodes/code/freespace2/freespace.cpp | Diff File | ||
|
trunk r8369 2012-01-24 00:54 Ported: N/A Details Diff |
From Eli2: Mantis 0002538: Fade-in time limitation. Testing in Multiplayer as well, no drastic incompatibility found. (If the host is patched but the client is not, then the timing returns are a little funny, but it doesn't cause for any crashes) |
||
| mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/globalincs/systemvars.h | Diff File | ||
| mod - /trunk/fs2_open/code/globalincs/systemvars.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/freespace2/freespace.cpp | Diff File | ||
|
trunk r8368 2012-01-23 23:11 Ported: N/A Details Diff |
Fix for Mantis 2556: Check if the mouse cursor is really there before drawing it. |
Affected Issues 0002556 |
|
| mod - /trunk/fs2_open/code/graphics/gropengl.cpp | Diff File | ||
|
antipodes r8367 2012-01-23 22:58 Ported: N/A Details Diff |
Trunk Sync: 8341. 8344. 8350. 8361-8363 | ||
| mod - /branches/antipodes/code/object/object.cpp | Diff File | ||
| mod - /branches/antipodes/code/model/modelinterp.cpp | Diff File | ||
| mod - /branches/antipodes/code/model/modelanim.h | Diff File | ||
| mod - /branches/antipodes/code/model/modelanim.cpp | Diff File | ||
| mod - /branches/antipodes/code/missionui/missionweaponchoice.cpp | Diff File | ||
| mod - /branches/antipodes/code/globalincs/def_files.cpp | Diff File | ||
| mod - /branches/antipodes/code/ai/aicode.cpp | Diff File | ||
| mod - /branches/antipodes/code/ai/ai.h | Diff File | ||
|
fs2_open_3_6_14 r8366 2012-01-23 19:19 Ported: N/A Details Diff |
Backport: Trunk 8363; Fix for Mantis 2583: Reinitialize the timer right when changing selection modes. |
Affected Issues 0002583 |
|
| mod - /branches/fs2_open_3_6_14/code/missionui/missionweaponchoice.cpp | Diff File | ||
|
fs2_open_3_6_14 r8365 2012-01-23 19:18 Ported: N/A Details Diff |
Backport: Trunk r8362; Makes a very strangely coded warning more readable and useful. | ||
| mod - /branches/fs2_open_3_6_14/code/ai/aicode.cpp | Diff File | ||
|
fs2_open_3_6_14 r8364 2012-01-23 19:14 Ported: N/A Details Diff |
Backport: Trunk r8361; upgrades to the docking system to incorporate docking animations -- incidentally, fixes Mantis 0002581. also, remove DOCK_BACKUP_RETURN_VAL which never did anything even in retail |
Affected Issues 0002581 |
|
| 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 | ||
|
trunk r8363 2012-01-23 19:13 Ported: N/A Details Diff |
Fix for Mantis 2583: Reinitialize the timer right when changing selection modes. |
Affected Issues 0002583 |
|
| mod - /trunk/fs2_open/code/missionui/missionweaponchoice.cpp | Diff File | ||
|
trunk r8362 2012-01-23 19:11 Ported: N/A Details Diff |
Makes a very strangely coded warning more readable and useful. | ||
| mod - /trunk/fs2_open/code/ai/aicode.cpp | Diff File | ||
|
trunk r8361 2012-01-23 18:27 Ported: N/A Details Diff |
upgrades to the docking system to incorporate docking animations -- incidentally, fixes Mantis 0002581 also, remove DOCK_BACKUP_RETURN_VAL which never did anything even in retail |
Affected Issues 0002581 |
|
| mod - /trunk/fs2_open/code/model/modelanim.h | Diff File | ||
| mod - /trunk/fs2_open/code/model/modelanim.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/ai/aicode.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/ai/ai.h | Diff File | ||
|
fs2_open_3_6_14 r8360 2012-01-23 18:16 Ported: N/A Details Diff |
Backport: Trunk 8344; Fix for Mantis 2580: Use the texture matrix in the vertex shader to support texture panning. |
Affected Issues 0002580 |
|
| mod - /branches/fs2_open_3_6_14/code/globalincs/def_files.cpp | Diff File | ||
|
fs2_open_3_6_14 r8359 2012-01-23 18:16 Ported: N/A Details Diff |
Backport: Trunk 8329; fix Mantis 0002579 |
Affected Issues 0002579 |
|
| mod - /branches/fs2_open_3_6_14/code/ship/ship.cpp | Diff File | ||
|
fs2_open_3_6_14 r8358 2012-01-23 18:06 Ported: N/A Details Diff |
Backport: Trunk 8327 + 8341; Fix for Mantis 1997: 'Filename too long' warning for nonexistant textures. && Followup to 8327: Texture names from pofs are provided without extension, so we have to make sure to account for it. |
Affected Issues 0001997 |
|
| mod - /branches/fs2_open_3_6_14/code/model/modelinterp.cpp | Diff File | ||
|
fs2_open_3_6_14 r8357 2012-01-23 18:04 Ported: N/A Details Diff |
Backport: Trunk 8326; Fixes 0002578 - Change the < in these checks against NAME_LENGTH to <=. |
Affected Issues 0002578 |
|
| mod - /branches/fs2_open_3_6_14/code/ship/ship.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/ai.cpp | Diff File | ||
|
fs2_open_3_6_14 r8356 2012-01-23 18:01 Ported: N/A Details Diff |
Backport: Trunk 8305; quash a warning | ||
| mod - /branches/fs2_open_3_6_14/code/fred2/wing_editor.cpp | Diff File | ||
|
fs2_open_3_6_14 r8355 2012-01-23 18:00 Ported: N/A Details Diff |
Backport: Trunk 8304; Documentation: pedantic rename of this function to describe it better | ||
| mod - /branches/fs2_open_3_6_14/code/mission/missionparse.cpp | Diff File | ||
|
fs2_open_3_6_14 r8354 2012-01-23 18:00 Ported: N/A Details Diff |
Backport: Trunk 8301; Documentation: Missionweaponchoice.cpp and related changes. Removed a few redundant functions. | ||
| mod - /branches/fs2_open_3_6_14/code/network/multiteamselect.h | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/network/multiteamselect.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/missionui/missionweaponchoice.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/missionui/missionscreencommon.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/missionui/missionbrief.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/lighting/lighting.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/lab/lab.cpp | Diff File | ||
|
fs2_open_3_6_14 r8353 2012-01-23 17:59 Ported: N/A Details Diff |
Backport: Trunk 8300; don't remove the escort flag from invisible ships that aren't on the escort list (fixes Mantis 0002057). also, don't remove dead or dying ships from the escort list, because due to the design of the culling function, they were never removed previously |
Affected Issues 0002057 |
|
| mod - /branches/fs2_open_3_6_14/code/hud/hudescort.cpp | Diff File | ||
|
fs2_open_3_6_14 r8352 2012-01-23 17:56 Ported: N/A Details Diff |
Backport: Trunk 8299 + 8302; the proper way to fix Mantis 0002441 is by modifying the team_visibility_update function && follow-up to 8299: we need to check visibility for our own team in case we have a friendly-stealth-invisible ship covered by AWACS, or something\nalso, clarify terminology: in-frustum/not-in-frustum replaces visible/invisible\nand do some minor rewrites for additional clarification |
Affected Issues 0002441 |
|
| mod - /branches/fs2_open_3_6_14/code/ship/awacs.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/radar/radarsetup.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/nebula/neb.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/hud/hudtarget.cpp | Diff File | ||
| mod - /branches/fs2_open_3_6_14/code/ai/aicode.cpp | Diff File | ||
