Changesets: fs2open
|
zookeeper r11209
Timestamp: 2015-01-08 10:24:21 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Probably fixed a bug with the next/prev subsystem targeting keys not working if the target only has one subsystem. | ||
| mod - /branches/zookeeper/code/hud/hudtarget.cpp | [ Diff ] [ File ] | ||
|
trunk r11208
Timestamp: 2015-01-07 15:46:32 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Fixing weird problem with snd_update_3d_pos() that, honestly, baffles me as to how the code ever worked on any system. | ||
| mod - /trunk/fs2_open/code/sound/sound.cpp | [ Diff ] [ File ] | ||
|
zookeeper r11207
Timestamp: 2015-01-04 08:03:47 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Trunk sync r11205. | ||
| mod - /branches/zookeeper/code/mission/missionparse.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/mission/missionparse.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/menuui/playermenu.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ship/ship.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/controlconfig/controlsconfigcommon.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ship/ship.h | [ Diff ] [ File ] | ||
|
trunk r11206
Timestamp: 2015-01-04 07:57:05 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Added support for NONE as a value for $Key Default, for making a key unbound by default. | ||
| mod - /trunk/fs2_open/code/controlconfig/controlsconfigcommon.cpp | [ Diff ] [ File ] | ||
|
trunk r11205
Timestamp: 2015-01-04 07:52:33 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Fixed breakage of $Category and $Type from r10843. | ||
| mod - /trunk/fs2_open/code/controlconfig/controlsconfigcommon.cpp | [ Diff ] [ File ] | ||
|
trunk r11204
Timestamp: 2014-12-22 15:48:34 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
add ship class texture replacement using a simplified method that doesn't require the texture_set code | ||
| mod - /trunk/fs2_open/code/ship/ship.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/ship/ship.cpp | [ Diff ] [ File ] | ||
|
texture_set r11203
Timestamp: 2014-12-22 15:34:04 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
Create branch based on r11202 that incorporates Taylor's texture_set code patch, yet not completely because there are some remaining tricky differences yet to be resolved | ||
| mod - /branches/texture_set/code/model/model.h | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/fred2/shiptexturesdlg.h | [ Diff ] [ File ] | ||
| add - /branches/texture_set | [ File ] | ||
| mod - /branches/texture_set/code/ship/ship.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/menuui/techmenu.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/ship/ship.h | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/freespace2/freespace.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/hud/hudtargetbox.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/debris/debris.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/model/modelinterp.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/species_defs/species_defs.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/model/modelread.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/lab/lab.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/mission/missionparse.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/species_defs/species_defs.h | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/fred2/shiptexturesdlg.cpp | [ Diff ] [ File ] | ||
| mod - /branches/texture_set/code/mission/missionparse.h | [ Diff ] [ File ] | ||
|
trunk r11202
Timestamp: 2014-12-22 02:39:31 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Fix mantis 0003068. Make hitting the "delete" key in the pilot-selection menu do the same thing as clicking on the "remove" button. |
||
| mod - /trunk/fs2_open/code/menuui/playermenu.cpp | [ Diff ] [ File ] | ||
|
trunk r11201
Timestamp: 2014-12-19 20:49:22 Author: niffiwan Ported: N/A [ Details ] [ Diff ] |
Add warning for very fast ship-rotation values Otherwise rotational collision detection is disabled for the ship (and an int3() triggers in debug) |
||
| mod - /trunk/fs2_open/code/ship/ship.cpp | [ Diff ] [ File ] | ||
|
zookeeper r11200
Timestamp: 2014-12-19 17:58:39 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Trunk sync r11199. | ||
| mod - /branches/zookeeper/code/pilotfile/pilotfile.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/network/multi_pause.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/missionui/missiondebrief.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/sound/audiostr.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/stats/scoring.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/stats/medals.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/sound/audiostr.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/stats/scoring.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/stats/medals.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/parse/lua.cpp | [ Diff ] [ File ] | ||
|
zookeeper r11199
Timestamp: 2014-12-19 17:53:45 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Avoid running On Frame hooks during all popups, not only the "Quit mission" popup. | ||
| mod - /branches/zookeeper/code/graphics/2d.cpp | [ Diff ] [ File ] | ||
|
trunk r11198
Timestamp: 2014-12-15 12:52:32 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Change m_badge_earned into a vector. This makes it so that getting enough kills to cross the threshold for more than one badge simultaneously grants all of them (with the debriefing showing only the last one) and backs out all of them if the scoring is backed out. |
||
| mod - /trunk/fs2_open/code/stats/scoring.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/pilotfile/pilotfile.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/missionui/missiondebrief.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/stats/scoring.cpp | [ Diff ] [ File ] | ||
|
trunk r11197
Timestamp: 2014-12-11 23:25:42 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
PAUSE ALL THE STREAMS | ||
| mod - /trunk/fs2_open/code/sound/audiostr.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/parse/lua.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/network/multi_pause.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/sound/audiostr.cpp | [ Diff ] [ File ] | ||
|
trunk r11196
Timestamp: 2014-12-11 20:43:18 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Adding "+Available From Start:" to Medals.tbl. Requested by MjnMixael. |
||
| mod - /trunk/fs2_open/code/stats/medals.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/stats/medals.cpp | [ Diff ] [ File ] | ||
|
trunk r11195
Timestamp: 2014-12-10 23:09:44 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
add the pauseMusic scripting function, requested by MjnMixael | ||
| mod - /trunk/fs2_open/code/parse/lua.cpp | [ Diff ] [ File ] | ||
|
zookeeper r11194
Timestamp: 2014-12-10 05:51:33 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Trunk sync r11193. | ||
| mod - /branches/zookeeper/code/math/vecmat.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/parse/parselo.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/object/object.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/missionui/missiondebrief.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/sound/audiostr.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/model/modelinterp.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/weapon/shockwave.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/fred2/management.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ai/ai_profiles.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/weapon/weapon.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/graphics/gropengldraw.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/mission/missionparse.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/io/keycontrol.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/weapon/weapons.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/math/vecmat.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ship/shiphit.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/freespace2/freespace.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ai/aicode.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/fred2/management.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/cmdline/cmdline.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/sound/audiostr.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ai/aiturret.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ai/ai_profiles.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/parse/lua.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/parse/sexp.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/fred2/missionsave.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/model/model.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/hud/hudsquadmsg.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ship/ship.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/fred2/wing.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/mission/missionmessage.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/object/objcollide.cpp | [ Diff ] [ File ] | ||
|
trunk r11193
Timestamp: 2014-12-09 21:32:58 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
fix Mantis 0003132 (is-iff returns true when the target is destroyed) | ||
| mod - /trunk/fs2_open/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
|
trunk r11192
Timestamp: 2014-12-09 18:22:30 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Related to r11189: avoid calling factor_table::getNextSlots() if the ship doesn't have the dynamic linking flag. Basically, hitting "o" on any ship with more than 6 slots in a bank could crash FSO, even without the flag. Reported by Spoon. |
||
| mod - /trunk/fs2_open/code/io/keycontrol.cpp | [ Diff ] [ File ] | ||
|
trunk r11191
Timestamp: 2014-12-08 12:09:14 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Correct copy-paste error in check_sexp_syntax() from the armor types commit. | ||
| mod - /trunk/fs2_open/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
|
trunk r11190
Timestamp: 2014-12-07 21:59:35 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
fix Mantis 0003135: account for the case when the game is paused before being minimized | ||
| mod - /trunk/fs2_open/code/freespace2/freespace.cpp | [ Diff ] [ File ] | ||
|
trunk r11189
Timestamp: 2014-12-07 16:21:32 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Fix mantis 0003133. Fixes logic errors in factor_table not being sure if it's supposed to be 0-based or 1-based at different times. | ||
| mod - /trunk/fs2_open/code/io/keycontrol.cpp | [ Diff ] [ File ] | ||
|
trunk r11188
Timestamp: 2014-12-07 16:17:21 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
move this around for more logical flow | ||
| mod - /trunk/fs2_open/code/mission/missionparse.cpp | [ Diff ] [ File ] | ||
|
trunk r11187
Timestamp: 2014-12-04 01:17:13 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
a more future-proof way to keep track of explicitly paused audio | ||
| mod - /trunk/fs2_open/code/sound/audiostr.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/sound/audiostr.cpp | [ Diff ] [ File ] | ||
|
trunk r11186
Timestamp: 2014-12-03 23:45:38 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
this should fix Mantis 0002888 (allow for head.ani files without letter suffixes) | ||
| mod - /trunk/fs2_open/code/mission/missionmessage.cpp | [ Diff ] [ File ] | ||
|
trunk r11185
Timestamp: 2014-12-03 03:43:43 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
when the game returns from a paused state, don't unpause the music paused by sexp | ||
| mod - /trunk/fs2_open/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/sound/audiostr.cpp | [ Diff ] [ File ] | ||