 Goober5000
|
ebdc00a523
|
more flexible checking of generic messages
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3597 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:36 +10:00 |
|
|
Goober5000
|
8ec6c1a67d
|
merge voice file manager into voice acting manager, plus make a few tweaks to it
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3596 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:36 +10:00 |
|
|
Goober5000
|
9af2763943
|
fix for Mantis #1070
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3595 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:36 +10:00 |
|
|
taylor
|
5b864af888
|
more standalone server fixes: - add some basic bmpman functionality to grstub, since it needs to do something at least - add missing gr_* function ptrs to grstrub - (re-)enable radar and hud setup functions that used to crash (problems are fixed now) - deal with default pilot file properly (also caused a bmpman headache) - don't bother with Multi_common_icons[] in standalone mode (they don't load, so don't let them unload either)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3594 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:36 +10:00 |
|
|
taylor
|
1c516c2540
|
clean up the function ptrs so that it's a bit easier to read
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3593 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:36 +10:00 |
|
|
taylor
|
8186572d15
|
move FS2NetD connection checks to *after* it tries to connect ;) (Mantis bug #1065)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3592 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
de2fbfb48d
|
fix for deletion of multiplayer pilots (Mantis bug #1066)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3591 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
9430b78326
|
minor clean and code optimizations clean up view/proj matrix fubar that made us need far more matrix levels that actually needed (partial fix for Mantis #563) add debug safety check to make sure that we don't use more than 2 proj matrices (all that GL is required to support) set up a texture matrix for the env map to that it doesn't move/look funky
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3590 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
8c0243b821
|
fix SAFE_STRCAT() so that it can work in an if() statement that doesn't have braces
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3589 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
acf10e3bba
|
small optimizations and code cleanup use the real frametime for FPS counter stuff, no reason to deal with time compression there (Mantis bug #1058)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3588 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
Backslash
|
217b5beb99
|
Ok, maybe this one will be better. Sorry about that.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3584 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
a6bcb0b3e7
|
revert Backslash's commit, *way* too many changes there for a single friggin line
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3583 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
Backslash
|
de16009a35
|
max_speed changed to get ship's max forward speed instead of max_vel magnitude, thus fixing trichord speed problems. (Mantis 1050, and early work by argv.)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3582 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
Goober5000
|
ac2ec50ba4
|
more descriptive warning message for docking paths
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3581 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
d4b831fa35
|
default to 44100 sound sample rate (OpenAL tends to works much better with this)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3580 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
082977d664
|
add some extra FS2NetD safety checks around to prevent the code from doing stupid crash-happy things
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3579 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
4134e985a5
|
have the joystick thread prevent the display and network from going to sleep or activating the screensaver if you use only a joystick to play
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3578 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
cf9095ed6e
|
the resolution checks needed to be based on the unscaled res since you would have to include correct sizes for every single resolution otherwise (fixes a bug noticed in WCS)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3577 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
d54301f34a
|
some gamma ramp fixage, still hasn't gotten a steller review from DaBrain but it does work much better than before, so I'll tweak it later if need be
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3576 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
e0b689c9bb
|
neither of these two structs appear to be used anywhere, so lets just comment them out
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3575 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
b17794b9ed
|
some basic error message/handling fixage
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3574 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
a02ac92043
|
properly support 4gig of RAM, and don't totally freak out if user has more than that
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3573 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
cdb3c02fa2
|
properly fix the new_recommendation_text FRED problem, plus some real cleanup for that code in general, and some memory leak fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3572 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:35 +10:00 |
|
|
taylor
|
0ca738ff0a
|
add default recommendation text for debriefing, it's either this or making sure that it's nul
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3565 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
e84a2e24b8
|
prevent FRED from hitting an Assert() that it shouldn't have had to hit in the first place
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3564 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
7b2407dd4c
|
fix for Mantis bug #1006
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3563 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
ecda5d2efa
|
fix some stuff_string()'s that got missed previously
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3562 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
166aafc603
|
forgot to check that error message to match the new struct format
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3561 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
d79e25ca97
|
bah! stupid.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3560 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
c1750c14ef
|
might as well add this, just to be on the safe side (I haven't hit it anywhere, but it could be made into a warning if it starts getting hit)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3558 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
34d198d30f
|
be sure to setup/reset ship team data too when moving to a red-alert mission (Mantis bug 1042) (this will hopefully fix Mantis bug 860 as well, which is a separate but related issue)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3557 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
b0033e2d81
|
be sure that we still try to play a movie if we get to the cmd/brief screen right from another mission without debrief (Mantis bug 1043)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3556 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
cbe140ab76
|
restore MAX_AIFTT_TURRETS to retail level, and add comment as to what it means for the next person that tries to change it
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3555 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
ece636df39
|
revert to retail behavior for turret_should_pick_new_target() fix out-of-bounds issue
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3550 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
471b758539
|
fixes for stuff_string() bounds checking
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3549 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
c29aa3e9e3
|
fixes for stuff_string() bounds checking stict compiler build fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3548 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
ba6773e0f2
|
compiler warning fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3547 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
32aa4ccbeb
|
fix bug where set-object-speed-* could set speed subjectively if left to default
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3546 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:34 +10:00 |
|
|
taylor
|
305a2d5855
|
fixes for stuff_string() bounds checking compiler warning and stict compiling fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3545 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
d47c1c9cab
|
fixes for stuff_string() bounds checking compiler warning fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3544 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
baa43c4331
|
fixes for stuff_string() bounds checking make sure that default entries always get used in techroom if they don't otherwise have the techroom visibility flag fix crash bug where the first entry in the various lists wasn't ever initialized if there is no ship/weapon/intel info to show
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3543 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
1ed5c7d6c7
|
various small compiler warning and strict compiling fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3542 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
dcf3ecd770
|
crap. ... again
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3541 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
4a3e5826ee
|
clean up the grstub mess (for work on standalone server, and just for sanity sake) move color and shader functions to 2d.cpp since they are exactly the same everywhere don't bother with the function pointer for gr_set_font(), it's the same everywhere anyway
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3540 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
01dd0cf6d3
|
crap, there was supposed to be a multi check there
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3539 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
4d018ff477
|
allow W32 init fallback if desktop depth is less than requested game depth (it may look like crap, but at least it will work)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3538 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
c7748312b8
|
bah! got the post-it sitting in front of me, but still forgot to remove this
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3537 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
6175b6652b
|
make Species_info[] and Asteroid_info[] dynamic
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3536 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
6ed629949b
|
quite a few fixes to handle missing campaigns better change load order for campaign loading to a full check: Player-specified -> BUILTIN_CAMPAIGN -> First Avaiable. clean up the getting of a list of available campaigns fix simroom issue where single missions, with the [V] icon, would display wrong (this was a retail bug, but it doesn't show normally) fix bug where, if a campaign failed to load, it would still appear available for savefile useage fix bug where, when resetting the campaign info, the num_missions var wasn't 0'd and it could cause a sexp Assert() during reset
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3535 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|
|
taylor
|
58a664c6c8
|
fix a compiler warning/error on Squadmsg_history[] init
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3534 387891d4-d844-0410-90c0-e4c51a9137d3
|
2015-04-29 18:42:33 +10:00 |
|