Nightly script
c72443b83a
Automated nightly commit
2016-06-18 19:09:47 +02:00
asarium
bc9ccbbcde
Fix package name variable
2016-06-18 18:29:55 +02:00
asarium
1fafc93186
Disable test configurations
2016-06-18 18:29:55 +02:00
asarium
eb71f6bf81
Add different package names for BinTray
2016-06-18 18:29:55 +02:00
asarium
255ec3c779
Use other version
2016-06-18 18:29:55 +02:00
asarium
f94ddf7a77
Disable always building nightly builds for Travis CI
2016-06-18 18:29:55 +02:00
asarium
b5480fc314
Fix provider
2016-06-18 18:29:55 +02:00
asarium
16823d850f
Fix PowerShell command
2016-06-18 18:29:55 +02:00
asarium
3f6ce50e73
Enable nightly building always
2016-06-18 18:29:55 +02:00
asarium
2576fd2c01
Fix if syntax
2016-06-18 18:29:55 +02:00
asarium
3418def2e0
Begin adding appveyor nightly support
2016-06-18 18:29:55 +02:00
asarium
2a19dfa21a
Disable dry-run
2016-06-18 18:29:55 +02:00
asarium
6d3bc3d006
Don't set -ex for script run with source
2016-06-18 18:29:55 +02:00
asarium
bccf37689d
Use set -ex everywhere
...
Also fix testing setup
2016-06-18 18:29:55 +02:00
asarium
97e74b39f9
Enable building again
2016-06-18 18:29:55 +02:00
asarium
61f538fc96
Add version name setting
2016-06-18 18:29:55 +02:00
asarium
c74a0c9e97
Change file regex to include all files
2016-06-18 18:29:55 +02:00
asarium
edec7aa354
Improve rename script
2016-06-18 18:29:55 +02:00
asarium
9ad97ea56f
Fix non-existing directory
2016-06-18 18:29:55 +02:00
asarium
0543dcccb1
Don't run before_script when deploying
2016-06-18 18:29:55 +02:00
asarium
991299095c
Finish release builds early for testing
2016-06-18 18:29:55 +02:00
asarium
1d1d011b07
Try to fix if
2016-06-18 18:29:55 +02:00
asarium
9874c1dccc
Export variables
2016-06-18 18:29:55 +02:00
asarium
55376a2424
Fix bintray config before deploying
2016-06-18 18:29:55 +02:00
asarium
edf0495473
Fix BinTray again...
2016-06-18 18:29:55 +02:00
asarium
a49e0db8b3
Also test generic environment variables
2016-06-18 18:29:54 +02:00
asarium
4dcdc04b52
Fix BinTray configuration
2016-06-18 18:29:54 +02:00
asarium
1325c37576
Enable Bintray for all branches
2016-06-18 18:29:54 +02:00
asarium
3fc7b6098e
Disable tag only deployment for now
2016-06-18 18:29:54 +02:00
asarium
d60bdcf0ff
Update bintray config
2016-06-18 18:29:54 +02:00
asarium
afdbf568aa
Begin adding BinTray support
2016-06-18 18:29:54 +02:00
asarium
386a72e566
Move Travis checks into separate file
2016-06-18 18:29:54 +02:00
asarium
24df8e9cae
Fix artifacts
2016-06-18 18:29:54 +02:00
asarium
f0f8949621
Fix PowerShell
2016-06-18 18:29:54 +02:00
asarium
335009a9a9
Add GitHub releases deployment
2016-06-18 18:29:54 +02:00
asarium
fccbf03cde
Fix platform toolset
2016-06-18 18:29:54 +02:00
asarium
b33637e856
More Appveyor stuff
2016-06-18 18:29:54 +02:00
asarium
741600d625
Add various appveyor scripts
2016-06-18 18:29:54 +02:00
asarium
e49bdbe946
More tests
2016-06-18 18:29:54 +02:00
asarium
19cbd57a20
Test Appveyor
2016-06-18 18:29:54 +02:00
asarium
e861e5d20d
Remove travis formatter again
2016-06-18 18:29:54 +02:00
asarium
7067b8ff75
Update GitHub API token
2016-06-18 18:29:54 +02:00
asarium
1f3b94e105
Fix .travis.yml
2016-06-18 18:29:54 +02:00
asarium
419bc2ac88
Add github release deployment
2016-06-18 18:29:54 +02:00
asarium
a39e71fd32
Refine pastebin usage a bit
2016-06-18 18:29:54 +02:00
asarium
b551e103d2
Readd before_script step
2016-06-18 18:29:54 +02:00
asarium
7adee267c4
Try uploading the build logs
2016-06-18 18:29:54 +02:00
asarium
660716a8be
Add code for switching releasing
2016-06-18 18:29:54 +02:00
asarium
c427f4ab28
Mac fixes
2016-06-18 18:29:54 +02:00
asarium
458dd90b81
Add rules for MacOSX
2016-06-18 18:29:54 +02:00
asarium
4cd4123224
Install executables
2016-06-18 18:29:54 +02:00
asarium
2e53d6e227
Make script executable
2016-06-18 18:29:54 +02:00
asarium
7137dd6372
Add release script
2016-06-18 18:29:54 +02:00
m!m
b7b89337b7
Merge pull request #631 from rtoijala/fix-vpath-builds
...
fix VPATH builds
2016-06-18 18:20:02 +02:00
Risto Toijala
5577c4e16e
fix VPATH builds
...
https://www.gnu.org/software/automake/manual/html_node/VPATH-Builds.html
VPATH builds were broken because mongoose.h was not found.
Makefile.am stated that it should be found in ../mongoose, which is
incorrect for VPATH builds. The search path should be relative to the
source tree ( i.e. $(VPATH) ).
Example:
mkdir -p build/debug
cd build/debug
../../autogen.sh
../../configure --enable-debug
make
The search path would then be (relative to the source tree)
build/mongoose, not ./mongoose as it should.
Fix this by changing ../mongoose to ./($VPATH)/../mongoose.
In the previous example, $(VPATH) is ../../../code, so the search path
is now correctly ./../../../code/../mongoose.
For in-tree builds, the path was previously ../mongoose. It is now
.//../mongoose, which is equivalent.
2016-06-18 16:02:17 +03:00
MageKing17
3ed6874cb2
Merge pull request #629 from asarium/fix/625
...
Fix for #625
2016-06-17 08:32:37 -07:00
m!m
e0b8abc0ba
Merge pull request #609 from jg18/ping_fix
...
Fix ping calculations in server list.
2016-06-17 10:17:28 +02:00
asarium
e3664152ca
Validate fiction viewer file name
2016-06-16 19:49:34 +02:00
asarium
371c49724e
Turn invalid file error into warning
2016-06-16 19:49:34 +02:00
m!m
b2fc33563d
Merge pull request #628 from rtoijala/lua51-build-fix
...
accept lua51 as pkg-config name for Lua
2016-06-16 19:25:30 +02:00
Risto Toijala
73c20cedd3
accept lua51 as pkg-config name for Lua
2016-06-16 15:34:53 +03:00
niffiwan
b51d6f84b8
Merge pull request #626 from rtoijala/misleading-indentation
...
Fix indentation warnings
2016-06-15 20:43:13 +10:00
Risto Toijala
7d7c87c290
Fix indentation warnings
...
GCC 6 warns about misleading indentation because it counts tabs as 8
spaces. The rest of the code uses tabs, these lines use 4 spaces.
Replace spaces with tabs.
Whitespace changes only.
2016-06-15 12:40:44 +03:00
m!m
cb9c66966d
Merge pull request #619 from MageKing17/feature/spinup-without-external-models
...
Move conditional so that weapon spinup happens without external models.
2016-06-05 13:06:38 +02:00
m!m
441ac5c066
Merge pull request #621 from tomimaki/master
...
Fix compiling debug build on linux with glibc 2.23
2016-06-04 11:36:06 +02:00
tomimaki
1b65fd50a0
Fix compiling debug build on linux with glibc 2.23 ( #1 )
2016-06-04 00:11:04 +02:00
MageKing17
5d307d24f4
Move conditional so that weapon spinup happens without external models.
...
Moves the sip->draw_primary_models[bank_to_fire] check so that it only contains the code related to shipp->primary_rotate_ang[bank_to_fire], since that really does only matter if external models are present. The rest of the spinup code doesn't actually care about the model, though, so it seems odd (and unfair to modders) to not allow it to function just because the ship has external primary models disabled.
I also wrapped the spinup code in a basic check that winfo_p->weapon_submodel_rotate_vel is greater than zero because most weapons aren't going to have a spinup, so there's no need to perform the other calculations for them (it's probably a marginal savings at best, but since I was getting rid of the best-case savings of most ships not having external primary models enabled, I figured I may as well replace it).
Minor formatting changes to the other lines just because it took me a while to figure out what the code was doing when I first read it; "if(" changed to "if (", and line breaks inserted into the one-line conditionals.
2016-06-02 21:40:16 -07:00
jg18
d06d6e6df0
Change f2fld() macro to f2d().
2016-05-30 14:08:28 -07:00
jg18
e78327d879
Fix ping average calculation.
2016-05-30 13:59:51 -07:00
jg18
8f42977ee8
Fix ping calculations in server list.
...
Fix calculations of server ping in in-game server list. Minimize floating
point calculations, using double instead of float, avoid calling timer
twice when receiving pong, and capture pong time more precisely.
2016-05-30 13:59:51 -07:00
m!m
d60c8d5f3f
Merge pull request #615 from niffiwan/feature/player_min_speed
...
Add player minimum speed feature
2016-05-27 14:19:08 +02:00
niffiwan
278a797db2
Add player minimum speed feature
...
Allows the players ship to have a minimum speed set. If the ships speed
drops below this (per ship) value, the throttle is increased to the
minimum.
For ships that are gliding, their engines will be reactivated when the
ships overall velocity falls below the minimum speed.
Currently only sets a minimum Z speed, Y & X are ignored.
2016-05-27 20:34:15 +10:00
m!m
1a59a1c811
Merge pull request #612 from Yarn366/messages_suffix_fix
...
Fix for automatic message suffixes
2016-05-25 19:40:42 +02:00
MageKing17
96c01e6c1e
Merge pull request #613 from DahBlount/Fix-Warp-No-Collide
...
Prevent "no collide" objects from colliding during warp sequence
2016-05-25 01:07:50 -07:00
DahBlount
50496c8143
Add OF_COLLIDES check to avoid OBJ_RECALC_PAIRS
...
OBJ_RECALC_PAIRS unsets then sets the OF_COLLIDES flag, so when a ship
with "no collide" set on it warps out, the flag is essentially ignored
and the ship can collide during the warp sequence.
2016-05-24 22:54:10 -06:00
Yarn366
7d3b824428
Added a flag the message_extra struct that tells whether the base animation exists. Also changed message_play_anim() to use this flag rather than the first_frame field to decide whether to add a suffix to the name.
2016-05-23 01:10:33 -04:00
MageKing17
8906c735c6
Merge pull request #607 from niffiwan/feature/lua_tAnim_instant
...
Add instant flag to lua triggered anims
2016-05-08 10:57:36 -07:00
MageKing17
2ee839152c
Merge pull request #608 from niffiwan/cleanup/lua_ets_desc
...
Fix ETS virtvar comments
2016-05-08 10:57:20 -07:00
niffiwan
6be09e7157
Merge pull request #606 from MageKing17/cleanup/fred2-executable-version
...
Update FRED2_Open executable version to 3.7.5.
2016-05-08 19:32:33 +10:00
niffiwan
1715b20d30
Fix ETS virtvar comments
2016-05-08 15:05:19 +10:00
niffiwan
37497cb7d7
Add instant flag to lua triggered anims
...
Just expose the existing instant flag from the animation handling code
2016-05-07 21:10:26 +10:00
MageKing17
b62eba559b
Update FRED2_Open executable version to 3.7.5.
...
Not sure how this got missed multiple times, but better late than never.
2016-05-06 16:10:20 -07:00
Cliff Gordon
4fa84ee388
Merge pull request #600 from MageKing17/bugfix/grammar-compilation
...
Make VS 2013 and 2015 use the copy of gc.exe like 2010 does.
2016-05-01 16:01:30 -05:00
Goober5000
776f0df434
Merge pull request #592 from downwash/mantis-02851
...
Removed support for // comments in FRED
2016-04-29 02:02:25 -04:00
MageKing17
39ce7d4253
Make VS 2013 and 2015 use the copy of gc.exe like 2010 does.
...
Recent update to VS 2015 Community Edition appears to have removed gc.exe for some reason; the safest thing to do would seem to be to go back to using the copy of it we were already keeping around for VS 2010 Express.
2016-04-27 14:51:47 -07:00
m!m
c33b54464e
Merge pull request #599 from PeterMitsis/double-float-conversions
...
Minor trig cleanup
2016-04-27 11:54:06 +02:00
Peter Mitsis
e3cde7086c
hud: Simplify HudGaugeLock::renderLockTrianglesOld()
...
Uses the following trig identities to reduce the number of floating
point operations in HudGaugeLock::renderLockTrianglesOld().
sin(-x) = -sin(x)
cos(-x) = cos(x)
Signed-off-by: Peter Mitsis <[email protected] >
2016-04-24 21:56:06 -04:00
Peter Mitsis
180674154c
trig: Use floating point versions of trig functions
...
Replaces calls to double-precision floating point trig functions with
calls to single-precision floating point trig functions as follows:
cos() -> cosf()
sin() -> sinf()
tan() -> tanf()
acos() -> acosf()
asin() -> asinf()
atan() -> atanf()
This allows the compiler to avoid generating unnecessary instructions
that convert a float to a double and then a double back to a float.
Signed-off-by: Peter Mitsis <[email protected] >
2016-04-24 21:56:06 -04:00
Peter Mitsis
181b758577
Replace ANG_TO_RAD() macro with fl_radians() macro
...
Both the ANG_TO_RAD() and fl_radians() macros were serving the same
purpose; they converted an angle from degrees to radians. To reduce
code duplication, ANG_TO_RAD() was replaced with the existing
fl_radians().
Signed-off-by: Peter Mitsis <[email protected] >
2016-04-24 21:56:06 -04:00
niffiwan
3f5e30b4dc
Merge pull request #596 from MageKing17/bugfix/template-first-time
...
Make ship templates default first_time to true, like ship classes.
2016-04-18 18:56:38 +10:00
MageKing17
15dec7e508
Make ship templates default first_time to true, like ship classes.
...
Otherwise, the first_time code never gets evaluated for template-based ships and you never get engine glows from species. Fixes issue #594 .
2016-04-17 17:02:44 -07:00
downwash
7e3198392b
Removed support for // comments in FRED
2016-04-16 23:28:13 +02:00
MageKing17
f247330e4b
Merge pull request #591 from niffiwan/bugfix/mouse_hat_interaction
...
Stop joystick hat binds being triggered spuriously
2016-04-13 09:36:07 -07:00
niffiwan
6c1dd85738
Stop joystick hat binds being triggered spuriously
...
There was a bug in the controls code that meant trigger type controls
bound to a joystick hat could be triggered by unrelated mouse button
presses. i.e. bind "hat-back" to cycle secondary weapons and secondary
banks would change when you fired with left mouse button.
Root cause is left bitshifting by 32 or more, which is implementation
defined and at least on Linux/GCC resulted in the above behaviour.
2016-04-13 22:21:08 +10:00
m!m
1a5700a0cb
Make new registry configurable on commandline ( #587 )
2016-04-10 13:18:44 +02:00
Yarn366
3584164ec0
Fix for tab key on barracks screen ( #589 )
...
* Fixed tab key not actually switching between single player/multiplayer.
2016-04-10 13:02:30 +02:00
m!m
2679f97dc2
Merge pull request #586 from niffiwan/bugfix/asan_triggered_anim_memcpy
...
Fix issue with memcpy on overlapping memory
2016-04-06 13:34:38 +02:00
niffiwan
0a041aade1
Fix issue with memcpy on overlapping memory
...
Triggered animations (e.g. models with rotating afterburner flaps)
could trigger a memcpy on overlapping memory. This may not have caused
issues, but is undefined behaviour according to the spec
Also see #574
2016-04-06 20:26:34 +10:00
MageKing17
9845a1ad46
Merge pull request #580 from Goober5000/dumb_rotate_compatibility
...
use $rotate, $rotate_rate, and $rotate_time, and their $dumb_ equivalents, with proper backwards compatibility
2016-04-03 20:41:08 -07:00
Goober5000
33151e956d
fix a bug in the option comparison, and also add sanity checking for infinite rotation rates
2016-04-03 21:07:55 -04:00
Goober5000
08e565a855
use $rotate, $rotate_rate, and $rotate_time, and their $dumb_ equivalents, with proper backwards compatibility
2016-04-03 18:15:20 -04:00
Fabian Woltermann
fb61239f85
Merge pull request #582 from asarium/fix/cfilecrash
...
Fix crash in cfile.cpp
2016-04-03 23:16:35 +02:00
asarium
88ffa54ae0
Fix crash in cfile.cpp
2016-04-03 22:12:13 +02:00
m!m
5de6635111
Merge pull request #576 from PeterMitsis/cfile-cleanup
...
Cfile cleanup
2016-04-02 09:35:31 +02:00
Peter Mitsis
04dc9f28cc
cfile: Fix minor issues found during code review
...
Signed-off-by: Peter Mitsis <[email protected] >
2016-04-01 20:03:00 -04:00
Fabian Woltermann
55bdad3799
Merge pull request #579 from DahBlount/Share_Fire_Direction-Accuracy-Fix
...
Remove redundant function and add check to add "salvo mode" if "share fire direction" is found
2016-04-02 01:00:19 +02:00
DahBlount
63bb60935c
Remove redundant function and add check to add "salvo mode" if "share fire direction" is found
2016-04-01 16:26:55 -06:00
MageKing17
6d82031115
Merge pull request #577 from asarium/fix/572
...
Fix issue #572
2016-04-01 04:05:11 -07:00
asarium
05fbb8d4de
Fix issue #572
2016-04-01 12:03:19 +02:00
MageKing17
f4645e3e6c
Merge pull request #569 from downwash/mantis-03153
...
Clarified a warning message about wave tresholds (Mantis 3153)
2016-04-01 01:42:32 -07:00
Peter Mitsis
8924aa06e9
cfile: Simplify cf_delete()
...
Removes the unnecessary attempt at opening the specified prior to
calling _unlink().
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
Peter Mitsis
673b8f61eb
cfile: Remove superfluous memset() in cfile_flush_dir()
...
There is no need to zero the 'stat' structure before using in stat().
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
Peter Mitsis
f75f6af43a
cfile: Refactor cfile_chdir() and cfile_push_chdir()
...
Reworks cfile_chdir() and cfile_push_chdir() to extract common and
reduce code duplication.
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
Peter Mitsis
71a61143bf
cfile: Simplify cfile_init() and cfile_in_root_dir()
...
Removes unnecessary error checking and simplifies the logic.
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
Peter Mitsis
cca2a776e1
cfile: Only define cfile_chdrive() for _WIN32
...
Not only was the use of of cfile_chdrive() already conditional on _WIN32
being defined, so too was its extern declaration.
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
Peter Mitsis
8e21aa6c88
cfile: Apply 'static' keyword
...
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
MageKing17
6bb1ccc830
Merge pull request #575 from niffiwan/bugfix/controlsconfig_delete
...
Fix new[] vs delete mismatch
2016-03-31 15:47:26 -07:00
niffiwan
f6ef7c1cd6
Fix new[] vs delete mismatch
...
Found by address sanitiser
2016-03-31 20:10:16 +10:00
downwash
a4c1d8f2eb
Wing editor no longer allows invalid values for wave treshold
2016-03-28 12:38:48 +02:00
Bernard Vervaet
20c5a86dcb
Clarified a warning message about wave tresholds (Mantis 3153)
2016-03-28 00:11:29 +02:00
m!m
ccc616fec3
Merge pull request #568 from niffiwan/bugfix/cleanup_weapon_model_unload
...
Cleanup weapon_info when models are unloaded
2016-03-27 15:21:18 +02:00
niffiwan
07284cf221
Cleanup weapon_info when models are unloaded
...
Avoids the assertions at model/modelread.cpp:3062
ASSERTION FAILED: "Polygon_models[num]->id == model_num" (etc)
2016-03-27 17:04:14 +10:00
Fabian Woltermann
2b4d08e842
Merge pull request #565 from chief1983/xcode_73_upgrade
...
[xcode_73_upgrade] Apply some recommended project file changes
2016-03-25 14:18:00 +01:00
Fabian Woltermann
1e3857e385
Merge pull request #567 from Yarn366/fix_shadow_tech_room
...
Fixed ship position in ship database
2016-03-25 14:17:25 +01:00
Yarn366
8635a8b537
Fixed ship position in ship database
2016-03-24 22:07:13 -04:00
MageKing17
762691c78f
Merge pull request #566 from ln-zookeeper/master
...
Fix for Mantis 3170
2016-03-23 15:53:30 -07:00
Lari Nieminen
f8cb347a62
Fix for Mantis 3170
...
Despite what the original report claims, the ship.cpp change described in it actually works.
2016-03-24 00:23:30 +02:00
Cliff Gordon
2d2df40efb
[xcode_73_upgrade] Apply some recommended project file changes after Xcode 7.3 upgrade.
2016-03-23 13:15:51 -05:00
Cliff Gordon
f0518514a3
Merge pull request #564 from asarium/ci/macosxFail
...
Make Travis build fail if one command fails
2016-03-23 12:53:25 -05:00
asarium
64104c19a8
Make Travis build fail if one command fails
2016-03-23 17:49:35 +01:00
Cliff Gordon
847521b012
Merge pull request #563 from asarium/fix/shaderOSX
...
Fix MacOSX compilation error
2016-03-23 11:47:56 -05:00
m!m
e6d0f9f72a
Fix MacOSX compilation error
2016-03-23 16:15:28 +01:00
MageKing17
1cd9d3fb04
Merge pull request #562 from asarium/cleanup/openglShaders
...
Clean up shader loading code a bit
2016-03-23 02:10:48 -07:00
asarium
6184ae6db6
Clean up shader loading code a bit
2016-03-22 17:38:42 +01:00
MageKing17
b270ad1bb9
Merge pull request #560 from Goober5000/dumb_rotation_tweak
...
fix the $dumb_rotate turn rate calculation to align with regular $rotate
2016-03-19 14:52:10 -07:00
Goober5000
fbc0c79973
fix the $dumb_rotate turn rate calculation to align with regular $rotate
2016-03-19 17:02:55 -04:00
MageKing17
caf41665f4
Merge pull request #556 from MageKing17/bugfix/issue-347
...
Fix mission screen grid by changing the drawing of the lines.
2016-03-17 06:01:29 -07:00
MageKing17
90a2676f17
Fix mission screen grid by changing the drawing of the lines.
...
Instead of using the clipping plane, simply don't draw the grid below the scanline. Fixes issue #347 .
2016-03-16 16:40:56 -07:00
MageKing17
5032d06964
Merge pull request #555 from asarium/fix/model_glsl
...
Fix flag file inconsistency
2016-03-16 16:15:33 -07:00
asarium
f9f65b0795
Fix flag file inconsistency
2016-03-16 23:18:01 +01:00
Fabian Woltermann
c9380f0091
Merge pull request #553 from niffiwan/cleanup/faster_debug_default_runtime_checks
...
Set Basic Runtime Checks to Default
2016-03-14 09:42:42 +01:00
niffiwan
033ba61588
Set Basic Runtime Checks to Default
...
Ref: https://randomascii.wordpress.com/2011/07/22/visual-c-debug-buildsfast-checks-cause-5x-slowdowns/
One option to speed up debug
2016-03-13 13:56:55 +10:00
Fabian Woltermann
09ce1f1846
Merge pull request #551 from asarium/fix/registry
...
Fix Windows Registry configuration
2016-03-12 15:02:07 +01:00
asarium
6184136ffe
Fix Windows Registry configuration
2016-03-11 12:41:59 +01:00
MageKing17
e98fd0bab3
Merge pull request #549 from asarium/fix/fictionviewer
...
Add validation when parsing a file spec
2016-03-10 12:25:50 -08:00
asarium
a1a8a53a65
Add validation when parsing a file spec
...
This issue was spotted by Taranis who encountered an assertion caused by
an empty file name. This check will make sure that every string parsed
as a file name will at least contain one character.
2016-03-10 18:33:43 +01:00
Cliff Gordon
38b51723e0
Automated 3.7.5 versioning commit
2016-03-10 10:09:20 -06:00
Fabian Woltermann
dc708ccbbb
Merge pull request #547 from Goober5000/game_level_seed
...
improve RNG seeding
2016-02-28 22:09:57 +01:00
Goober5000
5206220f5a
simplify the random number seeding; don't seed the RNG for every mission in single player
2016-02-27 13:25:48 -05:00
Fabian Woltermann
c049e7335b
Merge pull request #535 from jg18/remove_ipx
...
Remove IPX support.
2016-02-27 00:18:39 +01:00
jg18
a05d19db6b
Re-enable TCP/IPX selector buttons.
...
Re-enable the TCP selector button and unhide the IPX selector button.
Attempting to select IPX brings up a pop-up that IPX is no longer supported.
2016-02-25 10:28:50 -08:00
jg18
cb65ca8655
Revert changes to net_addr struct format.
...
Revert changes that were made to net_addr struct format in commit 220fa18.
The net_addr struct is now the same as it was in retail.
2016-02-25 10:28:49 -08:00
jg18
1adb64e39d
Remove IPX support.
...
Remove support for the IPX protocol. The IPX selector button in the multi
options menu is now hidden, and the TCP button is disabled since there is no other option.
2016-02-25 10:28:49 -08:00
Fabian Woltermann
6c308037e8
Merge pull request #546 from SamuelCho/fred_outline_fix
...
Fixes ships in FRED only rendering wireframe instead of both wireframe and model when selected.
2016-02-25 09:25:39 +01:00
SamuelCho
706b3a7f5e
Fixes ships in FRED only rendering wireframe instead of both wireframe and model when selected.
2016-02-24 23:32:57 -08:00
niffiwan
4c23cd0d00
Merge pull request #545 from asarium/fix/iamstupid
...
Fix some issues from my previous PRs
2016-02-22 21:40:10 +10:00
m!m
1fbeccd61e
Merge pull request #544 from niffiwan/feature/bm_used
...
Add debug console command: bm_used
2016-02-22 12:24:49 +01:00
asarium
564fc9a680
Update commend to match updated code
2016-02-22 12:11:44 +01:00
asarium
688c514352
Actually dump opened files to log file
2016-02-22 12:10:46 +01:00
niffiwan
acc57397e5
Add debug console command: bm_used
...
Reports how many bmpman slots are used, with subtotals for each image
type and EFFs broken down by sub-type
2016-02-22 18:49:57 +10:00
Fabian Woltermann
e47884e0fb
Merge pull request #543 from asarium/cleanup/graphics
...
Clean up the renderer interface
2016-02-22 09:12:41 +01:00
Fabian Woltermann
81bd363d6d
Merge pull request #542 from asarium/feature/cfile_debugging
...
Add source tracking for cfiles
2016-02-21 23:34:51 +01:00
asarium
108d60330f
Clean up the renderer interface
2016-02-21 23:24:01 +01:00
asarium
58575399f5
Add source tracking for cfiles
2016-02-21 22:34:37 +01:00
Fabian Woltermann
1253575a68
Merge pull request #540 from asarium/bmpman/loading
...
Move texture loading out of graphics code
2016-02-21 17:26:17 +01:00
asarium
a1d46479d7
Remove -img2dds
2016-02-21 15:57:52 +01:00
asarium
a4043fbf21
Improve Assertion message a bit
2016-02-21 15:40:18 +01:00
asarium
83b8361dcd
Move texture loading out of graphics code
...
Currently the graphics code handles loading texture information and data
but that should be done by bmpman itself. I removed two graphics API
functions and added a new one which is called to notify the graphics
code that a texture has been loaded.
2016-02-21 15:40:18 +01:00
Fabian Woltermann
be677937ae
Merge pull request #541 from asarium/ci/unused_function
...
Disable unused function warnings in release mode
2016-02-21 15:39:24 +01:00
asarium
aebdc6328b
Disable unused function warnings in release mode
2016-02-21 12:10:30 +01:00
m!m
801b808764
Merge pull request #529 from MageKing17/bugfix/objcollide-speed-check
...
Don't assume non-turning weapons have a fixed velocity.
2016-02-14 15:04:08 +01:00
m!m
73d12d15a3
Merge pull request #532 from Goober5000/function_parameter_tweak
...
modify function headers as suggested in PR #530
2016-02-11 10:46:51 +01:00
Goober5000
c9a45c9fbd
come on, Travis, stop halting after a single warning
2016-02-11 01:13:00 -05:00
Goober5000
ddd3a7d6fe
resolve Travis warning
2016-02-11 00:50:20 -05:00
Goober5000
e302f0e456
convert the rest of the model instance functions to have model_instance_num parameters instead of object parameters
2016-02-10 23:23:44 -05:00
Fabian Woltermann
0ed147fb45
Merge pull request #533 from Yarn366/scale_gauges_fix
...
$Scale Gauges fix
2016-02-07 12:18:22 +01:00
Goober5000
da812f9433
modify the actual function calls
2016-02-06 18:05:33 -05:00
Yarn366
5e623d10b0
Moved the check for negative values in $Force Scaling Above so that $Scale Gauges can work properly
2016-02-06 16:40:08 -05:00
Goober5000
471c898df5
modify function headers as suggested in PR #530
2016-02-06 15:46:06 -05:00
MageKing17
4e9f5dc754
Merge pull request #531 from Goober5000/intrinsic_rotation_refactor
...
refactor of dumb_rotation to intrinsic_rotation
2016-02-05 11:00:28 -08:00
Goober5000
df41bbe172
refactor of dumb_rotation to intrinsic_rotation
...
This is a renaming of the Dumb_rotation infrastructure, which is now called Intrinsic_rotation. Intrinsic rotations are automatically applied to submodels without the need for an associated subsystem. Dumb rotations are now a type of intrinsic rotation, and look_at rotations will be added in a future PR. The same code will handle both; the only difference is in how the intrinsic rotation is calculated. (In the case of dumb-rotation, it is calculated the same way as normal rotation; in the case of look-at, it will be calculated using submodel_look_at.)
2016-02-05 12:40:55 -05:00
Cliff Gordon
617fd6a977
Merge pull request #519 from chief1983/project_removal_201601
...
Project removal 2016-01
2016-02-03 10:38:44 -06:00
MageKing17
54e052bc2f
Don't assume non-turning weapons have a fixed velocity.
...
Somewhat related to PR #528 , this changes the branch that assumes constant velocity from checking for an absence of the WIF_TURNS flag to checking for the presence of the PF_CONST_VEL flag (because non-turning weapons can be given an acceleration time).
2016-01-31 18:54:41 -08:00
Goober5000
17c6b7cd58
Merge pull request #528 from ln-zookeeper/master
...
Fixed $Acceleration Time not working right on non-homing secondaries
2016-01-31 16:45:29 -05:00
Lari Nieminen
f12d2395dc
Fixed $Acceleration Time not working right on non-homing secondaries
2016-01-31 23:27:52 +02:00
Goober5000
746fe56b32
Merge pull request #525 from asarium/cleanup/timer
...
Remove some unused code from timer.h/.cpp
2016-01-31 16:12:04 -05:00
MageKing17
a87af22357
Merge pull request #523 from asarium/fix/time
...
Change timestamp integer handling again
2016-01-29 16:34:15 -08:00
MageKing17
4179d95975
Merge pull request #524 from Goober5000/small_fixes
...
one small bugfix, one small comment tweak
2016-01-29 16:33:31 -08:00
asarium
fc6bc3a1c6
Remove some unused code from timer.h/.cpp
...
The removed code has been replaced by the profiling subsystem.
2016-01-29 22:00:58 +01:00
Goober5000
5bcc89be3a
one small bugfix, one small comment tweak
...
This fixes a bug where, when the skybox is changed after loading a new mission, it tries to delete its model instance which was already deleted in model_instance_free_all. Setting the instance reference to -1 when the instance is freed fixes this. (This is something that would typically be handled by the object_delete function, as it is for ship_delete, asteroid_delete, and weapon_delete, but there is no such equivalent for skyboxes.)
Since this is such a small PR, I decided to also include a stash where I restored a comment that was inadvertently deleted by Swifty's hud_lock variable scope fix PR.
2016-01-29 12:37:14 -05:00
asarium
54b2eddc14
Change timestamp integer handling again
2016-01-28 16:39:10 +01:00
Fabian Woltermann
7a7abe1b3b
Merge pull request #522 from asarium/fix/time
...
Use integer math instead of floats for timestamps
2016-01-27 20:32:05 +01:00
Fabian Woltermann
75c69271a9
Merge pull request #520 from MageKing17/bugfix/object-recycling-errors
...
Fix object recycling errors
2016-01-27 20:31:20 +01:00
asarium
64c4e4d7b4
Use integer math instead of floats for timestamps
2016-01-27 15:34:37 +01:00
MageKing17
1159e66168
Avoid checking for combat music if the projectile's parent was recycled.
2016-01-27 01:25:46 -08:00
MageKing17
37a98b8cf8
Check B->parent_sig before checking B->parent in objcollide.cpp.
...
Could cause problems with recycled objects (specifically, I had a crash once because "Objects[B->parent].instance" was well over MAX_SHIPS due to being a weapon instead of a ship, causing the "Ships[Objects[B->parent].instance].team" reference to fail hard).
2016-01-26 23:59:23 -08:00
MageKing17
a5b705b2c1
Store debris damage type on the debris object itself.
...
If the Object that had been assigned to that particular debris's parent wound up getting recycled and used for something else, the code in shiphit.cpp would cause a crash as soon as that debris hit something. This would happen fairly reliably in cluttered missions like BP massive battle.
2016-01-26 23:36:24 -08:00
Goober5000
76b98684cc
Merge pull request #512 from Goober5000/dumb_rotation_refactor
...
Dumb rotation refactor
2016-01-26 22:04:08 -05:00
Cliff Gordon
aa0de45ddb
Part C: Update references to these projects in the CI configs and other areas.
2016-01-26 16:51:28 -06:00
Cliff Gordon
e6855a4153
Part B: Move Xcode4 project to Xcode.
2016-01-26 16:35:26 -06:00
Cliff Gordon
f61b869c7f
Part A: Remove 5 old crusty projects.
2016-01-26 16:34:57 -06:00
Goober5000
59d6a44db3
colons are redundant
2016-01-25 19:31:52 -05:00
MageKing17
8dc4030dbc
Merge pull request #518 from Yarn366/hud_scale_limit
...
Hud scale limit (part 2)
2016-01-25 16:31:41 -08:00
Yarn366
882467cb5a
Merge branch 'master' into hud_scale_limit
2016-01-25 17:14:59 -05:00
Yarn366
5b8410de98
Values of "Force Scaling Above" that are <= 0 are now handled in adjust_base_res rather than in gauge_load_common. (This fixes a bug that prevented this parameter from working properly under certain conditions.)
...
Also removed an erroneous plus sign in adjust_base_res.
2016-01-25 17:00:08 -05:00
m!m
79f3f08543
Merge pull request #500 from Yarn366/hud_scale_limit
...
Hud scale limit
2016-01-25 22:20:16 +01:00
Yarn366
1bd7160461
Remove parameters from gauge_settings constructor and change values after struct creation.
2016-01-25 15:13:17 -05:00
Yarn366
8464e1769f
Use a constructor rather than a define to create a gauge settings struct.
2016-01-25 04:41:24 -05:00
Goober5000
975e108841
further accommodation of the dumb-rotation movement type, including, finally, proper collision detection!
2016-01-25 01:29:51 -05:00
Goober5000
6d60bb1511
add some additional clarifying comments
2016-01-25 00:49:21 -05:00
Goober5000
28faa9e588
warn for dumb-rotation as well as regular rotation
2016-01-25 00:26:26 -05:00
Yarn366
3ccfbb6aac
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into hud_scale_limit
2016-01-24 23:26:19 -05:00
Goober5000
78ff02501b
improve debug warning handling
2016-01-24 21:41:31 -05:00
Goober5000
165124267a
Add model_instance handling for weapons, asteroids, and skyboxes
2016-01-24 21:28:43 -05:00
Goober5000
b9033ab2a2
fix Travis error
2016-01-24 19:00:04 -05:00
Goober5000
102efb192c
some additional error handling
2016-01-24 17:55:13 -05:00
MageKing17
da7ec6db4d
Merge pull request #463 from niffiwan/feature/cm_decoy_once_alt
...
Allow countermeasures to decoy missiles once only (alternate solution)
2016-01-24 14:08:02 -08:00
Cliff Gordon
e36b5398ef
Merge pull request #516 from asarium/ci/generic
...
Use generic architecture for Travis CI
2016-01-24 12:29:14 -06:00
asarium
335cc4a114
Use generic architecture by default
2016-01-24 14:31:13 +01:00
Goober5000
4b05468f3c
update comment with a small clarification, add an assertion that the function contract is being followed, and fix an incipient bug by adding a necessary is_ship flag
2016-01-20 14:44:45 -05:00
Goober5000
26a500bf7c
address warnings flagged by Travis
2016-01-19 22:18:09 -05:00
Goober5000
81ad6dc1b5
remove a field that is now redundant
2016-01-05 01:04:46 -05:00
Goober5000
025c58c679
fix const-correctness due to Swifty's change
2016-01-05 00:56:51 -05:00
Goober5000
bb93319871
small update due to changed API
2016-01-04 23:34:30 -05:00
Goober5000
8f224a76a4
incorporate turning rate
2016-01-04 23:34:30 -05:00
Goober5000
a640015afc
tweak the creation of dumb_rotate instances; move the check for can_move below look_at and dumb_rotate
2016-01-04 23:34:29 -05:00
Goober5000
82807f2760
delete dumb rotations when we delete the associated instance
2016-01-04 23:34:29 -05:00
Goober5000
97924c0628
Add data structures and the hook to create the dumb rotations when model instances are created. This might be sufficient to get dumb rotations working for ships.
2016-01-04 23:34:28 -05:00
Goober5000
680ac9175f
move the two dumb_rotation iterations into one function (which calls a subfunction) in modelread.cpp, and add some descriptive commenting
2016-01-04 23:34:28 -05:00
Goober5000
e3c4f90287
first chunk of work to reimplementing dumb_rotate in a way that syncs with the rest of the model code
2016-01-04 23:34:27 -05:00
Goober5000
ed2bbc35eb
Merge pull request #501 from SamuelCho/kill_ship_model_start
...
Killed the last vestiges of ship_model_start/stop.
2016-01-04 22:45:03 -05:00
Fabian Woltermann
23aa8cb18d
Merge pull request #504 from niffiwan/fix/shield_hit_anim_duration
...
Allow shield hit animations to play to the end
2016-01-04 15:40:03 +01:00
Yarn366
af2725b2b7
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into hud_scale_limit
2016-01-04 03:58:12 -05:00
Yarn366
ca95a3c25d
Changed default gauge settings from a function to a define
2016-01-04 03:57:13 -05:00
m!m
a9b4be5928
Merge pull request #425 from Echelon9/fix/SHADER_MODEL-concept-removal
...
OpenGL: Refactor GLSL setup and remove DirectX Shader Model concept
2016-01-03 23:56:46 +01:00
Echelon9
7691c4905e
Correct comment regarding glGetString(GL_SHADING_LANGUAGE_VERSION)
2016-01-03 16:33:05 -05:00
Echelon9
9bd4fb3ac7
Lift up FXAA shader GLSL version check to opengl_post_load_shader(), out of the GLSL shader compiler preprocessor stage.
2016-01-03 16:33:05 -05:00
Echelon9
49b5d9a3b7
Fix up the revert of 0345d09a513082d15b53b045471f3fe1e3621b9b
2016-01-03 16:33:04 -05:00
Echelon9
22f14d56ea
Revert "GLSL: Provide a dynamic #version directive to the shaders, in line with OpenGL standards"
...
This reverts commit 0345d09a513082d15b53b045471f3fe1e3621b9b.
2016-01-03 16:33:04 -05:00
Echelon9
5f4568cc0e
OpenGL: Correct typo in one use of the __VERSION__ predefined macro
2016-01-03 16:33:04 -05:00
Echelon9
39842e7115
OpenGL: Rely on predefined macro __VERSION__ in GLSL language specification, rather than rolling our own. This predefined macro has been a language feature in all GLSL versions we support. See Section 3.3 Preprocessor.
2016-01-03 16:33:04 -05:00
Echelon9
cb90d286e5
GLSL: Provide a dynamic #version directive to the shaders, in line with OpenGL standards
2016-01-03 16:33:04 -05:00
Echelon9
e4c98e8527
Remove final DirectX Shader Model concepts. OpenGL GLSL version supported by the driver can be directly queried, rather than a layer of abstraction through SM2, SM3 and SM4. Allows Use_GLSL to be removed following refactoring.
2016-01-03 16:33:04 -05:00
Echelon9
5d593f0df0
Plumb through is_minimum_GLSL_version()
2016-01-03 16:33:04 -05:00
Echelon9
a045e5d266
Refactor out -disable_glsl_model command line option, which is encoded in Use_GLSL internally
2016-01-03 16:33:04 -05:00
Echelon9
21b8e3bb52
Add helper function is_minimum_GLSL_version()
2016-01-03 16:33:04 -05:00
Echelon9
3aa671a211
Replace SHADER_MODEL with GLSL_VERSION
2016-01-03 16:33:04 -05:00
Echelon9
d3ce9874a7
DirectX Shader Model 4.0 is equivalent to GLSL version 3.30. Source: https://www.opengl.org/wiki/Detecting_the_Shader_Model
2016-01-03 16:33:04 -05:00
SamuelCho
1cfbc24fb9
Merge branch 'master' into kill_ship_model_start
2016-01-03 13:04:03 -08:00
SamuelCho
4a4486c9be
Merge branch 'master' into kill_ship_model_start
2016-01-03 13:02:47 -08:00
Yarn366
a1caca08ab
Merge branch 'master' into hud_scale_limit
2016-01-03 14:18:18 -05:00
niffiwan
e32e21bcd0
Merge pull request #509 from SamuelCho/team_glow_alpha_channel
...
Only enable team glow colors if team color texture mask has an alpha channel.
2016-01-03 20:16:24 +10:00
Yarn366
3fd9b8f802
Fix the errors reported by AppVeyor and Travis CI (take 2)
2016-01-03 04:29:59 -05:00
Yarn366
890c607ad2
Fix the errors reported by AppVeyor and Travis CI (hopefully)
2016-01-03 03:56:13 -05:00
Yarn366
e2dac4b7b4
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into hud_scale_limit
2016-01-03 03:12:29 -05:00
Yarn366
3512fcc18e
Changed the gauge loaders to accept a pointer to the new gauge_settings struct instead of a bunch of values.
2016-01-03 03:12:00 -05:00
SamuelCho
f57e346eff
Only enable team glow colors if team color texture mask has an alpha channel.
2016-01-02 16:47:28 -08:00
niffiwan
768e097c73
Merge pull request #508 from MageKing17/cleanup/stop-exporting-no_fps_capping
...
Stop exporting -no_fps_capping to the launcher.
2016-01-03 09:20:28 +10:00
MageKing17
b0115a5f80
Stop exporting -no_fps_capping to the launcher.
...
Given the number of unintended consequences that can result from use of this command-line flag, we should return to the pre-137eb7e4d4cb0f9c153d15bbcce847347aa3d716 behavior of not including it in the exe_params[] array; anyone who knows what it does and why we don't advertise it can still use it for testing purposes, but it should prevent the typical user from turning it on without knowing exactly what can go wrong.
2016-01-02 12:19:13 -08:00
niffiwan
a23630346b
Merge pull request #505 from DahBlount/Fix-for-Coverity-#1343617
...
Fix for coverity 1343617
2015-12-31 17:40:29 +10:00
DahBlount
d4d805d6ca
Move turret_enemy_objnum check further up in block and change to Assertion
2015-12-30 23:44:04 -07:00
niffiwan
b147ea0a21
Merge pull request #506 from Karajorma/BUGFIX-RepeatCounts
...
Fix the issue with repeat counts first discovered on this thread http…
2015-12-30 21:47:27 +10:00
Karajorma
8a2eec5b4a
Fix the issue with repeat counts first discovered on this thread http://www.hard-light.net/forums/index.php?topic=90763.msg1801379#msg1801379
2015-12-30 16:56:50 +08:00
niffiwan
ee64b83aec
Allow shield hit animations to play to the end
...
Previously they'd always stop at 75% complete, and it's probably just
luck that it worked correctly for ✌️
2015-12-28 14:55:54 +10:00
MageKing17
24b58db67f
Merge pull request #479 from SamuelCho/hud_lock_fix_for_issue_456
...
My attempt to fix the HUD lock scoping issues raised by issue #456 .
2015-12-25 22:52:40 -08:00
Samuel Cho
2ddee36007
Cleaned up HudGaugeLock::render() and removed hud_draw_diamond() since that's not being used.
2015-12-25 19:34:39 -08:00
Goober5000
7e9a798101
Merge pull request #503 from Goober5000/sf2_no_disabled_self_destruct
...
add no-disabled-self-destruct ship flag
2015-12-21 11:08:38 -05:00
Goober5000
542dc68df2
add to Ship_flag_names array
2015-12-21 00:56:51 -05:00
Goober5000
b1ac0876d4
add no-disabled-self-destruct ship flag
...
Normally, ships whose weapons or engines subsystems are destroyed will
self-destruct after 90 seconds if they are part of a wing (see
ai_maybe_self_destruct). This adds a ship flag to prevent that from
happening.
2015-12-20 23:12:59 -05:00
Goober5000
7badc4dfd9
Merge pull request #476 from MageKing17/feature/weapon-bank-modular-compatibility
...
Modular tables now clear allowed weapons if +noreplace isn't specified.
2015-12-17 00:47:28 -05:00
niffiwan
036aae0ee2
Merge pull request #502 from SamuelCho/team_color_glows
...
Team color glows
2015-12-17 12:50:53 +10:00
SamuelCho
9cc70790c9
Save all the channels of the team mask, not just the red and green channels.
2015-12-16 00:57:12 -08:00
SamuelCho
7d392bd61c
Adjust the blended glow color value by how much the team mask contributes to this fragment.
2015-12-16 00:44:58 -08:00
SamuelCho
1552e02a51
Added support for glowing team color textures.
2015-12-16 00:20:15 -08:00
Fabian Woltermann
175640d60a
Merge pull request #492 from SamuelCho/faster_bmp_lookup
...
Changed bitmap_lookup to use ubyte instead of floats.
2015-12-16 06:39:50 +01:00
SamuelCho
6583066936
Don't reset lock rendering timers and switches unless we really need to.
2015-12-15 20:39:38 -08:00
MageKing17
3c564b3210
Merge pull request #494 from DahBlount/Share-Fire-Direction-Turret-Flag
...
Share fire direction turret flag
2015-12-15 12:48:53 -08:00
DahBlount
9b7ebff53a
Change NULL to nullptr and change fighter beam flag comparison from > to !=
2015-12-15 09:54:34 -07:00
DahBlount
1491d4a79a
Create "share fire direction" subsystem flag
2015-12-15 09:54:32 -07:00
Fabian Woltermann
d603c463af
Merge pull request #499 from DahBlount/Final-Attempt-at-Fixing-Environment-Reflections
...
Fix environment reflection rotation issue
2015-12-15 15:12:27 +01:00
SamuelCho
3eb47c1867
ship_render() still needs to clear out miscellaneous per-draw model data.
2015-12-14 23:19:08 -08:00
SamuelCho
2db4bc37f2
Removed unused variable sii.
2015-12-14 00:06:16 -08:00
SamuelCho
0f0f6377d0
Killed the last vestiges of ship_model_start/stop.
2015-12-13 23:51:24 -08:00
Yarn366
8e7ad5f651
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into hud_scale_limit
2015-12-14 01:41:13 -05:00
DahBlount
bade3c58eb
Normalize the position vector used in environmental reflections
2015-12-13 15:03:31 -07:00
m!m
85a36e6fd8
Merge pull request #496 from SamuelCho/missing_destroyed_subsys
...
Fixes missing destroyed submodels from the polymodel_instance rendering commit.
2015-12-09 22:26:42 +01:00
Samuel Cho
2deffc1156
Removed comment from model_set_instance that no longer describes SSF_NO_DISAPPEAR functionality.
2015-12-09 10:32:36 -08:00
Fabian Woltermann
82ae54a6e8
Merge pull request #495 from SamuelCho/no_lighting_fix
...
Restore SIF2_NO_LIGHTING functionality for ship_render().
2015-12-09 09:02:11 +01:00
SamuelCho
0062d2567a
Fixes missing destroyed submodels from the polymodel_instance rendering commit.
2015-12-08 23:53:53 -08:00
SamuelCho
7972cad563
Restore SIF2_NO_LIGHTING functionality for ship_render().
2015-12-08 20:06:27 -08:00
niffiwan
c9cff48b95
Merge pull request #493 from ln-zookeeper/master
...
Fix a small glitch in shield icon alpha range
2015-12-08 22:49:09 +10:00
Lari Nieminen
8d0624b064
Fix a small glitch in shield icon alpha range
...
Calculates the alpha range using the actual number of shield segments instead of 4.
2015-12-08 14:08:34 +02:00
SamuelCho
236857ed37
Changed bitmap_lookup to use ubyte instead of floats for the color channels. Should make reading bitmaps faster.
2015-12-07 22:59:28 -08:00
MageKing17
fa57ea358a
Merge pull request #444 from asarium/feature/benchmark
...
Add benchmark command line option
2015-12-07 02:28:15 -08:00
MageKing17
a7bf7c63de
Merge pull request #490 from Goober5000/shipfx_little_explosions_fix
...
for model vertices, use the entire range of RAND_MAX, not the range divided by 32
2015-12-05 15:45:52 -08:00
Goober5000
81676b7d3f
a few tweaks from the PR...
...
a) remove redundant (shadowing) polymodel *pm declaration
b) end Warnings with \n
c) remove no-longer-needed Asserts (they are handled by the Error check above)
2015-12-05 14:25:28 -05:00
Goober5000
e1e188a43c
use the entire range of RAND_MAX, not the range divided by 32
2015-12-05 13:02:27 -05:00
Goober5000
47286d1af2
Merge pull request #483 from chief1983/fix/292_unused_functions
...
Wrap some unused functions in a diagnostic protection pragma
2015-12-04 21:08:55 -05:00
Yarn366
fa10977e77
Added parameters that allow HUD scaling to be disabled at lower resolutions and enabled at higher resolutions.
2015-12-03 20:06:06 -05:00
Fabian Woltermann
aaa80dfa6f
Merge pull request #486 from SamuelCho/model_instance_rendering
...
Allow model rendering code to use polymodel_instance.
2015-12-03 06:34:09 +01:00
SamuelCho
59fa7bd544
Remove superfluous line.
2015-12-02 19:08:59 -08:00
m!m
3c8b47ccfc
Merge pull request #460 from MageKing17/feature/subsys-autorepair-when-disabled
...
Adds the ability for subsystems to repair themselves when disabled.
2015-12-02 21:37:20 +01:00
MageKing17
81d8d063c2
Un-cluttering the autorepair conditional by spreading it out a little.
...
Should hopefully be a bit more readable this way.
2015-12-02 12:11:20 -08:00
MageKing17
75471276fc
Adds "don't autorepair if disabled" to blacklist a specific subsystem.
...
Obviously won't do anything if "repair disabled subsystems" ship flag isn't set. If both subsystem-specific flags get set at the same time, whichever one would be default behavior (based on the presence or absence of the ship-wide flag) gets removed and a Warning generated.
2015-12-02 08:29:04 -08:00
MageKing17
89d6031c79
Adds the ability for subsystems to repair themselves when disabled.
...
Can either be set for individual subsystems via the "autorepair if disabled" flag, or set for an entire ship via the "repair disabled subsystems" flag. It will, by necessity, only have an effect if the ship's "$Subsystem Repair Rate:" is a positive number.
2015-12-02 08:29:03 -08:00
MageKing17
551d64192c
Merge pull request #481 from The-E/vm_vec_cleanup2
...
Cleanup in vecmat, aile 2
2015-12-02 08:18:37 -08:00
asarium
661678f693
Fix an issue identified by MageKing17
2015-12-02 17:07:53 +01:00
asarium
94ca29735c
Quit when the end of the mission is reached
2015-12-02 17:03:54 +01:00
asarium
20f84c179a
When benchmarking automatically accept pilot screen
2015-12-02 17:03:54 +01:00
asarium
5f622094af
Add commandline option for benchmarking
2015-12-02 17:03:54 +01:00
SamuelCho
64ad950a80
Allow model rendering code to use polymodel_instance. Removes the reliance on ship_model_start/stop for rendering models. Also fix a bunch of oversights involving blown off models in the polymodel_instance code.
2015-12-01 23:53:24 -08:00
niffiwan
a30937b041
Merge pull request #484 from chief1983/asan_flag
...
AddressSanitizer toggle flag for configure.ac
2015-12-02 13:17:18 +10:00
Cliff Gordon
764e1772b0
Remove the -Wno-unused-function hider. Should be able to fix these with this method if any more crop up on Linux.
2015-12-01 20:56:10 -06:00
Cliff Gordon
ea549ab5a0
[fix/292_unused_functions] Mark rotate_z and accurate_square_root as unused. Last part of the issues in #292 .
2015-12-01 20:56:06 -06:00
niffiwan
af22ab34d3
Merge pull request #482 from chief1983/fix/187_debugging
...
Enhance an Assert to help track down how issue 187 could happen
2015-12-02 08:35:53 +10:00
chief1983
c8785dc093
[asan_flag] AddressSanitizer toggle flag for configure.ac.
2015-12-01 16:32:32 -06:00
Cliff Gordon
870ad9e3ae
[fix/187_debugging] Enhance an Assert to help track down how issue 187 could happen.
2015-12-01 14:54:57 -06:00
The E
487f769064
Renaming vm_copy_transpose_matrix to vm_copy_transpose
2015-12-01 20:38:30 +01:00
The E
7604e82f05
Renaming vm_transpose_matrix to vm_transpose
2015-12-01 20:37:33 +01:00
The E
e0defd287a
Renaming vm_vec_crossprod to vm_vec_cross
2015-12-01 20:36:34 +01:00
The E
a413255728
Renaming vm_vec_dotprod to vm_vec_dot
2015-12-01 20:35:47 +01:00
MageKing17
d6b0e9f566
Merge pull request #480 from The-E/mat_inverse_cleanup
...
Addressing a few small issues with PR 468
2015-12-01 07:35:31 -08:00
Fabian Woltermann
22e6de42a4
Remove comment here
2015-12-01 13:04:22 +01:00
Fabian Woltermann
9548002890
Removing code that has no place here
2015-12-01 11:39:28 +01:00
Fabian Woltermann
0334bd0c3b
Addressing a few small issues with PR 468
2015-12-01 11:34:00 +01:00
Fabian Woltermann
12b98063fb
Merge pull request #474 from Goober5000/hull_hit_soundfx_fix
...
retail sounds 36 and 37 should actually be converted to 3D
2015-12-01 11:06:37 +01:00
Fabian Woltermann
854bd5ba21
Merge pull request #468 from DahBlount/Fix-reflections-for-real
...
Final fix for reflections
2015-12-01 11:04:06 +01:00
DahBlount
096029a88d
Add Doxygen comments and additional changes
2015-12-01 00:55:30 -07:00
SamuelCho
d8ab39e261
This line in the HUD lock gauge wasn't supposed to be deleted.
2015-11-30 23:48:57 -08:00
DahBlount
02d15f36b7
Change a1d to a2d
2015-12-01 00:34:55 -07:00
SamuelCho
66c9e0c136
My attempt to fix the HUD lock scoping issues raised by issue #456 .
2015-11-30 23:16:43 -08:00
DahBlount
fb29b28113
Add function to invert matrix4 and change mview to GL_env_texture_matrix to properly setup environment maps.
2015-11-30 09:36:30 -07:00
DahBlount
3fa03fcda0
Fix ENVMAP vertex shader to use the inverse of gl_ModelViewMatrix
2015-11-30 09:36:29 -07:00
Goober5000
cb8154a993
Merge pull request #478 from Yarn366/mantis/3096
...
Fix for Mantis 3096
2015-11-29 18:16:50 -05:00
Yarn366
a4f793e6dc
Use the same FOV for everything in the main view, and apply the pi*(4/9) correction for ships to the briefing view.
2015-11-29 17:22:48 -05:00
m!m
e36e9ff879
Merge pull request #473 from rtoijala/unix_modlist
...
Unix modlist
2015-11-28 19:43:47 +01:00
Risto Toijala
3287ff6b3a
unix mods: change error to warning
...
Ignore failure to open directories that the filesystem gave us.
There's nothing we can do about it.
Also improve missing mod warning.
Tiny style improvement.
2015-11-28 18:20:56 +02:00
Risto Toijala
81092417bd
unix mods: use "." instead of full cwd path to avoid error condition
2015-11-28 18:19:50 +02:00
Risto Toijala
947deb8e12
unix mods: switch parent and dir for readability
2015-11-28 18:18:26 +02:00
MageKing17
bd1aa5e455
Modular tables now clear allowed weapons if +noreplace isn't specified.
...
This makes them behave more like ship flags and should bring them around towards how modders intuitively expect using a modular table to override a ship's allowed weapons to work.
Fixes Mantis 3176.
2015-11-28 06:53:23 -08:00
Goober5000
01e4741da6
Merge pull request #475 from Yarn366/background_editor_spinner_fix
...
Fix for spinners in background editor
2015-11-28 02:22:18 -05:00
Yarn366
37f4587230
Apply rounding to orientation values so that the spinners in the background editor work properly
2015-11-28 01:56:09 -05:00
Goober5000
e11f6904b4
retail sounds 36 and 37 should actually be converted to 3D
2015-11-28 00:27:27 -05:00
MageKing17
d74981b700
Merge pull request #471 from MageKing17/feature/escort-gauge-right-aligned-names
...
Add "Right-Align Ship Names:" option to HudGaugeEscort.
2015-11-27 18:24:24 -08:00
MageKing17
6df0a704f2
Add "Right-Align Ship Names:" option to HudGaugeEscort.
...
It allows the escort gauge to render with ship names right-aligned, as the name would suggest. Changed gr_force_fit_string() to return the width instead redundantly returning the (already modified in-place) string; nothing else actually cares about the return value, so secondary impact should be nonexistent.
2015-11-27 18:22:45 -08:00
Risto Toijala
0b84c18686
also accept backslashes as path separators on unix
2015-11-27 20:16:45 +02:00
Risto Toijala
7523669819
allow subfolders in mod paths
2015-11-27 20:16:45 +02:00
Risto Toijala
b1b8ae9668
move unix modlist handling to function
2015-11-27 20:16:45 +02:00
Risto Toijala
bddf438fb6
clean up unix mod handling
2015-11-27 20:16:45 +02:00
MageKing17
87d07c9597
Merge pull request #472 from ln-zookeeper/bm_unlock_unload_fixes
...
Fixes to some bm_unlock and bm_unload calls
2015-11-26 23:53:09 -08:00
Lari Nieminen
407a2356eb
Fixed silly syntax error
2015-11-26 18:06:41 +02:00
Lari Nieminen
0c5e6c7281
Fixes to some bm_unlock and bm_unload calls
...
As requested in https://github.com/scp-fs2open/fs2open.github.com/pull/449/files#r45241401
Note that I also included the ref_count >= 1 check.
2015-11-26 16:35:23 +02:00
m!m
2bd78eee74
Merge pull request #464 from The-E/inline_vecmat_removal
...
Removing the _INLINE_VECMAT preprocessor define
2015-11-26 13:49:01 +01:00
niffiwan
256ba6f9f2
Remove proposed AI profiles flag
...
Make the new behaviour the default, the change to gameplay should be
minimal due to the 2-frame feature being by far the largest factor in
current countermeasure effectiveness
2015-11-26 18:57:36 +10:00
niffiwan
040c1f39da
Merge pull request #469 from Yarn366/more_hud_table_options
...
Shivan Hunter's requested HUD table features
2015-11-25 21:07:28 +10:00
Yarn366
8f6bdcddeb
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into more_hud_table_options
2015-11-24 16:32:45 -05:00
m!m
ed855e6e1c
Merge pull request #467 from PeterMitsis/toolchain
...
Abstract toolchain capabilities
2015-11-24 09:57:32 +01:00
Yarn366
33c7c4eae9
Added "Radar Center Offsets:" and "Radar Size:" to the 2D and 3D radar gauges
2015-11-23 19:48:04 -05:00
Yarn366
962261421e
Added "Dock Max Width:" and "Order Max Width:" to extra target data gauge
2015-11-23 18:29:40 -05:00
Yarn366
5144dba6b4
Added "Fixed Header Position:" to wingman gauge
2015-11-23 18:22:37 -05:00
Peter Mitsis
9bbebfc55e
[fix] toolchain: Abstract compiler capabilities
...
Fixes various typos from the commit titled
'toolchain: Abstract compiler capabilities'
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-23 06:54:41 -05:00
MageKing17
02fc2b29ca
Revert "Fix envmap orientation"
...
This reverts commit a033f653d0 .
2015-11-23 00:20:55 -08:00
Fabian Woltermann
b097d3e7c2
Merge pull request #466 from DahBlount/fix/mantis_0003014
...
Fix Mantis 0003014
2015-11-23 07:40:59 +01:00
DahBlount
a033f653d0
Fix envmap orientation
2015-11-22 17:02:06 -07:00
The E
4b37433c4f
Removing the _INLINE_VECMAT preprocessor define. This is something the compiler is better equipped to decide.
2015-11-22 21:00:24 +01:00
Peter Mitsis
002dc3a965
toolchain: Introduce __ALIGNED(x) macro
...
The __ALIGNED(x) macro may be used to tell the compiler to align the
symbol's address to an 'x' byte boundary. Note that 'x' must be a
power of two.
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-22 11:32:07 -05:00
Peter Mitsis
7da81210ea
toolchain: Introduce likely() and unlikely() macros
...
The likely() and unlikely() macros may be used as hints to the compiler to
indicate whether a branch is likely or unlikely to be taken so that it may
generate code accordingly.
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-22 11:32:07 -05:00
Peter Mitsis
57c16bd58a
toolchain: Replace __attribute__((__unused__)) with __UNUSED
...
Abstracting this allows for the possibility of other compilers to have their
own implementation of marking a variable as potentially unused without using
the __attribute__ keyword (which is not supported on all compilers).
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-22 11:32:07 -05:00
Peter Mitsis
13c86d9540
toolchain: Abstract compiler capabilities
...
Abstract compiler capabilities to help simplify support for various
toolchains.
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-22 11:32:04 -05:00
niffiwan
338d6c9aaf
Allow countermeasures to decoy missiles once only
...
Adds ai_profiles flag
$countermeasures decoy a missile once:
Also (re)adds logging to make it easier to figure out what the
countermeasures are doing. Try adding "+countermeasures" to your
debug_filter.cfg file.
2015-11-22 20:36:03 +10:00
Goober5000
d59c4d44cc
Merge pull request #461 from niffiwan/fix/cm_float_int
...
CMEASURE_DETONATE_DISTANCE should be a float
2015-11-21 14:32:05 -05:00
niffiwan
0e07f4414e
CMEASURE_DETONATE_DISTANCE should be a float
...
Thanks to Goober5000 for noticing this
2015-11-21 21:18:08 +10:00
Fabian Woltermann
71cf169a0a
Merge pull request #457 from asarium/feature/versionCheck
...
Add "$Minimum version" to game settings table
2015-11-21 11:08:13 +01:00
Fabian Woltermann
184a583a32
Merge pull request #459 from MageKing17/bugfix/support-subsystem-repair
...
Fix support subsystem repair rate (for real this time).
2015-11-20 17:24:47 +01:00
Fabian Woltermann
fd66a432f5
Merge pull request #458 from MageKing17/cleanup/version-specific-comment-consistency
...
Improve consistency/flexibility of version-specific comments.
2015-11-20 17:23:47 +01:00
MageKing17
039359e7f2
Fix support subsystem repair rate (for real this time).
...
PR #445 was unfortunately incomplete; it fixed the time estimate for repairs, but not the actual repair part. I think I've identified which piece of code was preventing the actual repairs from working. This "repair_allocated > 0" conditional is actively preventing the "sip->sup_hull_repair_rate == 0.0f" branch from executing (so repair_allocated remains 0 and subsystems can't actually repair).
2015-11-20 06:50:49 -08:00
asarium
0bb6002f0a
Fix compilation error
...
Apparently multi_update.cpp isn't used anywhere in the code. That file
could be removed in the future.
2015-11-20 12:24:10 +01:00
MageKing17
91dbf8b751
Improve consistency/flexibility of version-specific comments.
...
matches_version_specific_tag() now uses the previously-FRED-only scan_fso_version_string() function, meaning it now supports version-specific comments with as few numbers as ;;FSO 3;; to as many numbers as ;;FSO 3.7.3.20151106;;, instead of you being required to supply exactly 3 numbers.
2015-11-20 03:22:45 -08:00
Fabian Woltermann
0c6bada5d5
Merge pull request #455 from Goober5000/set_arrival_info_sexp_help_tweak
...
improve sexp help regarding bitmasks on ship-arrival-info and ship-departure-info
2015-11-20 12:10:59 +01:00
asarium
519e89b6fa
Add "$Minimum version" to game settings table
...
This allows a modder to specify a minimum FSO version that is needed
for the mod.
2015-11-20 11:51:51 +01:00
Goober5000
ce7c7eb3f5
Merge pull request #454 from MageKing17/bugfix/lua-wing-indexer-crash
...
Fix various issues with wings in the Lua interface
2015-11-20 01:31:39 -05:00
Goober5000
8f3342f05e
improve sexp help regarding bitmasks on ship-arrival-info and ship-departure-info
2015-11-20 00:41:46 -05:00
MageKing17
6dd3158570
Make l_Wing functions handle invalid handles.
...
Indexing an invalid wing handle now returns invalid ship handles, getting its length returns 0, and getting its name returns an empty string.
2015-11-19 20:27:32 -08:00
MageKing17
004fdae08f
Clean up a couple minor issues in lua.cpp
...
A few comparisons weren't excluding their upper bounds properly, and the documentation for the l_Wing length function was the documentation for the l_Mission_Wings length function.
2015-11-19 20:20:47 -08:00
MageKing17
8fcb1ee789
Add isValid() function to l_Wing objects.
...
The l_Mission_Wings indexer will return an invalid wing if supplied an invalid name/index. However, you had no way of telling that this was the case because there was no isValid() function to test its validity.
2015-11-19 20:18:31 -08:00
MageKing17
9630d80827
Change wing_name_lookup() to wing_lookup() in l_Mission_Wings indexer.
...
Avoids inconsistency whereby some wings could be looked up by index but not by name.
2015-11-19 20:16:37 -08:00
niffiwan
e49159bd91
Merge pull request #418 from asarium/build/native
...
Use -march=native for linux builds
2015-11-20 14:10:44 +10:00
niffiwan
a13542616d
Merge pull request #452 from MageKing17/bugfix/too-many-classes-error
...
Change warning from too many ship/weapon classes to an error.
2015-11-20 14:09:28 +10:00
Fabian Woltermann
1960723f88
Merge pull request #453 from Yarn366/target_font_height_fix
...
Target bracket line height fix
2015-11-19 22:54:17 +01:00
asarium
206fbabaa5
Use -march=native for linux builds
2015-11-19 22:38:19 +01:00
MageKing17
5394b4943d
Change warning from too many ship/weapon classes to an error.
...
If a modular table broke the weapons limit, it would warn about too many weapon classes, and then not actually skip the entry, because of the "if(!replace)" conditional around it, resulting in nonsensical parsing errors. Rather than just fix this error, it was suggested on IRC (by The_E) that these problems should instead cause immediate errors. Upon reflection, this makes more sense: if the mod exceeds the limits, there's little point in loading it anyway and having things be missing.
Hopefully, eventually, these limits will be removed altogether, but until then, exceeding them should not just be a dismissible warning.
2015-11-19 12:37:45 -08:00
Yarn366
69f9d9f090
Make the target bracket gauge account for the sizes of the font and the attacker blip
2015-11-19 15:35:31 -05:00
niffiwan
1cb08e0262
Merge pull request #450 from asarium/fix/subModelRange
...
Make this Assert a little more informative
2015-11-19 07:07:09 +10:00
asarium
154a50028b
Make this Assert a little more informative
2015-11-18 18:43:19 +01:00
niffiwan
e11771980e
Merge pull request #447 from MageKing17/bugfix/fred-message-delete-assert
...
Fix incorrect assertion in FRED's Event Editor when deleting a message.
2015-11-18 09:39:35 +10:00
MageKing17
edbec0fca9
Fix incorrect assertion in FRED's Event Editor when deleting a message.
...
The function can get called with an m_cur_msg of -1 if there are no messages defined by the mission; since this is apparently intended behavior (and causes no problems thanks to the immediately-following if-statement), may as well change this assertion.
2015-11-17 14:08:38 -08:00
m!m
2c268e4ec6
Merge pull request #437 from niffiwan/feature/aspect_lost_lock_det
...
Allow aspect missiles to die when have lost lock
2015-11-16 20:10:42 +01:00
m!m
2a9cff4f46
Merge pull request #443 from DahBlount/InBriefMissionChange
...
Add jumpToMission LUA function and a jump to hub function
2015-11-16 19:58:34 +01:00
DahBlount
9050c08bec
Add jumpToMission LUA function and a jump to hub function
...
The purpose of this function is to provide modders the capability to jump to a mission using LUA scripts. There is an optional argument for jumping to a hub mission, a good example is the JAD campaign map.
2015-11-16 10:45:59 -07:00
Goober5000
799ebe01ce
Merge pull request #445 from DahBlount/Subsys-Repair-Fix
...
Fix support subsystem repair rate
2015-11-15 20:26:18 -05:00
DahBlount
248c398ba9
Fix support subsystem repair rate
2015-11-15 17:44:26 -07:00
Goober5000
96ede6f68b
Merge pull request #433 from Yarn366/multiple_background_adjustment
...
Change criteria for using second mission background
2015-11-15 01:07:53 -05:00
Goober5000
8177c03f3f
Merge pull request #423 from niffiwan/feature/customise_cm_det_rad
...
Add two small countermeasure features
2015-11-15 01:01:39 -05:00
m!m
546339c53a
Merge pull request #440 from The-E/no_persona_defaulting
...
small error correction
2015-11-14 23:20:14 +01:00
The E
f790b3b0c6
small error correction
2015-11-14 23:13:32 +01:00
m!m
bbcfe162da
Merge pull request #439 from The-E/no_persona_defaulting
...
Adds Persona flag "$Allow substitution of missing messages:"
2015-11-14 15:54:44 +01:00
m!m
51efc000ab
Merge pull request #435 from PeterMitsis/lighting-apply-keywords
...
Lighting apply keywords
2015-11-14 14:35:57 +01:00
The E
cbad1cf10f
Addressing style comments
2015-11-14 13:30:51 +01:00
Peter Mitsis
56343f0d03
lighting: remove void keyword from empty argument list
...
Routines in the lighting module that do not have any arguments do not
need the 'void' keyword in either their definitions or declarations.
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-14 07:08:52 -05:00
The E
67d51037ff
Adds Persona flag "$Allow substitution of missing messages:"
2015-11-14 12:55:41 +01:00
Goober5000
47d82a007f
Merge pull request #434 from asarium/multi/staticAssert
...
Check the size of data in multi packets
2015-11-13 21:20:44 -05:00
m!m
036000f79c
Merge pull request #438 from DahBlount/Damage-Attenuation-Update
...
Deprecate +Min Damage and +Max Damage, add +Attenuation Damage:
2015-11-13 21:51:58 +01:00
DahBlount
3e6fb113ee
Deprecate +Min Damage and +Max Damage, add +Attenuation Damage:
2015-11-13 12:26:04 -07:00
MageKing17
515f9fffb5
Merge pull request #431 from The-E/more_ship_classes
...
Upped MAX_SHIP_CLASSES to 500
2015-11-13 07:13:21 -08:00
asarium
28c9512727
Fix compilation
...
Now the static_asserts use the types from cstdint
2015-11-13 11:52:52 +01:00
Fabian Woltermann
e9a3e457cc
Merge pull request #426 from Yarn366/events_editor_filename_fix
...
Fix for crash in events editor
2015-11-12 19:27:17 +01:00
Fabian Woltermann
3637a9717c
Merge pull request #427 from DahBlount/Directional-Beam-Glows
...
Directional beam glows
2015-11-12 19:26:27 +01:00
niffiwan
ed6637031d
Allow aspect missiles to die when have lost lock
...
Note that aspect missiles don't lose lock when their target dies, I'll
see about adding that later
2015-11-12 19:09:59 +10:00
Peter Mitsis
f5ccad9619
lighting: Apply keywords
...
Applies the following keywords to the lighting module:
const
static
void
extern
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-11 11:20:01 -05:00
Peter Mitsis
b10de88cf0
lighting: Remove unused global variables
...
The following global variables from the lighting module were unused
and are being removed:
int cell_shaded_lightmap = -1;
int spec = 0;
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-11 11:20:01 -05:00
asarium
34a7f7d60f
Check the size of data in multi packets
...
This will make sure that compiler changes that affect the size of a
type are noticed early.
2015-11-11 14:56:14 +01:00
Yarn366
9d6b373781
Undid the function name changes
2015-11-10 23:22:34 -05:00
Yarn366
05eb4c0617
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into multiple_background_adjustment
2015-11-10 19:51:08 -05:00
Yarn366
320fd33431
If even one element in the first mission background is missing, fall back to the second background if it exists
2015-11-10 19:48:54 -05:00
niffiwan
22832957f3
Merge pull request #432 from MageKing17/bugfix/ship-turret-target-order
...
Fix ship-turret-target-order.
2015-11-11 09:26:38 +10:00
MageKing17
dba2d28265
Fix ship-turret-target-order.
...
We were declaring an array of NUM_TURRET_ORDER_TYPES ints, and then only specifying the first oindex of them; the memcpy() could've been changed to multiply by oindex instead, but it seemed cleaner to just reset new_target_order to -1 in all values and get rid of the redundant per-ship reset.
Discovered by triggering an Int3() in aiturret.cpp (line 1167 as of this writing) and finding uninitialized values in the turret_targeting_order array.
2015-11-10 14:55:55 -08:00
The E
647f6a867b
Upped MAX_SHIP_CLASSES to 500
2015-11-10 15:55:46 +01:00
DahBlount
89d072e18c
Add +Directonal Glow:
...
This goes directly below +Muzzleglow: in $Beam Info: and causes the muzzle glow to be rendered along a projected poly instead of a bitmap.
Takes a float argument that is the length of the glow.
2015-11-09 14:28:40 -07:00
Yarn366
b1e7a2a1bf
Don't add an extension to a sound's file name if the extension is supposed to be present already
2015-11-09 00:31:40 -05:00
niffiwan
4849f443aa
Missed two places to use killer_infop
2015-11-08 14:51:04 +10:00
niffiwan
aff81fe471
Countermeasures can detonate a single missile
...
As opposed to detonating all missiles within a radius. Is more
efficient than previous code that traversed the entire missile object
list to find all the missiles to detonate
Add to weapons tbl/tbm
$Countermeasure:
+Single Missile Kill: False
2015-11-08 14:42:29 +10:00
niffiwan
26d40553b2
Allow countermeasure kill-distance to be moddable
...
Trivial efficiency improvement by calculating a pointer once & reusing
it. Add more countermeasure nprintf messages
Add to weapons tbl/tbm
$Countermeasure:
+Missile Detonation Radius: 40
2015-11-08 14:41:40 +10:00
MageKing17
f876b89c24
Merge pull request #422 from niffiwan/cleanup/subsys_path_assert
...
Change Assert to Error
2015-11-07 20:20:40 -08:00
niffiwan
2c8d921d64
Change Assert to Error
...
This seems to be a data error rather than a coding error. Also provide
the user with more info to assist with tracking down the source of the
problem.
2015-11-08 13:04:13 +10:00
Fabian Woltermann
fc52668f30
Merge pull request #421 from Echelon9/fix/gr_opengl_init
...
Small tweaks to gr_opengl_init()
2015-11-07 14:35:13 +01:00
Echelon9
97c5a29b76
Better wrap to 80 character lines where sensible in gr_opengl_init()
2015-11-07 23:17:42 +11:00
Echelon9
fa9bd1c446
Whitespace clean up
2015-11-07 23:17:42 +11:00
Echelon9
04352920ee
Export opengl_tnl_init(), so that it doesn't need to be extern'd. Consistent with opengl_tnl_shutdown()
2015-11-07 23:17:42 +11:00
Echelon9
8111924f9b
OpenGL: Use the Core rather than older Extension form of GL_MAX_TEXTURE_IMAGE_UNITS
2015-11-07 23:17:42 +11:00
Echelon9
a11c69673e
Const correctness for ver in gr_opengl_init()
2015-11-07 23:17:42 +11:00
MageKing17
ee730d23c9
Merge pull request #420 from Echelon9/fix/GL_SHADING_LANGUAGE_VERSION
...
Use the Core rather than older Extension form of GL_SHADING_LANGUAGE_VERSION
2015-11-07 04:07:29 -08:00
Echelon9
0b61d0bd8e
OpenGL: Use the Core rather than older Extension form of GL_SHADING_LANGUAGE_VERSION.
2015-11-07 21:52:43 +11:00
Fabian Woltermann
0fcde305ec
Merge pull request #419 from Echelon9/fix/GLSL4-sample-keyword
...
OpenGL: As of GLSL 4.00 'sample' is a keyword
2015-11-07 08:21:42 +01:00
Echelon9
697c900a25
OpenGL: As of GLSL 4.00 'sample' is a keyword. See further Section 3.6 Keywords https://www.opengl.org/registry/doc/GLSLangSpec.4.00.7.pdf
2015-11-07 14:44:06 +11:00
m!m
fbc9ede423
Merge pull request #398 from Goober5000/g3_const
...
const-correctness inspired by #392 , because why not be masochistic
2015-11-06 16:51:32 +01:00
m!m
0f36c6905d
Merge pull request #417 from niffiwan/shadows_default_off
...
Disable shadows by default
2015-11-05 23:15:19 +01:00
niffiwan
1d66596bfb
Disable shadows by default
...
Enable shadows with -enable_shadows
-shadow_quality should still work
2015-11-06 07:59:03 +10:00
Fabian Woltermann
444874b110
Merge pull request #416 from Goober5000/shipfx_shadow_function_retval_tweaks
...
change these functions to return bool rather than int; fixes a minor warning
2015-11-05 17:35:02 +01:00
Goober5000
b704050c21
change these functions to return bool rather than int; fixes a minor warning
2015-11-05 00:36:06 -05:00
MageKing17
5676dbf9bd
Merge pull request #414 from Goober5000/issue_412_fix
...
properly close the fiction viewer when returning to the main menu
2015-11-04 03:04:09 -08:00
Goober5000
564f31aeab
properly close the fiction viewer when returning to the main menu
2015-11-04 00:54:02 -05:00
niffiwan
0ea25e79a9
Merge pull request #411 from The-E/sexp_profiling
...
Profiling support for mission events and scripts
2015-11-03 22:32:51 +10:00
The E
5a37992d3d
Adds profiling for sexp events and lua On Frame scripts.
2015-11-03 13:10:07 +01:00
Fabian Woltermann
3ade9ae1de
Merge pull request #389 from Goober5000/shipfx_eye_in_shadow_alt_pr
...
Alternative suggested PR to #384
2015-11-02 09:51:17 +01:00
Fabian Woltermann
f2aea8e69d
Merge pull request #410 from niffiwan/valgrind/ds_load_buffer
...
Fix memory leak in ds_load_buffer
2015-11-02 09:50:08 +01:00
niffiwan
5c74720265
Fix memory leak in ds_load_buffer
2015-11-01 19:33:10 +10:00
niffiwan
556e9a4447
Merge pull request #404 from Yarn366/scalable_head_anis
...
Scalable head ANIs
2015-11-01 15:41:42 +10:00
Goober5000
1bd8e11194
Merge pull request #401 from niffiwan/fix/missionparse_ammo_II
...
Guard against negative array index reads
2015-10-31 15:08:49 -04:00
m!m
bfc34953eb
Merge pull request #408 from niffiwan/coverity/modeling_update
...
Model Assert/Assertion as Coverity killpaths
2015-10-31 11:46:11 +01:00
niffiwan
1c84c54e4f
Model Assert/Assertion as Coverity killpaths
2015-10-31 20:17:12 +10:00
Goober5000
d790301fab
Merge pull request #407 from niffiwan/valgrind/control_configs
...
Fix memory leak from Control_config_presets
2015-10-31 00:31:09 -04:00
niffiwan
253d8a7eb1
Fix memory leak from Control_config_presets
2015-10-31 14:06:56 +10:00
Goober5000
dc3c5fb561
Merge pull request #406 from niffiwan/travis/fix_cov_scan_builds
...
Fix coverity_scan builds
2015-10-30 23:39:59 -04:00
niffiwan
eb1ff0f433
Fix coverity_scan builds
...
i.e. they should be building debug, not release
2015-10-31 12:51:33 +10:00
Fabian Woltermann
30564248a6
Merge pull request #405 from niffiwan/valgrind/camera_leak
...
Fix memory leak in cam_create/cam_close
2015-10-30 16:45:06 +01:00
niffiwan
9dfa67b64d
Correctly compare vector .end()
2015-10-30 22:01:06 +10:00
Yarn366
c3c7477114
Made head animations scale to the size of the gauge window. Also deprecated "Animation Background Size" parameter and added the more accurately named "Animation Size" parameter, which sets how large animations should be.
2015-10-29 14:35:08 -04:00
Goober5000
bbad1c2159
more const-correctness per PR comments
2015-10-29 09:34:18 -04:00
niffiwan
bb6e01caaf
Merge pull request #403 from Yarn366/sparky_hi_fallback_fix
...
Sparky hi fallback fix
2015-10-29 19:05:07 +10:00
Yarn366
fc941e9ca8
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into sparky_hi_fallback_fix
2015-10-28 18:26:49 -04:00
Yarn366
93e8e3ab6f
Resolutions below 1024x600 are no longer changed to 800x600 if sparky_hi_fs2.vp is missing.
...
In addition, the gr_get_resolution_class function has been added to avoid duplication of its code.
2015-10-28 18:21:31 -04:00
Goober5000
14eec21c68
Merge pull request #384 from The-E/mc_info_constructor
...
Better handling for mc_info
2015-10-28 08:48:57 -04:00
niffiwan
1ceae13be2
Guard against negative array index reads
...
Also convert Assert to Assertion to provide more info
2015-10-28 21:53:57 +10:00
niffiwan
fb20632b18
Fix memory leak in cam_create/cam_close
2015-10-28 21:26:00 +10:00
niffiwan
62fcbeaae8
Merge pull request #380 from Goober5000/wf_never_existed_removal
...
remove WF_NEVER_EXISTED
2015-10-28 19:35:46 +10:00
niffiwan
4250751ccc
Merge pull request #393 from Goober5000/convert_qsort_to_std_sort
...
convert qsort to std::sort
2015-10-28 19:33:12 +10:00
Fabian Woltermann
0a08b6348b
Revert "Removes inline keyword from mc_info_init declaration"
...
This reverts commit c789b117cf .
2015-10-28 09:19:21 +01:00
Fabian Woltermann
c789b117cf
Removes inline keyword from mc_info_init declaration
2015-10-28 08:54:03 +01:00
niffiwan
cc84210ac4
Merge pull request #399 from Goober5000/const_cast_trimming
...
remove obsolete const_casts
2015-10-28 17:13:36 +10:00
Goober5000
8a125ab019
remove obsolete const_casts
2015-10-28 00:18:31 -04:00
Goober5000
a7dcda9000
wip to avoid const_cast
2015-10-28 00:02:35 -04:00
Goober5000
bfc0948f1c
let's change this antipattern here too
2015-10-27 22:52:03 -04:00
Goober5000
75411d92bb
const-correctness inspired by 392, because why not be masochistic
2015-10-27 22:46:35 -04:00
MageKing17
afe29c60fe
Merge pull request #392 from DahBlount/CLoseup-zoom-testing
...
Fix Closeup_Pos and Closeup_Zoom
2015-10-27 17:16:50 -07:00
m!m
b0befdc1ba
Merge pull request #397 from MageKing17/bugfix/issue-396
...
Restore local SSM behavior.
2015-10-27 22:55:39 +01:00
DahBlount
51c61b5144
Change closeup_pos in draw_model_icon() to a pointer
2015-10-27 15:51:45 -06:00
DahBlount
6cf105b768
Fix Closeup_Pos and Closeup_Zoom
...
The draw_model_rotating() and draw_model_icon() functions were receiving
the whole Weapon_Info array instead of a single weapon_info object (wip
in this case).
2015-10-27 15:51:44 -06:00
MageKing17
5fd09f8557
Restore local SSM behavior broken by 88e7c83. Fixes issue #396 .
...
Not sure how I missed that when reviewing the PR, but there you go.
2015-10-27 14:48:21 -07:00
Fabian Woltermann
630ab5a3cc
Makes sure mc_info_init sets everything to safe data.
2015-10-27 08:24:06 +01:00
Fabian Woltermann
e28640ded0
Revert "Introduces a proper constructor for mc_info and removes the mc_info_init function on grounds of grave misuse of memset."
...
This reverts commit 35e34ac97c .
2015-10-27 08:15:45 +01:00
m!m
3708f101b4
Merge pull request #394 from niffiwan/valgrind/csg_read_missions
...
Fix memory leaks in mission_campaign_load
2015-10-26 23:15:24 +01:00
m!m
332b9fa4a4
Merge pull request #395 from The-E/debug_sexp_fix
...
Fix the debug sexp
2015-10-26 23:07:03 +01:00
The E
e6aa565b42
Name change as suggested by m|m
2015-10-26 20:31:24 +01:00
The E
788e28c646
Creates a new variant of Warning that is not #ifdefed out on release to make the debug sexp work as its description implies
2015-10-26 19:47:51 +01:00
Goober5000
6ccf4116fc
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into wf_never_existed_removal
2015-10-26 02:27:10 -04:00
Goober5000
c4240324fb
the comment really shouldn't have changed from the original retail '// if the current wave is zero, it never existed', because it illuminates the thought process behind the code
2015-10-26 02:26:51 -04:00
niffiwan
4fc2d9c610
Fix memory leaks in mission_campaign_load
2015-10-26 13:49:21 +10:00
Goober5000
ccc71a8e8b
looks like we'll need them in these three other files too
2015-10-25 21:20:57 -04:00
Goober5000
7dde0a79a7
that was just dumb
2015-10-25 21:14:08 -04:00
Goober5000
e895f86e44
come on, Travis
2015-10-25 20:48:02 -04:00
Goober5000
31e9a0dd7d
more linux compatibility
2015-10-25 20:23:26 -04:00
Goober5000
505de1b905
linux compatibility
2015-10-25 19:51:50 -04:00
Goober5000
b82d0c579d
convert qsort to std::sort
2015-10-25 19:16:36 -04:00
niffiwan
68d2e5f0eb
Merge pull request #391 from Goober5000/fred_completion_music_text_tweak
...
tweak the FRED and wxFRED dialog text to match the action
2015-10-26 08:46:33 +10:00
Goober5000
3c4861859b
tweak the FRED and wxFRED dialog text to match the action
2015-10-25 16:33:28 -04:00
Fabian Woltermann
8ab5cd3085
Merge pull request #390 from Goober5000/game_sunspot_process_tweak
...
small optimization of shadow checks
2015-10-24 21:51:18 +02:00
Goober5000
eaa09dd862
small optimization of shadow checks
2015-10-24 15:42:06 -04:00
Goober5000
45c8ed8926
Merge pull request #383 from niffiwan/valgrind/generic_anim_stream
...
Fix memory leaks in generic_anim_stream
2015-10-24 15:18:50 -04:00
Goober5000
1f6fc358f8
just a tweak to avoid comparing whitespace
2015-10-24 15:07:58 -04:00
Goober5000
5b8584b892
clarify the use of mc_info_init, and make sure that model_instance_num and submodel_num have the proper values
2015-10-24 15:06:58 -04:00
MageKing17
0cdac667a3
Merge pull request #385 from asarium/coverity/1093606
...
Fix Coverity 1093606 for real this time
2015-10-24 05:41:26 -07:00
MageKing17
5137787a99
Merge pull request #388 from asarium/coverity/1093600
...
Revert "Fix for Coverity 1093600: Negative array index read"
2015-10-24 05:40:56 -07:00
asarium
ddacb8cf32
Revert "Fix for Coverity 1093600: Negative array index read"
...
This reverts commit 2aa569c1e7 .
As discussed in #386 hud_squadmsg_is_target_order_valid actually doesn't properly catch cases where the target_objnum may be -1.
2015-10-24 14:16:31 +02:00
asarium
88e7c83a8e
Fix Coverity 1093606 for real this time
2015-10-24 12:53:03 +02:00
niffiwan
5b489da8a8
Merge pull request #376 from asarium/ci/fatalWarnings
...
Travis CI: Make warnings fatal errors
2015-10-24 20:08:53 +10:00
The E
35e34ac97c
Introduces a proper constructor for mc_info and removes the mc_info_init function on grounds of grave misuse of memset.
2015-10-24 09:58:38 +02:00
MageKing17
1ba35d42ae
Merge pull request #369 from The-E/player-fighterbays
...
Allow ships to arrive from hangars on player ships
2015-10-24 00:36:02 -07:00
niffiwan
409ba384b0
Fix memory leaks in generic_anim_stream
2015-10-24 15:04:13 +10:00
niffiwan
51c2a61d76
Merge pull request #382 from asarium/valgrind/1
...
Fix memory leak in bm_load_animation
2015-10-24 08:42:36 +10:00
asarium
f1fd9f9a3d
Fix memory leak in bm_load_animation
2015-10-23 22:35:56 +02:00
Goober5000
96d32b5031
remove WF_NEVER_EXISTED
2015-10-22 23:27:43 -04:00
Fabian Woltermann
21a16fbf15
Change this line back to what it was, with more accurate comment
2015-10-16 11:27:40 +02:00
Fabian Woltermann
76b6f954da
Merge pull request #377 from MageKing17/bugfix/sexps-accessing-wrong-nodes
...
Fixes numerous SEXPs accessing the wrong nodes.
2015-10-16 06:06:58 +02:00
MageKing17
064a07349f
Fixes numerous SEXPs accessing the wrong nodes.
...
Affected SEXPs include turret-set-target-order, turret-set-direction-preference, turret-set-rate-of-fire, turret-set-optimum-range, ship-turret-target-order, turret-get-primary-ammo, turret-set-primary-ammo, turret-get-secondary-ammo, and turret-set-secondary-ammo.
It's worth noting that while turret-set-direction-preference, turret-set-rate-of-fire, and turret-set-optimum-range were wrong, they were wrong in a way that wouldn't actually affect the outcome most of the time (thanks to the "if(turret == NULL)" checks simply skipping invalid subsystem names).
2015-10-15 18:58:27 -07:00
asarium
bcedaee793
Fix "uninitialized variable warning"
2015-10-14 18:54:14 +02:00
asarium
a020095b07
Disable array bounds checks in a Travis build
2015-10-14 18:44:57 +02:00
asarium
a5f918a811
Remove -ansi option as it's not supported by clang
2015-10-14 18:20:44 +02:00
asarium
4e21d9ee79
Make error fatal when doing a CI build
2015-10-14 18:09:16 +02:00
asarium
7efd107bfa
Fix format warning and syntax error
2015-10-14 18:07:45 +02:00
asarium
9f4589df65
Fix unitialized variable warning
...
GCC was complaining about an uninitialized warning but that was probably a false positive.
2015-10-14 17:51:21 +02:00
asarium
1d2153794c
Fix an overflow warning
...
Signed overflow is not well defined in the standard but unsinged it so now that is used to determine if the model index counter has overflown.
2015-10-14 17:45:46 +02:00
asarium
4a40aad107
Fix invalid index warning
...
The new version now prints the name of the help overlay that could not be added.
2015-10-14 17:44:03 +02:00
asarium
14f1ceec4d
Fix "unused return" warnings
2015-10-14 17:41:31 +02:00
Fabian Woltermann
2f78ae308b
Consistency for the doxygen comments
2015-10-13 10:17:35 +02:00
Fabian Woltermann
bc788d6cb7
More comment cleanup
2015-10-13 09:29:07 +02:00
Fabian Woltermann
f1b9c15618
More comment tweaks
2015-10-13 09:15:52 +02:00
Fabian Woltermann
eab9fab9ca
Further, non-multi-breaking changes as suggested by MageKing17.
2015-10-13 09:11:36 +02:00
Fabian Woltermann
a6d3982c7c
Merge pull request #375 from MageKing17/bugfix/homing_pos-null-check
...
Check IS_VEC_NULL(&wp->homing_pos) for det_radius and arm_radius.
2015-10-13 08:01:48 +02:00
MageKing17
7852d13ce5
Check IS_VEC_NULL(&wp->homing_pos) for det_radius and arm_radius.
...
"$Detonation Radius:" and "$Arm radius:" would both rely on wp->homing_pos being set if wp->homing_object was; however, during free flight time, wp->homing_pos remains uninitialized (a null vector). As a result, their vm_vec_dist() calls would be comparing with the distance from the mission origin (coordinates 0,0,0) instead of the actual location of whatever they were homing in on. In the case of detonation radius, this would result in instant detonation on launch if you fired within det_radius of the mission origin. In the case of arm radius, this would result in the weapon being armed during free flight if launched within the arm_radius of the origin (and yes, you could theoretically experience the effects of both of these bugs simultaneously).
Theoretically, this solution is still less than ideal (a target sitting exactly on the mission origin could cause wonkiness), but it's consistent with the IS_VEC_NULL() checks elsewhere in weapons.cpp. A "proper" solution would basically require rewriting the entire homing code... which, obviously, if somebody would like to volunteer for, I wouldn't stop you ;). In the meantime, firing a homing weapon at a target sitting on the mission origin is even less likely than firing a weapon with one of the affected attributes within a certain distance of the mission origin, which was already pretty uncommon (it took a weapon with an abnormally large detonation radius of 1 kilometer to even realize this bug existed).
2015-10-12 22:48:15 -07:00
Fabian Woltermann
ad62f1d342
Merge pull request #374 from MageKing17/bugfix/homing-object-NULL-confusion
...
Stop comparing/setting homing_object to NULL.
2015-10-13 07:23:34 +02:00
MageKing17
75ae511ae6
Stop comparing/setting homing_object to NULL.
...
The rest of the codebase uses &obj_used_list to mean "no homing target", and the inconsistency could cause all kinds of issues.
2015-10-12 16:10:05 -07:00
niffiwan
89ebdd9bc1
Merge pull request #373 from MageKing17/bugfix/turret-ammo-bank-3-typo
...
Fix a typo in the weapon editor dialogue for turret bank 3 ammo.
2015-10-13 08:27:41 +10:00
MageKing17
ccd6d1e619
Fix a typo in the weapon editor dialogue for turret bank 3 ammo.
2015-10-12 15:12:13 -07:00
Fabian Woltermann
92ace8e983
Further comment tweaks
2015-10-08 09:49:48 +02:00
MageKing17
61f2e78515
Merge pull request #370 from Goober5000/memset_bugfix
...
fix a memset typo identified by Echelon9
2015-10-05 12:38:59 -07:00
Goober5000
ebd81d9539
fix a memset typo identified by Echelon9
2015-10-05 11:49:54 -04:00
Fabian Woltermann
d3df7ef2b1
Adds explanatory comments and applies the same logic to the net signature overload.
2015-10-05 08:08:46 +02:00
The E
99306be6cf
Amendment based on Kara's feedback. Should allow same behaviour in both SP and MP.
2015-10-04 12:23:35 +02:00
The E
6835d2bf9f
Only remove the player ship from the arrival list in singleplayer
2015-10-03 22:15:57 +02:00
Goober5000
3f9ce3b6a5
Merge pull request #368 from asarium/fix/configureType
...
Fix typo in configure.ac
2015-10-03 14:12:27 -04:00
asarium
08067bc871
Fix typo in configure.ac
2015-10-03 19:18:52 +02:00
MageKing17
415f113f4d
Merge pull request #366 from The-E/ciws
...
Fixes the logic surrounding the ciws flag
2015-10-02 13:54:52 -07:00
MageKing17
a5b504bb85
Merge pull request #367 from The-E/longer-descriptions
...
Slightly increases the length limit for tech descriptions.
2015-10-02 13:54:09 -07:00
The E
9f94568d2f
Slightly increases the length limit for tech descriptions.
2015-10-02 20:37:04 +02:00
The E
ad4fed744e
Normalizes the logic to work the same way in both cases
2015-10-02 20:22:51 +02:00
The E
0a081fb292
Fixes the logic surrounding the ciws flag
2015-10-02 19:33:09 +02:00
Fabian Woltermann
efa5dc9620
Merge pull request #364 from Goober5000/background_bitmaps_tweak
...
made background sexp errors less fatal
2015-10-01 18:18:24 +02:00
Goober5000
bfb4db1dd4
made background sexp errors less fatal
2015-09-30 23:36:47 -04:00
MageKing17
2d56358755
Merge pull request #363 from DahBlount/Fix-debug-warning-in-Min/Max-Damage-definition-code
...
Additional debub warning move
2015-09-30 14:41:00 -07:00
DahBlount
d52e27dcc4
Move debug warnings to optional_string()
...
Only check if we actually set a value for min or max damage.
2015-09-30 13:54:18 -06:00
Fabian Woltermann
12acacbba8
Merge pull request #362 from DahBlount/Fix-debug-warning-in-Min/Max-Damage-definition-code
...
Fix debug warning in min max damage definition code
2015-09-30 21:43:13 +02:00
DahBlount
3bbabea978
Add additional checks to min/max damage code
...
This checks the damage attenuation code for have a parameter being set
to 0.0f before hand to prevent debug warnings.
2015-09-30 13:19:10 -06:00
m!m
cdc43731af
Merge pull request #361 from Goober5000/cfile_null_bugfix
...
cfclose() will hit an assertion if we try to close a null pointer
2015-09-30 21:08:03 +02:00
Goober5000
edc806897f
cfclose() will hit an assertion if we try to close a null pointer
2015-09-30 15:03:00 -04:00
MageKing17
f32a6e7ab9
Merge pull request #359 from ln-zookeeper/fotg_to_master
...
Make the array bounds check actually work
2015-09-25 12:30:14 -07:00
Lari Nieminen
2e9b2de40a
Make the array bounds check actually work
2015-09-24 09:25:59 +03:00
MageKing17
69ab8c179d
Merge pull request #357 from Goober5000/fiction_viewer_conditional_support
...
Fiction viewer conditional support
2015-09-23 16:14:46 -07:00
Goober5000
37657fc537
oh rubbish
2015-09-23 18:39:51 -04:00
Goober5000
1a5a0d6a7f
change an Error to an Assertion, and made Fiction_viewer_text use nullptr instead of NULL
2015-09-23 18:38:34 -04:00
m!m
1a196cbd7a
Merge pull request #356 from MageKing17/cleanup/voice-recognition-mantis-2373
...
Voice recognition cleanup based on Mantis #2373 patch.
2015-09-23 23:32:46 +02:00
MageKing17
89a6d69e08
Voice recognition cleanup based on Mantis #2373 patch.
...
* Frees cpAudio pointer in VOICEREC_deinit()
* Validates that the ship/wing can actually take orders, and validates that it can take the specific order in question before trying to send it.
* Reports the confidence of the voice match if DEBUG_ON is set.
* Various commenting changes based on the patch.
Not included: using confidence to discard voice matches that fall below a certain confidence level. I haven't noticed a tendency towards spurious matches, and I didn't want to introduce this without additional data, especially when it might cause problems for people with different accents (and ESPECIALLY without a setting to tweak the threshold value, which the original patch did not have; it was hardcoded at 90%).
2015-09-23 14:10:02 -07:00
Goober5000
b59c015df2
fix a subtle bug caught by Travis
2015-09-22 21:32:19 -04:00
Goober5000
c90db8c498
Merge pull request #314 from MageKing17/cleanup/fred-save-refactor
...
Refactor mission saving to avoid duplicate code.
2015-09-22 21:19:23 -04:00
Goober5000
cc79554f7a
keep track of the active stage via index rather than via pointer because the vector may be resized
2015-09-22 20:39:37 -04:00
Goober5000
3df6bb82db
add basic conditional support to fiction viewer stages
2015-09-22 20:17:31 -04:00
Goober5000
56a9391e31
some const-correctness
2015-09-22 19:02:10 -04:00
niffiwan
bc5b7e6906
Merge pull request #355 from ln-zookeeper/l_cf_get_path_id_buf_fix
...
Fix possible out of bounds array access
2015-09-22 19:13:01 +10:00
Lari Nieminen
6dc3d67905
Fix possible out of bounds array access
...
If the input string is "/", then buf[-1] would get accessed and in rare cases also modified.
2015-09-22 11:43:20 +03:00
Goober5000
0d1764d42e
Merge pull request #353 from Yarn366/per_mission_ui_backgrounds
...
Per-mission UI backgrounds
2015-09-21 17:02:03 -04:00
MageKing17
f4f31084fa
Merge pull request #354 from Goober5000/no_move_collision_tweak
...
collision optimization: two objects which do not move will never coll…
2015-09-21 13:56:38 -07:00
Goober5000
5fb98551c9
collision optimization: two objects which do not move will never collide with one another
2015-09-21 16:30:19 -04:00
Yarn366
5f58aaa392
Merge branch 'master' into per_mission_ui_backgrounds
2015-09-20 21:05:46 -04:00
Yarn366
484be09275
Added support for custom fiction viewer backgrounds. Also moved the $UI parameter so it occurs just before the $File parameter.
2015-09-20 15:59:29 -04:00
m!m
26e65cc9e5
Merge pull request #350 from niffiwan/headzlessIII
...
Reduce bmpslot usage by headz
2015-09-19 12:49:11 +02:00
Fabian Woltermann
26bca473e2
Merge pull request #352 from niffiwan/headz_comment_fix
...
Fix comment for HudGaugeTalkingHead::render
2015-09-19 11:00:32 +02:00
niffiwan
0132e2a320
Fix comment for HudGaugeTalkingHead::render
2015-09-19 18:55:30 +10:00
Yarn366
873694eae2
Added unified functions for loading and saving custom UI backgrounds
2015-09-19 04:47:11 -04:00
niffiwan
0b1c916352
Merge pull request #351 from MageKing17/cleanup/scripting-call-bm_release-instead-of-bm_unload
...
Make script_state::UnloadImages() call bm_release instead of bm_unload.
2015-09-19 15:09:50 +10:00
MageKing17
835c4a7d0e
Make script_state::UnloadImages() call bm_release instead of bm_unload.
...
Should result in reduced BMPMAN slot usage with certain scripts as bm_unload() unloads the image data but holds on to the slot, while bm_release() releases the slot.
2015-09-18 21:22:07 -07:00
Yarn366
f0c0d60a11
Fiction viewer UI can now be set in mission files and game_settings.tbl
2015-09-18 21:51:24 -04:00
niffiwan
12f4bcfd9b
Reduce bmpslot usage by headz
...
As headani's (both ANI & EFF) are streamed there's no need to have
the anim data in bmpman, the streaming code does that with only two
slots, rather than one slot per ani frame
Also fix a "leak" in the streaming code use of bmpman slots. i.e. each
time a message was played another slot would be used & not released
2015-09-18 19:34:28 +10:00
niffiwan
30c8d09c55
Merge pull request #349 from MageKing17/bugfix/for-counter-double-free
...
Fix double-free with for-counter (introduced by myself).
2015-09-17 13:06:06 +10:00
MageKing17
53f7f493cf
Merge pull request #335 from ln-zookeeper/fotg_to_master
...
Fixed the $On Ship Arrive hook code as per issue #334 and PR #333
2015-09-16 19:58:01 -07:00
MageKing17
24b0b28f6a
Fix double-free with for-counter (introduced by myself).
...
In 9ec10dd I thought I was fixing a memory leak, but the actual scenario was that the freeing was just delayed until later. This removes the freeing added by 9ec10dd and changes the free() calls into vm_free() calls.
2015-09-16 19:55:24 -07:00
Yarn366
0af93bcceb
Fixed attempts to access current debriefing as an array when saving the debriefing background
2015-09-16 14:24:59 -04:00
Yarn366
9cb1af00aa
Added support for custom command briefing backgrounds
2015-09-16 14:06:15 -04:00
Yarn366
4ef212157a
Briefing backgrounds are now set with $briefing_background_xxx instead of $background_xxx
2015-09-16 02:17:53 -04:00
Yarn366
3bb9b0068c
Added support for custom debriefing backgrounds
2015-09-16 01:32:57 -04:00
Yarn366
09aa01db6b
Added support for custom weapon select backgrounds
2015-09-16 00:14:54 -04:00
Yarn366
36cc228527
Added support for custom ship select backgrounds
2015-09-15 23:49:43 -04:00
niffiwan
022e3324ce
Merge pull request #348 from MageKing17/bugfix/dont-call-popup-during-gr_init
...
Stop calling popup() during gr_init().
2015-09-16 11:15:25 +10:00
Yarn366
f41c5a2a65
Added support for custom red-alert backgrounds
2015-09-15 21:08:25 -04:00
MageKing17
d672ee885f
Stop calling popup() during gr_init().
...
While investigating issue #345 , it was discovered that `popup()` is getting called during `gr_init()` (and since this is before `gamesnd_parse_soundstbl()` gets called, the eventual call to `gamesnd_play_iface()` results in reading invalid memory). Given that this is basically relying on a feature in the middle of the function initializing it, and given that both lines are preceded by `mprintf()` calls saying basically the same thing, it seems the best solution is to just remove the troublesome lines altogether.
2015-09-15 17:59:16 -07:00
MageKing17
3329285192
Refactor mission saving to avoid duplicate code.
...
Makes save_mission_file() and autosave_mission_file() delegate to a new save_mission_internal() function. Tested and works with both manual and automatic saves.
As an aside, this fixes a slight inconsistency between manual and automatic saving (which inspired this refactor in the first place): when the order of save_fiction() and save_cutscenes() was swapped (in r10886 a.k.a. d6e0a73 ), autosave_mission_file() wasn't also changed, so autosaves of missions with "#Cutscenes" sections can't actually be loaded.
2015-09-10 13:34:57 -07:00
z64555
9df07cda5e
Merge pull request #343 from Echelon9/fix/bm_load_and_parse_eff-return-type
...
Refactor bm_load_and_parse_eff() return type to bool
2015-09-08 09:48:53 -05:00
Echelon9
d7eca39338
Refactor bm_load_and_parse_eff() return type to bool, thereby removing a TODO
2015-09-08 22:14:43 +08:00
z64555
d1e6aa2b4f
Merge pull request #344 from Echelon9/fix/bm_set_render_target-return-type
...
Refactor bm_set_render_target() return type to bool
2015-09-08 09:02:14 -05:00
Echelon9
b7aaf2e885
Refactor bm_set_render_target() return type to bool, thereby removing a TODO
2015-09-07 17:07:24 +10:00
m!m
0339f1ba62
Merge pull request #341 from MageKing17/bugfix/mantis-3173
...
Fix Mantis #3173 .
2015-09-06 14:45:28 +02:00
MageKing17
1a0f2cf0e0
Fix Mantis #3173 .
...
So in PR #294 , I made 0-damage beams call the damage-applying code so they could be used to TAG things. The way I did this was I removed the do_damage check from the conditional before the switch block that handles beams damaging things.
This was a horrible mistake.
do_damage was set to 0 if a beam dealt <= 0 damage, but before that, it would only be set to 1 if the damage timestamp had elapsed. Removing the do_damage check caused damaging beams to deal damage every frame, which obviously will cause a substantial damage increase (well, unless your framerate was so low that beams would deal less than their full damage anyway).
This commit restores the do_damage check, and simply avoids setting do_damage to 0 if the beam isn't a damaging one (the <= 0 check is moved to beam_get_ship_damage() instead, so we can skip the attenuation calculation if we're not going to deal damage in the first place).
2015-09-06 05:33:30 -07:00
Lari Nieminen
473090e9e0
Made $On Ship Arrive cope with generic anchors (e.g. "<any hostile>")
...
This changes the interface of mission_set_arrival_location() to return the objnum of the anchor (if any; -1 otherwise).
2015-09-04 01:23:32 +03:00
Fabian Woltermann
d5a2238225
Merge pull request #340 from asarium/fix/unneededWarnings
...
Re-enable two gcc warnings
2015-09-03 18:10:32 +02:00
m!m
cbec552c19
Merge pull request #338 from Goober5000/sound_index_tweak2
...
Sound index tweak2
2015-09-03 17:02:38 +02:00
asarium
032aa154de
Re-enable two warnings
...
The unknown pragmas have been fixed by wrapping them in a visual studio ifdef
2015-09-03 15:38:33 +02:00
Goober5000
3b5ba969cc
change the Warning to an mprintf since technically SSM entries do not need a name
2015-09-02 22:49:31 -04:00
Goober5000
be5fdd0308
sprintf_s only works in Visual Studio; change to regular sprintf
2015-09-02 22:45:46 -04:00
Goober5000
abd31038e7
a bit of code cleanup with some robustness for SSM entry names
2015-09-02 22:45:38 -04:00
Goober5000
902fd5efbc
fix a VS2013 warning
2015-09-02 22:45:24 -04:00
Goober5000
7db9adae00
since Alarm Sound is optional, it's possible the sound index won't get assigned
2015-09-02 22:45:04 -04:00
m!m
f82a730f7e
Merge pull request #337 from Yarn366/mantis/3172
...
Fixed language autodetection
2015-09-02 23:44:08 +02:00
Yarn366
932a5230e9
Fixed language autodetection
2015-09-02 17:13:33 -04:00
Lari Nieminen
81d18573aa
Fixed the $On Ship Arrive hook code as per issue #334 and PR #333
2015-09-02 10:53:21 +03:00
Fabian Woltermann
fadd4e6d18
Merge pull request #327 from Goober5000/per_mission_briefing_backgrounds
...
mjn.mixael's request for per-mission briefing backgrounds
2015-08-31 09:03:05 +02:00
Fabian Woltermann
6484a19094
Merge pull request #331 from AxemP/NoBeamFlashImpact
...
Removes the beam flash impact from appearing when viewing from the hit object's cockpit
2015-08-31 09:00:01 +02:00
z64555
98fba0c00b
Merge pull request #328 from niffiwan/bmpslots
...
Add debug console command to log bmpman slot info
2015-08-30 18:47:57 -05:00
MageKing17
f95db90cc0
Merge pull request #332 from niffiwan/bmp_eff_cleanup
...
Minor bmpman/generic anim cleanup
2015-08-30 10:19:37 -07:00
niffiwan
2199863587
Minor bmpman/generic anim cleanup
...
Remove redundant Assert from bm_load_animation
Replace magic numbers in EFF streaming animations
2015-08-30 14:50:21 +10:00
MageKing17
df8317f3ed
Merge pull request #311 from ln-zookeeper/fotg_to_master
...
Added Lua functions to read mouse/joystick sensitivity and deadzone
2015-08-29 09:38:21 -07:00
Axem
cc08e986a2
Don't need that
2015-08-29 11:19:48 -05:00
Axem
65cce032d3
Merge branch 'NoBeamFlashImpact' of https://github.com/AxemP/fs2open.github.com.git
2015-08-29 11:15:36 -05:00
Axem
b8479fba88
I am comitting this!
2015-08-29 11:15:32 -05:00
Axem
7f22a80af6
Prelim work
2015-08-29 11:14:38 -05:00
Lari Nieminen
58b8f2a33c
Added Lua functions to read mouse/joystick sensitivity and deadzone
2015-08-29 16:54:19 +03:00
Fabian Woltermann
0aec74ae29
Merge pull request #320 from asarium/ci/container
...
Travis CI: Switch to container infrastructure
2015-08-27 21:49:36 +02:00
asarium
4e6a1ae716
Switch to container infrastructure
2015-08-27 21:39:23 +02:00
niffiwan
ebca85531c
Add debug console command to log bmpman slot info
2015-08-27 20:06:35 +10:00
m!m
0954d4e4ee
Merge pull request #326 from MageKing17/bugfix/mantis-3144
...
Fix Mantis #3144 .
2015-08-27 11:46:12 +02:00
MageKing17
ddace0c233
Add clarifying comment per m!m's note on GitHub.
2015-08-27 02:43:18 -07:00
m!m
7a38519a83
Merge pull request #302 from niffiwan/coverity+travis
...
Integrate Coverity with Travis CI
2015-08-27 10:49:12 +02:00
Goober5000
05d4e44c97
mjn.mixael's request for per-mission briefing backgrounds; see http://www.hard-light.net/forums/index.php?topic=90337.0
2015-08-27 01:22:14 -04:00
MageKing17
d4d6ab3fd7
Fix Mantis #3144 .
...
Stops stripping newlines from ship descriptions, and resizes the text width according to Yarn's findings.
2015-08-26 20:36:43 -07:00
niffiwan
3754bfbfdf
Merge branch 'master' into coverity+travis
...
Conflicts:
.travis.yml
2015-08-27 12:40:33 +10:00
MageKing17
3a5f7143a2
Merge pull request #321 from Goober5000/subsystem_mprintf_fix
...
the model filename is useful to have in the debug message
2015-08-24 10:15:47 -07:00
Goober5000
b2215ddf7d
the model filename is useful to have in the debug message
2015-08-24 12:59:15 -04:00
m!m
50feb3ed08
Merge pull request #315 from niffiwan/eff_streaming_is_done
...
Remove obsolete comments
2015-08-23 12:31:44 +02:00
niffiwan
a6f2cc5937
Remove obsolete comments
...
EFF streaming was implemented in 48e0517e (svn r9109)
2015-08-23 20:26:01 +10:00
niffiwan
545287cebf
Merge pull request #307 from asarium/ci/macosx
...
Add CI support for MacOSX
2015-08-23 19:52:15 +10:00
m!m
84a315d1db
Merge pull request #8 from niffiwan/asarium-ci_macosx
...
We need sudo; force it on
2015-08-23 10:11:43 +02:00
niffiwan
00c3733670
Merge pull request #313 from MageKing17/bugfix/fred-ship-loadout-invalid-memory
...
Replaces a reference to MAX_SHIP_CLASSES with Ship_info.size().
2015-08-23 14:10:00 +10:00
niffiwan
7fdfdc6134
We need sudo; force it on
2015-08-23 13:53:13 +10:00
MageKing17
6a69b02bbb
Replaces a reference to MAX_SHIP_CLASSES with Ship_info.size().
...
This would cause FRED to treat essentially unspecified pieces of memory as ship classes and then see if this nonsense class had the SIF_DEFAULT_PLAYER_SHIP flag set... and if so, put it in the default list of available ships. With a debug build (where the memory past the end of Ship_info is all identical for quite a ways), this could result in the default, empty mission saving as 60 megabytes.
2015-08-22 18:33:22 -07:00
Goober5000
886deddf99
Merge pull request #306 from MageKing17/bugfix/call-ssm-strike-warning
...
Fixes call-ssm-strike resulting in a Warning about a null vec3d.
2015-08-22 18:36:14 -04:00
MageKing17
360a55be63
Merge pull request #312 from MageKing17/bugfix/on-turret-fired-swarm-fix
...
Fix null pointer dereference with swarm turrets and "$On Turret Fired:".
2015-08-22 15:12:30 -07:00
MageKing17
91d25a8744
Fix null pointer dereference with swarm turrets and "$On Turret Fired:".
...
Forgot to set last_fired_turret and its last_fired_weapon_info_index, causing CHA_ONTURRETFIRED to crash as soon as a swarm turret fired.
Oops.
2015-08-22 14:29:27 -07:00
MageKing17
c990f44f82
Merge pull request #310 from ln-zookeeper/fotg_to_master
...
Supplement +Disable with +Disable: <bool>, to allow the table to enab…
2015-08-22 12:32:58 -07:00
Lari Nieminen
0d8f6f26ce
Supplement +Disable with +Disable: <bool>, to allow the table to enable binds disabled by default
2015-08-22 22:18:07 +03:00
MageKing17
55b857f269
Merge pull request #260 from ln-zookeeper/fotg_to_master
...
Whitespace and commenting tweaks
2015-08-22 11:58:19 -07:00
Lari Nieminen
00fa839d1d
Added a few comments and fixed typos in some others
2015-08-22 21:55:37 +03:00
Goober5000
ef3bb65d63
Merge pull request #305 from MageKing17/bugfix/fred-glowpoint-init
...
Makes FRED call glowpoint_init().
2015-08-22 14:17:26 -04:00
m!m
56ab9e02c8
Merge pull request #304 from MageKing17/bugfix/parselo-char-fix
...
Makes vsprintf() stop chopping off the last character. Fixes issue #298 .
2015-08-22 19:21:30 +02:00
MageKing17
cbcb053fbc
Merge pull request #309 from asarium/fix/drawSubsystem
...
Fix gr.drawSubsystemTargetingBrackets
2015-08-22 10:16:07 -07:00
asarium
b76bccb9ef
Actually set the bounds of the drawn subsystem
2015-08-22 17:16:42 +02:00
Axem
a535d66fc8
Prelim work
2015-08-22 08:36:58 -05:00
m!m
be4cac366b
Merge pull request #308 from niffiwan/gcc-warn
...
Fix gcc warning in ship/ship.cpp
2015-08-22 13:06:56 +02:00
m!m
a691e81e14
Merge pull request #303 from MageKing17/bugfix/lua-null-pointer-checks
...
Add null pointer checks throughout lua.cpp.
2015-08-22 13:06:23 +02:00
asarium
07fcd05fff
Add CI support for MacOSX
...
Requires enabling the multi-os feature of travis CI
2015-08-22 12:59:49 +02:00
niffiwan
9737994de5
Fix gcc warning in ship/ship.cpp
...
Use SIZE_T_ARG in Warning
2015-08-22 20:45:45 +10:00
MageKing17
fe1db37902
Makes FRED call glowpoint_init().
...
Avoids a constant stream of warnings when using "$Glowpoint overrides:".
2015-08-22 03:40:27 -07:00
MageKing17
238dbc5749
Makes vsprintf() stop chopping off the last character. Fixes issue #298 .
...
Also fixes saving missions in FRED, since it uses the same function.
2015-08-22 03:38:16 -07:00
MageKing17
cd3b543e56
Add null pointer checks throughout lua.cpp.
...
Previously, the "this != NULL" checks in the isValid() methods were covering most of these cases, but they were removed as part of PR #274 because clang was generating warnings because calling a method on a null pointer is undefined behavior (so the condition *should* be tautological). This performs the checks outside of isValid(), which should avoid (at least this variety of) undefined behavior while fixing the crashes that dereferencing null pointers was causing.
2015-08-22 03:36:26 -07:00
niffiwan
b3c1441d06
Integrate Coverity with Travis CI
...
This should let Coverity run a scan via Travis whenever commits
are pushed to the "coverity_scan" branch.
Some hackery is required to avoid submitting too many builds to
Coverity. See travis-ci/travis-ci#1975 for details.
2015-08-22 18:39:55 +10:00
MageKing17
fb8ffcacfd
Fixes call-ssm-strike resulting in a Warning about a null vec3d.
...
ssm_create() subtracts the start coordinates from the position of the target, and then normalizes that. Since call-ssm-strike was using the position of the target as the start coordinates, this was obviously resulting in normalizing a null vec3d, generating the spurious warning. This just makes call-ssm-strike use a point immediately behind the target's position (using the target's orientation) as the starting coordinate, thereby avoiding the warning.
2015-08-21 21:12:03 -07:00
niffiwan
0061718de4
Merge pull request #301 from MageKing17/bugfix/check-sexp-syntax
...
Fix check_sexp_syntax() so it works properly with OPF_SSM_CLASS.
2015-08-22 13:57:59 +10:00
MageKing17
d7ff43a1d1
Fix check_sexp_syntax() so it works properly with OPF_SSM_CLASS.
...
Also makes OP_BEAM_FLOATING_FIRE grab the correct ship_index for the subsystem check.
2015-08-21 13:41:45 -07:00
MageKing17
a748be2315
Merge pull request #300 from z64555/enhancement/nojoypoll
...
Removes joystick polling. Joy axes are now queried every frame.
2015-08-21 12:42:01 -07:00
z64555
f56f0c471d
Removes joystick polling. Joy axes are now queried every frame.
2015-08-21 14:32:07 -05:00
MageKing17
b610b9b246
Merge pull request #299 from niffiwan/bmp_overflow
...
Fix Coverity 1093366: Operands don't affect result
2015-08-21 09:47:02 -07:00
niffiwan
00a0b1bae7
Fix Coverity 1093366: Operands don't affect result
...
The previous check was always false, replace with something that should
safely detect uint overflow
2015-08-21 22:49:28 +10:00
Fabian Woltermann
509bd8c010
Merge pull request #294 from MageKing17/feature/beam-tagging-with-no-damage
...
Remove do_damage check before calling hit functions in beam collisions.
2015-08-21 09:32:29 +02:00
Fabian Woltermann
9afae0b64d
Merge pull request #287 from MageKing17/feature/on-turret-fired-for-all
...
Add CHA_ONTURRETFIRED support to beam and swarm turrets.
2015-08-21 09:31:32 +02:00
Cliff Gordon
0a2b97c3bc
Merge pull request #41 from MageKing17/ship_info
...
Ship_info vectorization, ship templates.
2015-08-20 21:51:18 -05:00
MageKing17
52a2ac542e
Merge pull request #296 from asarium/fix/vsprintf
...
Fix SCP_string version of vsprintf
2015-08-20 19:47:47 -07:00
Cliff Gordon
9bc635e098
Merge pull request #288 from MageKing17/feature/glide-decay-ai-profile-flag
...
Makes glide decay work even when not thrusting.
2015-08-20 21:46:42 -05:00
Cliff Gordon
f824df070b
Merge pull request #290 from MageKing17/cleanup/move-voice-recognition-grammar-files
...
Move the temporary grammar files into the build directory.
2015-08-20 21:34:10 -05:00
z64555
afe2f2dac6
Merge pull request #297 from MageKing17/bugfix/mantis-2436
...
Fix Mantis #2436 . Does the mouse mapping within player_control_read_stick vs. trying to remap later on.
2015-08-20 16:57:54 -05:00
MageKing17
72af3059e9
Fix Mantis #2436 .
...
Instead of the mouse's axes being automatically bound to heading/pitch/throttle, it finds what the axes are bound to (by looking through Axis_map_to[]) and modifies the corresponding values.
2015-08-20 14:53:01 -07:00
asarium
51832fd563
Fix SCP_string version of vsprintf
...
The previous version didn't use the c-library which would cause incompatibilities with formats that assume all format specified to be supported.
2015-08-20 22:52:49 +02:00
MageKing17
059af731a7
Merge pull request #295 from ln-zookeeper/master
...
Revert "Fixes Mantis #2436 : Mouse controls ignore the axis binds." du…
2015-08-20 13:50:01 -07:00
Lari Nieminen
b4c625c51a
Revert "Fixes Mantis #2436 : Mouse controls ignore the axis binds." due to the joystick axis problems it caused
...
This reverts commit da71e629b4 .
2015-08-20 22:07:56 +03:00
MageKing17
27d85189ea
Remove do_damage check before calling hit functions in beam collisions.
...
This should allow 0-damage beams to be used to apply TAG effects.
2015-08-19 22:17:05 -07:00
MageKing17
b296300365
Simplify some references to Weapon_info[b->weapon_info_index].
...
These were all referenced when there was already a weapon_info pointer to that element; it makes more sense to use that pointer instead of re-indexing Weapon_info[].
2015-08-19 22:15:23 -07:00
MageKing17
a5bff0c192
Merge pull request #293 from chief1983/fix/292_warnings_part_b
...
Fix/292 warnings part b
2015-08-19 16:47:17 -07:00
MageKing17
20279838bf
Move the temporary grammar files into the build directory.
...
These are only used for voice recognition on Windows. In addition, the gc.exe shouldn't be needed locally since it should be included with SAPI, which Visual Studio 2010 and later should already include.
I also tried to backport some of the changes from the 2013/2015 project files to the 2010/2012 project files, but lack of certain compiler flags made me tend to err on the conservative side in that regard.
2015-08-19 16:33:13 -07:00
Cliff Gordon
f0c4bf2e3a
[fix/292_warnings_part_b] Cast Frametime (of type fix) to int for printf specifier to avoid a warning.
2015-08-19 17:01:07 -05:00
Cliff Gordon
38e48bec16
[fix/292_warnings_part_b] Remove deprecated register type hint.
2015-08-19 17:01:07 -05:00
MageKing17
e5b7d48989
Add a couple more static_cast<int>()s to get rid of warnings.
2015-08-19 14:52:15 -07:00
Cliff Gordon
6850ac6fe0
Merge pull request #291 from asarium/fix/ssm-warnings
...
Fix warning introduced by #289
2015-08-19 16:05:42 -05:00
asarium
0c80c8d8c0
Fix warning introduced by #289
2015-08-19 22:34:08 +02:00
MageKing17
64c9b272e7
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/pilotfile/pilotfile.cpp
2015-08-19 11:53:25 -07:00
m!m
42ddd2fe5f
Merge pull request #289 from MageKing17/feature/variable-ssm-strikes
...
Allow SSM(/SSB) strikes to be more variable.
2015-08-19 20:39:29 +02:00
MageKing17
692c86c8e6
Allow SSM(/SSB) strikes to be more variable.
...
Allows specifying a min/max for count, radius, and/or offset. To make them variable, instead of e.g. "+Count:", specify "+Min Count:", which adds a requirement for "+Max Count:". Each time the strike is activated, it will pick a different random count, and each projectile in the strike will have a different random radius and offset.
2015-08-19 11:36:50 -07:00
MageKing17
ba2fe6603c
Merge pull request #274 from asarium/fix/printf
...
Fix remaining gcc/clang warnings
2015-08-19 10:37:13 -07:00
asarium
71d3139d14
Remove commented line
2015-08-19 11:26:32 +02:00
asarium
8d564da80c
Fix for loop
2015-08-19 11:26:32 +02:00
asarium
e037b08e2e
Add doxygen documentation for format macros
2015-08-19 11:26:32 +02:00
asarium
1d65102292
Fix alignment in tcp_client.cpp
2015-08-19 11:26:32 +02:00
asarium
3a69db26eb
Fix unneded checks for this != nullptr in lua.cpp
2015-08-19 11:26:31 +02:00
asarium
e075241e54
Fix unneded check for this != nullptr in object.h
2015-08-19 11:26:31 +02:00
asarium
191194dfa7
Remove part of condition that is always true
...
Fixes a clang compiler warning
2015-08-19 11:26:31 +02:00
asarium
733b020bf5
Fix unneded check for this != nullptr in wmcgui.h
2015-08-19 11:26:31 +02:00
asarium
9ec178f116
Use the right version of abs
2015-08-19 11:26:31 +02:00
asarium
fb068f6037
Fix invalid pointer comparision warning
...
This should match what the code is actually supposed to do
2015-08-19 11:26:31 +02:00
asarium
bb6045d762
Check if the compiler supports the -Wno-unused-but-set-variable flag
2015-08-19 11:26:31 +02:00
asarium
e8bb02bed3
Disable a few warnings in release mode
...
These will happen if debug builds use variables for debug checks
2015-08-19 11:26:31 +02:00
asarium
a6e93c7d46
Fix another braces warning
2015-08-19 11:26:30 +02:00
asarium
1cd7744d34
Fix "operator '?:' has lower precedence" warning
...
I think the ?: expression was meant to take precedence
2015-08-19 11:26:30 +02:00
asarium
fc3166ac52
Fix suggest braces around initialization of subobject warning
2015-08-19 11:26:30 +02:00
asarium
3826e24da2
Fix format warning in stubs.cpp
2015-08-19 11:26:30 +02:00
asarium
3ece769330
Fix format warnings in weapons.cpp
2015-08-19 11:26:30 +02:00
asarium
6ac1326dc8
Fix format warning in species_defs.cpp
2015-08-19 11:26:30 +02:00
asarium
03b26baf55
Fix format warning in ds.cpp
2015-08-19 11:26:30 +02:00
asarium
4b25b49432
Fix format warning in plr.cpp
2015-08-19 11:26:30 +02:00
asarium
721422f951
Fix format warning in pilotfile.cpp
...
Also fixes a logic error in the code (I think...)
2015-08-19 11:26:29 +02:00
asarium
509d11c29d
Fix format warning in csg.cpp
2015-08-19 11:26:29 +02:00
asarium
eb765b0c99
Fir format warnings in parselo.cpp
2015-08-19 11:26:29 +02:00
asarium
3d06468e2a
Fix format warnings in lua.cpp
2015-08-19 11:26:29 +02:00
asarium
1de9ad1ace
Fix format warnings in object.cpp
2015-08-19 11:26:29 +02:00
asarium
559198a2e4
Fix format warning in collideshipweapon.cpp
2015-08-19 11:26:29 +02:00
asarium
6b093f2ee9
Fix set but unused variable warning in multiutil.cpp
2015-08-19 11:26:29 +02:00
asarium
280ceabb45
Fix format warning in multi_options.cpp
2015-08-19 11:26:28 +02:00
asarium
ff51e79531
Fix set but unused variable warning in chat_api.cpp
2015-08-19 11:26:28 +02:00
asarium
9cbf944dee
Fix format warning in modelread.cpp
2015-08-19 11:26:28 +02:00
asarium
1ded65c3d0
Fix invalid usage of mprintf
2015-08-19 11:26:28 +02:00
asarium
c26bd197dc
Fix format warning in mainhallmenu.cpp
2015-08-19 11:26:28 +02:00
asarium
32b35ba62c
Fix format warnings in credits.cpp
2015-08-19 11:26:28 +02:00
asarium
8d5273b3c0
Fix set but unused variable warning in vecmat.cpp
...
I kept the code in comments as it may be usedful at some point.
2015-08-19 11:26:28 +02:00
asarium
6a5e660ff3
Fix format warnings in lighting.cpp
2015-08-19 11:26:28 +02:00
asarium
aaf470f49b
Fix format warning in keycontrol.cpp
2015-08-19 11:26:28 +02:00
asarium
077dc61660
Fix format warnings in hudshield.cpp
2015-08-19 11:26:27 +02:00
asarium
116df2e2c3
Fix set but unused variable warning in grstub.cpp
2015-08-19 11:26:27 +02:00
asarium
4670d5f87f
Fix set but unused variable warning in gropengltnl.cpp
2015-08-19 11:26:27 +02:00
asarium
f986d28c56
Fix format warnings in safe_string.h
2015-08-19 11:26:27 +02:00
asarium
dba0e8b458
Fix format warnings in gamesnd.cpp
2015-08-19 11:26:27 +02:00
asarium
cf68c5970e
Fix unused but set variable warnings in tcp_client.cpp
2015-08-19 11:26:27 +02:00
asarium
fc140194d3
Fix set but unused variable warning in ddsutils.cpp
2015-08-19 11:26:27 +02:00
asarium
a0b040c597
Fix unused but set variable error
...
I removed some function calls but all of them didn't have any side effects so it should be fine.
2015-08-19 11:26:27 +02:00
asarium
89e63d60b8
Fix warnings in decoder16.cpp
2015-08-19 11:26:26 +02:00
asarium
24a0b05b39
Fix unused but defined variable warning in controlsconfig.cpp
...
It's weird that shift and alt aren't used in this function but I couldn't find any reference to that in the structure for the controls config.
2015-08-19 11:26:26 +02:00
asarium
89f6794a13
Fix C++11 warning in aicode.cpp
2015-08-19 11:26:26 +02:00
asarium
f625df5c38
Fix format warning in aicode.cpp
2015-08-19 11:26:26 +02:00
asarium
37eadf4d16
Disable unreferenced function warning
2015-08-19 11:26:26 +02:00
asarium
a232a646dc
Fix size_t format warnings
2015-08-19 11:26:26 +02:00
asarium
40c81134ac
Fix "format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘long int’" warning
2015-08-19 11:26:26 +02:00
asarium
a63e1a2ba1
Fix invalid usage of mprintf
2015-08-19 11:26:26 +02:00
asarium
f00af4d89f
Fix "declaration of ‘i’ shadows a previous local" warning
2015-08-19 11:26:25 +02:00
asarium
c697dcb926
Fix "comparison between signed and unsigned integer expressions" warning
2015-08-19 11:26:25 +02:00
asarium
29afbe8ef5
Use new macro for size_t printf arguments
2015-08-19 11:26:25 +02:00
asarium
6f01adfb2e
Add portable format macros for size_t and ptrdiff_t
2015-08-19 11:26:25 +02:00
asarium
6a578b3fcd
Fix non-sensical comparision
...
std::string::find_* returns std::string::npos if the token couldn't be found.
2015-08-19 11:26:25 +02:00
MageKing17
048d65d3ca
Makes glide decay work even when not thrusting.
...
For any mods that might want to keep the old behavior, adds "$glide decay requires thrust:" AI profile flag.
2015-08-19 00:50:18 -07:00
MageKing17
e94511b7aa
Add CHA_ONTURRETFIRED support to beam and swarm turrets.
2015-08-19 00:06:11 -07:00
Fabian Woltermann
8b4f7dde77
Merge pull request #277 from MageKing17/bugfix/infinite-trigger-count
...
Fix infinite trigger count not interacting correctly with "+Interval:"
2015-08-19 08:33:12 +02:00
MageKing17
990411fd0b
Merge pull request #286 from Goober5000/woutersmits_fix
...
fix an obscure edge-case sexp crash
2015-08-18 23:30:26 -07:00
Goober5000
bd3cd7eb18
Merge pull request #195 from Echelon9/fix/sort-uniq-includes
...
Review and refactor #include's
2015-08-19 00:05:02 -04:00
Goober5000
17851dcc56
fix an obscure edge-case sexp crash
...
This bug was found by, of all people, woutersmits, while FREDding his happynewyear campaign. See http://www.hard-light.net/forums/index.php?topic=90069.0 for discussion. The crash was triggered by the use of ( validate-all-arguments ) as the entire sexp tree for one of his mission events.
This was a two-part fix. The first part was to ensure that every *-argument sexp (of which validate-all-arguments is but one) is actually used within a when-argument or every-time-argument tree. More specifically, every sexp operation that expects an argument handler should first check that the arg_handler node actually exists.
The second part was to partially revert one of Taylor's old commits:
Revision: 3644
Author: taylor
Date: Tuesday, October 24, 2006 9:17:24 AM
Message:
various bits of cleanup (warning messages, things that Valgrind complained about, etc.)
fix an out-of-bounds issue on Sexp_nodes[] which was leading to stack corruption
----
Modified : /branches/fs2_open_3_6_9/fs2_open/code/parse/sexp.cpp
This was intended to prevent a -1 array reference into Sexp_nodes[]. What Taylor did was to cause repeated calls of the parent_operator function to loop endlessly at the topmost parent. But there are certain edge cases (such as the one woutersmits discovered) where you need to know whether a parent is the topmost one. What Taylor should have done, and what this change does, is to keep the -1 as a valid return value but check for it in the places where it may cause an issue.
2015-08-18 21:32:14 -04:00
MageKing17
062929b8bd
Merge pull request #284 from Goober5000/sexp_assertions
...
various assertions to improve the sexp code
2015-08-18 17:56:39 -07:00
Goober5000
efce7de00d
fix syntax error, add node reference
2015-08-18 19:58:34 -04:00
Goober5000
2b032a1dbc
tweaks per MageKing17's suggestions
2015-08-18 13:27:57 -04:00
m!m
c8053d06b7
Merge pull request #285 from MageKing17/cleanup/hook-variable-removal
...
Cleanup hook variable removal
2015-08-18 17:52:10 +02:00
MageKing17
ce3755b333
Further hook variables cleanup.
...
Consolidated a few sequential calls, corrected a few instances of "ObjectB" being removed when "Object" was set, and removed a couple instances of hook variables that weren't set being removed.
2015-08-18 08:11:11 -07:00
MageKing17
313787effb
Add RemHookVars() calls to aiturret.cpp, object.cpp, and ship.cpp.
...
CHA_ONTURRETFIRED wasn't clearing its hook variables. Neither was CHA_ONWPEQUIPPED or CHA_ONWPFIRED, CHA_PRIMARYFIRE, CHA_SECONDARYFIRE, CHA_ONWPSELECTED, or CHA_ONWPDESELECTED.
2015-08-18 07:58:03 -07:00
niffiwan
578083367d
Merge pull request #283 from Goober5000/comment-fix
...
* remove an incorrect comment (the *= multiplies the variable by the …
2015-08-18 18:34:59 +10:00
Goober5000
e1d3838b2e
various assertions to improve the sexp code
2015-08-18 01:00:43 -04:00
Goober5000
1bf6f822ae
* remove an incorrect comment (the *= multiplies the variable by the entire RHS; it doesn't multiply and then add)
2015-08-18 00:35:51 -04:00
m!m
081eba90e5
Merge pull request #281 from Echelon9/fix/doc-cfile-init
...
Document cfile_init() function.
2015-08-16 18:15:48 +02:00
Echelon9
9487688edb
Document cfile_init() function.
2015-08-17 01:41:37 +10:00
m!m
2240e17413
Merge pull request #278 from Echelon9/fix/doxygen
...
Fix doxygen documentation
2015-08-15 13:29:03 +02:00
Echelon9
bd0fb590ca
Fix incorrect Doxygen comment for bm_lock().
2015-08-15 13:56:54 +10:00
Echelon9
420558d623
Fix incorrect Doxygen comment, there is no type @ret.
2015-08-15 13:55:05 +10:00
Echelon9
6061df4e65
Fix incorrect Doxygen comment for dc_draw_cursor().
2015-08-15 13:53:23 +10:00
Echelon9
830e523408
Fix incorrect Doxygen comment for opengl_shader_link_object() and keep line lengths below recommended 80 characters.
2015-08-15 13:51:23 +10:00
Echelon9
a21dd67d85
Fix incorrect Doxygen comment for opengl_shader_create() and keep line lengths below recommended 80 characters.
2015-08-15 13:49:20 +10:00
Echelon9
0319816539
Fix incorrect Doxygen comment for hud_anim_render().
2015-08-15 13:46:53 +10:00
Echelon9
9bccc64705
Fix incorrect Doxygen comment for free_object_slots().
2015-08-15 13:45:20 +10:00
m!m
81fe1e3952
Merge pull request #276 from MageKing17/bugfix/beam-create-with-coords
...
Fix beam-create with targeting coordinates instead of a ship/subsystem.
2015-08-14 21:27:32 +02:00
MageKing17
488a0f1da2
Fix infinite trigger count not interacting correctly with "+Interval:"
...
There's an undocumented feature whereby negative trigger counts are treated as infinite. However, since it doesn't use the bump_timestamp system of positive trigger counts, it'll behave more like an infinite repeat count (e.g. with "+Interval: 5" it will only check every 5 seconds instead of becoming active again after 5 seconds have passed). This just makes negative values set bump_timestamp and excludes them from resetting the timestamp if the event didn't trigger that frame (checking MEF_USING_TRIGGER_COUNT so that the other behavior is still possible if you set a negative repeat_count and don't specify a trigger_count).
2015-08-14 11:24:47 -07:00
MageKing17
d0cde03a69
Fix beam-create with targeting coordinates instead of a ship/subsystem.
...
If the subsystem was <none>, sexp_beam_floating_fire() wasn't consuming the node, resulting in it also being parsed as the X coordinate (making it always zero, because atoi("<none>") == 0).
2015-08-14 11:20:33 -07:00
Fabian Woltermann
76f67edb36
Merge pull request #275 from MageKing17/bugfix/actually-call-beam-create
...
Make beam-create actually call sexp_beam_floating_fire().
2015-08-14 19:51:29 +02:00
MageKing17
cbeb03b2d5
Make beam-create actually call sexp_beam_floating_fire().
...
Somehow, this got missed during the creation of the pull request, and I guess nobody (not even me) actually tried using it since then.
2015-08-14 10:32:27 -07:00
MageKing17
ef34e5e39e
Merge pull request #272 from MageKing17/bugfix/actually-fix-cargo-size-check
...
Actually fix the `cargo_size` check for turrets.
2015-08-13 18:08:29 -07:00
MageKing17
7b15fe0786
Do a couple more MAX_SHIP_*_BANKS to num_*_banks replacements.
2015-08-13 15:03:31 -07:00
MageKing17
fada4f514e
Make primary weapon cargo_size check first check the WIF2_BALLISTIC flag.
2015-08-13 03:59:52 -07:00
Fabian Woltermann
64f046c388
Merge pull request #273 from MageKing17/bugfix/ammo-sexp-multi-fix
...
Fix writing to undefined memory in multiplayer SEXP code for turret a…
2015-08-13 07:32:14 +02:00
MageKing17
d74d09554e
Fix writing to undefined memory in multiplayer SEXP code for turret ammo.
...
`multi_sexp_set_turret_primary_ammo()` and `multi_sexp_set_turret_secondary_ammo()` were using an uninitialized pointer instead of an uninitialized array, like every other instance of multi_get_string(). This is just begging to write to invalid memory.
2015-08-12 22:02:29 -07:00
MageKing17
d07673cbe1
Actually fix the cargo_size check for turrets.
...
So it turns out it actually was the secondary code triggering the Assertion, because `ship_system->weapons.secondary_bank_weapons[]` was full of 0s. Subach HL-7 is weapon type 0, and obviously doesn't have a `cargo_size`. I see no reason to iterate through `MAX_SHIP_PRIMARY_BANKS`/`MAX_SHIP_SECONDARY_BANKS` if there aren't that many banks being used anyway.
2015-08-12 21:18:37 -07:00
MageKing17
1684b7f85e
Make a few more changes to ship_info based on m!m's notes.
...
Copy constructor and copy-assignment are made private and unimplemented (may cause problems on VS 2010/2013? I have a vague memory of something similar needing to be removed for 2010 to work; we could always wrap 'em in an _MSC_VER check, of course). Speaking of an _MSC_VER check, adds a define for `NOEXCEPT` to `noexcept`, but only if we're not using a version of Visual Studio prior to 2015 (when `noexcept` support was added). It *should* allow the move constructor for ship_info to be used whenever the vector resizes both pre- and post-VS 2015 (and on non-MS compilers), but it could use some testing. ship_info::clone() made public (and used for ship templates instead of copy-assignment), and ship_info::move() now takes a ship_info&& object (and move-assignment/constructor use std::move() to keep it an rvalue).
2015-08-12 20:52:56 -07:00
MageKing17
4fb6f3d459
Changing a Ship_info.size() to !Ship_info.empty() as pointed out by m!m.
2015-08-12 14:39:42 -07:00
MageKing17
439ea76475
Adding static_cast<int>() to locations pointed out by m!m.
2015-08-12 14:39:12 -07:00
MageKing17
529fd197d8
Revert unintended missiongoals.cpp changes from vectorization commit.
...
I may make a separate pull request for this at some point, but it definitely doesn't belong here.
2015-08-12 14:23:36 -07:00
MageKing17
389a1a1a3d
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
2015-08-12 14:10:10 -07:00
m!m
b3aec16833
Merge pull request #271 from MageKing17/bugfix/fix-primary-cargo-size-check
...
Fix cargo size check for primary weapons I screwed up in PR 269.
2015-08-12 23:07:37 +02:00
MageKing17
28d04bfee4
Fix cargo size check for primary weapons I screwed up in PR 269.
...
Should've checked more than just that FRED was working... d'oh.
2015-08-12 14:03:33 -07:00
MageKing17
6985b198ec
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-12 13:25:34 -07:00
MageKing17
1aa7af5167
Merge pull request #263 from Echelon9/fix/printf-issues
...
Resolve numerous format string issues
2015-08-12 13:05:17 -07:00
MageKing17
d953b2e668
Fix the Num_ship_classes reference added by PR #269 to Ship_info.size().
2015-08-11 14:42:21 -07:00
MageKing17
4fc84e61c6
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-11 14:27:48 -07:00
MageKing17
92a5839bb1
Merge pull request #270 from DahBlount/Turret_Ammo_Fix
...
Turret Ammo Fix: Default Bank and Ammo Removal location
2015-08-11 14:20:10 -07:00
MageKing17
b15dfcb906
Merge pull request #269 from MageKing17/bugfix/turret-ammo-FRED-support
...
Hopefully fix FRED and turret ammo.
2015-08-11 14:15:55 -07:00
MageKing17
cd5824073c
Fix another copy-paste error, this time in the assertions.
2015-08-10 10:05:44 -07:00
MageKing17
36f7ac9ee3
Fix another copy-paste error.
...
Well, two copy-paste errors.
2015-08-09 18:12:09 -07:00
DahBlount
5c3d7b0f64
Turret bank fix and ammo removal
...
A turret's current_primary_bank/current_secondary_bank is always
initialized to -1, this is set to 0 if it is still -1 when a turret
tries to fire. Ammo removal for swarm and corkscrew weapons is now done
using a single flag check instead of the original two.
2015-08-09 19:29:16 -05:00
MageKing17
51be6aee77
Fix copy-paste error.
...
Whoops!
2015-08-09 17:21:22 -07:00
MageKing17
d59ee5953d
Make subsys_set() use cargo_size for ammo.
2015-08-09 17:13:19 -07:00
MageKing17
3b43614ae9
Hopefully fix FRED and turret ammo.
...
Adds a get_max_ammo_count_for_turret_bank() function that the weapon editor can use for turrets instead of trying to hack the behavior into get_max_ammo_count_for_bank somehow. Adjusts weaponeditordlg.cpp to use it, and also fixes missionparse.cpp so that ammo values get correctly converted from a percentage to the number of actual missiles (but only when FRED isn't running).
2015-08-09 16:53:50 -07:00
Echelon9
930f386064
Generalise warning string if we can't provide callback operator information.
2015-08-08 18:10:26 +10:00
m!m
4a154e630f
Merge pull request #267 from DahBlount/Turret-ammo-sexp-desc
...
Fix Turret Ammo Setter SEXP Descriptions
2015-08-07 18:05:10 +02:00
DahBlount
5412f16352
Fix the descriptions of the turret ammo setter sexps
...
The setter Sexps incorrectly had the same descriptions as the getter
sexps.
2015-08-07 09:02:43 -07:00
Echelon9
efc4d62bd0
Change s/Error code/Error message/ in GUISystem::ParseClassInfo()
2015-08-06 17:56:53 +10:00
Echelon9
8160cd40dc
Change s/Error code/Error message/ in parse_glowpoint_table()
2015-08-06 17:54:41 +10:00
Fabian Woltermann
3f4861271b
Merge pull request #264 from MageKing17/update/2015-project-files
...
Update the VS 2015 project files.
2015-08-06 09:34:39 +02:00
MageKing17
1ffe2629cf
Add collision_lod and auto_shield_spread_mid_span to clone() and move().
2015-08-06 00:28:04 -07:00
MageKing17
dc80ae0c9a
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-06 00:25:42 -07:00
MageKing17
87ce8a47fc
Update the VS 2015 project files.
...
These are basically just the 2013 project files updated to use the v140_xp toolset, but this gives the MSVC_2015 folder the same improvements that the MSVC_2013 folder got in commit 66bddb9 .
2015-08-06 00:13:41 -07:00
Echelon9
c15e7ec28c
Fix: warning: format not a string literal and no format arguments [-Wformat-security]
2015-08-05 21:07:05 +10:00
Echelon9
aee7ee6322
Fix: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘const char*’ [-Wformat=]
2015-08-05 20:57:21 +10:00
Echelon9
6dd45acb45
Fix: warning: format not a string literal and no format arguments [-Wformat-security]
2015-08-05 20:44:37 +10:00
Echelon9
3385a0a6a3
Fix: warning: format not a string literal and no format arguments [-Wformat-security]
2015-08-05 20:38:10 +10:00
Echelon9
8f9fd97902
Fix: warning: format ‘%d’ expects a matching ‘int’ argument [-Wformat=]
2015-08-05 20:29:41 +10:00
Echelon9
85c8c718bf
Fix missing format string specifier.
2015-08-05 20:20:15 +10:00
Echelon9
4f4449958b
Fix: warning: format ‘%s’ expects a matching ‘char*’ argument [-Wformat=]
2015-08-05 20:14:48 +10:00
Echelon9
cffdbe932f
Fix: warning: format ‘%d’ expects a matching ‘int’ argument [-Wformat=]
2015-08-05 20:12:41 +10:00
Echelon9
81fa44472d
Fix: warning: too many arguments for format [-Wformat-extra-args]
2015-08-05 20:08:02 +10:00
Echelon9
0388fb065c
Fix: warning: format ‘%s’ expects a matching ‘char*’ argument [-Wformat=]
2015-08-05 20:05:19 +10:00
Echelon9
4328134c82
Fix: warning: format not a string literal and no format arguments [-Wformat-security]
2015-08-05 20:00:07 +10:00
Echelon9
e1c38230af
Fix: warning: format not a string literal and no format arguments [-Wformat-security]
2015-08-05 19:59:09 +10:00
Echelon9
9f2a2dd4ed
Ensure sufficient format string specifiers.
2015-08-05 19:57:58 +10:00
Echelon9
13837b07f7
Ensure sufficient format string specifiers are present.
2015-08-05 19:55:03 +10:00
Echelon9
c4ce711171
Ensure sufficient format string specifiers are present.
2015-08-05 19:51:06 +10:00
Echelon9
d686d28053
Ensure sufficient format string specifier.
2015-08-05 19:48:58 +10:00
Echelon9
b260d92898
Fix too many variables for format string.
2015-08-05 19:45:42 +10:00
Echelon9
d14b8b9a79
Fix Error() with two few format string specifiers.
2015-08-05 19:44:21 +10:00
MageKing17
33cd9c6233
Merge pull request #262 from Echelon9/fix/issue261
...
Correct Warning() in parse_startbl
2015-08-05 01:28:39 -07:00
Echelon9
c829808dd7
Correct Warning() in parse_startbl
2015-08-05 16:48:49 +10:00
Fabian Woltermann
aed2b60bcf
Merge pull request #256 from Echelon9/fix/issue255
...
Resolve Coverity-reported incorrect for() loops.
2015-08-03 12:58:13 +02:00
Fabian Woltermann
5b91bee129
Merge pull request #259 from ln-zookeeper/fotg_to_master
...
Added $Collision LOD ship table property, for using a LOD for collisi…
2015-08-03 12:57:47 +02:00
Lari Nieminen
1bf86532fe
Added $Collision LOD ship table property, for using a LOD for collision detection
2015-08-03 13:20:14 +03:00
MageKing17
f5259eb6be
Merge pull request #258 from Echelon9/fix/issue257
...
Add correct argument to printf format string.
2015-08-03 02:22:35 -07:00
Echelon9
bdc90c007b
Ensure grammar works as a whole.
2015-08-03 19:04:10 +10:00
Echelon9
88ca967d3f
Improve the warning documentation associated with a faulty ship copy flag.
2015-08-03 19:03:17 +10:00
Echelon9
9ea2ae4299
Add correct argument to printf format string.
2015-08-03 18:01:13 +10:00
Echelon9
3b26eb85ae
Resolve Coverity-reported incorrect for() loops.
2015-08-02 20:02:44 +10:00
Fabian Woltermann
4aab4a969a
Merge pull request #249 from asarium/printf_checks
...
Add format specifying macros
2015-08-01 07:47:22 +02:00
m!m
0f2562a29c
Merge pull request #254 from The-E/better_assertions
...
Make this assertion in modelanim a bit more useful.
2015-07-31 22:43:36 +02:00
The E
0450ce7621
Make this assertion in modelanim a bit more useful.
2015-07-31 22:25:25 +02:00
Fabian Woltermann
44c4c7de76
Merge pull request #251 from DahBlount/turret_ammo
...
Turret Ammo Implementation
2015-07-31 11:45:01 +02:00
Fabian Woltermann
aff0328b4f
Merge pull request #253 from jg18/fix_openal_log
...
Log OpenAL info for selected device.
2015-07-31 11:44:11 +02:00
jg18
b50bd7586c
Log OpenAL info for selected device.
...
Fix the issue pointed out by Yarn where the OpenAL info for the default
device was being logged instead of the info for the selected
device. http://www.hard-light.net/forums/index.php?topic=90070.0 .
2015-07-30 15:27:36 -07:00
DahBlount
d973c9e147
Add cases for turret ammo setter multi_sexps
...
Can't believe I forgot this part. This just ensures the sexps actually
work.
2015-07-30 15:22:31 -05:00
DahBlount
9e3cb6baa3
Multi_SEXP Turret Ammo Functions
...
This adds multiplayer functionality to the Turret getter and setter
SEXPs.
2015-07-30 15:06:04 -05:00
DahBlount
0fd43dad75
Turret Ammo SEXPs
...
This adds getter and setter SEXPs for turret ammo.
"turret-get-primary-ammo"
"turret-get-secondary-ammo"
"turret-set-primary-ammo"
"turret-set-secondary-ammo"
I also forgot to make turrets that don't have the "use multiple guns"
flag set switch banks if their first bank is empty, so that has been
fixed as well.
2015-07-29 12:25:24 -05:00
DahBlount
688baa2bb6
Turret Ammo Implementation
...
This creates the foundation of turret ammo through the "turret use ammo" subsystem flag. Turret ammo works in the same manner as ship ammo, where the ammo is equal to bank capacity divided by the cargo size of the weapon. This was tested using the Blue Planet: War in Heaven mod.
Test case: UEFg Narayana turrets 19 through 21, all of which contain Apocalypse torpedos with a $Cargo Size: of 2.5, were changed to use ammo with a $SBank Capacity of 20, resulting in a total ammo capacity of 8 torpedos. The Narayana was ordered to attack a GTCv Diomedes; it fired 8 torpedos each from turrets 19 through 21 before stopping. The mission was left to proceed for an additional 2 minutes, in which time the Narayana did not fire any more torpedos. Note: The Apocalypse takes 20 seconds to fire each 4 torpedo burst.
Conclusion: Success
2015-07-28 12:32:08 -05:00
Cliff Gordon
1b3af6fea6
Merge pull request #245 from ln-zookeeper/fotg_to_master
...
Added a +Minimum Weapon Span auto spread shield option to control the…
2015-07-27 09:12:02 -05:00
asarium
d93f2e9d26
Add format specifying macros
2015-07-26 14:08:31 +02:00
Lari Nieminen
cacad0ba70
Fixed possibility of +Minimum Weapon Span breaking with modular tables.
2015-07-25 01:14:03 +03:00
MageKing17
1b514de28e
Merge pull request #247 from chief1983/fix/cid_1204285_divide_by_zero
...
[fix/cid_1204285_divide_by_zero] Fix CID 1204285: Division by zero
2015-07-24 13:49:05 -07:00
Cliff Gordon
f47bbed3ef
[fix/cid_1204285_divide_by_zero] Fix CID 1204285: Division by zero in set_currentItem()
2015-07-24 11:59:02 -05:00
MageKing17
33d83fe4fe
Merge pull request #246 from ln-zookeeper/master
...
Fixed bug with ship-ship collisions incorrectly choosing which quadra…
2015-07-24 00:32:35 -07:00
Lari Nieminen
202a4077a4
Fixed bug with ship-ship collisions incorrectly flashing a shield quadrant on the light ship.
2015-07-24 10:08:59 +03:00
Lari Nieminen
7b2c992380
Added a +Minimum Weapon Span auto spread shield option to control the minimum distance weapons must have traveled before being allowed to hit the shield.
2015-07-21 21:59:31 +03:00
Cliff Gordon
ce69e7179e
Merge pull request #243 from chief1983/fix/sse_fred_name
...
Fix the output Fred SSE target name.
2015-07-18 18:46:48 -05:00
Cliff Gordon (chief1983)
fc6765144d
Fix the output Fred SSE target name. Edited in VS2013 which fixed the file's line endings to CRLF.
2015-07-18 11:02:01 -05:00
Fabian Woltermann
ce22e3a0d4
Merge pull request #239 from PeterMitsis/math-refactoring
...
Math refactoring
2015-07-17 13:35:42 +02:00
Fabian Woltermann
be628af117
Merge pull request #223 from ln-zookeeper/master
...
Fixes Mantis #2436 : Mouse controls ignore the axis binds.
2015-07-17 13:16:58 +02:00
Peter Mitsis
83d00839ed
fvi: Refactor solution to quadratic formula
...
The classic solution to the quadratic equation ...
a*x*x + b*x + c = 0
is ...
-b +- sqrt(b*b - 4*ac)
x = ----------------------
2*a
This can be optimized by substituting b = 2*B.
-2*B +- sqrt((2*B)*(2*B) - 4*a*c)
x = ---------------------------------
2*a
This expands to ...
-2*B +- sqrt(4*B*B - 4*a*c)
x = ---------------------------
2*a
And simplifies to ...
-2*B +- 2*sqrt(B*B - 4*a*c)
x = ---------------------------
2*a
-B +- sqrt(B*B - a*c)
x = ---------------------
a
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-15 09:18:47 -04:00
Peter Mitsis
b72cf669b8
Refactor bez_fact()
...
Uses an array of precalculated factorials that are accessed as a lookup table
instead of computing the factorials at runtime. This cuts down on compiled
code bloat (compiler was both unrolling and inlining the computation's loop)
everywhere it was used.
NOTE: The original implementation returned an 'int'. As a result, the largest
uncorrupted factorial it could compute was 12!. For this reason, the lookup
table only goes up to 12!.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-15 09:08:19 -04:00
Peter Mitsis
9d3dd5c322
Refactor macros fl_radians() and fl_degrees()
...
Rejiggers the macros fl_radians() and fl_degrees() to avoid unnecessary
operations. The new placement of the parentheses permit the compiler to
evaluate (PI / 180.f) and (180.f / PI) at compile time rather than run time.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-15 09:08:19 -04:00
Fabian Woltermann
5f39c386ef
Merge pull request #234 from Echelon9/fix/clean-build
...
Clean up GCC build warnings
2015-07-12 09:54:30 +02:00
Echelon9
3e8278d698
Fix: model/modelread.cpp: warning: variable ‘flags’ set but not used [-Wunused-but-set-variable]
2015-07-11 22:47:25 +10:00
Echelon9
37cf848f51
Fix: model/modelrender.cpp:2898:9: warning: declaration of ‘view_pos’ shadows a previous local [-Wshadow]
2015-07-11 22:36:42 +10:00
Echelon9
95f615a894
Fix: bmpman/bmpman.cpp: warning: enumeration value ‘x’ not handled in switch [-Wswitch]
2015-07-11 22:30:12 +10:00
Echelon9
bae2d3116b
Fix: controlconfig/controlsconfig.cpp:2116:13: warning: declaration of ‘j’ shadows a previous local [-Wshadow]
2015-07-11 22:15:49 +10:00
Echelon9
542c794e72
Fix: object/collideshipship.cpp:1159:12: warning: variable ‘q’ set but not used [-Wunused-but-set-variable]
2015-07-11 22:08:52 +10:00
Echelon9
d029b82d98
Fix: ai/aicode.cpp:11855:9: warning: variable ‘dist_to_f2’ set but not used [-Wunused-but-set-variable]
2015-07-11 22:04:41 +10:00
Echelon9
ad8064ef81
Fix warning: variable ‘dist’ set but not used [-Wunused-but-set-variable]
2015-07-11 21:58:07 +10:00
Echelon9
a4e12d135b
Fix: ai/aibig.cpp:1266:10: warning: variable ‘box_dist’ set but not used [-Wunused-but-set-variable]
2015-07-11 21:39:49 +10:00
Echelon9
053ae6d287
Fix: modelrender.h:86:7: warning: ‘model_render_params::Replacement_textures’ will be initialized after [-Wreorder]
2015-07-11 21:28:01 +10:00
Fabian Woltermann
15bceee125
Merge pull request #232 from asarium/fix/snd_cfile
...
Fixes Mantis 3168: snd_load leaks cfile handles if it can't parse a file.
2015-07-11 12:29:42 +02:00
Echelon9
08e50885cb
Fix: warning: ‘opengl_vertex_buffer::ibo_size’ will be initialized after [-Wreorder]
2015-07-11 20:18:34 +10:00
asarium
e6dbb28b48
Fix for Mantis 3168: snd_load leaks cfile handles if it can't parse a file.
2015-07-11 11:36:21 +02:00
Echelon9
1e151865d4
Fix: object/collideshipweapon.cpp:67:185: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:45:38 +10:00
Echelon9
c2a2ef5682
Fix: object/collideshipweapon.cpp:39:63: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:42:15 +10:00
Echelon9
3acc777afe
Fix: model/modelread.cpp: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:40:12 +10:00
Echelon9
aa7bd5bf2c
Fix: asteroid/asteroid.cpp:1614:99: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:32:36 +10:00
Echelon9
ca2cd63a95
Fix: asteroid/asteroid.cpp:949:10: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:30:55 +10:00
Echelon9
1787b95498
Fix: ai/aicode.cpp:14896:75: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:28:59 +10:00
Echelon9
2586198e0e
Fix: asteroid/asteroid.cpp:1653:68: warning: declaration of ‘asteroid_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:14:38 +10:00
Echelon9
b7e76de184
Fix: asteroid/asteroid.cpp:1614:98: warning: declaration of ‘asteroid_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:12:27 +10:00
Echelon9
f656232030
Fix: asteroid/asteroid.cpp:1477:50: warning: declaration of ‘asteroid_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:10:02 +10:00
Echelon9
e4e3064bea
Fix: asteroid/asteroid.cpp:1363:92: warning: declaration of ‘asteroid_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:07:37 +10:00
Echelon9
f804539a15
Fix: debris/debris.cpp:846:10: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:04:25 +10:00
Echelon9
ca9ae8bb8e
Fix: nebula/neb.cpp:1422:37: warning: declaration of ‘eye’ shadows a global declaration [-Wshadow]
2015-07-06 23:01:21 +10:00
Echelon9
767b39fbbc
Fix: nebula/neb.cpp:1416:33: warning: declaration of ‘eye’ shadows a global declaration [-Wshadow]
2015-07-06 22:59:55 +10:00
Echelon9
6d0996d90c
Fix: graphics/grstub.cpp:736:71: warning: declaration of ‘shader’ shadows a global declaration [-Wshadow]
2015-07-06 22:57:12 +10:00
Echelon9
294cf79e04
Fix: graphics/gropenglshader.cpp: warning: declaration of ‘shader’ shadows a global declaration [-Wshadow]
2015-07-06 22:54:10 +10:00
Echelon9
b7864cd2aa
Fix: graphics/gropenglshader.cpp:231:73: warning: declaration of ‘shader’ shadows a global declaration [-Wshadow]
2015-07-06 22:52:01 +10:00
Echelon9
4bf5f15f72
Fix: graphics/gropenglpostprocessing.cpp:682:79: warning: declaration of ‘shader’ shadows a global declaration [-Wshadow]
2015-07-06 22:49:38 +10:00
Echelon9
4a0e3b4c40
Fix: graphics/generic.cpp:35:117: warning: declaration of ‘anim’ shadows a global declaration [-Wshadow]
2015-07-06 22:46:23 +10:00
Echelon9
3860951b6c
Fix: graphics/*.cpp warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-06 22:36:10 +10:00
Echelon9
54003a2622
Fix: debris/debris.cpp:850:10: warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-06 22:30:50 +10:00
Echelon9
b7bc60708c
Fix: asteroid/asteroid.cpp:953:10: warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-06 22:29:04 +10:00
Echelon9
dc5651ab70
Fix: object/collideshipship.cpp:539:10: warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-06 22:26:31 +10:00
Echelon9
f12dc5478b
Fix: ai/aicode.cpp: warning: declaration of ‘color’ shadows a global declaration [-Wshadow]
2015-07-06 22:19:28 +10:00
Echelon9
8051bac868
Fix: ai/aigoals.cpp:203:48: warning: declaration of ‘ai_goal’ shadows a global declaration [-Wshadow]
2015-07-06 22:15:18 +10:00
Echelon9
d94823ef77
Fix: graphics/gropenglbmpman.cpp:561:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2015-07-06 21:47:01 +10:00
Echelon9
eda6f33d77
Fix: graphics/gropenglbmpman.cpp:561:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2015-07-06 21:41:31 +10:00
Echelon9
9db610ef2c
Fix: network/multiutil.cpp:692:76: warning: declaration of ‘net_player’ shadows a global declaration [-Wshadow]
2015-07-06 21:30:27 +10:00
Echelon9
2b8ef9e1fd
Fix: graphics/2d.cpp:2142:1: warning: declaration of ‘team_color’ shadows a global declaration [-Wshadow]
2015-07-06 21:19:56 +10:00
Echelon9
1aa858a164
Fix: graphics/2d.cpp:1874:7: warning: variable ‘t0’ set but not used [-Wunused-but-set-variable]
2015-07-06 21:17:48 +10:00
Echelon9
aae7c47748
Fix: lab/lab.cpp:943:9: warning: declaration of ‘j’ shadows a previous local [-Wshadow]
2015-07-06 21:14:45 +10:00
Echelon9
53164a169c
Fix: mission/missioncampaign.cpp:1200:12: warning: declaration of ‘mission’ shadows a global declaration [-Wshadow]
2015-07-06 21:12:11 +10:00
Echelon9
fe1b607214
Fix: mission/missioncampaign.cpp:1012:12: warning: declaration of ‘mission’ shadows a global declaration [-Wshadow]
2015-07-06 21:08:00 +10:00
Echelon9
040d157644
Fix: mission/missioncampaign.cpp:1088:12: warning: declaration of ‘mission’ shadows a global declaration [-Wshadow]
2015-07-06 21:03:30 +10:00
Echelon9
475155d62f
Fix: mission/missioncampaign.cpp:1600:6: warning: declaration of ‘mission’ shadows a global declaration [-Wshadow]
2015-07-06 20:58:53 +10:00
Echelon9
85a0bda946
Fix: model/modelanim.cpp:536:78: warning: declaration of ‘anim’ shadows a global declaration [-Wshadow]
2015-07-06 20:54:14 +10:00
Echelon9
f2c8aa665f
Fix: missionui/missionshipchoice.cpp:923:9: warning: declaration of ‘header’ shadows a global declaration [-Wshadow]
2015-07-06 19:51:45 +10:00
Fabian Woltermann
181098e1e4
Merge pull request #230 from PeterMitsis/math-optimizations
...
math/vecmat optimizations
2015-07-06 02:42:14 -07:00
Echelon9
66257146b7
Fix: model/modelcollide.cpp:1215:36: warning: declaration of ‘mc_info’ shadows a global declaration [-Wshadow]
2015-07-06 19:40:21 +10:00
Echelon9
60d1234abd
Fix: model/modelread.cpp:270:12: warning: declaration of ‘i’ shadows a previous local [-Wshadow]
2015-07-05 17:13:01 +10:00
Echelon9
2bac9ba5fa
Fix: model/modelrender.cpp:780:55: warning: declaration of ‘color’ shadows a global declaration [-Wshadow]
2015-07-05 17:07:39 +10:00
Echelon9
6e273ccd7f
Fix: gamehelp/contexthelp.cpp:391:9: warning: declaration of ‘font’ shadows a global declaration [-Wshadow]
2015-07-05 17:01:37 +10:00
Echelon9
4885807d82
Fix: iff_defs/iff_defs.cpp:68:4: warning: declaration of ‘temp_color_t’ shadows a previous local [-Wshadow]
2015-07-05 16:57:35 +10:00
Echelon9
444f830fdc
Fix: network/multi_voice.cpp: warning: parameter set but not used [-Wunused-but-set-parameter]
2015-07-05 16:51:16 +10:00
Echelon9
e98d84314a
Fix: network/multimsgs.cpp:8473:70: warning: declaration of ‘bolt_type’ shadows a global declaration [-Wshadow]
2015-07-05 16:44:48 +10:00
Echelon9
5e9fd26028
Fix: network/multimsgs.cpp:8493:7: warning: declaration of ‘bolt_type’ shadows a global declaration [-Wshadow]
2015-07-05 16:42:24 +10:00
Echelon9
3a3e901249
Fix: network/multiteamselect.cpp:1720:7: warning: declaration of ‘wing’ shadows a global declaration [-Wshadow]
2015-07-05 16:40:04 +10:00
Echelon9
1f8c1dccde
Fix: object/collidedebrisweapon.cpp:100:10: warning: declaration of ‘weapon’ shadows a global declaration [-Wshadow]
2015-07-05 16:35:11 +10:00
Echelon9
0dc48f8470
Fix: object/collidedebrisweapon.cpp:45:10: warning: declaration of ‘weapon’ shadows a global declaration [-Wshadow]
2015-07-05 16:32:57 +10:00
Echelon9
83a8b2bee5
Fix: object/collideshipship.cpp:457:115: warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-05 16:27:21 +10:00
Echelon9
2c4fb4286c
Fix: object/collideshipweapon.cpp:470:10: warning: declaration of ‘weapon’ shadows a global declaration [-Wshadow]
2015-07-05 16:19:20 +10:00
Echelon9
570f6dd581
Fix: object/collideshipship.cpp:1316:138: warning: declaration of ‘mc_info’ shadows a global declaration [-Wshadow]
2015-07-05 16:14:24 +10:00
Echelon9
b326e77574
Fix: object/collideshipweapon.cpp:543:85: warning: declaration of ‘weapon’ shadows a global declaration [-Wshadow]
2015-07-05 15:55:15 +10:00
Echelon9
6d6d3e99e5
Fix: object/collideweaponweapon.cpp:168:10: warning: variable ‘dist’ set but not used [-Wunused-but-set-variable]
2015-07-05 14:25:53 +10:00
Echelon9
c7045147f3
Fix: object/collideshipship.cpp:1316:126: warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-05 14:17:53 +10:00
Peter Mitsis
3495b190d4
Streamline vm_quaternion_rotate()
...
Calculates sinf(theta * 0.5) once only instead of three times.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:31 -04:00
Peter Mitsis
62a7865f94
Streamline vm_angle_2_matrix()
...
The values of sin(0) and cos(0) are well known and do not need to be calculated
at run time.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:31 -04:00
Peter Mitsis
8193dbb316
Streamline vm_vec_avg_n()
...
Instead of performing three consecutive divisions, vm_vec_avg_n() now performs
one division at the start and three multiplications at the end. Recall that
multiplication is faster than division.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:31 -04:00
Peter Mitsis
95d1701794
Remove unnecessary checking before atan2_safe()
...
The routine atan2_safe() already contains a test that checks if both parameters
are zero--that is the point of the routine. Thus, there is no need for the
caller of atan2_safe() to perform that same check.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:31 -04:00
Peter Mitsis
945f655e0e
Remove unnecessary vm_vec_normalize() checks
...
The routine vm_vec_normalize() always returns a value greater than zero.
Thus, there is no need to test its return value for values that are less
than or equal to zero.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:31 -04:00
Peter Mitsis
11b65fe0bf
Remove unnecessary vm_vec_copy_normalize() checks
...
The routine vm_vec_copy_normalize() always returns a value greater than zero.
Thus, there is no need to test its return value for values that are less than
or equal to zero.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:27 -04:00
Echelon9
6618165926
Fix: model/modelinterp.cpp:4342:14: warning: declaration of ‘j’ shadows a previous local [-Wshadow]
2015-07-05 00:59:13 +10:00
Echelon9
6950c69ebb
Fix: model/modelinterp.cpp:2034:44: warning: declaration of ‘gpoi’ shadows a previous local [-Wshadow]
2015-07-05 00:54:29 +10:00
Echelon9
b8ff93dad2
Fix: model/modelinterp.cpp:2603:43: warning: declaration of ‘gpoi’ shadows a previous local [-Wshadow]
2015-07-05 00:52:39 +10:00
Echelon9
c220480075
Fix: lab/lab.cpp:2497:45: warning: declaration of ‘color’ shadows a global declaration [-Wshadow]
2015-07-05 00:40:13 +10:00
Echelon9
182b297af4
Fix: model/modelrender.cpp:2560:10: warning: variable ‘objp’ set but not used [-Wunused-but-set-variable]
2015-07-05 00:30:34 +10:00
Echelon9
a0527afd55
Fix: ship/ship.cpp:3132:14: warning: declaration of ‘i’ shadows a previous local [-Wshadow]
2015-07-05 00:04:05 +10:00
Echelon9
9283ff8227
Fix: controlconfig/controlsconfig.cpp:669:9: warning: variable ‘k’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:51:24 +10:00
Echelon9
769e98fe4c
Fix: controlconfig/controlsconfig.cpp:669:9: warning: variable ‘j’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:46:38 +10:00
Echelon9
3c48d81a52
Fix: controlconfig/controlsconfig.cpp:1443:27: warning: variable ‘len’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:41:59 +10:00
Echelon9
7f100c439a
Fix: controlconfig/controlsconfig.cpp:1442:18: warning: variable ‘jptr’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:34:40 +10:00
Echelon9
481ec12450
Fix: bmpman/bmpman.cpp:2671:12: warning: variable ‘bmp’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:29:00 +10:00
Echelon9
312648668c
Fix: anim/animplay.cpp:257:25: warning: variable ‘render_time’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:20:18 +10:00
Echelon9
f4aa493f59
Fix: anim/animplay.cpp:257:25: warning: variable ‘decompress_time’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:16:08 +10:00
Echelon9
039ad64a33
Fix: ai/aicode.cpp:10715:9: warning: variable ‘dist’ set but not used [-Wunused-but-set-variable]
2015-07-04 19:03:09 +10:00
Echelon9
c83a2ea2e8
Fix: ai/aicode.cpp:8169:24: warning: variable ‘time_to_enemy’ set but not used [-Wunused-but-set-variable]
2015-07-04 18:58:10 +10:00
Echelon9
edbedeb84a
Fix: ai/aicode.cpp:8017:10: warning: variable ‘eshipp’ set but not used [-Wunused-but-set-variable]
2015-07-04 17:39:44 +10:00
Echelon9
d855154fa9
Fix: graphics/gropenglshader.cpp:387:7: warning: variable ‘in_error’ set but not used [-Wunused-but-set-variable]
2015-07-04 17:33:22 +10:00
Echelon9
7fea629121
Fix: graphics/gropengltnl.cpp:696:8: warning: variable ‘rval’ set but not used [-Wunused-but-set-variable]
2015-07-04 17:10:17 +10:00
Echelon9
183f0615e2
Fix: graphics/gropengltnl.cpp:812:6: warning: variable ‘render_pass’ set but not used [-Wunused-but-set-variable]
2015-07-04 17:08:41 +10:00
Echelon9
e9330b4f5f
Fix: graphics/gropengltnl.cpp:1378:6: warning: variable ‘zbuff’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:52:50 +10:00
Echelon9
785398657c
Fix: menuui/readyroom.cpp:1175:15: warning: variable ‘z’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:22:59 +10:00
Echelon9
fff2d5280c
Fix: model/modelrender.cpp:2560:8: warning: variable ‘shipp’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:18:38 +10:00
Echelon9
cd503fd2e4
Fix: object/objcollide.cpp:1247:8: warning: variable ‘max’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:10:15 +10:00
Echelon9
e7e046f949
Fix: object/objcollide.cpp:1248:8: warning: variable ‘overlap_min’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:08:40 +10:00
Echelon9
6e6ff3c7c0
Fix: object/objectsort.cpp: warning: variable ‘wp’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:06:13 +10:00
Echelon9
4f4fe00b97
Fix: ship/ship.cpp:18381:6: warning: variable ‘clip_started’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:01:36 +10:00
Echelon9
98d6b6ce8b
Fix: weapons.cpp:7374:8: warning: variable ‘clip_plane’ set but not used [-Wunused-but-set-variable]
2015-07-04 15:55:15 +10:00
Goober5000
a47ac6c5ee
Merge pull request #211 from Echelon9/fix/janitorial-changes
...
Janitorial changes
2015-07-02 14:47:55 -04:00
Goober5000
da79469606
Merge pull request #224 from Echelon9/fix/issue196
...
Passing value 2.0 to asin() leads to implementation-defined result
2015-07-02 14:40:29 -04:00
Echelon9
a93215f781
Ensure input domain to asin() does not lead to irrational results (implementation defined behaviour)
2015-07-01 23:15:36 +10:00
Echelon9
58f7fb247b
Document ai_update_aim() after touching the function
2015-07-01 23:07:17 +10:00
Echelon9
aa1feb0799
Refrain from unnecessarily passing a pointer to global object to ai_update_aim()
2015-07-01 23:07:17 +10:00
Echelon9
833e7b1d7a
Ensure consistent capitalisation of ai_update_aim() parameter.
2015-07-01 23:07:17 +10:00
Echelon9
b2a07f19c2
Remove redundant parameter to compute_time_to_enemy(). Function doesn't need a pointer to the enemy objp, where it uses distance directly instead.
2015-07-01 23:07:17 +10:00
Echelon9
b38e153861
Remove redundant parameter to prioritize_goals().
2015-07-01 23:07:17 +10:00
Echelon9
39188f7926
Remove redundant parameter to ai_ignore_wing().
2015-07-01 23:07:17 +10:00
Echelon9
29fa74fd63
Remove redundant parameter to draw_brackets_diamond_quick().
2015-07-01 23:07:17 +10:00
Echelon9
8e018c5338
Clean up load_animating_pointer().
2015-07-01 23:07:17 +10:00
Echelon9
0810ae08de
Clean up definition of asteroid_process_pre().
2015-07-01 23:07:16 +10:00
Echelon9
366d409da4
Clean up definition of asteroid_process_post().
2015-07-01 23:07:16 +10:00
Goober5000
2434365103
Merge pull request #219 from PeterMitsis/fvi_apply_const_and_static_keywords
...
math/fvi: apply const and static keywords
2015-06-30 11:11:17 -04:00
Goober5000
bd18c88198
Merge pull request #77 from chief1983/fix/nat_multiplayer
...
[fix/nat_multiplayer] Fix for multiple users behind a NAT
2015-06-29 21:33:10 -04:00
Cliff Gordon
6e0f9c1cd2
[fix/nat_multiplayer] Simplify the new psnet check.
2015-06-29 16:51:49 -05:00
Cliff Gordon
5311ea4f7a
[fix/nat_multiplayer] Vestigare's submitted patch for allowing multiple users behind a NAT to connect to a remote standalone.
2015-06-29 16:50:06 -05:00
Lari Nieminen
09dfcf559e
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-06-28 18:13:51 +03:00
Cliff Gordon
0a9ae3eb46
Merge pull request #222 from scp-fs2open/revert-113-coverity/1298257
...
Revert "Fix Coverity 1298257: Uninitialized scalar var"
2015-06-28 10:00:42 -05:00
Peter Mitsis
7a59192bbb
More application of static and const keywords
...
Applies the const and static keywords to the recently restored routines.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-28 09:09:26 -04:00
Fabian Woltermann
6a0e550aac
Revert "Fix Coverity 1298257: Uninitialized scalar var"
2015-06-28 13:59:13 +02:00
Lari Nieminen
da71e629b4
Fixes Mantis #2436 : Mouse controls ignore the axis binds.
2015-06-28 14:42:17 +03:00
Peter Mitsis
ca07a428e3
Revert "Remove nine unused routines from math/fvi module"
...
This reverts commit 8cdabf6a23 .
Conflicts:
code/math/fvi.cpp
2015-06-28 07:20:34 -04:00
Fabian Woltermann
150a00a17a
Merge pull request #209 from ln-zookeeper/master
...
Fixes and enhancements for detail boxes and spheres
2015-06-27 11:43:56 +02:00
Fabian Woltermann
bdf844fc83
Merge pull request #113 from niffiwan/coverity/1298257
...
Fix Coverity 1298257: Uninitialized scalar var
2015-06-27 11:28:19 +02:00
Fabian Woltermann
464d49d182
Merge pull request #212 from Echelon9/fix/mantis3137
...
Fix Mantis 3137
2015-06-26 13:43:55 +02:00
Fabian Woltermann
3386dc6f20
Merge pull request #218 from asarium/fix/hudmessageIterator
...
Fix usage of invalid iterator in hudmessage.cpp
2015-06-26 13:42:14 +02:00
Fabian Woltermann
ff76a32508
Merge pull request #216 from Echelon9/fix/color-struct-alignment
...
Improve alignment of color struct
2015-06-26 13:41:31 +02:00
asarium
6b95037dcc
Fix usage of invalid iterator.
2015-06-25 18:22:51 +02:00
Peter Mitsis
3cb0c72ced
Apply static and const keywords to math/fvi module
...
Improves readability. It also has the potential to help the compiler make
better decisions.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-25 07:51:53 -04:00
Echelon9
2cf8d0cc98
Improve alignment of color struct (28 bytes -> 24 bytes, c.14%).
2015-06-25 23:39:17 +12:00
Peter Mitsis
8cdabf6a23
Remove nine unused routines from math/fvi module
...
Removes the following unused routines ...
1. accurate_square_root()
2. fvi_point_dist_plane()
3. fvi_segment_plane()
4. fvi_sphere_perp_edge()
5. check_sphere_point()
6. fvi_check_sphere_sphere()
7. fvi_cull_polyface_sphere()
8. fvi_closest_point_on_line_segment()
9. fvi_closest_line_line()
2015-06-25 07:03:59 -04:00
Lari Nieminen
e0605f125c
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-06-25 13:07:41 +03:00
Fabian Woltermann
911f3d647f
Merge pull request #214 from Echelon9/fix/issue213
...
Avoid shadowed declaration of previous local 'gpoi'
2015-06-25 10:09:23 +02:00
Echelon9
2ca1f40d98
Avoid shadowed declaration of previous local 'gpoi'
2015-06-25 17:20:10 +12:00
Echelon9
b5610a5005
Proposed refactor of #Cutscenes in mission files, per wiki documentation.
2015-06-25 16:56:24 +12:00
Goober5000
341fdd3589
Merge pull request #207 from Echelon9/fix/issue206
...
Resolve order of precedence compiler warning.
2015-06-25 00:43:10 -04:00
Echelon9
7f673c8ab6
Goober5000 code review: consistency change.
2015-06-25 16:25:35 +12:00
Echelon9
ce6179a58f
Resolve order of precedence compiler warning.
2015-06-25 14:27:31 +12:00
Fabian Woltermann
83fc90c74b
Merge pull request #210 from chief1983/fix/205_cleanup
...
Fix/205 cleanup
2015-06-24 15:11:59 +02:00
Cliff Gordon (chief1983)
8c73f39e6e
Remove the files from PR 205 via IDE.
2015-06-24 00:06:29 -05:00
Cliff Gordon (chief1983)
8efaf28a8a
Revert "Fixed project files for all MSVS versions that support vcxproj"
...
This reverts commit 610f8a2ff3 .
2015-06-23 22:37:35 -05:00
Cliff Gordon (chief1983)
8a3cc22605
Revert "Remove references to AVX from VS2010 project"
...
This reverts commit 3205f42dc2 .
2015-06-23 22:37:15 -05:00
Lari Nieminen
fc9acb3a4d
Added support for detail box $box_offset.
2015-06-24 00:48:07 +03:00
Lari Nieminen
2e012969e7
Fixed detail sphere $offset not working right.
2015-06-24 00:44:13 +03:00
Lari Nieminen
84b7a06a44
Restored ability to combine detail boxes and spheres.
2015-06-23 19:53:18 +03:00
Lari Nieminen
8fd09be8a0
Replaced the static Interp_render_* variables with normal local ones.
2015-06-23 19:50:17 +03:00
Fabian Woltermann
83a7e862ae
Merge pull request #205 from Echelon9/fix/cleanup-empty-files
...
Cleanup empty files
2015-06-23 11:32:48 +02:00
Echelon9
85428f5eb4
Remove added <MinimalRebuild> option to MSVC_2012.
2015-06-23 18:44:31 +10:00
Fabian Woltermann
e73dbd1647
Merge pull request #170 from z64555/parselo
...
Organizes required_string(); Doxy's required_string() and required_st…
2015-06-23 10:16:59 +02:00
Fabian Woltermann
b11497d075
Merge pull request #183 from ln-zookeeper/master
...
Added a "no-secondary-lock-on" ship flag to disable secondary homing.
2015-06-23 10:16:24 +02:00
Fabian Woltermann
14ed049331
Merge pull request #198 from Echelon9/fix/issue197
...
Update format string specifier to unsigned int (mainhallmenu.cpp)
2015-06-23 10:14:38 +02:00
Rhys Kidd
00d4271550
Merge pull request #1 from The-E/fix/cleanup-empty-files
...
Fixed project files for all MSVS versions that support vcxproj
2015-06-23 18:14:20 +10:00
Fabian Woltermann
ff22d7b9a6
Merge pull request #200 from Echelon9/fix/issue199
...
Retval of bm_get_size (int handle) should be a size_t
2015-06-23 10:14:18 +02:00
Fabian Woltermann
ce3bb0a6a9
Merge pull request #202 from Echelon9/fix/issue201
...
Retval of bm_page_out(int handle) should be a bool
2015-06-23 10:14:00 +02:00
Fabian Woltermann
4c55ad45a0
Merge pull request #204 from Echelon9/fix/issue203
...
Retval of bm_has_alpha_channel(int handle) should be a bool
2015-06-23 10:13:34 +02:00
The_E
3205f42dc2
Remove references to AVX from VS2010 project
2015-06-23 10:11:24 +02:00
The_E
610f8a2ff3
Fixed project files for all MSVS versions that support vcxproj
2015-06-23 10:03:08 +02:00
Echelon9
0fde8c3925
Update Xcode 4+ project file for removal of empty files.
2015-06-23 16:05:01 +10:00
Echelon9
8ba1ddbbc2
Makefile removal of references to missionui/missionstats.[cpp|h].
2015-06-23 14:52:58 +10:00
Echelon9
3af13b603d
Remove empty missionui/missionstats.[cpp|h].
2015-06-23 14:46:42 +10:00
Echelon9
54508b6429
Makefile and source code removal of references to ai/ailocal.h
2015-06-23 14:39:43 +10:00
Echelon9
b62196dc0d
Remove empty ai/ailocal.h
2015-06-23 14:32:02 +10:00
Echelon9
8eeff0e06c
Remove missionrecommend.[cpp|h] from Makefile.
2015-06-23 14:30:01 +10:00
Echelon9
da9d363230
Remove empty missionrecommend.[cpp|h] files.
2015-06-23 14:23:28 +10:00
Echelon9
cb617b5e9f
Modify usage of bm_has_alpha_channel that needs to pass int to the OpenGL driver. Use ternary operator.
2015-06-23 14:05:58 +10:00
Echelon9
130a148816
Remove TODO doxygen comment.
2015-06-23 13:59:10 +10:00
Echelon9
33cae6930c
Amend retval in declaration and definition to bool.
2015-06-23 13:57:58 +10:00
Echelon9
6abba98455
Increase consistency with adjacent code style, and avoid >80 character line wrap.
2015-06-23 11:49:48 +10:00
Echelon9
0437f81999
Ensure paramater name matches between declaration and definition.
2015-06-23 11:44:47 +10:00
Echelon9
4f649f1cdb
Remove TODO doxygen comment.
2015-06-23 11:40:27 +10:00
Echelon9
e33f2e1d38
Amend retval in declaration and definition to bool.
2015-06-23 11:39:44 +10:00
Echelon9
df1c50bc47
Convert internal mem_taken type to size_t.
2015-06-23 11:07:29 +10:00
Echelon9
79597e9757
Ensure parameter name matches between declaration and definition.
2015-06-23 10:59:43 +10:00
Echelon9
6447208960
Remove TODO doxygen comment.
2015-06-23 10:48:47 +10:00
Echelon9
c061ee6324
Amend retval in declaration and definition to size_t.
2015-06-23 10:48:11 +10:00
Echelon9
57c9e1ae6a
Address putative requirement for mm/mmreg.h to have <windows.h> included first.
2015-06-23 10:16:59 +10:00
Echelon9
60aec6f6cb
Update format string specifier to unsigned int.
2015-06-22 21:40:43 +10:00
Echelon9
418b9e06d7
Simplify duplicative weapon/ includes, which are in weapon/weapon.h
2015-06-22 20:24:31 +10:00
Echelon9
d2f5575e20
Simplify duplicative ui/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
8c12affa23
Simplify duplicative species_def/ includes, which are in species_def/species_def.h
2015-06-22 20:24:31 +10:00
Echelon9
ca552b45f5
Simplify duplicative ship/ includes, which are in ship/shipfx.h
2015-06-22 20:24:31 +10:00
Echelon9
00bfe37cb4
Simplify duplicative radar/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
2964132f7d
Properly guard inclusion of playerman/managepilot.h
2015-06-22 20:24:31 +10:00
Echelon9
eb739e2a9b
Simplify duplicative pilotfile/ includes, which are in pilotfile/pilotfile.h
2015-06-22 20:24:31 +10:00
Echelon9
8c2c451e8e
Simplify duplicative parse/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
29faabdfb3
Simplify duplicative object/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
2b251e3cb3
Simplify duplicative model/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
ed2170b2ea
Simplify duplicative mod_table/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
493d9a4280
Simplify duplicative missionui/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
a7e6be3368
Simplify duplicative mission/ includes.
2015-06-22 20:24:30 +10:00
Echelon9
dd3a6c2e50
Simplify duplicative menuui/ includes.
2015-06-22 20:24:30 +10:00
Echelon9
97a134e51f
Simplify duplicative math/ includes.
2015-06-22 20:24:30 +10:00
Echelon9
e613f4db7d
Simplify duplicative lab/ includes, which are in lab/wmcgui.h
2015-06-22 20:24:30 +10:00
Echelon9
47af1ff851
Simplify duplicative hud/ includes.
2015-06-22 20:24:30 +10:00
Echelon9
4e6f525f7c
Simplify duplicative graphics/ includes.
2015-06-22 20:24:30 +10:00
Echelon9
b25feb69aa
Simplify duplicative gamesnd/ includes, which are in gamesnd/gamesnd.h
2015-06-22 20:24:30 +10:00
Echelon9
90bb4e3a7b
Simplify duplicative freespace2/ includes, which are in freespace2/freespace.h
2015-06-22 20:24:30 +10:00
Echelon9
39e1ed3403
Simplify fireball/ include logic.
2015-06-22 20:24:30 +10:00
Echelon9
45664465be
Simplify debugconsole/ include logic.
2015-06-22 20:24:30 +10:00
Echelon9
1601f83a05
Guard extraneous inclusion of globalincs/pstypes.h
2015-06-22 20:24:30 +10:00
Echelon9
ae8a310e97
Simplify duplicative camera/ includes, which are in camera/camera.h
2015-06-22 20:24:30 +10:00
Echelon9
0d35f901b3
Simplify duplicative autopilot/ includes, which are in autopilot/autopilot.h
2015-06-22 20:24:30 +10:00
Echelon9
726036b91e
Simplify duplicative bmpman/ includes, which are in bmpman/bmpman.h
2015-06-22 20:24:30 +10:00
Echelon9
c5493bb480
Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes.
2015-06-22 20:24:30 +10:00
Fabian Woltermann
fda36a1476
Merge pull request #193 from PeterMitsis/vecmat_apply_const_and_static_keywords
...
vecmat: apply const and static keywords
2015-06-22 12:13:46 +02:00
Fabian Woltermann
e176132106
Merge pull request #194 from Echelon9/feature/make-cppcheck
...
Add 'make cppcheck' command line option.
2015-06-22 12:10:54 +02:00
Echelon9
2c36ce39af
Add 'make cppcheck' command line option.
2015-06-21 15:37:25 +10:00
Peter Mitsis
fc6f7cbbb6
Add static and const keywords to vector math routines
...
Improves readability. It also has the potential to help the compiler make
better decisions.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-20 08:01:25 -04:00
Peter Mitsis
7c2eb53e62
Remove unused routine vm_fvec_matrix_interpolate()
...
Not only is the routine vm_fvec_matrix_interpolate() unused, it does not appear
to have been used for the duration of the project. The only reference to it
found in the history was in a removed comment. That comment indicated that it
was implemented in 1997.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-20 07:59:34 -04:00
MageKing17
bcf19f1256
Merge pull request #192 from jg18/log_enhanced_sound
...
Log usage status of enhanced sound.
2015-06-20 01:54:59 -07:00
jg18
4d6d679c7b
Log usage status of enhanced sound.
2015-06-19 23:50:14 -07:00
Fabian Woltermann
feb6d188f7
Merge pull request #188 from chief1983/fix/standalone_name_hang
...
[fix/standalone_name_hang] Prevent the standalone from hanging
2015-06-19 21:24:47 +02:00
MageKing17
179229fa81
Add max_shield_recharge and shield_impact_explosion_anim to copy/move functions.
2015-06-18 14:45:43 -07:00
MageKing17
ab9d2e20fb
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-06-18 14:40:53 -07:00
MageKing17
35813b5e0f
Merge pull request #120 from chief1983/mp_for_2012
...
Add /MP to all projects and configs in VS 2012 project files.
2015-06-18 14:14:49 -07:00
MageKing17
eff6d402f3
Merge pull request #76 from chief1983/fix/triplemon_hud
...
[fix/triplemon_hud] Yarn's triple-monitor fix
2015-06-18 14:11:51 -07:00
Cliff Gordon
3e8b62999b
[fix/standalone_name_hang] Prevent the standalone from hanging when attempting to set a name that is too long.
2015-06-17 14:14:06 -05:00
Cliff Gordon (chief1983)
c56925a830
Disable the minimal rebuilds that were enabled for debug configurations. Also contains some whitespace cleanup that VS applied automatically.
2015-06-17 10:38:15 -05:00
Cliff Gordon
28c1286c4d
Merge remote-tracking branch 'origin/master' into mp_for_2012
2015-06-17 10:15:44 -05:00
Cliff Gordon
2d662075c3
Merge remote-tracking branch 'origin/master' into fix/triplemon_hud
2015-06-17 10:11:57 -05:00
Cliff Gordon
3247fb08d0
Merge pull request #185 from FSCyborg/patch-1
...
Resolve CID 1093395 - Unnecessary sanity check
2015-06-17 10:02:17 -05:00
FSCyborg
916fce023d
Resolve CID 1093395 - Unnecessary sanity check
...
Pretty sure this is just a paranoid check. If it's negative it should get changed to at least 2 in the following line. Let me know if I have any misconceptions.
2015-06-15 16:12:22 -04:00
Fabian Woltermann
b9f9afe26a
Revert "Merge pull request #181 from PeterMitsis/math-cleanup"
...
This reverts commit 1192c1dafc , reversing
changes made to 8643fa7327 .
2015-06-15 08:58:59 +02:00
Goober5000
335f1be322
Merge pull request #177 from FSCyborg/patch-1
...
Resolve CID 1093428 & 1093429
2015-06-14 20:43:39 -04:00
MageKing17
1cc452c13e
Merge pull request #182 from DahBlount/feature/dont_spawn_if_shot
...
Create "don't spawn if shot" flag
2015-06-14 15:32:09 -07:00
Lari Nieminen
4acad3b126
Added a "no-secondary-lock-on" ship flag to disable secondary homing.
2015-06-14 22:25:54 +03:00
DahBlount
923d9851b9
Create "don't spawn if shot" flag
...
This flag prevents submunitions from being created if a parent weapon is
shot down.
2015-06-14 10:51:09 -07:00
Fabian Woltermann
1192c1dafc
Merge pull request #181 from PeterMitsis/math-cleanup
...
Math cleanup
2015-06-14 11:40:31 +02:00
Peter Mitsis
85f50d9c94
Streamline vm_quaternion_rotate()
...
Calculates sinf(theta * 0.5) once only instead of three times.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:31 -04:00
Peter Mitsis
1af0f814c9
Refactor bez_fact()
...
Uses an array of precalculated factorials that are accessed as a lookup table
instead of computing the factorials at runtime. This cuts down on compiled
code bloat (compiler was both unrolling and inlining the computation's loop)
everywhere it was used.
NOTE: The original implementation returned an 'int'. As a result, the largest
uncorrupted factorial it could compute was 12!. For this reason, the lookup
table only goes up to 12!.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:31 -04:00
Peter Mitsis
42dc0fcc74
Streamline fl_radians() and fl_degrees() macros
...
Rewrites the macros to avoid unnecessary divisions. The compiler is now free
to precalculate the scaling ratio and perform it in a single multiply. Note
that the previous placement of the parentheses meant that the compiler (at
least GCC) was performing a multiply followed by a divide.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:31 -04:00
Peter Mitsis
93639e967c
Cosmetic: Do not check for negative vector magnitudes
...
Mathematically, the magnitude of a vector can not be negative.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:31 -04:00
Peter Mitsis
3f0476a880
Streamline vm_angle_2_matrix()
...
The values of sin(0) and cos(0) are well known and do not need to be calculated
at run time.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:31 -04:00
Peter Mitsis
a92ebdc08a
Remove commented out from vm_vec_copy_normalize()
...
The commented out code was cluttering things up.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
ee40ac7089
Streamline vm_vec_avg_n()
...
Instead of perform three consecutive divisions, vm_vec_avg_n() now performs one
division at the start and three multiplications at the end. Recall that
multiplication is faster than division.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
b883078ce8
Remove unnecessary checking before atan2_safe()
...
The routine atan2_safe() already contains a test that checks if both parameters
are zero--that is the point of the routine. Thus, there is no need for the
caller of atan2_safe() to perform that same check.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
748fe8e5dd
Remove unnecessary vm_vec_normalize() checks
...
The routine vm_vec_normalize() always returns a non-zero value.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
c9003f0c9d
Remove unnecessary vm_vec_copy_normalize() checks
...
The routine vm_vec_copy_normalize() always returns a non-zero value.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
391be952f5
Add static and const keywords to vector math routines
...
Improves readability. It also has the potential to help the compiler make
better decisions.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
49d6474237
Update vecmat.h and vecmat.cpp file mode bits
...
Changes the file mode bits of vecmat.h and vecmat.cpp to make them consistent
with the other files under "code/math".
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
m!m
8643fa7327
Merge pull request #178 from FSCyborg/patch-2
...
Resolve CID 1093431 & 1093432
2015-06-13 20:20:06 +02:00
m!m
a71e527e04
Merge pull request #179 from FSCyborg/patch-3
...
Resolve CID 1093435 & 1093437
2015-06-13 20:16:25 +02:00
FSCyborg
8515b68c0c
Resolve CID 1093435 & 1093437
...
Should resolve issues 1093435 and 1093437. These issues cannot cause crashes because the denominator is indirectly checked, but it's good to change to get coverity and other future diagnosing programs to stop yelling at us.
2015-06-13 13:35:10 -04:00
FSCyborg
6393189c19
Resolve CID 1093431 & 1093432
...
Should resolve issues 1093431 and 1093432. These issues cannot cause crashes because the denominator is indirectly checked, but it's good to change to get coverity and other future diagnosing programs to stop yelling at us.
2015-06-13 13:26:25 -04:00
FSCyborg
418d17b4da
Resolve CID 1093428 & 1093429
...
Should resolve issues 1093428 and 1093429. These issues cannot cause crashes because the denominator is indirectly checked, but it's good to change to get coverity and other future diagnosing programs to stop yelling at us.
2015-06-13 13:16:56 -04:00
Fabian Woltermann
f6d0e7d97a
Merge pull request #126 from AxemP/PainFlash
...
Adding customizable pain flash and shield pain flash settings
2015-06-13 15:22:40 +02:00
MageKing17
3cb6cc305b
Merge pull request #172 from DahBlount/feature/weapon_dmg_decay
...
Weapon Damage Decay
2015-06-12 11:39:31 -07:00
DahBlount
5f63e86dde
Add sanity checks and an extra parameter
...
This adds extra sanity checks to the Weapon Damage Decay code and also
adds a new parameter for weapons that can GAIN damage is they approach
the end of their lifetime.
2015-06-12 09:56:13 -07:00
DahBlount
e8f58f5947
Create Weapon Damage Decay framework
...
This adds the $Daamge Time: and +Min Damage: entries to weapons.tbl.
These parameters are used to create damage attenuation for non-beam primary weapon.
2015-06-12 05:01:21 -07:00
Axem
27e81df523
Commit cause reasons
2015-06-11 19:50:35 -05:00
z64555
5bd09cfac5
Merge pull request #171 from DahBlount/feature/random_fire_delay
...
Add Max delay and Min Delay
2015-06-11 13:47:10 -05:00
DahBlount
58f38c2e1e
Add Max delay and Min Delay
...
This adds two weapons.tbl entries that allow a weapon to have a range of
possible fire delay times which results in random firing time. simulates
real life firing time error for the most part.
2015-06-11 08:15:22 -07:00
z64555
99a06b4839
Organizes required_string(); Doxy's required_string() and required_string_one_of()
2015-06-10 09:00:33 -05:00
Fabian Woltermann
f162db5e48
Merge pull request #161 from ln-zookeeper/master
...
Added a $Max Shield Recharge ship table entry for limiting how full t…
2015-06-10 15:18:44 +02:00
Zacam
1e6455c393
Merge pull request #166 from The-E/master
...
Sets AVX instruction sets for all projects
2015-06-07 01:33:44 -07:00
The E
66c5dff14a
Sets AVX instruction sets for all projects
2015-06-07 10:30:33 +02:00
m!m
2190fccc66
Merge pull request #165 from The-E/master
...
Sets AVX output for VS2015
2015-06-07 10:25:11 +02:00
The E
6204241b7d
Sets AVX output for VS2015
2015-06-07 10:22:11 +02:00
Lari Nieminen
26e31a4cf0
Added a $Max Shield Recharge ship table entry for limiting how full the shields may recharge.
2015-06-04 15:35:41 +03:00
Fabian Woltermann
421d8be977
Merge pull request #153 from Echelon9/fix/Xcode4-project-file
...
Update Xcode4+ project files for the removal of timerbar.cpp|h
2015-06-04 13:35:09 +02:00
Fabian Woltermann
7a505887ff
Merge pull request #135 from ln-zookeeper/master
...
Added customizable shield impact explosion effects, originally adapte…
2015-06-04 13:33:40 +02:00
m!m
3c229a9c81
Merge pull request #157 from AxemP/LuaOnBeamFire
...
Adds On Beam Fire scripting hook
2015-06-04 10:05:56 +02:00
Axem
4b20b46509
Commit because reasons? (Why git, why)
2015-06-03 17:44:37 -05:00
Axem
7e8557d564
Merging with new updated master
2015-06-03 17:38:52 -05:00
m!m
8c3e9dcdd7
Merge pull request #154 from AxemP/LuaAfterburn+BeamFire
...
Adds Afterburner Engage/Ending scripting hooks
2015-06-03 16:26:36 +02:00
m!m
91ea6b83cf
Merge pull request #155 from AxemP/LuaApplyWhack
...
Adds applyWhack() scripting function for ship objects
2015-06-03 16:24:30 +02:00
Fabian Woltermann
d7f54dd703
Merge pull request #151 from jg18/enhanced_sound
...
Add support for enhanced sound.
2015-06-02 08:13:42 +02:00
jg18
7fe5ba8db8
Make enhanced sound on by default.
2015-06-01 11:18:07 -07:00
jg18
faa0c5e9ee
Make minor corrections to enhanced sound.
2015-06-01 10:24:07 -07:00
Axem
61e4f739ce
Adds On Beam Fire scripting hook
2015-05-31 18:02:36 -05:00
Axem
852a4eb3fa
Tweaking formatting...
2015-05-31 17:26:03 -05:00
Axem
7975300304
Cutting out the beam fire
2015-05-31 17:20:39 -05:00
Axem
58e8c23665
Adds on Afterburner Engage, Afterburner End, and On Beam Fire scripting hooks
2015-05-31 11:51:22 -05:00
Axem
2fa7e8f096
Adds applyWhack() scripting function for ship objects
2015-05-31 11:18:45 -05:00
Lari Nieminen
037c5a06aa
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-05-31 14:28:52 +03:00
MageKing17
859405b62e
Merge pull request #149 from SamuelCho/mantis3163
...
Refactored how color setting is done for model rendering. Fixes Mantis 3163
2015-05-30 19:24:15 -07:00
Echelon9
2943d3f1a4
Address Xcode issue with quotes and version strings.
2015-05-31 12:07:57 +10:00
Echelon9
f2fb83801c
Update Xcode4+ project files for the removal of timerbar.cpp|h
2015-05-31 10:54:46 +10:00
Goober5000
74ae0a9395
Merge pull request #148 from SamuelCho/mantis3161
...
Fix for Mantis 3161. Corrected model debug rendering when calling the immediate version of model rendering.
2015-05-30 18:13:05 -04:00
Goober5000
aa0d424699
Merge pull request #150 from SamuelCho/skybox_render_order
...
Eliminate sorting of draw calls for skyboxes for correctness.
2015-05-30 13:03:33 -04:00
Goober5000
4fe9668fa3
Merge pull request #152 from SamuelCho/mantis3162
...
Rectified jump nodes not rendering in FRED. Fixes Mantis 3162.
2015-05-30 13:00:44 -04:00
SamuelCho
0c9996c32b
Rectified jump nodes not rendering in FRED. Fixes Mantis 3162.
2015-05-29 23:37:50 -07:00
jg18
ad910280e7
Add support for enhanced sound.
...
Add support for enhanced in-mission sound, with 128 audio channels and a
new system for specifying per-sound priorities and concurrent playback
limits using modular extensions of soudns.tbl.
2015-05-29 23:05:30 -07:00
SamuelCho
a7c1e29bf6
Eliminate sorting of draw calls for skyboxes for correctness.
2015-05-29 22:58:28 -07:00
SamuelCho
2ba39e6b6d
Refactored how color setting is done for model rendering. Fixes Mantis 3163.
2015-05-29 21:54:33 -07:00
SamuelCho
44de943a99
Fix for Mantis 3161. Corrected model debug rendering when calling the immediate version of model rendering.
2015-05-29 19:47:23 -07:00
m!m
661b650911
Merge pull request #145 from asarium/fix/timerbar
...
Remove unused timerbar files
2015-05-29 17:45:10 +02:00
asarium
badbe4a239
Remove unused timerbar files
2015-05-29 16:31:41 +02:00
MageKing17
db781c1a7f
Hopefully fix VS 2010 compilation.
...
Apparently VS 2010 doesn't like vector::emplace_back() with 0 arguments. A push_back() of a generic ship_info object should provide basically the same effect.
2015-05-29 02:06:04 -07:00
MageKing17
8fb0436b42
Add new variables to clone() and move().
...
Also add model_icon_angles to the constructor (let's just make absolutely sure it's zeroed out on initialization).
2015-05-28 23:56:22 -07:00
MageKing17
7e696a55d2
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Also added model_icon_angles to the ship_info() constructor, and model_icon_angles, thruster_glow_noise_mult, and min_engine_vol to ship_info::clone() and and ship_info::move().
Conflicts:
code/ship/ship.cpp
code/ship/ship.h
2015-05-28 23:49:33 -07:00
m!m
3030e20121
Merge pull request #140 from scp-fs2open/possible-appveyor-fix
...
Remove AppVeyor logger.
2015-05-28 11:03:00 +02:00
MageKing17
9f65ab39d0
Remove AppVeyor logger.
...
Apparently it's causing the nonsensical failures for builds of the 2013 project.
2015-05-28 00:28:11 -07:00
Lari Nieminen
3e4cfa361d
Added customizable shield impact explosion effects, originally adapted from Wanderer branch.
2015-05-27 13:41:50 +03:00
Fabian Woltermann
a127a8cad6
Merge pull request #133 from ln-zookeeper/master
...
Added a $Model Icon Direction ship table entry for overriding the ang…
2015-05-27 11:31:31 +02:00
Lari Nieminen
8fd0bf3f7f
Added a $Model Icon Direction ship table entry for overriding the angle from which ship icons are rendered from.
2015-05-27 12:19:06 +03:00
z64555
56f9f608be
Merge pull request #119 from The-E/dedicated_gpu
...
Use high-performance GPU by default.
2015-05-27 03:13:49 -05:00
Fabian Woltermann
258662ff4c
Merge pull request #104 from MageKing17/feature/subspace-beams
...
Subspace Beams
2015-05-27 10:00:44 +02:00
Fabian Woltermann
a0ed1ac897
Merge pull request #125 from ln-zookeeper/master
...
Added a $Thruster Glow Noise Mult ship table entry for decreasing/inc…
2015-05-27 09:56:45 +02:00
Fabian Woltermann
136091fc68
Merge pull request #131 from asarium/mantis/3160
...
Mantis 3160: Only set processor affinity if a commandline flag is present
2015-05-27 09:32:50 +02:00
asarium
c5cf337365
Only set processor affinity if a commandline flag is present
2015-05-27 00:31:08 +02:00
Axem
e396686570
Adding customizable pain flash and shield pain flash settings
2015-05-24 09:00:30 -05:00
Lari Nieminen
72a082c9eb
Added a $Thruster Glow Noise Mult ship table entry for decreasing/increasing the effect of noise applied to the glow radius.
2015-05-23 00:11:43 +03:00
MageKing17
67a87a33f3
Change if-elseif chain to switch statement.
...
Somewhat easier to read this way.
2015-05-22 12:38:13 -07:00
MageKing17
b2cff0788a
Make these assertions more clear.
2015-05-22 12:37:19 -07:00
MageKing17
fa61278c10
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into feature/subspace-beams
2015-05-22 12:32:34 -07:00
m!m
585a5fe64d
Merge pull request #112 from ln-zookeeper/master
...
Added $Minimum Engine Volume to ships.tbl, with which to customize ho…
2015-05-21 19:44:26 +02:00
Lari Nieminen
81f7d272fd
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-05-21 18:35:32 +03:00
Goober5000
ee6cd1d204
Merge pull request #121 from MageKing17/bugfix/fred-warnings
...
Fix a couple FRED warnings.
2015-05-21 00:06:48 -04:00
Cliff Gordon
a4c1f89720
Merge remote-tracking branch 'origin/master' into fix/triplemon_hud
...
Conflicts:
code/freespace2/freespace.cpp
2015-05-20 17:15:15 -05:00
Cliff Gordon (chief1983)
9429770f3d
Add /MP to all projects and configs in VS 2012 project files.
2015-05-20 12:19:43 -05:00
m!m
2c5999b1d0
Merge pull request #114 from chief1983/rename_2011
...
[rename_2011] Rename MSVC_2011 to MSVC_2012
2015-05-20 17:32:38 +02:00
Cliff Gordon
2f152ce085
[rename_2011] Fix the appveyor config to handle the renamed project.
2015-05-20 09:27:40 -05:00
Cliff Gordon (chief1983)
3163319217
Merge remote-tracking branch 'origin/master' into rename_2011
2015-05-19 21:33:53 -05:00
Cliff Gordon (chief1983)
8e4f6afddd
Add the shadows files to the VS 2012 project. The diff looks like a lot changed, but most is apparently just whitespace. diff -w shows a clean set of file additions.
2015-05-19 21:30:32 -05:00
The E
ef9ae017b5
Make sure we use the same calling convention both times
2015-05-19 21:21:54 +02:00
The E
2c626b4eec
According to AMD and NV, these _should_ force their drivers into high-performance mode
2015-05-19 20:48:01 +02:00
MageKing17
cac6737541
Fix a couple FRED warnings.
...
Change a couple instances of setting a DWORD_PTR to -1 by explicitly casting it to a DWORD_PTR.
2015-05-19 11:39:36 -07:00
MageKing17
ab900aad1c
Avoid calling ssm_create() from ship_apply_tag() if ssm_index < 0.
...
This would happen if a TAG level 3 weapon had no specified SSM (or an invalid one). Since nothing can call ssm_create() with a negative ssm_index now, changed it to a size_t and simplified one of the verification conditionals.
2015-05-19 10:55:17 -07:00
Fabian Woltermann
a69566f8bd
Merge pull request #116 from asarium/ci/appveyor
...
Add AppVeyor configuration
2015-05-19 08:03:07 +02:00
MageKing17
67c75304e7
Merge pull request #115 from asarium/fix/luacpp
...
Fix scripting function ad.playMusic
2015-05-18 17:30:10 -07:00
niffiwan
6a88616f9b
Merge pull request #96 from asarium/fix/unordered_map
...
Change SCP_hash_map to SCP_unordered_map
2015-05-19 07:48:23 +10:00
asarium
57f709fcec
Add AppVeyor configuration
2015-05-18 23:26:38 +02:00
asarium
6c24aaae77
Actually get the loop variable from the lua stack
2015-05-18 21:57:44 +02:00
MageKing17
764c1ab03f
Fix F3 lab using old idx value.
...
This was causing everything to use the Ship_info index of the size of the species vector; for FS2, that meant 3, which meant GTF Ares.
2015-05-18 10:09:29 -07:00
MageKing17
cde82a9093
Get rid of erroneous assertion.
2015-05-18 10:08:12 -07:00
MageKing17
16229a9950
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
2015-05-18 10:04:21 -07:00
Fabian Woltermann
7bf700f173
Merge pull request #105 from MageKing17/mantis/3139
...
Fix Mantis #3139 .
2015-05-18 18:21:49 +02:00
Lari Nieminen
742925e0d9
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-05-18 19:07:31 +03:00
Cliff Gordon
761de4a671
[rename_2011] Rename MSVC_2011 to MSVC_2012 since that's what the IDE actually released as.
2015-05-18 10:53:15 -05:00
m!m
8502c66e7c
Merge pull request #108 from niffiwan/coverity/1298258
...
Fix Coverity 1298258: Uninitialized scalar var
2015-05-18 11:46:56 +02:00
m!m
dcebc4aa50
Merge pull request #110 from niffiwan/coverity/1298255
...
Fix Coverity 1298255: Uninitialized scalar var
2015-05-18 11:45:10 +02:00
Lari Nieminen
54a2a3ea5b
Fixed stupid syntax error.
2015-05-18 00:49:31 +03:00
Lari Nieminen
56273906b7
Fixed incorrect volume ramping.
2015-05-17 17:04:57 +03:00
niffiwan
9df5407dfb
I think this should resolve the Travis issue
2015-05-17 19:48:18 +10:00
niffiwan
51b8e83d89
Fix Coverity 1298257: Uninitialized scalar var
...
Add all struct members to constructor (esp thrust_scale which was read
uninitialised). Remove some var sets that the constructor now sets as
defaults. Also fixes 1298248
2015-05-17 13:25:00 +10:00
Lari Nieminen
a44daaba35
Added $Minimum Engine Volume to ships.tbl, with which to customize how the ship's speed affects engine sound volume.
2015-05-17 03:33:46 +03:00
niffiwan
2d832dd11e
Fix Coverity 1298255: Uninitialized scalar var
...
Copy particle min/max life values from modelinterp
Also avoid double->float conversion
2015-05-16 21:51:39 +10:00
niffiwan
1784e880ae
Merge pull request #50 from asarium/coverity/1093690
...
Fix for Coverity 1093690: Resource leak
2015-05-16 20:05:43 +10:00
asarium
189f23a341
Change SCP_hash_map to SCP_unordered_map
...
Also uses std::unordered_map on every platform now
2015-05-16 11:40:10 +02:00
asarium
cc9109843a
Fix for Coverity 1093690: Resource leak
...
This introduces a move constructor for CJumpNode to handle freeing resources.
2015-05-16 11:20:20 +02:00
niffiwan
1deb837973
Merge pull request #102 from asarium/fix/noallocator
...
Remove SCP_vm_allocator
2015-05-16 14:13:44 +10:00
niffiwan
3859d16640
Fix Coverity 1298258: Uninitialized scalar var
...
Also fixes 1298256, 1298254, 1298253
For vertex vars use default value-initialisation to zero the struct
http://en.cppreference.com/w/cpp/language/value_initialization
Note that parts of vertex don't seem used in relevant codepaths, e.g.
the colours. A zero init approach should be safer should code change in
future.
2015-05-16 12:44:56 +10:00
MageKing17
e68261bbf3
Merge pull request #107 from niffiwan/coverity/1298268
...
Fix Coverity 1298268: Division by float zero
2015-05-15 19:01:37 -07:00
MageKing17
e2a350940a
Merge pull request #106 from niffiwan/coverity/1298261
...
Fix Coverity 1298261 Missing break in switch
2015-05-15 19:00:07 -07:00
niffiwan
6512edec77
Fix Coverity 1298268: Division by float zero
...
The div-by-zero won't be triggered by this code because the
secondaryteam is "none". Play it safe and protect the div anyway
2015-05-16 10:59:15 +10:00
niffiwan
2910a7a6eb
Fix Coverity 1298261 Missing break in switch
2015-05-16 10:36:30 +10:00
MageKing17
8efbd74cf0
Fix Mantis #3139 .
...
This make ship explosion shockwaves use the tabled damage type. The code was creating a new shockwave_create_info object, initializing it, and then only copying some of the attributes of the ship's "shockwave" shockwave_create_info member (not including damage type). It makes more sense to use copy-assignment and then specifically override the attributes that should be overridden.
2015-05-15 16:40:25 -07:00
MageKing17
05b79a41fb
Allow beams to be spawned weapons.
2015-05-15 16:28:42 -07:00
niffiwan
e24f459eaf
Merge pull request #103 from asarium/travis/badge
...
Add Travis CI badge to Readme.md
2015-05-16 09:23:02 +10:00
MageKing17
9a5fa95c54
Add subspace beam strikes.
...
Overhaul hudartillery.cpp to use STL containers (removes hardcoded limits on maximum number of strike types, simultaneously active strikes, and projectiles per strike), use modular tables, allow for different shape options, and allow beams as the weapon.
2015-05-15 16:19:44 -07:00
MageKing17
abfba82d48
Add beam-create SEXP.
...
Fires a floating beam from a given set of coordinates (like fire-beam and fire-beam-at-coordinates).
2015-05-15 16:11:36 -07:00
MageKing17
0609d3919f
Allow floating beams.
...
Makes it possible for a beam to fire from a point in space instead of a turret.
2015-05-15 16:09:35 -07:00
MageKing17
f8954cc941
Fix typo of "section" as "secion".
2015-05-15 15:28:27 -07:00
asarium
794a7f5bd1
Add coverity badge to Readme.md
2015-05-16 00:02:56 +02:00
asarium
762e7c3e24
Remove SCP_vm_allocator
2015-05-15 23:39:15 +02:00
MageKing17
165fc95411
Merge pull request #100 from ln-zookeeper/master
...
Fixed a bug with the next/prev subsystem targeting keys not working i…
2015-05-15 14:29:34 -07:00
Lari Nieminen
268c2558d5
Fixed a bug with the next/prev subsystem targeting keys not working if the target only has one subsystem.
2015-05-15 15:16:58 +03:00
niffiwan
34170b1cd2
Merge pull request #97 from asarium/travis/master
...
Add Travis CI config file
2015-05-15 20:39:20 +10:00
niffiwan
9147fc483f
Merge pull request #52 from asarium/fix/warnings
...
Fix compilation warnings
2015-05-15 20:37:58 +10:00
Fabian Woltermann
450bc83068
Merge pull request #99 from SamuelCho/fog_shader_fix
...
Fix errors when model shader variants use fog but don't use diffuse maps.
2015-05-15 08:11:42 +02:00
SamuelCho
65d3d59c0f
Fix errors when model shader variants use fog but don't use diffuse maps.
2015-05-14 22:40:43 -07:00
asarium
e50555c4ae
Add Travis CI config file
2015-05-14 22:20:30 +02:00
asarium
e677ed7657
Fix warning 'allocate_poly_list' : unreferenced local function has been removed
2015-05-14 17:37:41 +02:00
niffiwan
82c2805b36
Merge branch 'ln-zookeeper-master'
2015-05-14 19:44:27 +10:00
niffiwan
bf13e5053e
Merge branch 'master' into ln-zookeeper-master
...
Conflicts:
code/ai/ai_profiles.cpp
2015-05-14 19:38:19 +10:00
Fabian Woltermann
f6093feceb
Merge pull request #94 from MageKing17/bugfix/bomb-invulnerability
...
Make an AI profile flag for the aspect bomb invulnerability fix.
2015-05-14 10:54:56 +02:00
Fabian Woltermann
2ae6216c93
Merge pull request #95 from SamuelCho/bracket_trans_fix
...
Fixed ship select bracket rendering and lighting on transparent geometry.
2015-05-14 10:54:28 +02:00
asarium
a237d7faad
Fix compilation on OS X
2015-05-14 10:45:32 +02:00
asarium
77283e9c7a
Fix conversion warnings
2015-05-14 10:45:32 +02:00
asarium
f7a22d7ed0
Fix BM_TYPE to ubyte conversion warnings
2015-05-14 10:45:31 +02:00
asarium
ab1b12fdd6
Fix "conversion from 'SPPHRASERNG' to 'ULONG'" warning
2015-05-14 10:45:30 +02:00
asarium
d5938614c1
Fix "forcing value to bool 'true' or 'false'" warning
2015-05-14 10:45:29 +02:00
asarium
83bb7e144f
Fix unused function warning
2015-05-14 10:45:29 +02:00
asarium
65b1569df2
Fix macro redefinition warning
2015-05-14 10:45:28 +02:00
asarium
b849eec785
Fix "conversion from 'BM_TYPE' to 'ubyte'" warning
2015-05-14 10:45:27 +02:00
asarium
b883ebc038
Fix usage of uninitialized variable warning
2015-05-14 10:45:26 +02:00
asarium
3cfbcbe363
Fix signed < unsigned warning
2015-05-14 10:45:25 +02:00
SamuelCho
5255f129dc
Fixed gradient brackets in ship select screen. Fixed lighting for transparent meshes when using deferred lighting.
2015-05-13 20:38:17 -07:00
MageKing17
9555602823
Make an AI profile flag for the aspect bomb invulnerability fix.
...
Originally introduced in r8696 back in 2012 (hash d7d6009ea1 ), this fix changes retail balance and should be behind a flag.
2015-05-13 20:15:27 -07:00
MageKing17
9db390b553
Avoid bug in older clang versions.
...
Avoids calling std::swap() on multidimensional arrays.
2015-05-12 19:45:55 -07:00
MageKing17
48095d34e6
Fix a few typos.
2015-05-12 19:45:11 -07:00
MageKing17
51a8932f7f
Add glowpoint_bank_override_map to the ship_info operations.
2015-05-12 19:44:26 -07:00
MageKing17
274a32e1ac
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/model/modelread.cpp
code/ship/ship.h
2015-05-12 19:22:58 -07:00
Lari Nieminen
2c1d1b12cc
Allowed bay path speed modifiers to function in both pathing modes.
2015-05-13 00:35:40 +03:00
Lari Nieminen
133f059b8d
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-05-13 00:21:04 +03:00
Cliff Gordon
fbbfef9ae2
Missing project file additions for shadows to compile on OS X.
2015-05-12 15:37:44 -05:00
The E
556550fbde
Updated project files for MSVC 2015
2015-05-12 20:27:34 +02:00
Fabian Woltermann
5dfbc6d292
Merge pull request #88 from SamuelCho/soft_shadows_deferred_lighting
...
Soft shadows, deferred lighting, and various graphics improvements and optimizations
2015-05-12 20:06:33 +02:00
Lari Nieminen
4fbf65ae8b
Warn about bay path speed multipliers currently only working with the 'alt1' pathing type.
2015-05-11 19:50:13 +03:00
Lari Nieminen
c9ec754eb6
Fixed $bay arrive/depart speed multiplier not working correctly.
2015-05-11 19:09:55 +03:00
niffiwan
1fe476a9e2
Merge pull request #79 from asarium/mantis/3134
...
From LotF: Fix for Mantis 3134
2015-05-10 21:45:25 +10:00
Lari Nieminen
ffed62372f
Added ai_profiles and path metadata options to force AI ships flying bay paths to gradually accelerate/decelerate instead of flying the path at max speed.
2015-05-10 11:52:09 +03:00
MageKing17
367c060749
Merge pull request #91 from ln-zookeeper/master
...
Avoid loading the anchor ship model multiple times when resolving pat…
2015-05-09 17:13:31 -07:00
Lari Nieminen
24d16213a6
Avoid loading the anchor ship model multiple times when resolving path masks.
2015-05-10 02:23:44 +03:00
MageKing17
be57943a52
Merge pull request #90 from ln-zookeeper/master
...
Revert a part of f6e2f1d2 / r11129 which causes collision problems in…
2015-05-09 16:03:09 -07:00
Lari Nieminen
7a8c7cc6c2
Revert a part of f6e2f1d2 / r11129 which causes collision problems in some corner cases.
2015-05-09 13:42:12 +03:00
niffiwan
c85904b3c5
Merge pull request #85 from MageKing17/bugfix/random-multiple-of
...
Fix random-multiple-of.
2015-05-09 19:47:23 +10:00
MageKing17
08a1434b71
Merge pull request #89 from niffiwan/coverity/1093714_mk2
...
Fix Coverity 1093714: Negative array index read
2015-05-09 01:42:50 -07:00
niffiwan
d69b7d7e0d
Add newline to Assertion msg
2015-05-09 18:27:20 +10:00
niffiwan
93a5d82ca8
Fix Coverity 1093714: Negative array index read
...
This is very unlikely, but add an assertion anyway just in case someone
in future messes us keeping num_primary_banks & primary_bank_weapons in
sync.
2015-05-09 17:08:21 +10:00
SamuelCho
90c8025588
Code cleanup before the big soft shadows and deferred lighting merge into master.
2015-05-08 21:55:28 -07:00
SamuelCho
520b89408e
Fixed warnings related to graphics code additions.
2015-05-08 21:21:20 -07:00
SamuelCho
094c5fe302
Resolve faster ibx and improved profiling merges.
2015-05-08 20:53:59 -07:00
niffiwan
27cdf337fb
Merge pull request #74 from SamuelCho/faster_ibx
...
Greatly increase the generation speed of index buffers.
2015-05-09 13:35:54 +10:00
niffiwan
f2d3763bdd
Merge pull request #86 from MageKing17/bugfix/sexp-not-segfault
...
Fix typo in eval_not.
2015-05-09 13:30:29 +10:00
SamuelCho
96cbfb1fdf
#include <algorithm> to get faster index buffer generation working on Linux.
2015-05-08 20:20:29 -07:00
MageKing17
290d25d6ae
Fix typo in eval_not.
...
Can cause serious problems by accessing Sexp_nodes[-1].value. Caused chief1986 to segfault on OS X.
2015-05-08 16:13:35 -07:00
MageKing17
9ef7aa2432
Fix random-multiple-of.
...
I don't know if I was just tired when I wrote this originally or what, but there were two problems here; one, the for-loop condition was inverted (and since I made it a for-loop instead of a while-loop, I'm not sure why I didn't take out the "break" condition), so its contents would never actually evaluate. Two, the node matching random_argument wasn't being stored anywhere so even if the for-loop condition hadn't been wrong, it would've just used the last valid argument instead of the first argument every time. Fixes GitHub issue #84 .
2015-05-08 16:09:37 -07:00
niffiwan
a39a7530f8
Merge pull request #82 from ln-zookeeper/master
...
Added a "Show Destroyed Subsystems" flag to ship lab for viewing -des…
2015-05-08 20:32:13 +10:00
Fabian Woltermann
77ee6f100b
Merge pull request #83 from asarium/feature/betterGamesndParsing
...
Improve gamesnd modular parsing
2015-05-08 10:32:26 +02:00
asarium
88a85e4024
Improve gamesnd modular parsing
...
As requested by jg18, this improves the sound.tbl parser to properly handle +nocreate. If the file name of an entry should not be changed you have to specify <same>.
2015-05-08 08:48:17 +02:00
Lari Nieminen
ce853a5f07
Added a "Show Destroyed Subsystems" flag to ship lab for viewing -destroyed submodels.
2015-05-08 01:20:58 +03:00
MageKing17
87b79774d1
Merge pull request #80 from asarium/fix/gitignore
...
Update .gitignore to include voice recognition files
2015-05-07 13:46:32 -07:00
asarium
48206c3ef8
Update .gitignore to include voice recognition files
2015-05-07 22:41:22 +02:00
Fabian Woltermann
0349240a33
Merge pull request #75 from SamuelCho/profiling_microseconds
...
Improved profiling code to have a timing resolution of microseconds instead of milliseconds
2015-05-07 21:03:44 +02:00
Samuel Cho
135620dcf9
Merge branch 'faster_ibx' of https://github.com/SamuelCho/fs2open.github.com into faster_ibx
2015-05-07 09:47:41 -07:00
Swifty
60a5a6bd7c
Removal of IBX file code and related command-line options.
2015-05-07 09:46:58 -07:00
Swifty
5a68f6d830
Greatly increase the generation speed of index buffers.
2015-05-07 09:46:57 -07:00
asarium
aa6936a2a5
From LotF: Fix for Mantis 3134
...
dynamic weapon point firing causes a crash when used on a fighter with more than 6 firing points
2015-05-07 18:27:48 +02:00
niffiwan
935af40c87
Merge pull request #78 from ln-zookeeper/master
...
Make firepoint HUD gauge light up only firepoints that'll fire next
2015-05-07 20:32:28 +10:00
Lari Nieminen
42d830e62f
* Made the firepoint HUD gauge light up only the firepoints which will fire next, if "dynamic primary linking" ship flag or "cycle" weapon flag is used.
2015-05-06 23:40:40 +03:00
Swifty
7cf5a3e085
Removal of IBX file code and related command-line options.
2015-05-06 12:27:50 -07:00
Cliff Gordon
0ce31bf471
[fix/triplemon_hud] Yarn's triple-monitor fix, see http://www.hard-light.net/forums/index.php?topic=89262.0 . Patch tweaked to work around changes in 9aed627.
2015-05-06 10:40:45 -05:00
Fabian Woltermann
4d90765185
Merge pull request #48 from MageKing17/bugfix/fred-ship-editor-persona
...
Fix persona selection in FRED's ship editor.
2015-05-06 12:27:05 +02:00
niffiwan
7b82acb327
Merge pull request #73 from MageKing17/mantis/3140
...
Fix Mantis 3140.
2015-05-06 20:17:26 +10:00
niffiwan
666e1ddeeb
Merge pull request #70 from ln-zookeeper/master
...
Add optional control preset names
Also display the name in the control config page (F2)
2015-05-06 19:11:51 +10:00
Swifty
dd9f9ed921
Improved profiling code to have a timing resolution of microseconds instead of milliseconds.
2015-05-05 20:41:05 -07:00
Swifty
47c2aa0bbc
Greatly increase the generation speed of index buffers.
2015-05-05 19:08:41 -07:00
MageKing17
e59bb76f72
Get rid of warning on 64-bit compilers.
...
If size_t is bigger than an int, this line generates warnings.
2015-05-05 14:43:20 -07:00
MageKing17
202bd3a5dc
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
2015-05-05 14:39:01 -07:00
MageKing17
5f43e78be2
Fix Mantis 3140.
...
Changes the "virtual frame" used for aspect locks to be 640x480 so as to correct different lock behavior due to both different aspect ratios and different resolutions. Applies a scaling factor to the drawing of the lock indicator on the HUD so that it traverses roughly the same portion of the screen regardless of resolution.
2015-05-05 12:54:07 -07:00
Cliff Gordon
e3ca0ec5b1
Merge pull request #59 from Echelon9/fix/doxygen
...
Fix doxygen documentation
2015-05-05 09:41:41 -05:00
Echelon9
464a25b457
Fix empty documentation/doxygen using .gitkeep and global .gitignore trick. Otherwise, Git does not index empty folders.
2015-05-06 00:18:28 +10:00
Echelon9
819f53721d
Revert "Fix empty documentation/doxygen using .gitignore trick. Otherwise, Git does not index empty folders."
...
This reverts commit 550998e827 .
2015-05-05 23:59:39 +10:00
niffiwan
4e68213569
Merge pull request #72 from chief1983/mantis/3158b
...
Fix for Mantis #3158 : prevent narrowing that breaks compilation in stricter compilers
2015-05-05 11:37:09 +10:00
Cliff Gordon
6b080df736
Fix for Mantis #3158 (take 2): change the size of the token used for released but active streams to fit into an int without narrowing.
2015-05-04 20:33:02 -05:00
Lari Nieminen
0bb972b141
Made it possible to name control presets, and made controls config display the current preset's name if there are multiple to choose from.
2015-05-05 00:38:24 +03:00
niffiwan
93d88650e1
Merge pull request #68 from chief1983/fix/HAVE_CXX11-freebsd
...
Fix for a 'HAVE_CXX11 already defined' warning
(related to clang on non-OSX OS's)
2015-05-05 07:34:08 +10:00
Cliff Gordon
cd399f90a1
Fix for a 'HAVE_CXX11 already defined' warning on almost every compiled object on FreeBSD.
2015-05-04 14:42:41 -05:00
Fabian Woltermann
189275da56
Merge pull request #56 from asarium/coverity/1093600
...
Fix for Coverity 1093600: Negative array index read
2015-05-03 21:57:23 +02:00
Fabian Woltermann
4c7d80cba8
Merge pull request #63 from asarium/coverity/1093530
...
Fix for Coverity 1093530: Negative array index read
2015-05-03 21:56:16 +02:00
Fabian Woltermann
4a14e26256
Merge pull request #64 from asarium/coverity/1093515
...
Fix for Coverity 1093515: Negative array index read
2015-05-03 21:55:50 +02:00
Fabian Woltermann
0fc8e53f5f
Merge pull request #65 from asarium/coverity/1237276
...
Fix for Coverity 1237276: Uninitialized scalar field
2015-05-03 21:55:04 +02:00
Fabian Woltermann
ba2a1c9e7d
Merge pull request #62 from asarium/coverity/1093555
...
Fix for Coverity 1093555: Negative array index read
2015-05-03 21:53:56 +02:00
Fabian Woltermann
115a2979b1
Merge pull request #67 from asarium/fix/aigoals
...
Fix usage of negative index
2015-05-03 21:53:01 +02:00
asarium
e9b9797b6e
Fix usage of negative index
...
I have no idea why this didn't cause any issues earlier...
2015-05-03 21:27:23 +02:00
asarium
da0ef89ac5
Fix for Coverity 1237276: Uninitialized scalar field
...
The field will contain an arbitrary value left over from earlier computations.
In subtitle::subtitle(int, int, char const*, char const*, float, float, color const*, int, bool, bool, int, int, bool): A scalar field is not initialized by the constructor
2015-05-03 14:55:06 +02:00
asarium
fe49ef63aa
Fix for Coverity 1093515: Negative array index read
...
A memory location at a negative offset from the beginning of the array will be read, resulting in incorrect values.
In multi_options_process_packet(unsigned char *, header *): Negative value used to index an array in a read operation
2015-05-03 14:44:26 +02:00
asarium
f51bc78126
Fix for Coverity 1093530: Negative array index read
...
A memory location at a negative offset from the beginning of the array will be read, resulting in incorrect values.
In message_queue_process(): Negative value used to index an array in a read operation
2015-05-03 14:34:06 +02:00
m!m
711c7a7bf8
Merge pull request #61 from niffiwan/coverity-1093565
...
Fix Coverity 1093565: Negative array index read
2015-05-03 04:27:22 -07:00
asarium
ca16b4710d
Fix for Coverity 1093555: Negative array index read
...
A memory location at a negative offset from the beginning of the array will be read, resulting in incorrect values.
In multi_create_standalone_object(): Negative value used to index an array in a read operation
observer_create() will only fail in exceptional circumstances so a showing an error dialog should be acceptable
2015-05-03 13:12:23 +02:00
niffiwan
471cf4c988
Fix Coverity 1093565: Negative array index read
...
Add an assertion to catch any callers that haven't correctly set
the target_name. Also fix a minor typo in the comments
2015-05-03 20:31:16 +10:00
Goober5000
d734a36940
Merge pull request #60 from niffiwan/coverity-1093484
...
Fix Coverity 1093484
2015-05-03 02:14:34 -04:00
niffiwan
25079f5ed2
Fix Coverity 1093484
...
time_t is 64bit on 64bit systems; casting a pointer to a larger type is
dangerous, but assigning to a larger type should be fine
2015-05-03 15:42:25 +10:00
Goober5000
f0a0632d9d
Merge pull request #51 from asarium/coverity/1093689
...
Fix for Coverity 1093689: Resource leak
2015-05-02 23:47:28 -04:00
Echelon9
b8ba7f1466
Address obsolete Doxyfile sections, per Doxygen 1.8.9.1 automatic Doxyfile updater.
2015-05-03 11:39:36 +10:00
Echelon9
550998e827
Fix empty documentation/doxygen using .gitignore trick. Otherwise, Git does not index empty folders.
2015-05-03 11:23:19 +10:00
Swifty
6da0d162b8
Fixed compilation issues.
2015-05-02 17:18:51 -07:00
asarium
3528dffabd
Fix for Coverity 1093587: Negative array index read
...
The random value shouldn't be used if there are no countermeasures so this shouldn't cause any issues.
2015-05-02 23:53:39 +02:00
Swifty
c620372357
Soft shadows, deferred lighting, and various major graphics optimizations.
2015-05-02 14:35:37 -07:00
asarium
2aa569c1e7
Fix for Coverity 1093600: Negative array index read
...
hud_squadmsg_is_target_order_valid already checks if ainfo->target_objnum is less than zero so that check is not needed
2015-05-02 23:14:59 +02:00
Goober5000
584ec36f62
Merge pull request #53 from asarium/coverity/1093688
...
Fix for Coverity 1093688: Resource leak
2015-05-02 15:45:50 -04:00
Goober5000
93c46bd1f9
Merge pull request #55 from asarium/coverity/1093606
...
Fix for Coverity 1093606: Negative array index read
2015-05-02 15:45:17 -04:00
Goober5000
b6cc62c435
Merge pull request #54 from asarium/coverity/1093683
...
Fix for Coverity 1093683: Resource leak
2015-05-02 15:44:26 -04:00
asarium
00a288d53e
Fix for Coverity 1093606: Negative array index read
2015-05-02 19:41:55 +02:00
asarium
4bfea90a17
Fix for Coverity 1093683: Resource leak
2015-05-02 19:32:39 +02:00
asarium
aef3e3ac36
Fix for Coverity 1093688: Resource leak
2015-05-02 19:24:57 +02:00
asarium
a7398d7f5c
Fix for Coverity 1093689: Resource leak
2015-05-02 18:19:28 +02:00
MageKing17
0a6ab7d1f7
Fix persona selection in FRED's ship editor.
...
The old code operated under the assumption that all wingman personas would be at the start of the persona list. Since this assumption was neither checked for nor warned if violated anywhere else, I've made FRED work regardless of how they might be distributed throughout the Personas[] array.
2015-05-01 16:23:29 -07:00
MageKing17
e8bed8f892
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-05-01 13:09:32 -07:00
Fabian Woltermann
e2d740513a
Merge pull request #47 from MageKing17/mantis/2971
...
Fix for 2971 from MageKing17: Stop executing HUD code when running as standalone.
2015-05-01 08:27:01 +02:00
MageKing17
1a29b395ab
Stop standalones from executing hud_shield_quadrant_hit().
...
Also add some assertions to avoid (or at least help detect) similar errors in the future. Should fix Mantis 2971.
2015-04-30 22:10:17 -07:00
Goober5000
b2e01d6173
Merge pull request #42 from MageKing17/argument_sexps
...
*-argument sexp short-circuiting
2015-04-30 22:46:38 -04:00
Me
bc17966b08
Merge pull request #46 from DahBlount/recoil
...
Feature: add primary weapon recoil
2015-05-01 08:02:53 +10:00
MageKing17
be9990f6a5
Fix cf_file_exists().
...
Was passing the pointer to *size instead of *offset, so instead of seeing if the file didn't have an offset, we were checking if it didn't have a size.
2015-04-29 23:21:49 -07:00
niffiwan
c5bddac8fb
Merge pull request #43 from niffiwan/cpp11_mk2
...
Cpp11 support for GCC
2015-04-30 14:36:20 +10:00
DahBlount
3de25b7e3a
modifier value changes
...
We don't want to change things at run time so initialize them to
non-zero values.
2015-04-29 18:11:16 -07:00
DahBlount
2768863c36
Add ship_recoil_modifier
2015-04-29 18:01:52 -07:00
DahBlount
7b78df2363
Add "apply recoil" flag and modifier
...
This adds the "apply recoil" weapon flag and $Recoil Modifier:
weapons.tbl entry.
2015-04-29 17:26:33 -07:00
MageKing17
d84736be1c
Revert "Made the firepoint HUD gauge light up only the firepoints which will fire next, if "dynamic primary linking" ship flag or "cycle" weapon flag is used."
...
This reverts commit 5042c44904 .
(Apparently, "git revert" on a range is only inclusive of the end commit, not the starting commit.)
2015-04-29 16:35:41 -07:00
MageKing17
1591237acf
Reverting recent string of commits.
...
Since they didn't go through code review (and break compilation), reverting the recent string of commits (just used "git revert -n 5042c44..05b4635").
2015-04-29 16:19:59 -07:00
zookeeper
05b4635048
Added bay arrive/depart speed multipliers to +Path Metadata.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11271 387891d4-d844-0410-90c0-e4c51a9137d3
Conflicts:
code/ai/ai_profiles.cpp
2015-04-29 23:19:02 +03:00
zookeeper
eef1041323
Initialize bay_arrive_speed_mult and bay_depart_speed_mult.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10731 387891d4-d844-0410-90c0-e4c51a9137d3
Conflicts:
code/ai/ai_profiles.cpp
2015-04-29 23:17:51 +03:00
zookeeper
18058a45f7
Added ai_profiles.tbl options to force AI ships flying bay paths to gradually accelerate/decelerate instead of flying the path at max speed.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10422 387891d4-d844-0410-90c0-e4c51a9137d3
Conflicts:
code/ai/ai_profiles.cpp
2015-04-29 23:16:55 +03:00
zookeeper
fbb76863fd
Probably fixed a bug with the next/prev subsystem targeting keys not working if the target only has one subsystem.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11209 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 23:12:42 +03:00
zookeeper
400fd0f9a8
Fixed $Thruster Glow Noise Mult not having effect in the ship lab.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10789 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 23:07:41 +03:00
zookeeper
b18337754d
Added a $Model Icon Direction ship table entry for overriding the angle from which ship icons are rendered from.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10612 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 23:04:25 +03:00
zookeeper
92a28b71cb
Added a $Thruster Glow Noise Mult ship table entry for decreasing/increasing the effect of noise applied to the glow radius.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10610 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 23:04:24 +03:00
zookeeper
0656175a72
Added a $Minimum Engine Volume ship table entry for specifying the minimum engine sound volume used when ship is stationary.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10609 387891d4-d844-0410-90c0-e4c51a9137d3
Conflicts:
code/object/objectsnd.cpp
2015-04-29 23:04:23 +03:00
zookeeper
dc820fdfc1
Avoid loading the anchor ship model multiple times when resolving path masks.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11235 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 22:45:57 +03:00
zookeeper
5042c44904
Made the firepoint HUD gauge light up only the firepoints which will fire next, if "dynamic primary linking" ship flag or "cycle" weapon flag is used.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11256 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 22:42:58 +03:00
Lari Nieminen
91000b4468
Revert "Fixed +Spread From LOD not working right."
...
This reverts commit 4b15ec4e75 .
2015-04-29 22:41:17 +03:00
Lari Nieminen
91614162f2
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-04-29 22:38:05 +03:00
zookeeper
4b15ec4e75
Fixed +Spread From LOD not working right.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11268 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 22:36:43 +03:00
MageKing17
e84a6e8d33
Fix tech room mission lists.
...
get_mission_info() was returning an uninitialized int due to rval no longer being initialized to 0 by setjmp(). Since rval isn't actually needed anymore, I went ahead and removed it. The only bits of code that actually check the return value of get_mission_info() are the tech room's mission simulator and some of the multiplayer code, so this bug wasn't actually preventing missions from being played through the ready room.
2015-04-29 12:34:11 -07:00
niffiwan
763601033b
Remove unused function from palman.[cpp|h]
2015-04-29 21:00:19 +10:00
niffiwan
0ff8c8191f
Remove gcc -Wshadow warnings
2015-04-29 20:55:56 +10:00
niffiwan
b0bb0ee3be
Remove gcc -Wunused-but-set-variable warnings
2015-04-29 20:27:49 +10:00
MageKing17
31140ab533
Make FRED use the new try-catch logic.
...
Missed during the recent parseExceptions merge; there was a usage of setjmp() during the background import dialogue.
2015-04-28 19:09:19 -07:00
niffiwan
e3d1428e35
From Yarn: fix mantis 3157
...
Switch German and Polish translations of "Transport"
2015-04-28 19:36:30 +10:00
Fabian Woltermann
1d332d693d
Merge pull request #38 from asarium/feature/parseExceptions
...
Replace longjmp with exceptions
2015-04-28 07:47:53 +02:00
niffiwan
36c656c389
bah, lrn2markdown
2015-04-27 20:46:37 +10:00
niffiwan
43b8cf2221
Resolve github issue #34 (add Coverity Badge)
...
Also freshen up the new README.md contents
2015-04-27 20:43:51 +10:00
MageKing17
ad91ba61b5
Short-circuit eval_sexp() on SEXP_NAN_FOREVER.
...
Since SEXP_NAN_FOREVER is supposed to indicate that the node will always evaluate to SEXP_NAN_FOREVER, we should short-circuit the process like we do for SEXP_KNOWN_TRUE and SEXP_KNOWN_FALSE.
2015-04-27 03:11:33 -07:00
MageKing17
7dea7075e7
Clean up eval_sexp() return value comparisons.
...
From niffiwan and myself (almost entirely niffiwan). Since eval_sexp() can't actually (and shouldn't) return certain special values, remove conditions checking for them and remove the erroneous comment claiming they should be returned.
2015-04-27 03:09:45 -07:00
MageKing17
9ec10dd3e6
Fix memory leak in for-counter.
...
Switch from strdup() to vm_strdup(), and make sure the allocated strings get freed after usage.
2015-04-27 03:06:28 -07:00
MageKing17
83b59fb76c
Make *-argument SEXPs possible to short-circuit.
...
Fixes Mantis 3136. Written by niffiwan and myself. Allows the *-of SEXPs to return SEXP_KNOWN_FALSE when they can't evaluate ever again, allowing the when-argument or every-time-argument SEXP containing them to itself return SEXP_KNOWN_FALSE.
2015-04-27 03:05:18 -07:00
Lari Nieminen
418d53f169
Removed false "returns ptr to vector" comments.
2015-04-27 11:57:39 +03:00
MageKing17
15f6549087
Ship templates!
...
Restores ship templates, only working, thanks to ship_info now having a proper copy-assignment operator.
2015-04-27 00:05:57 -07:00
MageKing17
3a7307d0ce
Somewhat-related followup to Ship_info vectorization.
...
There were some references to MAX_WEAPON_TYPES in missionscreencommon.cpp that really looked like they should've been referring to Num_weapon_types (formatted similarly to some references to MAX_SHIP_CLASSES which were changed to Ship_info.size() references). Figured I might as well fix them at the same time.
2015-04-27 00:03:20 -07:00
MageKing17
bc0c7cf4c5
Vectorization of Ship_info.
...
Converts Ship_info from a ship_info[] to an SCP_vector<ship_info>. ship_info now has proper constructors, assignment operators, and a destructor. Num_ship_classes removed; various references to Num_ship_classes and/or MAX_SHIP_CLASSES (which remains for various other structures which need it) changed to Ship_info.size() instead.
This doesn't make the ship class limit dynamic, but it is a preparatory step to get there.
2015-04-27 00:01:22 -07:00
MageKing17
5daf294f25
Remove irrelevant assertion.
...
Removes assertion in ship_model_update_instance() about turrets having the ability to rotate. Matches previous change to ship_model_start() (done in r10822; see also Mantis 3061).
2015-04-26 15:51:37 -07:00
MageKing17
0bcb3f24e6
Fix automatic "$Short name:" generation.
...
Made it include srcend (i.e. the null terminator) so that treating short_name as a null-terminated string (which it should be) doesn't access invalid memory. Also removed unused "destend" pointer.
2015-04-26 13:48:11 -07:00
MageKing17
9e66027e8b
Remove unused "tspecies_names" pointer array.
2015-04-26 13:38:20 -07:00
MageKing17
d1444b45ac
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-04-26 10:04:57 -07:00
MageKing17
26553f1327
Voice recognition upgrades.
...
Switches to an in-process recognizer, removes the hard-coded wing list (which could in accessing invalid memory, when used with a custom grammar file), and fixes up the grammar file a bit.
2015-04-26 10:03:44 -07:00
Cliff Gordon (chief1983)
18ef1f77d4
FreeBSD 10 is on Clang now, -ansi doesn't mean anything here.
2015-04-26 10:27:12 -05:00
asarium
9aed627ce7
Replace longjmp with exceptions
...
Also added a EditorConfig file
2015-04-24 15:03:59 +02:00
chief1983
f187522238
File exists wrappers for bitmaps and animations; eliminates worrying about extensions, only need the base filename and it'll tell you if it's available.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11328 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:19 +10:00
chief1983
26adf935f7
Globalize various file extension lists littered throughout the code so they can be referenced from other classes as needed, instead of being hardcoded multiple times.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11327 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:18 +10:00
chief1983
d68baac787
Eliminate some redundancy with ship allowed weapon parsing.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11326 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:17 +10:00
chief1983
c3d3f4d4dd
Update OS X project to work with updated Jansson.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11325 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:17 +10:00
chief1983
cc037e3259
Upgrade Jansson to 2.7.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11324 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:16 +10:00
MageKing17
0c60515662
Record mission loading time in the debug log.
...
(Just changes a printf into an mprintf.)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11323 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:15 +10:00
MageKing17
ec88fdbae1
Minor objectsnd.cpp cleanup.
...
Should be all nonfunctional changes (yes, even those "else" branches that look like they change behavior; functionally speaking, those branches shouldn't get hit because FSO will delete the sounds when they shouldn't apply).
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11322 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:10 +10:00
MageKing17
83414b238d
Remove required_string_3() and required_string_4().
...
Replaced with usage of required_string_one_of(). (required_string_either() not removed due to different behavior.)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11321 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:06 +10:00
MageKing17
a233f62afb
Remove some redundant code in parselo.cpp.
...
7 cases in stuff_string() (both versions) were using identical code. Consolidated into one branch for clarity.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11320 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:08:31 +10:00
MageKing17
8ef442205c
Fix minor problem with weapons.cpp.
...
If "@Laser Color2:" is defined for a weapon and you override that weapon with a modular table (even if that override entry doesn't actually contain any data), the weapon's laser_color_2 value would get defaulted to its laser_color_1 value. Now, only do that if changing laser_color_1 and the RGB values of the two colors matched before.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11319 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:08:31 +10:00
MageKing17
66bddb970c
Commit various updates to the MSVS 2013 project files, following discussion in #scp.
...
Fixes Mantis 3104, amongst other minor issues. Given the existence of the Community Edition, decided to make FS2_SPEECH and FS2_VOICER defined by default. Setup release builds for debugging symbols. Corrected a few inconsistencies between configurations.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11318 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:08:30 +10:00
chief1983
4ecc546e34
Backport (?) r3727 and 3733 from fs2_open-unstable_old, the old CVS unstable branch.
...
3727: added MadProf's voice recognition enhancements
3733: fix spelling, and synch with voicerec.cpp
See http://www.hard-light.net/forums/index.php?topic=37643.msg880793#msg880793 for more information.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11317 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:08:29 +10:00
MageKing17
aaec401c8f
Removing unused code from hud.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11315 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-19 00:10:27 +10:00
MageKing17
6f1e33938c
Fix a possible crash with -reparse_mainhall.
...
Left over pointer towards a structure that had been cleared and rebuilt could cause a crash. Found (and fix tested) by Axem. Also thanks to z64555 for bouncing ideas back and forth until this solution was found.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11314 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-18 18:12:07 +10:00
chief1983
c4d1ed526c
Other half of version bump to 3.7.3, I will probably have that automated by the next release cycle.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11310 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-18 18:12:06 +10:00
chief1983
161e7498c4
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11309 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-18 18:12:04 +10:00
m_m
e3311f36ac
Fix for Mantis 3156: Fighter beam range depends on target radius
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11307 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-18 00:09:10 +10:00
MageKing17
ed11f9a1c1
Fix objnum/instance confusion in comm menu.
...
Could cause orders to be grayed out for the wrong ship, due to it happening to have an objnum matching the instance of the ship you were ordering.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11305 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-17 06:07:54 +10:00
niffiwan
e0e3cffab6
Update credits for 3.7.2
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11304 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-16 00:08:49 +10:00
z64555
b6d48faf4d
BMPMAN doxy effort. Also defines EXAMPLE_PATH in the doxyfile to enable use of the @example command, which references code snippets as examples.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11303 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-14 00:06:58 +10:00
zookeeper
73d6483df6
Typo-fixed and clarified some SEXP argument descriptions.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11302 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-12 12:07:23 +10:00
zookeeper
3952713eba
Fixed "get-ets-values" to "get-ets-value" in the help string.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11301 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-12 12:07:22 +10:00
z64555
617c530a3b
From Echelon9 and myself. Resolves some typos with the debug console parser.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11300 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-11 18:11:42 +10:00
niffiwan
8c0f95ced8
Fix mantis 3150
...
Use and set music volume changes requested by sexp_adjust_audio_volume()
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11299 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-11 12:12:06 +10:00
Goober5000
78f9c8f82c
related to Mantis #3130 - don't create a VBO if we're not supposed to
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11298 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-11 12:12:03 +10:00
m_m
9ad5d09c0a
From LotF and me: Fix for Mantis 3146: Crash when pressing enter key in empty region of main hall
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11296 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-31 18:58:28 +10:00
MageKing17
b61779e852
Fix mantis #3154 .
...
Adds ON_CLBN_CHKCHANGE to the message map for the ships and weapons lists so that hitting spacebar to change the checked/unchecked status of a ship or weapon also updates the availability count.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11295 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-31 18:40:28 +10:00
m_m
2d82f7652d
Fix "Callsigns still don't work when messages come from capships" issue
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11294 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-30 17:29:39 +10:00
The_E
9284264885
Patch to add MSVC2015 support. Also fixes a few warnings its compiler threw.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11292 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-29 11:05:02 +10:00
niffiwan
3e9c19c5c7
Fix mantis 3151
...
Implement case insensitive -mod dir search on *nix
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11291 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-28 11:12:25 +10:00
z64555
cd8595cf0f
Fix for Mantis 3152: Moves the trail origin to the mathematical center of a laser bolt, if the weapon's render type is a laser.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11290 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-28 08:53:10 +10:00
The_E
1199555321
Adds a new debug output filter, "CFileDebug", which if enabled via debug_filter.cfg will print the absolute path to any file requested by the engine.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11289 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-22 13:04:55 +10:00
The_E
0808c3459f
If a text file to be read by the engine is in Unicode, abort. Could be something important we're missing.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11288 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-22 13:04:55 +10:00
niffiwan
b5fe481ab2
add script-eval-block sexp
...
This is a workaround to the sexp TOKEN_LENGTH limit
The script can be split across multiple arguments to allow scripts
longer than 32 chars (i.e. current TOKEN_LENGTH)
e.g.
( script-eval
"ba.warning('foo"
" more and more and more"
" and the rest')"
)
Kudos to Axem for suggesting the idea
(And to zookeeper for reminding me to actually commit it!)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11286 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-21 11:41:49 +10:00
zookeeper
44b786c171
Fixed a mistake in $Model Point Shield Controls.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11285 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-19 16:40:17 +10:00
MageKing17
21cbf82196
Fix mantis 3147. From Admiral MS and myself.
...
From Admiral MS: Avoid bashing orientation if trying to avoid a collision.
From myself: Bash orientation if aspect seekers are equipped.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11284 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-18 18:21:21 +10:00
zookeeper
ae32159408
Moved the fix in r11279 to a slightly more logical place.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11280 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-17 11:20:24 +10:00
zookeeper
56f694dc43
Check for and fix rare but possible discrepancy between sip->model_num and sip->subsystems[].model_num which can lead to model index collision errors.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11279 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-17 08:30:08 +10:00
zookeeper
95145a4f3f
Slightly clarified variable use.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11276 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-07 09:39:26 +10:00
MageKing17
e0527d9bc7
Fix mantis #1929 .
...
Makes the IDC_OLD_TEXTURE_LIST dropdown list use the same sorting as the old_texture_name[] array, and should also so that multiple old texture replacements for the same ship are properly erased.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11274 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-04 22:43:03 +10:00
MageKing17
4742378d50
Followup to r11266; let code use hardcoded defaults.
...
Presumably, the use of use_default_pos in load_gauge_radar_dradis() is the result of a copy&paste job, but removing it allows the default values to be used to compute coords.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11273 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-04 22:43:03 +10:00
zookeeper
a2e15f4c61
Tweaks to the argument documentation of a bunch of scripting functions.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11272 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-03 16:22:51 +10:00
zookeeper
77b245eed2
Fixed shield handle not returning correct quads when indexing with the SHIELD_* enums.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11270 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-03 16:22:51 +10:00
niffiwan
a1979e704e
Coverity 1244962 Uninitialized scalar variable
...
Set default DRADIS coords to 0,0
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11266 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
niffiwan
23fbcb1a2f
Add indentation for previous commit
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11265 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
niffiwan
dc02e70716
Coverity 1093719 Negative array index read
...
Check current_bank is > -1 before using it
Note: did not alter indentation in this commit in order to make
relevant changes easier to see
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11264 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
niffiwan
170614f150
Coverity 1093718 Negative array index read
...
Create swip after checking that its index is > -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11263 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
niffiwan
5c8a6234a1
Coverity 1093705 Negative array index read
...
Probably not an issue, but to be safe removing the unused pointer anyway
i.e. the check that instance >= 0 suggests there's a possiblilty that the
pointer could contains a negative array index read
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11262 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
niffiwan
aadc41a40a
Coverity 1093495+1093498 Missing break in switch
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11261 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
zookeeper
2203c1e9a8
Ported r11232 from zookeeper branch: Set the Sender hook variable to nil in On Message Received hooks if message not coming from a ship.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11257 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-21 11:34:30 +10:00
MageKing17
40a9025aeb
Fixes hardpoint gauge not rendering outline.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11247 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-12 17:13:54 +10:00
MageKing17
14bd62147c
Adding a "$Briefing Grid:" interface color to colors.tbl.
...
Requested by Axem.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11245 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-12 17:13:54 +10:00
m_m
70d735ceb4
Added "On HUD Message Received" scripting hook which is invoked when the HUD receives message text to display.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11242 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-09 17:22:03 +10:00
niffiwan
7d92b1cecf
Fix mantis 3138: remove spurious warning
...
Don't warn about low rotational velocities disabling collisions for
no_collide ships
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11238 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-03 17:08:58 +10:00
zookeeper
8a50f844b0
Improved warnings text and clarified variable use in turret modelread code.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11236 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-02 17:21:53 +10:00
zookeeper
35d6a9654d
Ported r11100 from zookeeper branch: Fix various issues with $Acceleration Time.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11234 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-27 18:27:41 +10:00
zookeeper
c47233ca3c
Ported r11085 from zookeeper branch: Fixed weapon particle spews not taking launch velocity properly into account if $Acceleration Time is used.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11233 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-27 18:27:40 +10:00
MageKing17
d01856d992
Fix a potential crash during ships.tbl parsing.
...
Makes parse_ship() use ship_info_lookup_sub() instead of ship_info_lookup() (shouldn't be jumping through those hoops during table parsing if they're for FS1 mission conversion), and more importantly, added an error check to ship_info_lookup() to avoid sprintf() exceeding the length of the char array.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11230 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-24 09:22:32 +10:00
chief1983
ec758aa108
Fix for Mantis 3036: This unifies the cf_exists function to behave like the other functions in the cf_exists* family, and simultaneously addresses the bug.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11222 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-23 18:35:55 +10:00
MageKing17
f5c1b6608d
Reverting r4959 per discussion on #scp and the forums.
...
Adding every "#"-variant was causing spurious errors when switching from the MediaVPs to no mod. See http://www.hard-light.net/forums/index.php?topic=88982.0 for details.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11221 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-20 18:50:38 +10:00
chief1983
7df12ebd75
Experimental flag to apply lighting to briefing window model popups. Flag should be removed and behavior made default if no issues arise after next release.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11218 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-16 18:58:02 +10:00
zookeeper
4422aaa311
Fixed an issue with disabled binds getting matched in key translation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11215 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:44 +10:00
chief1983
9ebcc3e437
Added OpenBSD to what is now a multi-BSD check.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11214 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
Goober5000
4f53f07681
minor modifications to mission cutscenes: change cutscene_name field to filename, because it's actually the filename of the cutscene make struct a plain old data object (no constructor) make parsing a little tidier, and make the SEXP formula and closing #end tag optional
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11213 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
Goober5000
61df0f18b1
add warning if a cutscene is specified that isn't in cutscenes.tbl
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11212 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
Goober5000
87e8170268
add optional_string_one_of, which is useful to have
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11211 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
Goober5000
b9a6a9f23e
instead of an Int3(), use a Warning that's only displayed once
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11210 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
MageKing17
6a77d128c9
Fixing weird problem with snd_update_3d_pos() that, honestly, baffles me as to how the code ever worked on any system.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11208 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
zookeeper
20218b0924
Added support for NONE as a value for $Key Default, for making a key unbound by default.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11206 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
zookeeper
b1f1756dd1
Fixed breakage of $Category and $Type from r10843.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11205 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
Goober5000
7250cd13a6
add ship class texture replacement using a simplified method that doesn't require the texture_set code
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11204 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-23 18:15:11 +10:00
MageKing17
b23aea5a41
Fix mantis #3068 .
...
Make hitting the "delete" key in the pilot-selection menu do the same thing as clicking on the "remove" button.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11202 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-22 18:01:31 +10:00
niffiwan
a49eb75c6e
Add warning for very fast ship-rotation values
...
Otherwise rotational collision detection is disabled for the ship
(and an int3() triggers in debug)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11201 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-20 11:54:49 +10:00
MageKing17
c8b48e4a36
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.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11198 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-16 19:57:49 +10:00
Goober5000
709f483617
PAUSE ALL THE STREAMS
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11197 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-12 16:12:16 +10:00
MageKing17
ffd74fa60b
Adding "+Available From Start:" to Medals.tbl.
...
Requested by MjnMixael.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11196 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-12 16:12:16 +10:00
Goober5000
1c826d366e
add the pauseMusic scripting function, requested by MjnMixael
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11195 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-11 18:15:36 +10:00
Goober5000
1c464864c3
fix Mantis #3132 (is-iff returns true when the target is destroyed)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11193 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-10 16:37:43 +10:00
MageKing17
a03f96ca01
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.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11192 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-10 16:37:43 +10:00
MageKing17
15fad7f58b
Correct copy-paste error in check_sexp_syntax() from the armor types commit.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11191 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-09 14:09:29 +10:00
Goober5000
f01c4bf952
fix Mantis #3135 : account for the case when the game is paused before being minimized
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11190 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-08 17:14:57 +10:00
MageKing17
1d7c01181e
Fix mantis #3133 . Fixes logic errors in factor_table not being sure if it's supposed to be 0-based or 1-based at different times.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11189 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-08 17:14:57 +10:00
Goober5000
0162cab8bd
move this around for more logical flow
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11188 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-08 17:14:57 +10:00
Goober5000
b02af2ef6e
a more future-proof way to keep track of explicitly paused audio
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11187 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-04 16:39:40 +10:00
Goober5000
4eb1726004
this should fix Mantis #2888 (allow for head.ani files without letter suffixes)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11186 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-04 16:39:40 +10:00
Goober5000
2f734daf0d
when the game returns from a paused state, don't unpause the music paused by sexp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11185 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-03 20:31:32 +10:00
Goober5000
a516b88803
it's good to check whether the music is paused, for bulletproof-ness
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11184 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-03 20:31:31 +10:00
Goober5000
9f12e1f56b
added a sexp to pause and unpause music that is currently playing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11183 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-03 20:31:31 +10:00
Goober5000
255c2912cb
minor reorganization
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11182 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-03 16:23:42 +10:00
Goober5000
ac25da1bd9
remove the Error (originally Assert) from r1675 and add back the comment removed in r8005
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11181 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-01 20:37:52 +10:00
Goober5000
872bbe2a11
improve sexp code for obtaining pitch/bank/heading with the following changes: 1) use an alternate algorithm for extracting angles from an orientation matrix 2) properly round floats to integers when converting to degrees
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11180 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-29 19:53:19 +10:00
Goober5000
f7353121e6
m!m's fix for Mantis #3131 : contrary to the xt change from r11138, NULL is only returned on vm_malloc failure (so should never happen in normal execution)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11179 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-25 19:15:56 +10:00
MageKing17
f64afbecfb
From The_E, niffiwan, m_m, and myself: Fix Mantis 2404.
...
Makes "$Weapon Model Draw Distance:" actually stop external weapon models from being drawn beyond that distance (modified by detail level).
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11178 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-22 08:47:11 +10:00
niffiwan
c05845cb9d
Fix mantis 3114
...
Change turret-tagged-only behaviour back to retail
Add AI profiles flag to allow use of newer behaviour (i.e. stricter)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11177 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-21 19:26:53 +10:00
niffiwan
a73404dbd5
Error needs LOCATION :)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11176 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-21 19:26:53 +10:00
The_E
fbd590cd77
Improvement for this error message
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11175 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-21 18:43:52 +10:00
MageKing17
e4072d6e51
Adding area-of-effect capability to Electronics weapons.
...
By adding an "+Area Of Effect" line after "+New Style:" or "+Old Style:", it causes every ship caught in the weapon's shockwave or blast to suffer electronics disruption. Requested by Black Wolf.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11173 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-21 18:43:52 +10:00
MageKing17
0417b4c335
Ensure that the debriefing code sets the font before wordwrapping.
...
Also, explicitly set the font instead of relying on Debrief_ui_window.draw() doing it implicitly.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11172 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-18 18:09:08 +10:00
MageKing17
b14b590ab1
Adding "interceptable", "turret interceptable", and "fighter interceptable" weapon flags.
...
These allow munitions to be attacked by the AI without needing to set the "bomb" flag; "turret interceptable" means it can be attacked by turrets, "fighter interceptable" means it can be shot down by fighters, and "interceptable" sets both flags simultaneously. Requested by Rheyah.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11171 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-10 17:45:58 +10:00
m_m
de57f043da
From MageKing17 and me: Fix for Mantis 3128: Docking related crash - dock_list isn't initialized This patch makes the copy constructor and the assignment operator of the object class private as it contains members that should not be copied.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11170 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-08 10:57:03 +10:00
niffiwan
487f764764
Redo Coverity 1215458 Uninitialized pointer field
...
Includes more robust checks of cmdline_parm data
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11169 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-02 19:52:04 +10:00
m_m
86510572bf
With help from MageKing17: Fix for Mantis 3123: Virtual variables and indexers that return nil break the scripting system
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11168 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-02 11:22:29 +10:00
MageKing17
e604125e5d
Minor followup to r11150.
...
The regular parsing code not using the same broken logic as parse_comments() is not the same thing as it "ignoring" too high versions, and searching for repetitions of the same token would result in just finding the first one over and over again (the likelihood of this actually mattering to anyone is minuscule, but I needed something to test commit access, and this code has been tested).
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11167 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-30 13:23:58 +10:00
Swifty
33776fc4be
gr_opengl_string retooled to use glDrawArrays. Should be a bit faster now.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11165 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-29 18:47:04 +10:00
zookeeper
c13c35ec25
Fixed a FRED crash when using $Flight controls follow eyepoint orientation (patch by MageKing17).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11163 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-29 18:47:04 +10:00
zookeeper
83d6456c6a
Clarified how to set a new variable with mn.SEXPVariables.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11161 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-28 22:04:56 +10:00
zookeeper
1d55b98017
Added a little extra info to two bmpman errors.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11160 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-28 22:04:56 +10:00
m_m
bd602cc1a3
Revert 11158 as it breaks FRED compilation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11159 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-27 18:23:02 +10:00
m_m
89cd36a242
Fix a crash reported by Axem related to freeing the dock list of an object. This was caused by freeing the dock list from the destructor of an object which meant that copies of an object would corrupt the original object instance. To make sure that doesn't happen again the copy constructor and assignment operator of object have been made private.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11158 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-27 18:23:02 +10:00
Goober5000
414daaaed8
Mantis #3127 : fix the spatial check in the rewritten algorithm
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11157 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-27 18:23:02 +10:00
The_E
4295cd3edb
Corrects an unwanted change in formatting
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11155 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-27 18:22:42 +10:00
The_E
6c48551fb3
From MageKing17: Make the lua doManeuver command behave the same way as the sexp.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11154 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-27 18:22:42 +10:00
niffiwan
866667a977
Fix mantis 3126 (from MageKing17)
...
Remove limit of 32 tbms being loaded for any given table type
2014-10-24 19:35:47 +10:00
niffiwan
d1aa2e1c37
Set 1024x768 32bit as default res on *nix
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11153 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-24 19:06:22 +10:00
niffiwan
07e1679138
Partial revert of r11145
...
A fake subsystem used as the firing point for fighter beams. It's
re-used for every fire point so the turret is supposed to only have 1
firepoint. i.e. energy consumption was already correctly calculated
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11152 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-24 19:06:21 +10:00
niffiwan
16f0ff1959
Allow fonts to set/change special char indexes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11151 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-24 19:06:21 +10:00
Goober5000
6cc96ce0c5
MageKing17 has done yeoman's work in fixing the version-specific commenting system. Thanks, MageKing17!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11150 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:40 +10:00
Goober5000
9161158996
xt branch: load stuff from the correct location
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11149 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:35 +10:00
Goober5000
557ef07079
xt branch: memset a bunch of weapons strings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11148 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:33 +10:00
Goober5000
130165af9f
xt branch: WIF_MFLASH is unnecessary because we can check whether there is a muzzle flash index
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11147 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:32 +10:00
Goober5000
6e56b2970f
xt branch: minor tweaks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11146 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:31 +10:00
Goober5000
5a31e0b38e
xt branch: 1) the number of beam firing points should be the same as the number of ship firing points, because that's how we're calculating the expenditure of weapon energy 2) clear out Ship_type information when we exit the game
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11145 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:29 +10:00
Goober5000
3234a8360c
refine the calculation of effective_primary_banks... 1) optimization from xt branch: don't calculate if we only actually have one bank on our ship 2) make sure to count the current bank that we're firing, to avoid an edge case where we might have a negative fire penalty 3) make the condition logic a little clearer
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11144 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:26 +10:00
Goober5000
14dfb5e73d
xt branch: minor ship.cpp fixes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11143 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:21 +10:00
Goober5000
d734f76369
xt branch: "Nothing major here, just added the same basic stuff from the nebula code to make beam glows fade out depending on how close to the eye they are. The primary reason for this was for beams on fighters, since the muzzle glows tend to block your view when they show up. Having them fade out still gives you the visual effect, but allows you to see through them as well."
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11142 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:16 +10:00
Goober5000
871bb0b19a
xt branch: minor optimizations in beam.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11141 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:14 +10:00
Goober5000
4f06fd2435
additional string safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11140 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-15 18:22:57 +10:00
Goober5000
e9f5c531e0
heh... Microsoft's implementation of snprintf doesn't conform to the standard!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11139 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-15 06:23:18 +10:00
Goober5000
dff2156c18
xt branch: more string safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11138 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:41 +10:00
Goober5000
f23a3c5843
SCP_string is useful here too
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11137 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:40 +10:00
Goober5000
ff38449a46
string printing safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11136 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:39 +10:00
Goober5000
1318ccfa91
wut? defaulting to NULL here will cause these to never log anything...
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11135 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:38 +10:00
Goober5000
65265f8ab8
fix a compile error (d'oh) and use type safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11134 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:37 +10:00
Goober5000
a541a22239
xt branch: optimize objectsort.cpp by not calculating some things every loop iteration
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11133 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:35 +10:00
Goober5000
aee1305841
according to the C standard... "The functions snprintf() and vsnprintf() write at most size bytes (including the trailing null byte ('\0')) to str." ...so we have that going for us, which is nice
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11132 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:33 +10:00
Goober5000
e43dacdcc3
xt branch: use CLAMP here
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11131 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:32 +10:00
Goober5000
8e4d98bd4f
xt branch: minor tweaks to glow_points
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11130 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:31 +10:00
Goober5000
f6e2f1d236
xt branch: optimizations in modelcollide.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11129 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:25 +10:00
Goober5000
e22a4b0b5b
xt branch: add capability for custom identifiers in build names (e.g. Xt-0314)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11128 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:24 +10:00
Goober5000
11855ed3d8
xt branch: having a float version of gr_opengl_string makes text scrolling nice and smooth at high nonstandard resolutions (also, looks like quad rendering works just fine here; no need to convert to tris)
...
convert credits.cpp to use float version of gr_opengl_string; eventually Taylor wanted to make the float version standard
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11127 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:23 +10:00
Goober5000
fe775aeedf
xt branch: optimizations in fvi.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11126 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:22 +10:00
Goober5000
5c0bc126bb
xt branch: tweaks to vecmat.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11125 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:20 +10:00
Goober5000
c6364987b3
we don't need to cast because mod is a float
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11124 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:17 +10:00
Goober5000
b8a05e30a0
xt: sprintf length safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11123 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 18:22:14 +10:00
Goober5000
5f3600dc79
probably good to change the comment too
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11122 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 18:22:13 +10:00
Goober5000
f2d8277452
xt branch: additional optimizations using RAND_MAX_1f
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11121 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 18:22:12 +10:00
Goober5000
31562ba811
xt branch tweaks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11120 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 18:22:10 +10:00
Goober5000
4200bb55d7
from xt branch: remove unneeded parameters, tweak some assets, minor optimization
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11119 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 12:21:51 +10:00
Goober5000
bffdef1ce5
from xt branch: add some hysteresis to asteroid fields to prevent "popping" when an asteroid exceeds the bounds
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11118 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 06:22:25 +10:00
Goober5000
4dafc8ff5f
this too
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11117 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 06:22:24 +10:00
Goober5000
d5e81757b0
some turret changes from the XT branch
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11116 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 06:22:22 +10:00
Goober5000
61c97871f0
technically, this is better
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11115 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-09 18:21:40 +10:00
Goober5000
50f16b7d02
better method of appending ellipsis (nb: strncpy pads with 0 if string is shorter than len)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11114 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-09 18:21:37 +10:00
Goober5000
8688b05c91
related to Mantis #3121 , make SEXP parsing more robust, and remove some old debug/unused code in get_sexp_main()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11113 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-09 18:21:35 +10:00
chief1983
9a90a43801
Wrong variable type, may work in MSVC but not on clang or gcc.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11112 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-09 06:21:40 +10:00
Goober5000
15c6f18c74
remove unused debug function
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11111 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-08 18:22:27 +10:00
Goober5000
5552fbcbd9
related to Mantis #3121 , add parentheses if the string passed to runSEXP doesn't have them
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11110 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-08 18:22:24 +10:00
Goober5000
a3b7eec214
make flag checking more efficient and prevent an Int3() on bad data
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11109 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-07 18:22:11 +10:00
Goober5000
2d14ca7539
Parias's patch for Mantis #3102 (make show-subtitle-text positioning consistent on MP clients)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11108 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-07 18:22:10 +10:00
Goober5000
88abaf6de4
I forget who requested this, but this change now causes FRED to allow numeric sexps to be used for OPF_WEAPON_BANK_NUMBER
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11107 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-07 18:22:08 +10:00
Goober5000
3b90b65547
allow sexps which reference sounds to use either the table index or the entry name as the reference (based on a patch by m!m, see http://www.hard-light.net/forums/index.php?topic=86293.0 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11106 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-07 18:22:07 +10:00
zookeeper
4e0beccfc9
Reverted r10944 and r10945 for now, with the exception of the GL_TRIANGLE_STRIP->GL_QUADS fix.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11105 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-07 12:21:56 +10:00
Goober5000
cc76884514
well ok, revert that
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11104 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-06 18:20:08 +10:00
Goober5000
c3bcfc6303
don't enable nav system always... that's not how this is supposed to work
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11103 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-06 18:20:06 +10:00
m_m
478bb022c7
Fixed a bug reported by Axem: The scripting API used the wrong functions to determine if a hud gauge is a custom hud gauge.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11102 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-06 12:20:50 +10:00
Goober5000
4037d3be68
tweaks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11101 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-05 18:20:10 +10:00
Goober5000
85872114ee
related to Mantis #2971 : properly reset shield info when we have a null objp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11099 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:44 +10:00
Goober5000
93c7775109
stupid missing parenthesis >.>
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11098 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:44 +10:00
Goober5000
e15cd38a88
Between the Ashes HPC request: extend ai-chase-same-team to ai-disarm, ai-disable, and ai-destroy-subsys too
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11097 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:44 +10:00
Goober5000
416af26244
and on the subject of Mantis #3110 : fix the multi_sexp_deal_with_ship_flag issue that MageKing17 noticed, and tweak a sexp to be more clear
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11096 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:44 +10:00
Goober5000
cd2996f01d
MageKing17's patch for Mantis #3110 : Message Brackets not displayed with 'Invisible to Friendlies' flag
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11095 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:43 +10:00
Goober5000
f7e3bef9b7
Between the Ashes HPC request: allow ships to attack others on the same team
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11094 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:43 +10:00
Goober5000
31716a9348
use the OBJ_INDEX macro, because that's why we have it
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11093 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:43 +10:00
z64555
ec60984483
From MageKing17, Makes the $CD: token for cutscenes.tbl optional. Useful, since a majority of assets no longer require physical CD's.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11092 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:43 +10:00
chief1983
5e94b75354
Fix Mantis 3109: Revert r11079 and reopen #2888 since I didn't realize that Fred messages also often use built-in suffix appending. Need to either use FUBAR's original solution or re-engineer something else.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11090 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-29 06:19:41 +10:00
niffiwan
484b518760
Fix mantis 2804: beams can use damage factors
...
Add game_setting.tbl option that allows beams to use weapons table
Armor/Shield/Subsystem damage factors
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11089 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-27 18:20:18 +10:00
niffiwan
df3435cadd
Fix mantis 3108 (from Yarn)
...
Make parsing of DRADIS and custom hud gauges consistent with the rest
of the hud gauges
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11087 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-27 00:19:25 +10:00
Goober5000
7917b9885d
fix Mantis #2987 (AddressSanitizer: global-buffer-overflow in message_queue_process())
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11084 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-25 16:40:34 +10:00
Goober5000
e0aaa83513
CommanderDJ's patch for Mantis #2899 (AddressSanitizer: heap-buffer-overflow in snd_play() sound.cpp)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11083 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-25 16:40:34 +10:00
Goober5000
435b078157
Yarn's patch for Mantis #3107 (Parts of the interface code assume a font size of 10)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11082 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-25 16:40:34 +10:00
Goober5000
a3e83aacfe
CommanderDJ's patch for Mantis #3050 (Custom mainhall text is limited to 10 chars in the campaign editor)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11081 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-24 20:08:21 +10:00
Goober5000
62a2fb3c00
Yarn's patch for Mantis #3106 (Font parameter in hud_gauges.tbl not parsed correctly)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11080 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-24 20:08:21 +10:00
chief1983
946d7a45af
Fix for Mantis 2888 - add Suffix support to disable suffixes for messages on a per message basis in messages.tbl. See the wiki.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11079 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-24 20:08:21 +10:00
niffiwan
ab3ebebc9c
Parts of mantis 3103 (From MageKing17)
...
Points 3-5 from the mantis ticket
i.e. use OPF_SSM_CLASS in appropriate places
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11078 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-22 20:17:36 +10:00
m_m
5b79ed3ea5
Fix for Mantis 3093: mn.getMissionFilenname() doesn't return a value if in GS_STATE_BRIEFING
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11077 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-22 19:59:03 +10:00
m_m
dd4c91f8b6
From Parias: Fix for Mantis 3094: Request for new scripting function: ts.playCutscene()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11076 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-18 19:11:16 +10:00
niffiwan
fc9f570374
Update .gitignore for new autoconf & libtool
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11075 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-13 14:03:50 +10:00
niffiwan
fb2ce33802
Fix mantis 3105 (from MageKing17)
...
Use a pointer for reading radar IFF info, not an object copy
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11074 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-13 13:52:21 +10:00
niffiwan
d9a4320dbb
Add missing \n to mod_table mprintf
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11073 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-13 13:52:21 +10:00
niffiwan
cd7b271b3b
Tweak autotools
...
Use libtool, remove warnings about subdirs, DIE if autogen.sh pre-reqs
aren't met
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11072 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
1ac06f8b1c
substitue main hall for displaying MjnMixael's main halls in fsport
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11046 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
7cd97633b6
Yarn's patch for Polish localization
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11044 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
603e96865f
VC6 compatibility
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11043 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
5e2046c44b
use class declarations since these contain SCP_string
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11042 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
d2a6beaacc
that variable isn't actually a buffer, so change the misleading name
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11041 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
cd76a257c1
subtitles can now be as long as messages
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11040 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
6052d9c4a4
since we can replace variables in SCP_string, use that instead of an arbitrary char[256] buffer also const-correctness in the constructor
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11039 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
c866ff0061
Karajorma missed an Opps :p
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11038 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
dd353a74d8
add an Assertion about a buffer overflow vulnerability in split_str
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11037 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
karajorma
b05303fa63
Opps. Only need that defined once!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11036 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
karajorma
23d5913e9d
The previously committed version of multi-eval did not include the code to allow it to determine if client side scripts should also be executed on the server. This version does but will break any previously created missions.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11035 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
karajorma
04fe7fb64a
Fix Mantis 3077 (Subtitles including a message will crash multiplayer games).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11034 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
niffiwan
3052565490
Revert "Silence GCC warning variable ‘max_size’ set but not used"
...
Based on chief1983's comment that this code is still used, I'll take
the safer route of just telling gcc to shaddupaboudit
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11029 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
b63fd9a86a
Mantis #3101 : check for presence of support dockpoints in all builds, not just release
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11028 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
a7d6891520
MageKing17's patch: add door keys and quick start region, and fix single player / multiplayer description toggling also fix two warnings regarding int and boolean conversions
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11027 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
niffiwan
9b37d1e0f4
Fix gcc warnings in hudconfig.cpp
...
declaration of ‘color’ shadows a global declaration [-Wshadow] (x2)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11021 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 15:42:09 +10:00
niffiwan
0bebe6f98a
Partial fix for mantis 2932 (cutscenes)
...
Convert campaign viewed cutscenes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11020 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 15:42:09 +10:00
niffiwan
743a27b82f
Partial fix for mantis 2932 (RA wep idx)
...
Ensure pilot conversion RA weapon indexes are always valid
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11019 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 15:42:09 +10:00
niffiwan
57faea2bef
Fix mantis 3099 (from Yarn)
...
Make HCF parsing more flexible
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11018 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 15:42:09 +10:00
niffiwan
1a3336e9bd
Silence GCC warning variable ‘max_size’ set but not used
...
Code seems redundant as dscap_get_raw_data checks for a max size
anyway. And AFAIK the entire voice capture code is non-functional anyway
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11017 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:06 +10:00
niffiwan
b88edd53bc
Followup fix for mantis 2883 (from Yarn)
...
Set Lcl_special_chars when changing fonts
Change some copyright chars to use Lcl_special_chars
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11016 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:06 +10:00
Echelon9
cba4cc9943
Fix cppcheck (performance) Prefer prefix ++/-- operators for non-primitive types.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11015 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:06 +10:00
Echelon9
aa4b76d990
Fix cppcheck (style) Consecutive return, break, continue, goto or throw statements are unnecessary.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11014 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
Echelon9
44dc398b19
Fix cppcheck (style) Same expression on both sides of ||.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11013 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
Echelon9
85427ec76a
Fix cppcheck (warning) Logical conjunction always evaluates to false: logfile_type < 0 && logfile_type >= 2.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11012 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
niffiwan
75e8f8642c
Fix mantis 3020 (pilot stats issue)
...
Reset pilot stats when we're creating a new CSG file. Otherwise stats
from the current pilot or campaign will be inherited by the new pilot /
campaign
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11011 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
niffiwan
e6b8a433f1
Fix mantis 3097 (valgrind)
...
Don't read past the start of the string
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11009 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
niffiwan
c603d42b61
Followup fix for mantis 3049 (from Yarn)
...
Revert an Error back to a Warning
Prevent an out-of-bounds read of the Lcl_ext_str array
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11008 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
niffiwan
179c2ceb82
Fix mantis 3065 (clear RA data)
...
Clear red alert data when resetting campaign progress, changing
campaigns and switching pilots
In CSG read, move RA data clear from the read RA section to the data
reset function (i.e. clear if CSG is valid, not if section contains
data)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11007 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:12 +10:00
Echelon9
21cee81a2a
Fix Coverity 1093622 Array compared against 0 in process_new_player_packet()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11006 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:12 +10:00
Echelon9
0f77e0aa34
Fix Coverity 1093621 Array compared against 0 in send_accept_packet()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11005 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:12 +10:00
Echelon9
f3a1589d42
Fix Coverity 1093619 Array compared against 0 in delete_player()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11004 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:12 +10:00
Echelon9
01df45e37e
Fix Coverity 1093613 Negative array index read in stuff_loadout_list()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11003 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:11 +10:00
Echelon9
1484f93590
Fix Coverity 1093599 Negative array index read in hud_query_order_issued()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11002 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:11 +10:00
niffiwan
b29868aea7
Followup fix for mantis 3016 (FRED Briefing window FOV)
...
Make FRED icons & labels respect the Briefing_window_FOV
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11001 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:11 +10:00
niffiwan
2427c9cfe3
Fix mantis 3092 (from Yarn)
...
Fix certain key string parsing in German & French
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10995 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-16 12:31:57 +10:00
niffiwan
bfa3397dbd
Fix mantis 2985 (from Yarn)
...
Fix float-to-int rounding errors in gr_[re|un]size_screen_pos
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10990 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-16 12:31:57 +10:00
niffiwan
3d8554b41f
Followup fix to mantis 2887 (from MageKing17)
...
no-collide ship classes would collide unless the no-collide flag was set
in the mission file
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10989 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-16 12:31:57 +10:00
niffiwan
3c81c02829
oops - recommit r10986
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10988 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-16 12:31:56 +10:00
niffiwan
167739ed95
Fix gcc warning
...
declaration of ‘brief_line’ shadows a global declaration [-Wshadow]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10987 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
5bcbad1e3a
Fix mantis 3091 (from Yarn)
...
Treat non-ASCII chars above unsigned index 127 as word separators when
ending retail style colorisation
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10986 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
Zacam
060bc97360
From Axem: adds isInCampaign() lua function to tell when a mission is being played in a campaign (as opposed to via Techroom)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10985 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
a2fd4aa519
Fix mantis 3088 (from Yarn)
...
Fix two German keys not displaying in controls config
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10984 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
4b7a69f34e
Fix mantis 3089 (From MageKing17)
...
Move 3D ship select model drawing earlier so that the help overlay is
drawn over the top, not underneath
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10983 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
ce8ed29326
From Coverity ID 1230636 Improper use of negative value
...
false positive; but add comment explaining why
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10982 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
43f3b6ade9
Fix Coverity ID 1230635 Unchecked return value
...
Check return code from lua EvalString on mainhall doors
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10981 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
Echelon9
0ed6dee427
Fix Mantis 3090: Valgrind: Conditional jump or move depends on uninitialised value(s) in webserverApiRequest()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10980 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
335b05c82a
Fix input lag with some ATI cards on Linux
...
From electrojustin; adds cmdline option to force a gl_finish call
prior to swapping buffers.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10979 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
m_m
f8ff3be1fe
From MageKing17: Fix for Mantis 3085: Unhelpful error reporting in hud_gauges.tbl if an invalid gauge type is specified.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10978 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:04 +10:00
niffiwan
7defc6aeeb
Fix mantis 3086 (from Yarn)
...
Add special case to avoid crash from mismatched quotes in
tstrings.tbl German text
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10977 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:04 +10:00
niffiwan
b725ec527a
Fix mantis 3087 (from Yarn)
...
Readd translation support for default escort gauge header text
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10976 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:04 +10:00
Goober5000
5cbb9d991b
Additional tweak for Mantis #2887 and follow-up to r10181: when modifying OF_COLLIDE, need to call obj_set_flags for collision code support
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10974 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:04 +10:00
m_m
27e824c215
Revert accidentally committed project file changes.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10973 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:04 +10:00
niffiwan
8e7a936c08
Fix line-endings in fred2/fred.rc
...
(somehow these got messed up in the git repo)
2014-08-06 19:41:46 +10:00
Goober5000
439b2c8cad
add additional lookup for GTSC Faustus for next version of FSPort
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10972 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-06 19:39:35 +10:00
m_m
3db76adf40
From karajorma: Adds the multi-eval SEXP WARNING: This SEXP is subject to change and will likely be removed or changed in a future version, use with caution. Also fixes Mantis 3079: Add multi-eval to list of available SEXPs (.patch included)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10971 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-06 19:39:35 +10:00
m_m
8e4235a86e
From ngld and Parias: Fix for Mantis 3084: Bitmaps loaded with gr.loadTexture() are never released.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10970 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-06 19:39:35 +10:00
m_m
9689711149
From FUBAR-BDHR, chief1983, m!m and MageKing17: Fix for Mantis 2887: Additional workaround for mantis 2693
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10969 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-06 19:39:34 +10:00
Zacam
b562ebe1f5
From Axem: adds getFrametimeOverall() lua function for timing purposes outside of gameplay
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10967 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:23 +10:00
Zacam
c03fad72cd
Since we updated libpng, might as well update zlib as well. Now v1.2.8.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10966 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:23 +10:00
niffiwan
1a813db618
Fix mantis 3078 (From Yarn)
...
Don't set / reset unscaled screen area when rendering to texture
Also fix a pre-10844 bug where scaling down a cockpit gauge would
cause the gauge to be improperly clipped if it was close enough to the
right or bottom edge of the texture.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10965 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:23 +10:00
niffiwan
b39b23c3f6
"Fix" gcc warnings in Control_config[]
...
warning: missing initializer for member 'config_item::BLAH'
[-Wmissing-field-initializers]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10964 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:23 +10:00
Zacam
e6f92ddcd9
Fix Mantis 3075 : Upgrades libpng from 1.5.7 to 1.6.12
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10963 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:23 +10:00
The_E
04f2c365f8
Fix for Mantis 3080 from MjnMixael: Fix for inadvertently changed parsing order for mainhall tables.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10962 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:22 +10:00
niffiwan
1291e0ad82
Fix mantis 3073: Additional Mainhall capabilities (from ngld)
...
Adds two new mainhall.tbl options:
1) "+Misc anim over doors:" (misc anim rendered after doors)
2) "+Cheat String:" (exchanges misc anim when cheat is entered)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10961 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-30 20:41:21 +10:00
zookeeper
774ec066a4
Fix a render target bug by disabling environment mapping when doing full-scene RTT.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10959 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-30 20:41:21 +10:00
niffiwan
9f768b8cff
Doh! Assign, not equality!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10958 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-30 20:41:21 +10:00
niffiwan
f730df6c1a
Fix Coverity ID 1093805 Uninitialized scalar variable
...
1st use of fbfire_info.bfi_flags so assign instead of |=
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10957 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-30 20:41:21 +10:00
niffiwan
5daa8d87d2
Fix Coverity 1093822 Uninitialized scalar variable
...
Set sensible looking defaults for the elems added to the beam_collision
struct since retail
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10956 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-30 20:41:20 +10:00
niffiwan
9314dc89da
Fix gcc warnings in hud/hudtarget.cpp
...
declaration of ‘gauge_object’ shadows a member of 'this'
declaration of ‘esct’ shadows a global declaration [-Wshadow]
variable ‘srange’ set but not used [-Wunused-but-set-variable]
variable ‘ship_is_ballistic’ set but not used
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10955 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 20:39:18 +10:00
niffiwan
3cccc7cb13
Fix gcc warnings in hud/hud.cpp
...
declaration of ‘render’ shadows a member of 'this'
declaration of ‘font’ shadows a global declaration [-Wshadow]
variable ‘flags’ set but not used [-Wunused-but-set-variable]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10954 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 20:39:18 +10:00
niffiwan
71faaf3137
From MageKing17: tweak team colors
...
While we're looking at the Team Color code, let's have a warning if
someone tries to name a team 'none', and avoid pushing duplicate teams
to the Team_Names vector.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10953 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 20:39:18 +10:00
niffiwan
1a0ef281ed
Fix gcc warning in io/keycontrol.cpp
...
suggest parentheses around ‘+’ in operand of ‘&’ [-Wparentheses]
This code previously worked only by fluke!
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10952 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 20:39:17 +10:00
z64555
021a0bd3a7
From MageKing17: Followup to r10914. Makes the name check ignore case.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10951 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
niffiwan
e2eddea231
Fix gcc warnings in globalincs/alphacolors.cpp
...
warning: declaration of ‘i’ shadows a previous local [-Wshadow]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10950 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
niffiwan
2b191eef2d
Fix Coverity 1228854 Copy-paste error
...
Check pof_file_hud for "$POF target file:" not pof_file ("$POF file:")
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10949 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
niffiwan
e93c1e94b6
Fix Coverity ID 1228858 Missing varargs init or cleanup
...
In required_string_one_of(int arg_count, ...)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10948 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
zookeeper
751861c397
Fixed bits missing from r10946.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10947 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
zookeeper
ae1c4435cf
Turned the required SEXP variable arguments for add-background-bitmap and add-sun-bitmap into optional arguments.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10946 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
zookeeper
a23438f590
Fixed inverted normals in RTT if post-processing is on.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10945 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
zookeeper
6b404f1daa
Fixed RTT bugs: 1) inverted geometry, 2) the output being mirrored both ways and a quarter of the output missing if post-processing is off.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10944 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
niffiwan
2838afdd60
Fix several gcc warnings in code/graphics/gropengldraw.cpp
...
variable ‘clipped’ set but not used [-Wunused-but-set-variable]
variable ‘swapped’ set but not used [-Wunused-but-set-variable]
the address of ‘Distortion_texture’ will always evaluate as ‘true’
[-Waddress]
declaration of ‘vertex’ shadows a global declaration [-Wshadow]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10943 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
Goober5000
0bd67304c4
a tweaked version of ngld's patch for additional main hall capabilities (see Mantis #3071 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10941 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
Goober5000
6249638c5a
use static casts to make our intentions clear and prevent compiler warnings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10940 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:03 +10:00
Goober5000
5eeb6dd219
some const-correctness in preparation for the Mantis #3071 patch
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10939 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:03 +10:00
Goober5000
d04ae65f8b
for Mantis #2064 : remove ship template feature which never worked without crashing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10938 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:03 +10:00
Goober5000
a30269bd3c
for Mantis #2651 : revert r10933, per forum discussion: http://www.hard-light.net/forums/index.php?topic=88047.0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10937 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:03 +10:00
niffiwan
60bad89060
Fix gcc warning: ordered comparison of pointer with integer zero
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10935 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:03 +10:00
niffiwan
ca31f9a402
Fix mantis 2651: from ZekeSulastin
...
Add support for up to 98 joystick buttons
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10933 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:29 +10:00
Goober5000
469e566b20
another localization patch by Yarn: disable character remapping when the game is running in Polish
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10932 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:29 +10:00
Goober5000
e13e37245e
MageKing17's tweaks, with a couple of my own
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10931 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:29 +10:00
Goober5000
038ccffdaa
Mantis #2999 - add docking log entries for support ships
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10930 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
niffiwan
b19622cf96
Fix gcc warning in hud/hud.cpp
...
the address of ‘Hud_text_flash’ will always evaluate as ‘true’ [-Waddress]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10929 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
The_E
96e8e77f4e
Fix for Mantis 3064 from MageKing17: Followup fix.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10928 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
The_E
b178fd0cbc
Fix for Mantis 3076 from MageKing17: Fixes behaviour of animated textures on skyboxes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10927 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
The_E
d3ef69848c
Fix for Mantis 3064 from MageKing17: Adds more functionality to colors.tbl. * "#Start Colors" is now optional; no more need for a blank section at the start of a colors.tbl just to define some team colors. * "#Interface Colors" section added for redefining various colors used by the interface. * "#Color Tags" section added for redefining or adding your own text color tags. * "#Default Text Color" section for choosing what color tag is the baseline default for various different screens. * And the big one, support for *-clr.tbm modular table files.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10926 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
The_E
a5a1a0ff3b
Patch for Mantis 3069 by MageKing17: Fixes help.tbl error reporting
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10925 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
Goober5000
6f80088695
for Mantis #2153 : MageKing17's FRED support for error messages when wingmen have illegal weapons
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10924 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
Goober5000
905f0999c2
Yarn's patch which allows FreeSpace fonts to support all characters that exist in both Code Page 437 and Windows-1252
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10923 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
The_E
3eaf02c022
Fixes an unintended linebreak removal in previous commit
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10922 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
The_E
5bff2754c2
From MageKing17: Fixes for a couple of clang warnings.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10921 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
The_E
5e6746af43
From MageKing17: Improves sexp help text to clear up possible confusion about indexes that are zero-based.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10920 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
niffiwan
d2cbf65e1e
Fix mantis3054 (from ngld)
...
In weapon select screen check weapon model index is != -1 before drawing it
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10918 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
m_m
fca002ada8
From Axem: Add ba.getGameDifficulty() scripting function to get the current difficulty level.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10916 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:32 +10:00
The_E
d3089bb406
Fix for Mantis 2882 by Mageking17 (change-team-color with None color results in error)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10914 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:32 +10:00
The_E
b96b0e87d8
Removes nonfunctional debug code left over from the :V: days
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10911 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:32 +10:00
The_E
3d3fa6a749
Moving an assignment out of an if statement for better readability
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10910 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:32 +10:00
The_E
514a8c3557
PVS Studio fix: Make the logic responsible for sending the builtin rearm messages behave as intended.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10909 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:32 +10:00
Goober5000
fe4b949c06
fix Mantis #3072 (crashes when using different languages)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10908 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
chief1983
ae351d2924
Fix Mantis 2886 - Option to render External weapon models, besides Tech models, in Weapon lab, from FUBAR.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10907 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
chief1983
4854087a18
Fix Mantis 2885 - SEXP flag to enable/disable primitive sensors, from FUBAR.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10906 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
831e0f3be7
Address clang warning: parameter 'x,' not found in the function declaration [-Wdocumentation]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10904 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
307923e8dd
Address clang warning: unknown command tag name 'brieft'; did you mean 'brief'? [-Wdocumentation]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10903 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
eacf4d4e6e
Address clang warning: parameter [x] not found in the function declaration [-Wdocumentation]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10902 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
2859e74ac9
Address clang warning: extra ';' after member function definition [-Wextra-semi]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10901 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Goober5000
98a6166956
follow-up to r7163: this makes the text display properly in-game, no Unicode support needed (thanks to Yarn for the patch)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10900 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
07cad23aed
Address clang warning: commas at the end of enumerator lists are a C++11 extension
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10899 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
255fef6e47
Address clang warning: unused variable
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10898 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
fc1b587cb6
Address clang warning: declaration shadows a field of 'HudGaugeRadarDradis' [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10897 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Goober5000
8cdfb029d3
add mod_table option for red-alert for delayed ships (Mantis #3055 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10895 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Goober5000
2fe0ec8ef0
Yarn's patch for Mantis #3049 (character remapping in tstrings.tbl)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10894 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
The_E
75f533a6fe
Fix for Mantis 2960: Actually make sure that we're not performing invalid operations on a vector.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10887 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
The_E
d6e0a731db
From MageKing17: Patch for Mantis 3074: Correct mismatch between mission write and mission parse
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10886 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
Echelon9
327c67ff1d
Address clang warnings - hud/hud.cpp:1310:3: warning: delete called on 'HudGauge' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dtor]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10885 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
Echelon9
80e1ecee69
Address clang warning - hud/hudtarget.cpp:7224:12: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10884 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
Echelon9
02aa18c260
Address clang warning - io/keycontrol.cpp:2504:7: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10883 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
The_E
53e78033c6
Fix unintended linebreak removal from 10880
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10882 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
Echelon9
bc568a9149
Address clang warning - lab/lab.cpp:912:8: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10881 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
The_E
0d9cc00ba8
From MageKing17: Removes redundant function call
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10880 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
Echelon9
46288483c9
Address clang warning - menuui/mainhallmenu.cpp:2141:9: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10879 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
The_E
580330c224
From MageKing17: Patch for a small issue in briefing text color spans
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10878 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
3f645215ad
Address clang warning - object/collideshipweapon.cpp:258:17: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10877 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
d3f914a404
Address clang warning - ./ui/ui.h:291:7: warning: private field 'ignore_escape' is not used [-Wunused-private-field]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10876 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
7f9d879d7b
Address clang warning - ./ship/shipfx.h:202:6: warning: private field 'stage' is not used [-Wunused-private-field]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10875 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
54de592835
Address clang warning - debugconsole/console.cpp:169:13: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10874 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
03c32c1648
Further tweak fix for Coverity 1093783 Uninitialized scalar variable, and remove redundant variable in opengl_light structure
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10873 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
713e291bdc
Partially re-add the secure coding aspects of 10806 (which was rolled back in 10857). Fundamentally, the code in theora_open is written in a non-secure manner prior to this fix. That the callers currently appear per Goober to use it correctly is not the issue. There is no way of enforcing that contract as to length of the string unless it is internally handled in the function. Also Goober's comment that all callers use string lengths of MAX_FILENAME_LEN is incorrect. Examples trivially found that use the separate define NAME_LENGTH, which could be changed in future.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10872 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
chief1983
137eb7e4d4
Fix Mantis #2790 , Easy options should be just that again.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10869 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
chief1983
f89d864756
Fix Mantis #3070 , courtesy of Yarn.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10868 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Echelon9
7a56e7ff4a
Fix Clang warnings about incorrect type given different pointer sizes for the architecture. Use the standard compliant ptrdiff_t
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10867 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Echelon9
a0ed86d6bc
Remove a tautological Assert(), which cannot be triggered due to the type
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10866 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Goober5000
475e4d5d35
Yarn's fix for Mantis #2362 (scale images properly with show-subtitle-image)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10865 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Goober5000
3743449a42
from MageKing17: choose alt_names and callsigns by array index instead of substring; fixes Mantis #2934
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10864 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Goober5000
79b73f241b
MageKing17's patch for callsigns not resetting when the mission is cleared (Mantis #2934 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10863 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Echelon9
2da2527207
Quieten a number of warnings related to UI_USERBOX without a declaration yet. Added TODO.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10862 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Echelon9
f8ef768bbf
Address Clang warnings are overloaded virtual functions in UI_GADET. Also opportunity to simplify code by making the most of inherited polymorphism. Docs cleanup
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10861 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Echelon9
522eb962ff
Fix a range of issue identified via clang warnings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10860 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Goober5000
ad761f980f
fix a bug introduced by r10852: MAX_OBJECTS is not a valid object index
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10859 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Goober5000
41d7f2408c
fix a bug introduced by r10837: 0 is a valid path index
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10858 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Goober5000
7c07151e26
roll back r10806 because 1) all callers to this function have names which are MAX_FILENAME_LEN in size; and 2) the memset already sets all characters to 0, so there's no need to add a null terminator
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10857 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Goober5000
05e0af6ebd
the minimum macro is defined as MIN in FSO to avoid conflicts; no need to #undef (since rev 10796 uses MIN anyway)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10856 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
d37e4c567d
Fix Coverity #1093706 Negative array index read in scoring_eval_kill_on_weapon()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10855 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
130ed7c7e3
Fix Coverity #1093707 Negative array index read in start_ship_animation()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10854 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
8d6e82c3bc
Fix Coverity #1093711 Negative array index read in event_music_enemy_arrival()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10853 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
823c144ecc
Fix Coverity #1093715 Negative array index read in maybe_weapon_detonate()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10852 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
abc0fd11b5
Fix Coverity #1093720 Negative array index read in ai_big_maybe_follow_subsys_path()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10851 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
c3494516bd
Fix Coverity #1093544 Negative array index read in multi_ts_handle_mouse()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10850 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
Echelon9
9cbd23d2e9
Fix Coverity #1093783 Uninitialized scalar variable in gr_opengl_set_center_alpha()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10849 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
Echelon9
8cbb46f40c
Fix Coverity #1224006 Uninitialized scalar variable in nebl_generate_section()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10848 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
Echelon9
c85caef631
Fix Coverity #1224005 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10847 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
The_E
3545cacda0
From MageKing17: Patch for Mantis 761(!): Text color tags do not work in debriefings. Also allows color spans in text to cover line breaks.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10846 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
The_E
7be5b03c62
From MageKing17: Patch form Mantis 3067 (Nebula flashing not following player view point)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10845 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
niffiwan
027f218f7f
Allow any resolution for mainhalls (From Yarn)
...
Also includes support for more than two mainhall resolutions, zooming
so one mainhall can adapt to multiple resolutions, setting new mainhall
fonts, help overlays for all resolutions and adjustable tooltip padding.
Also allows preload screens to be any resolution & aspect ratio.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10844 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
z64555
cdb954f333
Fixes mantis 2877: $Type and $Category entries in controlconfigdefaults.tbl would not properly parse. #defines and enumerated names in the controls code (Such as TAB_SHIP and the various CC_TYPE's) may now be used in the .tbl
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10843 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:06 +10:00
The_E
8c1bef0415
From FUBAR: Patch for Mantis 2842 (Adds new section to game_settings.tbl called "#FRED SETTINGS". Also adds a parameter for it, "$Disable Hard Coded Message Head Ani Files:", a boolean value that controls whether FRED fills the head ani selection in the Event Editor with the retail head ani names)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10842 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:06 +10:00
The_E
c07d792e4e
From FUBAR: Patch for Mantis 2872 (Make FRED emit a warning for invalid ship classes in a mission file)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10841 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:06 +10:00
niffiwan
545fd5e6ac
Fix mantis 3056
...
In redalert loadout, only store the current number of banks in use by
ships, not all banks where the weapon idx is -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10840 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 18:54:31 +10:00
Echelon9
c837a21f0d
Now that standalone server is support on more than Windows, ensure its features are applied as consistently as possible
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10839 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
Echelon9
666f53e44b
Fix Coverity #1093598 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10838 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
Echelon9
edad644595
Fix Coverity #1093597 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10837 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
Echelon9
82058a8c99
Fix Coverity #1093552 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10836 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
Echelon9
ae6365bc35
Fix Coverity #1093545 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10835 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
Echelon9
c2122f9767
Fix Coverity #1093544 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10834 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
zookeeper
8e0304a58f
Fixed a bug in normal maps caused by a redundant and float-inaccurate calculation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10833 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
niffiwan
2740cf5ea2
Allow missions to exit to mainhall on successful completion
...
Activate with either a mission flag, or the 3rd parameter to the
end-mission sexp. Covers ending via the debrief, skipped from dying
5x times or skipped training mission
Does NOT work for redalert missions or multi (yet)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10832 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
niffiwan
322d1f39e0
Fix mantis 2945 (From MageKing17)
...
Don't set PF_PROJECTED in g3_transfer_vertex() as it's not projecting
the vertex
Note: displaying nebula emp/lightning used to depend on unitialised data!
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10828 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:54 +10:00
Zacam
cc36ac9faf
Follow-up to r10793, missed a spot of [more]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10827 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:54 +10:00
m_m
a45e930047
Fix for Mantis 3063: Animation code-related sound entries doesn't use new sound format
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10826 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:54 +10:00
The_E
83ffa764b5
Fix for Mantis 3016 part 2 (Make FRED respect the Briefing Window FOV setting in game_settings.tbl
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10825 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:54 +10:00
The_E
54787e8402
Fix for Mantis 3016 (Briefing window FOV different from retail). Also adds a new setting to game_settings.tbl, "$Briefing Window FOV:" under Graphics, which takes a single float argument to set the FOV of the briefing window.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10824 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
The_E
8da0ac791e
From MageKing17: Patch for Mantis 3060 (Beam particles not generated correctly in certain cases)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10823 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
The_E
971192ab30
From MageKing17: Patch for Mantis 3061 (Turrets can't have an initial rotation defined)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10822 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
The_E
505e1e77f5
From MageKing17: Patch for Mantis 3012 (Various issues with ships in nebula)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10821 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
The_E
cba1eb07db
Fix for Mantis 2982: Removes superfluous Assert.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10820 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
CommanderDJ
358e2ab4fc
Fix Mantis 2773: Models turn black when full nebula enabled in FRED.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10819 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
niffiwan
f5199ea122
Fix mantis 2929
...
Save shortcut rank to the csg flags & bump csg version
Add function to read the csg rank during pilotfile::verify()
Reorder 'find pilots' call so that Game_mode is valid for verify
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10818 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
niffiwan
603a4086f5
Fix mantis 2920: prevent pilots switching languages
...
In other words, a pilot can only be used in the same language it was
created with. Checks both the initial selection screen and in the
barracks.
Also fixes issue with PLR version being ignored in pilotfile::verify()
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10817 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
niffiwan
05adea0e25
Fix mantis 2923
...
Backout all_time and multi_stats from the pilotfile stats as
required
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10816 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
3f752b9a40
Address Coverity 1093687 Resource leak in os_init_cmdline() that would occur when the -parse_cmdline_only flag was set. Refactored to improve readability at the same time. Order of precedence remains data/cmdline_fso.cfg, per-user cmdline_fso.cfg (on Linux and Mac), then actual commandline. The presence of -parse_cmdline_only will ignore all settings in on-disk cmdline_fso.cfg files
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10815 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
55f34b1b58
Address Coverity 1093378 and 1093379 Resource leaks in object ChttpGet::ChttpGet()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10814 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
a0f31e6dc5
Address Coverity 1093380 Resource leak in object CFtpGet::CFtpGet()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10813 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
f5a9d32d14
Address Coverity 1093781 and 1093782 Uninitialized scalar variables in cftp.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10812 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
d0b786fe87
Address Coverity 1093635 Out-of-bounds read in multi_team_report()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10811 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
d8e26c8e02
Address Coverity 1212011 Unchecked return value in DCF(multi oo)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10810 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
05991a9fbf
Address Coverity 1107318 Logically dead code in outwnd_print(), check for NULL id has already occurred
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10809 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
55af81050d
Fix Mantis 3059: Coverity 1204289 String not null terminated in cf_search_root_pack()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10808 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
27495abda6
Address Coverity 1093373 Copy-paste error in vm_find_bounding_sphere()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10807 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
129a2d0d85
Address Coverity 1204290 Copy into fixed size buffer - strncpy() should be restricted by length to that of the target string, and does not guarantee null termination if the source string overran
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10806 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:35 +10:00
Echelon9
1883fcb8ae
Address Coverity 1093663: Out-of-bounds access with memcpy() in multi_oo_pack_data() for clients only
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10805 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:35 +10:00
niffiwan
2ea048ee51
Fix mantis 3005: add arg so end-campaign sexp can ignore the death screen
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10804 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:35 +10:00
niffiwan
c4978d3661
Fix r10801 (thanks to MageKing17 for noticing this)
...
Really avoid using -1 as an array index
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10803 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
chief1983
d2ffd40d67
Fix an assertion logic reversal in r10797, spotted by MageKing17.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10802 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
niffiwan
e86d0c573d
Fix pilot conversion issue (followup to r9630)
...
-1 is a valid weapon index, but avoid indexing the array with it
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10801 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
Zacam
1d6e173023
Fix for Mantis 3058: On warp out, glowpoints still stay "on" and in mission space without a ship; from MageKing17
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10799 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
Zacam
2db5a3b991
Fix for Mantis 2725: Beam sounds not panning correctly
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10798 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
Zacam
3e22cc0d54
Fix for Mantis 3057: Loadout (Ship/Weapon Select effect) rendering black models or no effect. Also corrects wireframe color for FS2 effect from black to blue. Committed on behalf of MageKing17.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10797 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
m_m
3390ba23a0
Fix for Mantis issue 2891: gr.drawString text box height irregular
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10796 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
niffiwan
1f246b7de1
Coverity ID 1093586 Negative array index read
...
Shouldn't be able to occur since when artillery_objnum is set to -1,
artillery_lock_time is also set to 0.0f. BUT, protect the array
access anyway in case the surrounding code changes in future.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10794 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
Goober5000
35096fd957
use the [more] color, per MageKing17's previous changes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10793 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
niffiwan
1bd98325bd
Coverity ID 1093722 Negative array index read
...
Move -1 check to before the convinience ptr is created & used
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10788 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:19 +10:00
niffiwan
06b0eb8d35
Fix mantis 3051 (From MageKing17)
...
Only store CPVs on accepting mission results
Add copy of CPVs to missioncampaign and pilot .csg so redalert missions
can rollback the CPVs if required
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10786 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:53 +10:00
niffiwan
5801bd47ea
Coverity ID 1093538 Negative array index read
...
Change unknown +Default Ship index (-1) to 1st ship index (0)
Fix loop iteration
Change Assert to Assertion
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10774 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:53 +10:00
niffiwan
a545580a5a
Coverity ID 1093533 Negative array index read
...
This negative read occurs regularly, but it'd be very very rare for that
random read value to evaluate to OBJ_WEAPON and cause further issues.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10773 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:53 +10:00
niffiwan
3b77e65f5f
Raise MAX_PATH_LEN to 256 so FSO can run in long paths
...
Specifically avoid one issue with running FSO in the default Steam dir
Converted some magic 128/127 numbers to MAX_PATH_LEN
Convert some Int3() into more friendly errors
Stopgap measure until proper fix added with compressed VP support
Fix mantis 3028
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10772 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:52 +10:00
zookeeper
3a3e8599df
Removed an assert checking for a condition which can rarely be false (presumably due to inaccuracy in vector normalization) but which doesn't actually need to be true.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10766 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:52 +10:00
niffiwan
9da72db80e
Coverity 1221482: Dereference after null check
...
Stop Ctrl-PgUp/PgDown crashing when a briefing icon is not in closeup mode
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10764 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:52 +10:00
niffiwan
e3ebdd3ce9
Coverity ID 1221483: Missing break in switch
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10763 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:52 +10:00
niffiwan
8baa713ef8
Fix a few gcc compile errors introduced by r10756
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10760 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-07 12:37:26 +10:00
The_E
147bf23067
Catch a lua error that apparently can happen
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10759 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-07 12:37:26 +10:00
niffiwan
fdd8666524
Fix mantis 3048 (From MageKing17)
...
Fix "more" & offsets in [cmd|de|]briefings
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10758 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-07 12:37:26 +10:00
m_m
d84d9d31aa
Added multiple scripting features related to messaging as requested by Axem.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10756 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:18 +10:00
m_m
6d5b5ddde1
Add support for voice acting in fiction viewer.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10755 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:18 +10:00
niffiwan
f54429d49f
Fix mantis 3041
...
Allow set-skybox-model to set skybox flags (with FRED support - thanks
m!m)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10754 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
Goober5000
8e1c4be1b6
quotes can span multiple lines as well, so let's keep track of that flag (fixes Mantis #3001 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10753 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
Goober5000
e10550cdbd
fix a bug in the when-argument sexp that managed to escape detection from its original design! spotted by MageKing17, fixes Mantis #3052
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10748 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
Goober5000
a1e5d76c02
roll back r10741 pending further code review; see Mantis #3052
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10743 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
Goober5000
cf8c06f850
follow-up to r10734: in the event of any SND_F flags being added in the future, this is more future-proof
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10742 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
The_E
c562e34516
From MageKing17: Fix for Mantis 3502 (Flush the sexp result tree after argument evaluation to avert accidental short-circuit results)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10741 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
niffiwan
28c31c9ba2
Fix mantis 3053 (From MageKing17)
...
Check KEY_DEBUGGED1 to allow event.log snapshot to trigger when using
release+cheats
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10740 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:30:00 +10:00
niffiwan
e926d6bad0
Fix mantis 2812 (From Yarn)
...
Add modular help tables and allow more than 2 help overlays
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10739 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:30:00 +10:00
The_E
52331f89a2
Stopgap fix to avert a crash in get_subsystem_world_pos later on
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10738 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
f995298abf
Fix Coverity 1093663: Out-of-bounds access in multi_oo_pack_data()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10737 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
62b9833bf0
Fix Coverity 1093638, 1093640 and 1093667: Out-of-bounds access in tcp_client.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10736 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
0279040e80
Fix Coverity 1093799 Uninitialized scalar variable -- initialise array contents to zero
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10735 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
ff38404cac
Fix Coverity 1093788 Uninitialized scalar variable - no need for bitwise AND when value is so far unset
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10734 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
a779ee3ed4
Fix Coverity 1093783 Uninitialized scalar variable with opengl_light structure in gr_opengl_set_center_alpha()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10733 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
4033465143
Fix Coverity reports of Uninitialized scalar variable with the vertex struct. Should vertex ever be converted to a class from a struct, these memsets as well as the pre-existing ones will need to be removed in favour of a proper constructor of the then vertex class.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10732 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
niffiwan
e7d041c332
Fix mantis 2940
...
Only reset pilotfile stats when the local Player is reset
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10722 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:58 +10:00
m_m
c1b2d7c1ee
Fix for Mantis 3045: gr.drawImage()'s UV arguments aren't working properly
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10721 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-25 19:03:50 +10:00
Goober5000
53e5ba5913
remove Import Weapon Loadouts feature, which was mainly used for versions of FSPort prior to 3.0 and was broken from r2768 to r10718 anyway
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10720 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-25 19:03:50 +10:00
The_E
154a1a6c76
Removing dead and potentially confusing code
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10719 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-25 19:03:50 +10:00
Goober5000
9fdfde9ae6
restore a strcpy that was accidentally removed in r2768 (fixes Mantis #3046 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10718 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-25 19:03:50 +10:00
The_E
d5388ad4bf
Fixes crash in the texture replacement editor: Erasing the end element of a size 0 vector is probably not a safe thing to do
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10717 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-25 19:03:50 +10:00
niffiwan
c27079fb7a
Fix Coverity ID 1215457 Out-of-bounds write
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10716 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-24 09:35:04 +10:00
niffiwan
e037571170
Fix Coverity ID 1215458 Uninitialized pointer field
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10715 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-24 09:35:04 +10:00
z64555
d5e81f4561
Fixes 3039: C++ STL was having data race issues with instantiating the debug_commands and the vector that was supposed to reference them. Seems like ✌️ ran into this issue a few times before...
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10712 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-23 22:04:59 +10:00
The_E
003d5e5a2a
Amendment to 10706: INT, FLOAT and STRING are already defined symbols on Windows, I've changed them to AT_INT etc so that compilation can happen.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10710 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-22 20:49:29 +10:00
niffiwan
e31a8be138
Fix mantis 3026
...
Update Linux --help option to show all cmdline options
Added data/checks for expected args to cmdline options
Add extra const-ness per m!m review
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10706 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
m_m
a6a41efa84
Add support for countermeasures that will pull aspect seekers away from their previous targets.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10705 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
The_E
3344f554f9
More ship flag/ship info flag confusion cleared up
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10704 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
The_E
2c59a39bf6
See 10701, same issue here
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10702 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
The_E
3e1d0082c4
Checking a ship_info flag against a ship flag isn't going to work
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10701 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
chief1983
b4785ea039
Add some lib locations for Solaris for software installed from OpenCSW.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10695 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
asarium
6c16d0a890
Revert "Add support for countermeasures that will pull aspect seekers away from their previous targets."
...
This reverts commit 263ed7f05d .
2014-05-17 22:17:57 +02:00
asarium
263ed7f05d
Add support for countermeasures that will pull aspect seekers away from their previous targets.
2014-05-17 22:12:37 +02:00
niffiwan
8da9a68d31
Fix assertion when entering barracks in debug
...
Assert that there's one more line free, not number-of-ships lines
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10689 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
The_E
c22fd46f18
Change the "Report Bug" button's URL to scp.indiegames.us
...
In other news, did you know that FRED has a "Report Bug" button in its About dialog?
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10666 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
niffiwan
bd64590ec1
Fix mantis 2981
...
Read & write pilot loop data in the same order
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10665 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
niffiwan
ec90cae8d9
Fix Coverity ID 1212016 Copy into fixed size buffer
...
replace strcpy with strcpy_s
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10662 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
niffiwan
e199a928c4
Fix Coverity ID 1212017 Copy into fixed size buffer
...
replace strcpy with strcpy_s
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10661 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
niffiwan
3890ca6928
Fix Coverity ID 1212013 Macro compares unsigned to 0
...
Use MAX instead of CLAMP
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10660 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
niffiwan
6b955bb7b8
Fix Coverity ID 1212014. Unsigned compared against 0
...
Removed the >= 0 check
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10659 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:11 +10:00
niffiwan
cc21af0d08
Fix Coverity ID 1212015.
...
Check the pointers value vs '\0', not the pointer
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10658 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:11 +10:00
z64555
153cb7dc79
Debug console. Now with more intuitive pagination from the help list!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10654 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:11 +10:00
niffiwan
5ccfbe1119
Remove GCC Warning (unused-variable)
...
Since token_str is only used in 1x .cpp, move the declaration from
the .h to the .cpp
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10653 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:38 +10:00
z64555
2903bbee1f
Resolves complaints from VC6 about several instances of find_if that were not scoped properly. None of the other compilers seemed to have noticed...
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10647 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:38 +10:00
z64555
c6e9736c18
Resolves some warnings concerning signed/unsigned comparisons. Fixes a typo with a DCF_BOOL output message. Fixes compiling on MSVS 6.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10646 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:38 +10:00
zookeeper
9b822a3fa7
Fixed gr.drawOffscreenIndicator() returning wrongly scaled coordinates.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10645 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
The_E
cc8f3d2b21
Fixes another C4800: Conversion from int to bool warning
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10632 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
The_E
e3421897b9
fixes a bunch of C4800 warnings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10631 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
zookeeper
90c0e77250
Fixed missing closing tags.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10629 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
chief1983
5e21ff72b9
Revert some accidental solution file changes from the debug console commit.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10627 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
chief1983
f11188246b
Fix debug console compiling error on Linux.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10626 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
chief1983
5b8728411f
Add debugconsole files to makefile. Also, remove lingering reference to dbugfile.h which was deleted in r7857.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10625 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
chief1983
4dcf6a62ee
Add debugconsole to Xcode 3 project.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10624 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
chief1983
92d9b8b308
Redo the LastUpgradeVersion part of r10558.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10623 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
z64555
8d5fbab768
z64555's debug console. Take 2. Includes changes to most (not Xcode) project files to include the added files of r10621
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10622 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
z64555
f18f8a9ea7
debug console amendment, these files got ignored, somehow.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10621 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:36 +10:00
The_E
98355da7d5
Revert 10619: Missing files
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10620 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:36 +10:00
z64555
2b2ba832f8
z64555's debug console.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10619 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:36 +10:00
zookeeper
edc515e681
Fixed Mantis #3037 ; surface shields will again check for a shield mesh collision before hull collision.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10618 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:35 +10:00
zookeeper
c80484f890
Clarified documentation of gr.drawPolygon and gr.drawSphere.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10616 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:35 +10:00
niffiwan
b42f468552
Fix issues added in r10587
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10611 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-04 20:52:23 +10:00
niffiwan
a861372efc
Add lua campaign lib & functions to retrieve mission filenames
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10602 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-04 20:52:23 +10:00
niffiwan
7c3631002b
From Yarn: Fix mantis 3031
...
Use PF_USE_AFFIRMATIVE_ICON where necessary
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10601 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-04 20:52:23 +10:00
Echelon9
67ccdfb6d3
Fix Mantis Issue #2976 : AddressSanitizer: global-buffer-overflow in firing_aspect_seeking_bomb()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10596 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-04 20:52:22 +10:00
karajorma
bb7e894107
Output how much of the player's score comes from the currently displayed list of kills by ship type in the barracks.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10595 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-25 16:04:45 +10:00
Echelon9
8267319073
Resolve build errors reported on MSVC in beam_ok_to_fire()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10594 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-25 16:04:45 +10:00
Echelon9
c1fdd9a58c
Correct the cast to size_t in buffer_data constructors
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10593 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-25 16:04:45 +10:00
Echelon9
a7e1390397
Fix Mantis Issue 3035: AddressSanitizer: double-free in interp_configure_vertex_buffers() of memory contained in buffer_data object. Add a copy-constructor and copy-assignment operator which are required as we manage our own memory in buffer_data
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10592 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-25 16:04:45 +10:00
Echelon9
ceeabbf805
Reverse commit in r10558. Given we regularly have users provide Debug logs, this will prevent that small subset with only 32bit Mac's from running a Debug build
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10588 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-25 16:04:44 +10:00
niffiwan
b1ca9a33da
Fix mantis 2950: make shields-on/shields-off multi compatible
...
Fix multi player for alter-ship-flag
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10587 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
974bf06237
Fix Coverity 1093381: Resource leak in object due to absence of destructor. Provided that release() has already been called, which would mean memory has been cleaned up on most paths, this destructor will be in essence a NOP (or close to it). If memory has typically not been cleaned up already, this addition will improve memory usage over time.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10581 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
b36f1c1709
Fix Coverity 1093306: Whilst the return value was not checked in beam.cpp, the correct fix is to convert the function to void given no location actually checks the return value.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10580 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
bdd192a17d
Fix Coverity 1093302: Unchecked return value. This is the only occasion where the return value of ship_get_by_signature() is not checked. Likely oversight.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10579 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
5268ef1916
Related to Coverity 1093623: The self-assignment at present has no effect
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10578 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
26ee96a012
Fix Coverity 1093493: Missing break in switch statement. No logical reason why LE_ORDER_EVADE should fall through to LE_ORDER_STAY_NEAR. Only switch statement in block without a break statement further indicates an oversight.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10577 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
389f4b3dfb
Fix Coverity 1093376: Copy-paste error in ade_table_entry::OutputMeta()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10576 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
1205336fee
Fix Coverity 1194949: Copy-paste error in gr_opengl_bitmap_ex()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10575 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
chief1983
0bb037bb85
Removes the DS_Store hidden files from the Xcode4 Frameworks archive.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10572 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
chief1983
46c61fcbcf
Unify all the revision placeholders out to 6 digits for increased regex replacement reliablity.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10570 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
chief1983
f903da75e3
Increase Xcode and Xcode4 version and filename consistency with other platforms.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10569 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
Echelon9
3c155fd888
Fix Mantis Issue #3033 : AddressSanitizer: global-buffer-overflow in shockwave_move()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10568 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
Echelon9
308179256a
Fix Mantis Issue 3032: AddressSanitizer: SEGV on unknown address 0x00000000f000 in texture_info::LoadTexture()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10567 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
zookeeper
a20f54957c
Ported r10282 from zookeeper branch: added a new #SOUND SETTINGS section to game_settings.tbl and in it overrides for the default sound, music and voice volume.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10563 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:24 +10:00
zookeeper
1f2f6d8d8e
Ported r10395 from zookeeper branch: made the Shields handle support non-quadrant shields.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10562 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:24 +10:00
zookeeper
636f903f72
Ported r10442 from zookeeper branch: increased the arrival/departure paths restriction dialog's width by 100px so even longer path names will be fully visible.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10561 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:24 +10:00
Echelon9
01d718f8e9
Project files in Xcode4 folder adopt latest suggested project file settings from Xcode 5.1.1
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10558 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-14 19:40:17 +10:00
Echelon9
7e47598eb9
Fix issue 3030: Clang warning: semantic issue, '&&' within '||' in gr_[re|un]size_screen_pos() and gr_[re|un]size_screen_posf()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10557 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-14 19:40:17 +10:00
Echelon9
7aaa5fa4a1
Fix Mantis 3029: Clang warning: expression result unused in multi_pinfo_blit_squadron_logo()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10556 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-14 19:40:17 +10:00
m_m
77d7871266
Fix for Mantis 3027: Crash if ship AI is forced to change target
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10552 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-14 19:40:17 +10:00
m_m
d3dde35341
Fix for an invalid index crash.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10550 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-14 19:40:17 +10:00
niffiwan
3a113e6176
Remove gcc warnings (unused)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10548 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-31 17:28:25 +10:00
The_E
6e91857745
From Yarn: Fixes interface graphics scaling issues. If, for some reason, you want to have the interface graphics stretched, use the -stretch_menu commandline flag.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10544 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
niffiwan
c5417c1909
Fix mantis 3025: pass lua HookVar integer data as an integer, not a struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10543 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
Goober5000
d195c97056
Yarn's fix for Mantis #3024
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10531 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
Goober5000
c5a7223943
this will likely fix Mantis #3013
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10530 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
The_E
4f39ef2e07
Fix for Mantis 3023 by Yarn: Make sure the vasudan mainhall fun cheat works again
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10519 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
The_E
07980be92e
Fix for Mantis 3015: Makes sure rotation values are always in the 0-359 degree range
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10518 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
niffiwan
08280e3d9e
Remove gcc warnings (unused & shadow)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10517 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
niffiwan
ca17188572
Fix mantis 2921: start mainhall music when leaving the credits state
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10507 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
Goober5000
d7b6a1ac6f
add briefing icons for ship-with-cargo and wing-with-cargo
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10506 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
zookeeper
7099170497
Changed the label of the "Broadcast Locally" multiplayer option from "/multidata" to "Broadcast Locally".
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10498 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
niffiwan
7f1a2c734f
From Axem: fix newly added hud gauge sexps
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10497 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
karajorma
2356f04f04
Yarn's fix for Mantis 3017 (Certain HUD elements don't work after the changes to strings.tbl). Not very happy with the way it fixes thing (it only solves problems for French, German and Polish, which kinda makes the changes to strings.tbl in r9761 somewhat pointless) but it makes sense to wait for SDL and truetype support and then fix everything properly then.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10496 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
niffiwan
55bec33861
From Axem & niffiwan: stop briefing/credits/mainhall music with scripting
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10495 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
m_m
626269d4a4
Fix for Mantis 3018: Setting a weapon's Target/HomingObject/HomingPosition etc doesn't work
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10494 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
Fabian Woltermann
083905b4f8
Merge pull request #16 from asarium/fix/hudmessage
...
Fix a crash with invalid iterators
2014-03-16 22:57:45 +01:00
asarium
31d6ca5a0e
Fix a crash with invalid iterators
2014-03-16 22:32:10 +01:00
niffiwan
3f349849d6
Fix mantis 3019: flush bitmap to prevent alpha-additive-blend shenanigans with lua drawRectangle
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10493 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:32 +10:00
Goober5000
ff675c3653
New method of handling quotes and comments that examines lines character by character like most languages do, instead of just searching for the start of a comment. If a comment character is inside a quoted string, it will not kick off a new comment. (This actually fixes the core design flaw that caused semicolons to truncate messages, so the $semicolon tag is technically no longer necessary. It will still be kept, of course.) Fixes Mantis #3001 .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10492 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:32 +10:00
Goober5000
0eb5606527
the #define already has a (char)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10491 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:31 +10:00
niffiwan
2f22873e35
From Axem: add hud-set-custom-gauge-active and hud-set-retail-gauge active
...
Deprecates hud-set-active-gauge and hud-activate-gauge-type in favor of hud-set-custom-gauge-active and hud-set-retail-gauge active, which are clearer to understand and now accept INT_MAX number of gauges, instead of just 1.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10489 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:31 +10:00
Goober5000
03144d3846
going through old revisions, r8540 is wrong, since it was like that in trunk -- memsetting the whole struct to -1 sets all integers and floats to -1 (so let's go back to the old way in case some old retail code relied on model_instance_num, model_num, or submodel_num being set to -1)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10481 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:31 +10:00
m_m
638ad77a21
Add a scripting hook variable that specifies the mouse buttons. This variable is named MouseButton and is a bit field which uses the MOUSE_* defines (index 0 for right, 1 for left, 2 for middle).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10477 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:31 +10:00
niffiwan
4e98285d2a
Followup to mantis 3009; missed the Lead Sight gauge in the 1st fix
...
Rechecked all other gauges that set slew=true in their contructors
(vs 1st pass which checked gauges that set slew=true in hudparse.cpp)
I think I got them all now...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10476 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:31 +10:00
karajorma
a7428c5a72
Bigger (and better?) Briefing and Debriefing editors courtesy of Axem.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10475 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-26 21:37:14 +10:00
zookeeper
6f906561bb
Fixed oversight in r10430: the $Weapon class hook condition didn't work on $Weapon Collision hooks if the other object was an asteroid.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10474 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:02 +10:00
Zacam
3ef41e164c
I think we can allow for 32bit Color Depth to be the default option now.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10473 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:02 +10:00
karajorma
159d8e7107
Fix a bug where you couldn't press g to start a mission in debug builds.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10471 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
karajorma
b4dad30c77
Add a SEXP for checking the current state of ship flags.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10470 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
karajorma
64efaddaab
Make the Mission Objectives editor a little larger. Cause why not?
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10469 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
karajorma
ebfdf4e901
Fix a bug with the event.log where SEXPs which weren't in events would also write data to the log.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10467 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
karajorma
5dc4bfea97
Fix a bug with the multiplayer SEXP code. The callback functions write to the packet and thus can also make it go out of bounds.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10466 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
m_m
05702504c4
Fix for Coverity 1107332: Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10464 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
m_m
08dad5b3af
Add -no_unfocused_pause option.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10463 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
niffiwan
a2b42bf5f1
Fix mantis 3009: set slew correctly for hud gauges
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10462 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:35 +10:00
m_m
3490ac3a9c
Add lua function to get a handle of the current player
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10446 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
The_E
37ded5589d
Adds set-motion-debris-override sexp. This can be used to control the presence of motion debris, and overrides any user choice made through the -nomotiondebris commandline flag.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10445 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
zookeeper
cef02e7b9f
Clarified which time units are expected by camera.setOrientation() and camera.setPosition().
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10431 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
zookeeper
a72f0f9d62
Allowed the $Weapon class hook condition to work on $Weapon Collision hooks.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10430 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
6d5e026a3e
Mantis #3004 : don't remove subspace drives from support ships
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10429 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
df73bacb9e
Mantis #3004 : standardize checks for whether ships can depart to docking bays, and whether departure goals are achievable, and whether a ship can be commanded to depart; also fix the default behavior if a ship attempts to warp out but is unable to
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10428 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
m_m
d97f31d034
Fix for Coverity Issue 1166829: Dereference before null check
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10411 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
a880bcb9c2
Mantis #3004 : ship_get_ship_with_dock_bay was written in such a way that it allowed a negative array index to create all sorts of havoc
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10407 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
dbe5f61dd6
following up from r10000 and r10004, fix the hud squad message display for support ship aborts (and in the process optimize things slightly)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10406 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
0a9063a525
wing names with the hash at the beginning aren't subject to the name bashing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10405 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
827286ec95
only warn once, because old missions tended to have a *lot* of these broken +Team values
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10404 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:33 +10:00
karajorma
aeb089b216
If we've already written the content of CTEXT(n) to a variable, we should use that, rather than calling CTEXT(n) 500+ times.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10403 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:33 +10:00
m_m
5fa9a5c946
Fix for Coverity 1147623: Out-of-bounds access
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10393 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:33 +10:00
m_m
0d54630e83
Fix for Coverity 1107329: Improper use of negative value
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10392 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:33 +10:00
Echelon9
f97e478c6d
Fix Coverity 1093576 Improper use of negative value: In model_collide_flatpoly(unsigned char *): Negative value can be returned from function is not being checked before being used improperly (CWE-394). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10391 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
3b19fab1c1
Fix Coverity 1093446 Dereference after null check: In obj_snd_stop_all(): Pointer is checked against null but then dereferenced anyway (CWE-476). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10390 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
6d52a7c2b2
Fix Coverity 1093407 Logically dead code: In model_interp_sub(void *, polymodel *, bsp_info *, int): Code can never be reached because of a logical contradiction (CWE-561). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10389 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
0288075eb0
Fix Coverity 1093392 Logically dead code: In obj_snd_assign(int, int, vec3d *, int, int, ship_subsys *): Code can never be reached because of a logical contradiction (CWE-561). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10388 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
cf0928ab8c
Fix Coverity 1129278 Uninitialized scalar field: In object::object(): A scalar field is not initialized by the constructor (CWE-457). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10387 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
b2231f28d1
Fix Coverity 1102734 Uninitialized scalar field: In collider_pair::collider_pair(): A scalar field is not initialized by the constructor (CWE-457). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10386 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
846cdad098
Fix Coverity 1107319 Copy-paste error: In collide_weapon_weapon(obj_pair *): A copied piece of code is inconsistent with the original (CWE-398). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10385 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
64dad52741
Fix Coverity 1093455 Dereference after null check: In read_model_file(polymodel *, char *, int, model_subsystem *, int): Pointer is checked against null but then dereferenced anyway (CWE-476). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10384 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
2936dde64f
Fix Coverity 1093728 Allocation size mismatch: In model_allocate_interp_data(int, int, int): Allocation size is not a multiple of the target pointer's pointed-to type (CWE-131). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10383 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
f02cba4090
Fix Coverity 1093413 Logically dead code: In model_collide_sub(void *): Code can never be reached because of a logical contradiction (CWE-561). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10382 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
7241a6b686
Fix Coverity 1093669 Out-of-bounds access: In triggered_rotation::add_queue(queued_animation *, int): Out-of-bounds access to a buffer (CWE-119). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10381 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
0572c25aa1
Fix Coverity 1093859: Uninitialized scalar field In mst_info::mst_info(): A scalar field is not initialized by the constructor (CWE-457). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10380 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
d503d1d42e
Expand the .gitignore exclusions to cover modern Xcode project local files. Based off StackOverflow suggestions as documented.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10379 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
0b494959e1
Fix Mantis 2997: Make +Bitmap a required table item if a weapon trail has been set
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10378 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
karajorma
f9f2b1e8d7
There was some confusion about the old help text.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10377 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
The_E
e4009799c6
Remove a pointless, ✌️ original assert (All ships should be able to send messages regardless of whether they're flyable; checking whether they are accomplishes literally nothing)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10376 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
The_E
d36fc2a88e
Remove per-campaign detail settings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10351 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:26:00 +10:00
The_E
6b39db6b12
Remove a superfluous $ sign from gauge_load_common, which was messing up hud_gauges tables that defined differing fonts for hud gauges.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10350 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:26:00 +10:00
zookeeper
6e8a90fbbc
Fixed targethit1 -> targhit1 in an error message.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10349 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:26:00 +10:00
zookeeper
0794dcded3
Another little Lua documentation fix.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10348 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:26:00 +10:00
zookeeper
dc37d2e5de
Two small Lua documentation fixes.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10347 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:26:00 +10:00
m_m
5050494c45
Fix for Coverity 1135848
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10311 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:25:59 +10:00
niffiwan
c08aaf1ec2
Coverity ID 1093440: Evaluation order violation in weapon_create()
...
Related to weapon substitution code
Also a gcc warning (sequence point)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10301 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:25:59 +10:00
m_m
8fb2a7ffad
Add -profile_write_file options to write frame times to a file. See Wiki for more information.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10299 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:25:59 +10:00
zookeeper
0cac254b04
Fixed Mantis #3000 .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10298 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:25:59 +10:00
niffiwan
9f67d2e337
From Admiral MS: add scripting function to get the waypoint-list of a waypoint
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10297 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
niffiwan
2605583be6
From Admiral MS: add scripting function to get the wing of a ship
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10296 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
niffiwan
e1711a326e
From Admiral MS: scripting access to ship orders; also allows modifying some order values
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10295 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
zookeeper
270d3d9248
Fixed breakage from r10254: key tokens in messages weren't getting translated right.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10293 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
zookeeper
7f74ce48a6
Fixed +Spread From LOD not working.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10290 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
zookeeper
31ab1cff2c
Ported "no homing speed ramp" weapon flag from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10289 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
zookeeper
dbded13fa4
Ported $Acceleration Time weapons table option from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10288 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
zookeeper
ef94f4bb04
Ported $Velocity Inherit weapons table option from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10287 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
karajorma
1adabef7bd
X3N0-Life-Form's Call-SSM-Strike SEXP.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10286 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
karajorma
c27f75cd5a
Add support for replaying briefing and command briefing cutscenes. The go back a stage and go to first stage buttons will now count these as a briefing stage.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10280 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
karajorma
7ef94f084b
Allow training missions to also show mission goals.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10279 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
karajorma
cd9c2f851b
Make it easier to distinguish the events in the mission log
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10278 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
Goober5000
2c34ca0218
fix Mantis #2994 : a model can have initial animation states even if it doesn't have animations
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10277 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
niffiwan
cecc445e8b
Move $Scale Gauges: token before $Reticle Style: to avoid breaking parsing when both are specified
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10275 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
niffiwan
7f05cca670
Ensure Offset & Origin are used together (hud gauges)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10274 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
niffiwan
4d7c218d59
Tweak HUD so that retail gauge scale/no-scale can be set in a minimalistic hud gauges table
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10273 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
niffiwan
770cd66755
Add scaling option to Yarns hud gauges
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10272 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
Goober5000
0b4f71c84d
Mantis #2951 : fix memory corruption issues by changing weapon substitution patterns to use C-style arrays rather than SCP_vectors
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10270 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
Goober5000
b090ea1f68
revert r10082 temporarily while substitute pattern feature is modified
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10269 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
niffiwan
84728de587
Add cmdline flag to disable use of pixel buffer objects
...
Workaround a bug/deficiency in recent linux intel video drivers
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10268 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
Goober5000
a04e83ab01
red-alert will now work with ships that appear at some point subsequent to mission start
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10267 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
Goober5000
180115feba
correct ammo for red-alerted ballistic primaries
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10257 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:44 +10:00
zookeeper
e93e27fc0d
Improved the calculation for how many segments to use for drawing circles and arcs.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10255 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:44 +10:00
zookeeper
61d9ce895b
Ported the $On Action and $On Action Stopped scripting hooks from zookeeper branch. Also bumps the char limit for conditions from 32 to 64.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10254 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:44 +10:00
niffiwan
e3715cc420
change var names to avoid warnings re shadowing
2014-01-01 19:58:36 +10:00
niffiwan
366f4d5642
set HAVE_CXX11 for clang
2014-01-01 19:30:05 +10:00
niffiwan
547d615552
set HAVE_CXX11 for MSVC
2014-01-01 18:56:32 +10:00
niffiwan
4f074d94d1
Add compile time catch for memmove used on non-trivial objects
2013-12-22 20:09:44 +10:00
niffiwan
a4ac843d5b
Add compile time catch for memcpy used on non-trivial objects
2013-12-22 19:53:52 +10:00
niffiwan
0115235de7
Add lua on-collision hooks for beams: from Axem & Wanderer
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10253 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
z64555
63ab561e59
Mantis 2977 - Fixes some scripting hooks and references broken by r9549
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10252 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
The_E
9ff8f21b1f
Adds a check to see if the model actually has a defined viewpoint; We can't generate the firepoint display if it doesn't
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10251 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
karajorma
69749cdaee
Add the was-destroyed-delay SEXP by the WCS team. Add support to alter-ship-flag for hiding ship names.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10250 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
m_m
9cd218a595
Fix Mantis 2978: Off by 1 error with getShipClassIndex()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10249 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
Echelon9
5875b4f3a3
Fix Coverity CID 1093619: Array compared against 0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10247 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
Echelon9
08f36eb32c
Fix Coverity CID 1109072: Copy into fixed size buffer
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10246 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
Echelon9
f834aa80a9
Fix Coverity CID 1093375: Copy-paste error
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10245 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
Echelon9
b35ba0e419
Fix Coverity CID 1093368 - Copy-paste error
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10244 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
Echelon9
d753954bcb
Fix Coverity CIDs 1107320, 1107321, 1107322, 1107323 - Copy paste coding corrected
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10243 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
chief1983
5664773a29
Allow game_settings.tbl to define the FS2NetD port, so TCs can work out of the box on *nix, etc.
...
http://www.hard-light.net/forums/index.php?topic=86317.0
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10242 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
niffiwan
8105d2a372
Fix Coverity ID 1093819: Uninitialized scalar variable in (template) class ade_obj::GetPtr()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10241 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
niffiwan
34b1f276f3
Fix Coverity ID 1093784Y: Uninitialized scalar variable in struct order_h
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10240 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
chief1983
975f94f207
USHRT_MAX is in limits.h on Linux.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10239 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
Goober5000
d9b45b0eb2
just minor tweaks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10237 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
Goober5000
1ff223687d
when new subsystem entries are inserted, make sure the blank subsystem gets saved and inserted at the proper spot so that we don't use stale data (fixes Mantis #2979 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10236 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
chief1983
a45af2f019
Found the constant USHRT_MAX I was looking for just a little too late.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10235 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
chief1983
da4b191160
Saner parsing all around for webapi port number.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10233 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
chief1983
459e2bd469
Fix a warning when copying the webapi port token int into its destination ushort.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10232 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
niffiwan
359a98410a
Add compile time catch for memset used on non-trivial objects
...
Fix one instance of this problem in osapi/outwnd_unix.cpp
2013-12-16 19:44:23 +10:00
niffiwan
1acfc1c326
Allow gcc on Linux to compile with -std=c++11
...
Tested with 4.6.3, 4.7.2 & 4.8.0
2013-12-16 19:37:02 +10:00
niffiwan
9e73870862
add wxfred2 execs to .gitignore
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10225 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
c5c7e58507
autotools: use autoreconf & m4 dir to make it easier to add/manage macros
...
add m4/wxwin.m4 macro file from wxWidgets 2.9.5 (previously pasted into acinclude.m4)
remove obsolete WX* macros from acinclude.m4
move acinclude to m4/fso.m4
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10224 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
zookeeper
6d3b183373
Ported parts of r9727 from zookeeper branch: Added support for multiple control presets.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10223 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
d904a4d516
Fix Coverity ID 1093569: Negative array index read in create_wings()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10222 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
def53398bc
Fix Coverity ID 1093574: Negative array index read in sexp_change_player_score()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10221 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
620f6aaf3d
Fix Coverity ID 1093581: Negative array index read in sexp_clear_ship_goals()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10220 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
3ffe479cca
Fix Coverity ID 1093579: Negative array index write in sexp_damage_escort_list()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10219 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
7d846defa5
Coverity 110733[01]: Negative array index read in get_string_or_variable()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10218 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
aa60c5acec
Coverity ID 109381[456]: Uninitialized scalar variable in load_gauge_target_monitor()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10217 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
336db15246
Coverity ID 1093808: Uninitialized scalar variable in init_ai_target_priorities()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10216 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
6d402f43aa
Coverity ID 1093550: Negative array index write in multi_voice_release_token()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10215 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:01 +10:00
niffiwan
9480b079ca
Coverity ID 1093508: Negative array index write in observer_create()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10214 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:01 +10:00
niffiwan
7b9f485a34
Coverity ID 1135850: Out-of-bounds read in hud_target_change_check()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10213 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:01 +10:00
zookeeper
d13236e0e4
Ported r9704 from zookeeper branch: Added scripting function for drawing filled and unfilled arcs and made drawCircle able to draw unfilled circles.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10211 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-11 18:52:14 +10:00
niffiwan
a3256bbf88
Fix two issues found by Yarn
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10210 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-11 18:52:14 +10:00
niffiwan
0402e46f89
Merge Yarn adaptable hud with m!m common hud parse
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10209 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-11 18:52:14 +10:00
niffiwan
706152c7d5
Add common parsing function for hud tables (originally from m!m with updates from me)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10208 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-11 18:52:14 +10:00
niffiwan
e6d4b83907
update .gitignore to ignore codeblocks layout files
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10207 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-11 18:52:13 +10:00
Echelon9
45d6f9be21
Fix Mantis 2975: AddressSanitizer: global-buffer-overflow in HudGaugeLeadSight::render()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10205 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:58 +10:00
Echelon9
ce41e56f46
Fix Mantis 2896: AddressSanitizer: global-buffer-overflow in hud_lock_reset() hudlock.cpp (v2)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10204 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:58 +10:00
Goober5000
3eedfc7853
don't freak out if we don't have a beam texture
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10203 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:58 +10:00
Goober5000
645ee9a2ba
make warning messages friendlier
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10202 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:58 +10:00
Echelon9
be08468a81
Fix Mantis 2974: WebUI interface: Chat tab does not print messages sent from WebUI
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10201 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:58 +10:00
Goober5000
ab1b8912b7
Sushi (or maybe LPine) broke Shield_Hit_Ani for modular tables when coding a Diaspora feature
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10200 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
Echelon9
e75a09d203
Update Jansson library to upstream v2.5 -- http://www.digip.org/blog/2013/09/jansson-2.5-released.html
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10199 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
Goober5000
f3c902c39b
add wing_bash_ship_name, which handles the hash symbol thing, accommodates Blue Planet's capship trick, and works in FRED and while we're at it, do a little bit of const'ing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10198 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
Goober5000
6804e5ae7d
a spelling fix, and also clarify a sexp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10197 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
niffiwan
6443005f5c
Tweak insignia limits again per Oddgrim's recommendations
...
http://www.hard-light.net/forums/index.php?topic=86195.msg1722757#msg1722757
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10196 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
niffiwan
07dbfed088
Fix compile issue on Linux re: INT_MAX / <limits.h>
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10195 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
zookeeper
7ff59d0559
Enabled fighterbay door animations to better define which bay path must be used or not used for the animation to trigger using +sub_type. Fixes the (undocumented) current numbering of fighterbay +sub_types to be 1-based instead of 0-based. Turns the SUBTYPE_CHECK macro to a proper function.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10194 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
zookeeper
9f65775702
Made +delay and +acceleration in animation code optional and default to 0.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10192 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
Goober5000
1e78f8c6e1
fix hidden divide-by-zero
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10190 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
zookeeper
1c74472423
Added an $On Ship Arrive scripting hook.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10188 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
Echelon9
49c56eea91
Fix Mantis 2970: AddressSanitizer: global-buffer-overflow in show_ship_subsys_count()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10187 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:56 +10:00
Echelon9
9d6fdb07ba
Fix Mantis 2969: AddressSanitizer: global-buffer-overflow in ai_do_objects_repairing_stuff()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10186 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:56 +10:00
zookeeper
54a4f26146
Replaced shield_hit_info in escort_info with its own simple set of timer variables. Fixes Mantis #2966 and makes the code simpler and safer.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10185 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:56 +10:00
niffiwan
41fee37f3f
Bump model insignia faces/vertexes limits
...
(so that newer more detailed ships can have proper insignia)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10184 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:56 +10:00
niffiwan
4c93092045
Add warning for model insignia specifying an invalid LOD
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10183 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Echelon9
14fc0cfd88
Fix Mantis 2800: Particles not removed on standalone
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10182 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Goober5000
c19ac5df9d
when changing ship types, make sure the collision flags propagate
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10181 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Goober5000
1467b0ef16
for wing names with hash symbols, put the ship number before the hash
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10180 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Goober5000
3bc14442c5
just make this block similar to the other one
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10179 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
niffiwan
668e67c52d
Fix Coverity 1093549: Negative array index write
...
(practically impossible to occur, but lets be safe in case multi_voice_get_stream() changes in future)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10178 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
zookeeper
4b7543361b
Added initialization of render box and sphere offsets.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10177 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
niffiwan
e58cbc159b
Fix mantis 2967: use Medals array instead of Ranks (from Yarn)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10176 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Echelon9
da6c95b8c4
Fix Mantis 2968: AddressSanitizer: global-buffer-overflow in shield_info_reset() - relates to hud_target_change_check()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10175 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Goober5000
69c7ee68f5
don't Int3() because this can happen when a ship is missing from a mod (i.e. when it turns into the GTF Ulysses)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10174 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
Echelon9
af9b12e448
Resolve compilation failure introduced by r10170
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10171 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
zookeeper
b7a7bb968e
Fixed some improper initialization of escort list hit_infos.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10170 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
zookeeper
85e39497cd
More fixes to potentially uninitialized shield_hit_infos.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10168 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
Echelon9
b6b3a24e05
General clean up of commented out #ifndef NDEBUG blocks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10166 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
Echelon9
cb446460e4
General cleanup of commented out code in beam.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10165 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
Echelon9
396afcacf8
Ensure compliance with the usual form of test in the FS2_Open codebase for running in Debug mode
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10164 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 20:12:54 +10:00
niffiwan
7f20857796
Honour ships' "no lighting" flag in the techroom (from Axem)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10162 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:38 +10:00
zookeeper
a59be2e7c7
Allowed shield_info_reset() to initialize shield_hit_info to empty values if it's not associated with a ship, as required by hudescort.cpp. Might fix Mantis #2961 .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10161 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
niffiwan
1a3fc26bfe
Move set-ets-values sexp to the correct category (thanks to Axem for finding this)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10160 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
ad1bef5344
some things don't need to be re-inited every time you pause the game
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10159 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
0fb563b241
set ballistic HUD gauge any time HUD is changed -- fixes Mantis #2962
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10158 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
9ec027641d
add quotes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10157 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
92435f7217
fix some things that FreeBSD complained about
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10156 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Wanderer
141f6bc121
fix issue with burst firing secondaries - thanks to Goober for finding it
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10150 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Wanderer
96cc3c017d
feature commit: excluding weapons from linked fire penalty (per request)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10147 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
chief1983
4e54350dcc
Fix #2959 . Framebuffer explosions need framebuffer objects, or it seems we assert later in the code.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10145 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
chief1983
04e7b4c288
Recommit the ship.h part of 10082 as the OBO fixes seem to have fixed #2958 .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10144 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Echelon9
3bbd389420
LLVM/Clang warns that a dangling else can occur without one level of braces
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10143 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
4611a77dbd
re-commit r10082, except for ship.h, because it's the size of the ship_weapon struct that's causing the mysterious crashes (Mantis #2958 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10141 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
9ca44d8ce4
fix an off-by-one error
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10140 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
40c4583792
fix Echelon9's fix >:( also add a judicious Assert for Mantis #2958
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10139 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
724e7816e4
Fix an actual Volition bug. This has AI balance implications, but it's already in the "pick a random weapon" section, so it will probably be all right.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10138 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
zookeeper
204ebfca63
Remember to initialize shield_point_augment_ctrls.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10137 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
70d05d3815
scramble messages on a per-ship basis
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10136 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
zookeeper
8cd19aa588
Merged model point shields from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10135 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
chief1983
1cb031c190
Fix #2959 by reverting r10082. I can probably talk zookeeper into converting the troublesome SCP_vectors into static variables so this isn't causing memset issues.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10132 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
f6a92e0972
allow modder to specify countermeasure type on a per-species basis
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10131 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
karajorma
bad6af8a3a
Yarn's fix for Mantis 2941 (Strings.tbms without the current language crash the game).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10130 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
chief1983
b2167c61a3
Fix #2957 - FreeBSD RAND_MAX is 0x7ffffffd, not 0x7fffffff, so we can't always assume that it's the latter. Also move the check earlier in the code, if it's going to break at all, break immediately on any non-conforming platform so we can fine tune this some more.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10129 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
e8a7c8cf57
medal_stuff passes the duck test, so make it an official class
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10128 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
6470f9043f
make init_ship_entry actually init all the fields in ship_info make draw_weapon_models a ship flag instead of a boolean remove the MAX_SHIP_FLAGS #define because it didn't mean what everybody thought it meant
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10127 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
niffiwan
da21b44d07
fix gcc warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10125 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
niffiwan
4581ed9aa2
Persona-specific promotion debriefings (from Yarn)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10124 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
chief1983
5ceabf1e8b
Add support for the framecap menu option.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10121 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
chief1983
5ebd06bb29
Fix WebUI server name changes updating in clients and FS2NetD.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10120 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
858afb0cef
turns out gcc doesn't like the two angled brackets adjacent to one another
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10119 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
13c8f95046
let's not make expensive copies of all these SCP_strings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10118 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
8179453ffa
fix Mantis #2955 : crash when trying to join multiplayer server, caused by trying to memcpy an integer into a ushort (also add some sanity asserts)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10117 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
389a2c6955
fix Mantis #2933 : don't output alt ship class information using fout_version
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10116 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Echelon9
9cdd329f11
Webui: Resolve bug that was causing standalone game name to not appear
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10115 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
niffiwan
da92a1a709
Add stub for std_init_os() so that *nix can compile
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10114 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
niffiwan
f01eefe832
According to the medal_stuff class, some of these should be MAX_FILENAME_LEN, not NAME_LENGTH
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10113 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
karajorma
f4a7a117e4
Fix Mantis 2954 (Standalone can't find default language)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10112 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
Goober5000
7585aed83b
clarify help... OP_AND will actually evaluate all arguments
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10111 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
Goober5000
f8dcbffab8
rather than piggy-back the perform-actions sexp on top of the when sexp, it works better to make it its own operator (fixes Mantis #2956 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10110 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
Echelon9
e5115993bf
AddressSanitizer: alloc-dealloc-mismatch (operator new vs free) in hud_close()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10109 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
Echelon9
ea93153446
Remove this memory event, as clear() is called after loop, which will call the destructor of each item. Picked up by AddressSanitizer as this was attempting to free() memory allocated with new()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10108 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
Goober5000
70f84212df
we can just use the STL methods here
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10095 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:44 +10:00
Goober5000
a739c172f4
add an important note
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10094 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:44 +10:00
niffiwan
b4ab0f3a44
fix gcc warning: declaration of ‘shipp’ shadows a previous local [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10092 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
7a1b8d5be1
Coverity 1129269: Dereference after null check
...
add checks to deal with parent_objp == NULL
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10091 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
ed49e0786b
Coverity 1129274: Negative array index read
...
weapon_create can return -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10090 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
e5260a381a
Coverity 1129270: Negative array index read
...
weapon_create can return -1
(& oops, r10087 was 1129271, not 1129270)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10089 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
95ab88de98
remove gcc warning: [-Wunused-but-set-variable]
...
(ret_val earmarked for future use)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10088 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
ae429e756e
Coverity 1129270: Negative array index read
...
weapon_create can return -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10087 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
442f3fb846
Coverity 1129272: Negative array index read
...
weapon_create can return -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10086 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
1dad7f799e
Coverity 1129273: Negative array index read
...
weapon_create can return -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10085 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
b2958b5e4a
Remove a magic number
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10084 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
fa7cf7a910
"new" shouldn't really ever fail
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10083 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
33b871d29d
remove non-working and non-supported $substitute feature for weapons (Mantis #2951 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10082 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
6bc71834ec
this exited_ship constructor is redundant and interferes with the POD-ness of the struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10081 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
35347262d4
make man_thruster a POD struct, and initialize maneuvering thrusters in ship_info initialization
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10080 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
de792bc0ca
memset initialized the wrong level of pointer :-/
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10079 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
ed04c7788b
these memsets aren't needed
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10078 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
e9fc00df0c
now that we have queued_animation_init, we can rewrite this properly
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10077 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
551ba6ba1a
ugh, neither the constructor nor the memsets are actually needed here
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10076 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
fcb31d94c1
change p_dock_function_info to a class as well
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10075 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
b7db596f12
change dock_function_info to a class
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10074 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
13513588df
turn p_object into a class ensure that p_object dock instances are cleared between missions, not just when the game exits handle Player_start_pobject in a saner way the p_object Reset method is nice, but it turns out we don't need it
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10060 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
6b97f368e8
sync functions for freeing dock instances
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10059 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
d310647bfe
clear dock lists when objects are deleted, and redundantly clear them between missions and when object instances are destroyed (Mantis #2952 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10058 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
ed06a01897
restore r10051, this time allocating triggered_rotation instances when we need them
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10057 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
7413a7a7d2
don't unnecessarily retime collision checks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10056 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
niffiwan
0299c7e42b
fix gcc warning: [-Wreorder]
...
‘game_snd::flags’ will be initialised after ‘uint game_snd::signature’
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10055 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
The_E
c0a3d69ed2
Revert revision 10051: If we're going to use a global vector to store animation info, we need to fill it (and the references to it) too.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10054 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
niffiwan
3b89290cd8
fix gcc warning: [-Wreorder]
...
‘campaign::variables’ will be initialised after ‘int campaign::num_missions’
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10052 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
Goober5000
d11c7ccc2f
ship subsystems should reference an index in a global Triggered_rotations vector rather than maintaining their own class object, which wastes space
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10051 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
Goober5000
afe08580c0
make cmission and campaign into full-fledged classes since they contain non-POD types remove a memset which hoses the multi campaign class
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10050 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
Goober5000
3aeee91f14
better assignment of vec3d and matrix (matrix should be set to identity, not all-0)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10049 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
Goober5000
e0fa46a185
more memset refactoring... turn texture_replace back into a POD struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10048 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
Echelon9
cc8310a491
Webui: Clarify the use of branching if statements, to be consistent with existing code
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10046 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
0e34a25207
Webui: Support setting an alternative port than 8080 to host the webui on
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10045 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
d9ac71740a
Webui: Support the setting of a non-default username and password in multi.cfg. These settings are +webapi_username and +webapi_password
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10044 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
8009d34928
Webui: support writing to fs2_standalone.log on Unix or Mac OS X when running a standalone server
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10043 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
07e35d7bd1
LLVM warning: Initialization of pointer of type 'bool *' to null from a constant boolean expression
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10042 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
2d9dfebae3
Re-enable -Wno-shorten-64-to-32 for Xcode. There remains code in the project, including third party, that assumes implicit 64->32 casts are permitted, which the expectation of overflow. We'll need to re-enable this warning later and revisit specific cases in question, either adding an explicit cast, or handling any cases where overflow is theoretically possible and undersired.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10041 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
93e3461748
Xcode 4/5 project file cleanup. These are redundant settings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10040 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
5c8d8f6ded
Xcode 4/5 project file cleanup. Further deprecated settings related to cfilearchiver
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10039 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
fa1403f9a9
Further Xcode 4/5 project file cleanup. Install setting not required as we build an .app bundle
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10038 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
af81604303
Further cleanup Xcode 4/5 project file. Promote settings to top level where possible, remove redundant GCC settings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10037 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
eefa00cb19
Clean up Xcode4/5 project file. Remove blank overrides at the lower level of specific projects
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10036 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
niffiwan
196bfa25d3
Revert "oops - using the right pointer helps (from r10032)" (too hasty)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10035 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
niffiwan
a2fe09fe6c
oops - using the right pointer helps (from r10032)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10034 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
The_E
184df2fb9e
Make sure is-facing does not blow up id OSWPT_TYPE_NONE is encountered
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10033 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
niffiwan
1f2005ab02
Fix mantis 2946 part C: when enabling sheields, only rebalance ETS if the shields were previously off
...
Also fix same issue in alter-ship-flag ( "no-shields" ... )
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10032 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Wanderer
6f3e773359
Fix for Mantis #2807 - not particularly elegant fix but enough to prevent the reported null vec issue
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10031 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Wanderer
e4f63a227c
Solution to issues mentioned in Mantis #2949
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10030 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
The_E
25d5cf17f0
Small performance improvement: Only call opengl_shader_t::uniforms::end() once, not every iteration.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10029 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Wanderer
db183e021c
Continued on Mantis #2806
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10028 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
The_E
521e31d766
...aaand cleanup
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10027 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
The_E
ec56e7771a
Ooops, small buffer collision. Need to load the depth buffer to texture unit 2.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10026 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
The_E
551a539fe8
Adds depth buffer access to post processing shaders (via use of the depth_tex uniform)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10025 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Wanderer
0d4cc04cd6
Fix for Mantis #2352 - Turret reset when idle woes and other limited rotation turret woes.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10024 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
niffiwan
9525d19b89
Fix mantis 2946 part B: set defaults ets when calling shields-on
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10023 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Wanderer
ca0bcd5dbf
Fix for Mantis #2806 - added option to rotate the turrets according to 'initial' state animation code in the lab - option enabled by default but can be toggled via render options
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10022 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Goober5000
6836199eeb
ship_subsys is now a class
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10021 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Goober5000
f883a4bc09
make script_hook behave as a POD object, and fix some parameter passing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10020 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Goober5000
90e7709da5
fix warning and mismatched line endings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10019 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Wanderer
8a8c338409
Fix for Mantis #2784
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10018 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Wanderer
f571d2336f
Assert to trap lua getSignature access to objects with invalid signature.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10017 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Wanderer
6cbc4f78c4
Fix to prevent invalid weapon bitmap references from being created in the lab.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10016 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
The_E
e6a77d8a34
Moves game_settings.tbl parsing up a few lines so that it takes place before graphics are initialized (Necessary due to the table deciding whether to load external shaders or not)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10015 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
niffiwan
6e265e7e96
Fix mantis 2946: set ets shield index to zero when sexp shields-off is called
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10014 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Goober5000
39024965b8
promptly change the icon type when the wing checkbox is checked load icons.tbl earlier in FRED so that briefing icons work correctly
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10013 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Goober5000
5d73931b6d
this should now allow wing icons to be specified too
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10012 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Goober5000
686088fa90
store briefing icons in a master list rather than in species_def allow ship classes to specify their own briefing icon to override normal icon
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10011 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
7e6cb331bf
game_snd has a STL field, so it is properly a class and consequently species_info needs to be a class as well
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10010 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
The_E
45791f371d
Make sure we only write to the event log if the buffer to do this actually exists
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10009 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
The_E
b5e0647d54
Adds a check to the mn.Debris table in lua to check for invalid debris pieces
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10008 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
The_E
7b0f6b310b
Make sure entries in the Debris[] array get cleared properly upon deletion
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10007 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
The_E
d20df5b4c9
Adds a safety check to model_render_glow_points to stop it from blowing up when a glowpoint texture is for some reason not available
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10006 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
1ab4286a25
some calculations will be above 999999, so just do it this way; the end result doesn't matter anyway as we just need the minimum
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10005 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
80320485c1
fix some more loose ends in the revised support ship code
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10004 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
f8b3d75fa4
fail
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10003 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
4bf48943d4
oh come on
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10002 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
c17fd1af7d
fix somebody's spelling
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10001 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
Goober5000
6a8bc0a5ed
make support ship deployment more robust, and prevent an edge case where too many support ships could be in the mission at one time
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10000 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
niffiwan
f3318caef7
some updates to r9885 per discussion with Goober5000
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9999 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
niffiwan
fa04b7c412
Fix mantis 2905: lead sight for secondaries uses subsys distance when targeting a subsys
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9998 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
Goober5000
941fcf34ef
and that shouldn't have been committed in r9995
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9997 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
Goober5000
522299eadf
the game doesn't like it when you do an Assertion while it's shutting down
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9996 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
Goober5000
5aa3bddf70
change object from a struct to a class, since it contains the objsnd_num field :-/
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9995 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
niffiwan
f301cefe2c
redo r9978 with BUF-1 instead of x[BUF+1]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9994 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
zookeeper
3df8818635
Fixed subtle breakage I caused to surface shields in r9794.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9993 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
Goober5000
758bf662e7
valid timestamps are actually > 0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9992 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
niffiwan
629ca0cdc0
Fix mantis 2938: ship.time_first_tagged should be initialised to 0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9989 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
niffiwan
aa3f9080d9
From X3N0-Life-Form: add custom sound for SSM strikes
...
(I updated the patch to use parse_sound instead of the missing stuff_sound)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9988 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
niffiwan
617e4472a2
Remove stuff_sound declaration - was never implemented
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9987 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
niffiwan
2c03139f97
Fix mantis 2889: add sexps's ets-get-value & ets-set-values
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9986 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
niffiwan
797ffdf0f4
Fix mantis 2883
...
update hud_num_make_mono (& callers) to handle the font number
add partial support for specifying special char indexes for individual fonts
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9985 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
Goober5000
7b3a2ddeb5
Mantis #2944 : add a hack to remember the color we faded out to
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9984 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
The_E
575bc3bcce
From Axem: Allow secondaries to cause shudder effects through use of the Shudder flag
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9983 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:02 +10:00
niffiwan
7f7f857559
Add the Polish font01.vf checksum
...
Sourced from https://svn.icculus.org/freespace2/trunk
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9982 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:50 +10:00
niffiwan
e39c972f3d
Coverity 1112867: Buffer not null terminated
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9981 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:50 +10:00
niffiwan
24e7810b24
Coverity fixes from Flaming_Sword
...
Uninitialized scalar field 1093859 1093917 1093810
Out-of-bounds read/access 1093669 1093670
Logically dead code 1093413 1093396 1093407 1093408 1093409 1093410 1093423 1093427 1093390
Allocation size mismatch 1093729 1093728
Unused pointer value 1093921 1093922
Wrong sizeof argument 1093732 1093731
Operands don't affect result 1093365
Dereference after null check/return value 1093475 1093455 1093627
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9979 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:50 +10:00
niffiwan
f5757f8591
Coverity 1093664: Out-of-bounds write
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9978 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
0e561c822a
Coverity 1093500: Missing break in switch
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9977 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
The_E
a43062a426
Makes the following changes to the FRED project for MSVC2013: -Set WINVER and _WIN32_WINNT to 0x501
...
In combination with this download: http://go.microsoft.com/?linkid=9832071 this will enable FRED building on that compiler.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9976 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
chief1983
aaab9f2f00
Fix FreeBSD since it doesn't have libdl and doesn't need to include it to build currently. May break Solaris but it doesn't work yet anyway.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9973 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
chief1983
eb1cfc9ef7
Fix Unix building on several platforms breaking from the new WebUI standalone code. See http://www.hard-light.net/forums/index.php?topic=85859
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9972 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
5f5d13f2b6
Remove 2 unused hudbrackets functions (only with "#if 0" for now)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9971 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
93992f55ff
Coverity 1093668: Out-of-bounds access in fs2netd/tcp_client.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9970 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
zookeeper
5586cd14b0
Port r9959 from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9968 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
The_E
4a422d3398
Updated for released version of VS2013. Note that FRED building is currently not supported on this platform due to MS deprecating Multibyte Charset for MFC, and haven't provided a workaround at this time.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9967 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
2615ca9ab0
Coverity 1107315: Buffer not null terminated
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9966 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
6002874610
Coverity 1107314: Buffer not null terminated
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9965 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
chief1983
b790092b50
This will actually fix the webui code to support jansson 2.2.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9964 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
chief1983
63de4932f8
Ubuntu LTS still uses jansson 2.2.1 in their repo and the code does in fact support 2.2. The libs change was definitely my fault though, I forgot all about r7939.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9963 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
df6f8b5292
And tweak it again, for some reason 2.4 != 2.4.0 :rolleyes:
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9962 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
9df9586ef0
Fix new standalone builds
...
Bumped jansson required version to 2.4.0 since that's the version included with our source
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9960 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
chief1983
8d371f9e94
From Eli2: WebUI-based standalone/dedicated server code for all supported non-Windows platforms. See WIP documentation at http://www.hard-light.net/wiki/index.php/FS2_WebUI_Standalone .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9957 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:48 +10:00
chief1983
22cfa72250
One more Solaris tweak. No malloc_size or malloc_usable_size on Sun kit. Still can't get it to link though.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9949 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:48 +10:00
Goober5000
c1aaefea08
patch for Mantis #2937
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9946 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
Goober5000
bce047db1e
fix handling of multi-line comments, and add !* and *! as a possible option
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9945 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
zookeeper
92712f5579
Port 9940-9941 from zookeeper branch: Made the targeting box render the target relative to player's eyepoint orientation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9942 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
zookeeper
9ed68b129d
Port r9936 from zookeeper branch: Fixed possible crashes related to the eyepoint orientation features.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9939 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
zookeeper
5312b47983
Typo fix.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9938 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
Goober5000
a81491161e
allow setting of background and mask bitmaps for the medal case
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9935 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
zookeeper
81a40458c2
Fixed -misc maps being dependent on LOD and lighting levels.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9929 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
The_E
ea6edd3f8c
Catch a rare error condition where shield_hit_tri was -1 for some reason
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9927 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
niffiwan
6b3c7bd83e
more fixes for wxfred all-lowercase filenames
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9926 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
Goober5000
7343c92c23
spelling
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9925 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
niffiwan
7298f50b7a
From Admiral MS: Add a scripting function to check if a ship is in the field of view of a turret.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9924 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
m_m
6021fb4bea
Some new scripting functions as requested by Axem: Access to the CargoSize of a weapon class Access to the AltName of a ship class Access to the actual capacity of a weapon bank Access to the callsign of a ship Access to the alternate ship type of a ship Access to the maximum velocity of a ship with respect to its engine energy level
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9923 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
niffiwan
184cda8e58
remove gcc warnings [-Wunused-but-set-variable] in ship/shiphit.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9922 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
niffiwan
e725bfc7a1
remove gcc warnings [-Wshadow] in ship/shiphit.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9921 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
niffiwan
af56b43beb
Coverity 1093367: logical vs bitwise operator in stars_draw_background()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9920 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
Goober5000
762045168a
merp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9918 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
Goober5000
73ebcda173
additional memory management improvements
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9917 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
Goober5000
2359bd5c7a
more clarification of structs vs. classes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9916 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
chief1983
75148a3f76
Upgrade Xcode4 project file to...Xcode 5, turning on recommend compiler warnings. Feel free to disable them if they were off for a reason.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9915 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
a0c510e1c6
fix Mantis #2931 : don't prematurely exit the model_interp_tmappoly method if we're drawing outlines
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9913 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
595a4c44c5
initialize this just to prevent loose ends
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9912 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
8dc043ae23
WMC has a screwy way of destroying his jumpnode class, so we need a screwy workaround to avoid hitting an Assert...
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9911 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
22d491e50b
add copy-variable-from-index and copy-variable-between-indexes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9910 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
0a7409c7a8
better ranges are also good
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9909 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
f77dd3c219
change sexp operator names for clarity, make sure mprintfs have newlines, and fix typo
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9908 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
chief1983
ae169ebb39
Add .svn folders to .gitignore.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9907 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
niffiwan
92e5d5bee3
Coverity 1093637: "fix" out of bounds read of Weapon_info[Weapons[other_obj->instance].weapon_info_index].subtype
...
(fix for release, at least, Assert probably handles this in debug)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9906 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:45:59 +10:00
niffiwan
01629bd946
Redo 9903 - this is a more robust solution
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9905 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:32 +10:00
niffiwan
7348b9b08d
remove gcc warnings [-Wunused-but-set-variable] in network/psnet2.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9904 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:32 +10:00
niffiwan
2fe56e6780
Coverity 1093639: fix out of bounds access (ip_addr.sin_addr with proto TCP)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9903 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
e991f7b3ac
remove gcc warnings [-Wshadow] in mission/missionlog.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9902 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
14058b834d
Coverity 1093641: fix out of bounds write (Log_line_timestamps[Num_log_lines])
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9901 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
a7c074e5c3
Coverity 1093645 (out of bounds read): fix 2nd case & correct previous "fix"
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9900 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Echelon9
d0d932fb43
Fix Coverity 1093773: Uninitialized scalar variable - hostaddr.sin_zero
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9899 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
a2b7935a15
remove gcc warnings [-Wunused-but-set-variable] in fs2netd/fs2netd_client.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9898 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
02afed1d78
Coverity: more out-of-bounds fixes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9897 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
2f573aeb29
fix ship sounds when in observer mode (bug was introduced in revision 7923)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9896 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
26f8b5fed1
make collider_pair an actual class since its constructor is called by hash_map
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9891 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
9e8356b72c
setting to 0 is better because -1 triggers an Int3() on the first swarm entry
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9890 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
e68d8097cd
Fix waaay too short char * var for hostname
...
(this was a buffer overrun for every fs2netd game until coverity complained)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9889 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
5531c0d6b4
resolve issues with ship-templates and memcpy by deprecating ship-copy
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9888 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
0c4c9ec9c9
Fix mantis 2906
...
reset stats in Pilot (i.e. .plr) on new pilot create/clone
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9887 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
3e3714fb8d
fix declaration
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9886 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
0f1971c5aa
change the ship struct to a class, and remove use of memcpy and memset for setting/copying the entire ship class
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9885 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
bdc0767bb0
change strcpy to strcpy_s (left over from r9832)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9884 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
Goober5000
d3e0a2b904
improved error messaging for icons.tbl
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9883 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
Echelon9
96e2f96f1a
Fix Coverity 1093931 and 1093932: Missing varargs init or cleanup
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9882 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
Echelon9
4d63d6ea05
Fix Coverity 1093734: Copy into fixed size buffer
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9881 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
z64555
ee1711ed0b
Fixed spelling error with 2 filenames. Updated MSVC project and filters to reflect previous changes with filenames.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9880 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
b26ec341bd
Coverity: more out-of-bounds errors (& fix mistakes in previous "fixes")
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9879 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
1861195702
add .gitignore file :D
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9878 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
576baed1d3
add Coverity modeling file
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9877 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
019c18fab4
Coverity: fix some out-of-bounds access/read/write issues
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9876 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
d7cc54b324
Change Assert -> Assertion (plus removed some trailing whitespace)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9875 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
910d4bd293
Coverity: fix some out-of-bounds access issues
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9874 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
5f0351c72b
Coverity: buffer not null terminated issues
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9873 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
niffiwan
7e1ad3dd5b
Coverity: potential array out of bounds read in ade_set_object_with_breed
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9872 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
niffiwan
a02b97b25a
remove GCC warnings in lua.cpp [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9871 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
z64555
f44356a4c5
Looks like I missed 2 files for renaming.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9870 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
z64555
63df481478
Compliance modifications. EOL to Unix style (LF only), files renamed to only lowercase
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9869 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
zookeeper
f1d0d36647
Port r9734 from zookeeper branch: Added scripting function to enable/disable tips of the day in mainhall.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9868 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
zookeeper
40af858593
Port r9823 from zookeeper branch: Added an option to make pitch and yaw axes be determined by eyepoint orientation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9867 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
zookeeper
ad1c2f0ecd
Port r9738 from zookeeper branch: Forgot this from r9728; makes changing eyepoint orientation affect chase view as well.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9866 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
zookeeper
e8a15e7b22
Port r9728 from zookeeper branch: Made eyepoints match the orientation of their parent submodel.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9865 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
zookeeper
f164e30b0b
Port r9725 from zookeeper branch: Added a Lua function for drawing offscreen indicators. Includes refactoring of some of HudGaugeOffscreen gauge code to separate the position finding and drawing logic.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9864 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
niffiwan
a2ac3497b8
(redo 9781) remove GCC warnings in sexp.cpp [-Wunused-but-set-variable]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9863 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
niffiwan
5135771062
Update ChangeLog, 1st time since 2002...
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9862 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
CommanderDJ
5022356faa
Fix a couple of typos.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9861 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
Goober5000
55c2f4b156
well crap, looks like I broke XSTR in r9809
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9859 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
niffiwan
7adf66330d
Coverity CID 1093820: read of uninitialised var in beam_render_muzzle_glow(beam *b)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9858 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:23 +10:00
niffiwan
8b78abd7a6
Coverity CID 1093930: read from pointer after free in GUIScreen::Add(GUIObject* new_gauge)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9857 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:23 +10:00
niffiwan
5ec75bdd06
Coverity CID 1093821: use of an uninitialised variable in ship_select_blit_ship_info()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9856 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:23 +10:00
z64555
79415c262a
Fixes mantis 2925 and 2926. Errors with declaring wxFlexGridSizer item sizes in wxFormBuilder.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9855 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:23 +10:00
Goober5000
3e4eca4104
reintegrate Goober5000 branch into trunk: adds STLport support and fixes MSVC6 compatibility with SCP_hash_map (part 2)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9854 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:23 +10:00
Goober5000
82fbd9a7c1
reintegrate Goober5000 branch into trunk: adds STLport support and fixes MSVC6 compatibility with SCP_hash_map (part 1)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9853 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
Goober5000
67b171612d
proper class/struct distinction and use of vector over list are A-1 SUPAR
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9851 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
Goober5000
69e1d4e36b
the adjustment should be fixed this way, since most people don't count from 0 to n-1
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9846 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
The_E
52381d05db
Small adjustment to the error message here to minimize confusion
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9844 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
The_E
16e60920cf
Changes an Assert to an Assertion in order to provide better feedback in case stuff_int_list fails due to too many entries in the passed list of integers
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9843 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
niffiwan
62d06cfcd9
Coverity multiple CID: fix potential not null terminated strings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9842 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
niffiwan
ece9b2034b
Coverity CID 1093804: init member raw8 of color struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9841 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:21 +10:00
niffiwan
05a298c68d
Coverity CID 1099443: fix out of bounds access
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9840 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:24 +10:00
Goober5000
8a72823839
turn hud_anim back into an actual struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9834 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
Goober5000
c7f6394d6c
polymodel code now has basic class management in place and no longer uses memset
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9833 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
Goober5000
8e096f5c15
remove bad use of memcpy by assigning player class using an actual assign() method (part 2)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9832 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
Goober5000
52edd5b112
remove bad use of memcpy by assigning player class using an actual assign() method
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9831 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
Goober5000
52e9c4a8e0
allow fade-in and fade-out with any color, not just black, white, and red
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9830 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
z64555
5c0a97db80
Allows compiling of wxFred2 on *Nix machines. Includes niffiwan's autocools, fixes some referencing issues with button graphics, and includes graphics for the program and application icons.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9829 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
niffiwan
cebded3acb
Tweak autotools compilation
...
Add -pipe to potentially speed up compiles
Change -mtune to generic to clarify intent
(people compiling executables for their own use (i.e. not for distribution)
should set CXXFLAGS="-march=native" before running autogen.sh)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9824 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:36 +10:00
Goober5000
7e5b2aee52
turn mc_info into a plain data struct, part 2
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9822 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:36 +10:00
Goober5000
4a9d457154
turn mc_info back into a plain data struct, part 1
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9821 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
c46c0d1412
derp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9820 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
444d4b801a
make engine_wash_info a struct again
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9819 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
2ee1b24b65
queued_animation uses a mess of memcpy and memset, so make sure it's a plain struct!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9818 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
fe934190ac
clarify that some structs should now be treated as classes change shockwave_create_info back to being a struct fix some missing shockwave_create_info initialization
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9817 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
b4cc5d72f4
use an index rather than an iterator into the waypoint list so that ai_info is again a plain old data object
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9816 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Echelon9
e7cbe63a08
Resovle a few const char build errors for non-Windows platforms
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9815 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
f0830b6d64
scoring_level_init is only supposed to initialize a subset of the stats
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9814 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
7248acc004
use a copy method rather than memcpy to clone stats (Mantis #2922 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9813 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Swifty
4a1e2cb4c5
From Kobrar: Make sure we normalize when normal mapping is off.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9812 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
Goober5000
fc191a40f2
whoops
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9811 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
Goober5000
97e18cd758
various fixes for pilotfile stats
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9810 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
Goober5000
4bd10888ff
make localization more robust with additional checks on string length, more consting, and stronger typing and make XSTR const, since we don't want to modify the strings it translates and then CONST ALL THE THINGS
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9809 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
chief1983
d8e4b8de55
Add profiling.cpp to the Makefile.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9808 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
chief1983
d1ac95963f
Add profiling file to Xcode projects, and remove the wxfred2 files from their code.lib targets.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9807 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
The_E
e2281c39cb
Adds Swifty's frame profiling code. In order to activate it, use the -profile_frame_time commandline parameter. ATTENTION PLATFORM MAINTAINERS:
...
This adds a new file to the source tree named profiling.cpp, add this to the respective project files (I've already done it for the various MSVS projects)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9806 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:33 +10:00
Goober5000
2e779e8bef
MOAR const!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9805 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:33 +10:00
Goober5000
38ae06e97d
derp... apply consting to FRED
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9804 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:33 +10:00
The_E
3f6f498340
Fix a function call that got broken in all the consting.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9803 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:33 +10:00
Goober5000
8cf10e86f8
remove Bobboau's "better error messages" which were never fully implemented and are more distracting than helpful
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9802 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:46:41 +10:00
Goober5000
886018d28f
here a const, there a const, everywhere a const const
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9801 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:46:41 +10:00
Goober5000
0dfcea3b22
make MAX_MEDALS dynamic (missed a file)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9800 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:27:08 +10:00
Goober5000
7f90f5c674
make MAX_MEDALS dynamic
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9799 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:27:03 +10:00
Goober5000
fcf6d56774
fix tech-add-intel-xstr to actually localize from tstrings.tbl (Mantis #2919 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9798 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
Goober5000
ebe1043a13
add tech-add-intel-xstr, and modify intel_info_lookup to properly translate intel entries (fixes Mantis #2919 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9797 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
chief1983
cc0caf5e55
The last remaining code change (I think) blocking Solaris compatibility.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9796 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
The_E
c0919e0777
Admiral MS' AI flag to enable the AI to be smarter when using afterburners. flag name is "free-afterburner-use". See http://www.hard-light.net/forums/index.php?topic=83818.0 for reference
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9795 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
zookeeper
d993c3e1f5
Merge auto spread shields from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9794 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
zookeeper
46ad62f831
Clarified a warning about missing glowpoint textures.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9791 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
Goober5000
b3798527a0
allow medals.tbl to specify images for debriefing views of medals, not just medal case views
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9789 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:18 +10:00
The_E
81c5c06218
Experimental Configurations to make AVX builds
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9788 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:18 +10:00
Goober5000
6d6c82c652
make localization names consistent, and move medal localization into localize.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9787 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:33 +10:00
niffiwan
e19e9d1afd
Allow the use of __attribute__ (GCC specific syntax) In particular, __attribute__((__unused__)) to shush compiler warning -Wunused-but-set-variable
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9786 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:33 +10:00
z64555
32bd62bc18
wxFred2: whoops, forgot some resource files
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9785 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:32 +10:00
z64555
ec02c3c972
wxFred progress: GUI elements designed, organized code/wxfred2, work begun on main fred viewport.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9784 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:32 +10:00
Goober5000
138e6b853f
yeesh... a veritable cascade of const-correctness
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9783 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:32 +10:00
chief1983
0a1379159d
Revert r9781 until it can be implemented without breaking MSVC.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9782 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:32 +10:00
niffiwan
809ee2483d
remove GCC warnings in sexp.cpp [-Wunused-but-set-variable]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9781 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:32 +10:00
niffiwan
9a602777bd
Fix mantis 2911: stop (de)activate-glow-point-bank sexp from processing the 1st arg twice
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9780 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
The_E
41af7e5ec0
Project files vor MSVS 2013. Please note that in order to build FRED, you need to install the Multibyte MFC library from http://www.microsoft.com/en-us/download/confirmation.aspx?id=39309
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9779 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
niffiwan
5a6493fa62
remove GCC warnings in sexp.cpp [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9778 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
zookeeper
143463b478
Port r9723 from zookeeper branch to trunk: Made is-facing able to check for target objects other than ships.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9777 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
zookeeper
f98030b122
Port r9705 from zookeeper branch to trunk: Exposed a ship's autoaim FOV to Lua and allowed $Autoaim FOV to take floats rather than just ints.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9776 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
zookeeper
fd21b9054b
Port r9701 from zookeeper branch to trunk: Added a Lua function to check whether a ship is warp-capable.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9775 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
d5f03daa6b
spelling, hehe
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9774 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
96587dd2ab
allow specification of medal, callsign, and label coordinates
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9773 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
0debee3c51
pretty sure this needs to be 0, per line 325
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9772 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
3550b720cb
remove requirement that game_settings.tbl should specify a campaign filename with an extension
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9771 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
42d096a3c2
allow a user-specified number of credit images
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9770 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
a921665872
add missing newline
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9769 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
52413c944f
what's this? a Volition bug?
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9768 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:30 +10:00
karajorma
602e608065
Fix Mantis 2883 (All the 1's have vanished since r9761)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9767 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:30 +10:00
The_E
06900df8df
As requested by Axem, adds "player-is-cheating" sexp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9766 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
chief1983
6c88f96cc0
Bump version to 3.7.1 for nightlies.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9765 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
niffiwan
7fad36e90c
Fix for mantis 2907: In red alert missions that skip briefings, use the red alert "continue" button, not the ship/weapon select "commit" button.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9764 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
niffiwan
3d1edee29a
Fix for mantis 2878: LUA playMusic uses players music volume, not the requested volume
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9763 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
karajorma
0b0b3fdf70
Allow event.log to snapshot all events that are checked this frame. Allow event.log to record the status of the event the previous time it was checked in addition to its status this frame.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9762 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
karajorma
2691085f9f
Add support for other languages beyond French, German and Polish. Any non-unicode language should work now.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9761 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
karajorma
800602701a
Add alter-ship-flag support for several more flags
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9760 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
karajorma
18ca1c08db
Add the toggle-subsystem-scanning option to the alter-ship-flag SEXP
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9759 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
Goober5000
8f7320119e
show-subtitle-text will now display subtitles from a message
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9758 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
Goober5000
d7fc8372aa
Number 3 from Axem's "A triplet of small patches", http://www.hard-light.net/forums/index.php?topic=82749.0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9757 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
karajorma
f38b90f431
Fix Mantis Mantis 2913 (Time Compression SEXPs do not work in multiplayer)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9756 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
karajorma
c251c031f0
Fix Mantis 2903 (Spinners in the Object Editor point in the wrong direction).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9753 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
The_E
7b53a46e88
From m|m: Fix for Mantis 2914 (AmmoLeft and AmmoMax return strange things in scripting)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9752 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
chief1983
5b7c056cb1
Revert 9749 until after 3.7.0.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9751 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
karajorma
53d0129e8f
Fix Mantis 2912 (Hud-set-max-targeting-range doesn't work on multiplayer clients).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9750 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
The_E
6524a2140f
As requested by Aesaar, raise the per-model debris limit to 48 (previously 32). Also increases the per-frame debris limit to 96 (previously 64)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9749 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
z64555
134b0dd757
fix for mantis 2874: Pilot conversion not preserving axis mappings. Also adds a warning that is activated whenever the pilot loading process has to skip bytes of "extra/unknown data" in a section.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9748 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
niffiwan
315373e952
Fix mantis 2908: finally get "richer" pilot conversion exceptions data working correctly THANK YOU Tony D @stackoverflow! http://stackoverflow.com/questions/6248404/c-exceptions-is-throwing-c-string-as-an-exception-bad
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9747 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
niffiwan
99ef01ff6d
Fix 3 for 2901: remove long/short read warning by making mainhall(csg flags), cutscenes(csg flags) & is_multi(plr flags) consistent between pilot conversion and normal save/loads
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9746 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
niffiwan
d619d86976
Fix 2 for mantis 2901: 7 weapon slots (not 12) for pilot conversions
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9745 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
niffiwan
d60a930dc2
2808 accidentally clobbered 2810: change 3.6.18 last played pilot name before loading the pilot for the 1st time
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9744 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
The_E
4eb1787e4e
Fix for Mantis 2898: Reverting r8627 to reinstate -img2dds
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9742 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
Echelon9
0f7d8ec579
Fix Mantis 2847: Assert: (team != -1) -- due to aicode issues tracking destroyed weapons
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9741 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
niffiwan
878a7a1921
Fix for mantis 2904: redalert wingmen without RA data are treated as destroyed
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9740 387891d4-d844-0410-90c0-e4c51a9137d3
2013-08-06 22:55:15 +10:00
niffiwan
12de1de128
Fix MSVC warning (int to char conversion): thanks to zookeeper for noticing this
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9739 387891d4-d844-0410-90c0-e4c51a9137d3
2013-08-06 22:55:15 +10:00
zookeeper
cf4fa30f0f
Fixed bug in RotationalVelocityDesired documentation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9737 387891d4-d844-0410-90c0-e4c51a9137d3
2013-08-06 22:55:14 +10:00
Echelon9
fb33fe020b
Resolve a series of Xcode (LLVM compiler) warnings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9735 387891d4-d844-0410-90c0-e4c51a9137d3
2013-08-06 22:55:14 +10:00
niffiwan
59762a4db7
add some red alert doco
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9733 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:31 +10:00
niffiwan
d4d10dedd9
add more data to pilot (csg) conversion error messages
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9732 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:31 +10:00
Echelon9
e776f8e5dd
Fix issue where switch statement would fall through for TS_MOVE_PLAYER, which would then not get pushed to other hosts
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9731 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
niffiwan
f8a74ae5c9
Partial fix for 2901: pilot conversion needs to read the ubyte mainhall from <= 3.6.18
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9730 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
m_m
f410440604
Fix for Mantis 2884: Team colors not displayed on player ship.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9720 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
The_E
bccd0533bd
Removes a console command that basically amounted to being a more elaborate way of causing an Int3()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9719 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
The_E
c6397750e0
Fix for Mantis 2861: Make sure we switch off shader-based effect rendering if the GPU can't handle it
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9718 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
f5f42f65fa
this is required for strict const-correctness
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9715 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
ce118c232c
add a missing #include
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9714 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
509f509347
MSVC6 compatibility
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9710 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
bda6c72d31
remove an unused function, per Echelon9's detective work (Mantis #2900 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9709 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
b5f278c91c
a modified version of Echelon9's fix for Mantis #2897 (heap corruption due to object indexes being too large for the object dock bitstring)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9708 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Echelon9
17c7d0be26
Documentation cleanup of object.cpp pursuant to Mantis 2897 bug-hunting.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9706 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Echelon9
90a6702ede
Fix Mantis 2896: AddressSanitizer: global-buffer-overflow in hud_lock_reset() hudlock.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9699 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
54875d1de8
fix Mantis #2893 (invalid characters in sexp tokens weren't replaced)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9698 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:29 +10:00
Goober5000
4e2ee8bece
Mantis #2852 : commit the newest version of the patch, based on discussion
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9697 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:29 +10:00
Goober5000
693448eb99
Mantis #2852 : good catch, but I'd rather not modify the damage variable... and also, there's the danger of divide-by-zero which wasn't checked
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9696 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:29 +10:00
Echelon9
773ada0084
Fix Mantis 2852: AddressSanitizer: global-buffer-overflow in shockwave_move() shockwave.cpp:359
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9695 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:29 +10:00
The_E
b7cd4e3c67
oops, broke something
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9693 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:17 +10:00
The_E
f860e040b2
Fix for Mantis 2882: "None" team color setting causes errors. Also fixes a few other oversights.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9692 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:17 +10:00
niffiwan
46796a59c8
Fix for mantis 1326: add & handle "not present" state for red alert ships
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9689 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:17 +10:00
niffiwan
049b3205ef
Fix for mantis 2880: handle -1 red alert departed ship indexes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9688 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:17 +10:00
The_E
658c6c5aa8
From Axem: Patch for Mantis 2870 (hook variable for On Death: scripting hook is not always set correctly)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9687 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:17 +10:00
karajorma
5708875eda
We only need to see this error once in FS2. Ensure that this instance only appears in FRED.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9686 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:17 +10:00
karajorma
856c593a2c
Better error reporting for this issue (in order to help track down a Diaspora bug).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9685 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:17 +10:00
karajorma
d1ec691f62
Assign the debris signature correctly.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9684 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
karajorma
99948813c1
Fix for Mantis 1863 (Ships with an arrival cue of true and a delay do not arrive on the standalone). Might possibly fix Mantis 1815 too.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9683 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
niffiwan
d04130c453
Fix for mantis 2879: clear/reset *everything* in Campaign struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9682 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
niffiwan
194300dc94
Fix for mantis 2864: correctly init message_extra struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9681 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
Backslash
14aa992f6c
Small fix to selection set / multitarget / hotkey wing behavior. If a set is not active and something is targeted that is in a set, pressing THAT set's key will not change targets, but just activate the set.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9680 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
niffiwan
c5bdbe268e
Fix for mantis 2868: clear all mission completed flags when changing campaigns
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9679 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
niffiwan
793cd89ad3
Fix for mantis 2801 from Mr_Maniac: increase buffer size to correctly handle localisation strings > 1024 chars
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9678 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
Echelon9
4cbe3903d7
Fix Mantis 2837: AddressSanitizer: heap-buffer-overflow in sexp_get_damage_caused()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9677 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
Goober5000
b9d06a1e58
fix for Mantis #2856 - combine all the has-[un]docked[-delay] sexp functions and make adjustments for the order of ship checks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9675 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
Echelon9
af5928aa70
Fix Mantis 2859: Game crashes if mod is changed with the same pilot in use. From niffiwan.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9673 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
Echelon9
3d2c85f623
Fix Mantis 2862: Crash exiting game from command briefing on newly created pilot, caused by double free in cutscenes.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9672 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
Echelon9
9d85779875
Fix Mantis 2819: AddressSanitizer: stack-buffer-overflow in l_File_read_f()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9671 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
Zacam
ca90ec8e75
Fix for Mantis 0002860: Tostring function for enumerations returns invalid for highest enumeration index From: Admiral MS
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9670 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
Zacam
23faeda404
Fix for Mantis 2829: If it doesn't like trying to @param a double stuffed func, then don't. We have the @params defined in the original draw_func_ptr anyway.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9669 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
niffiwan
46a3f5483a
Fix for mantis 2802: when restoring last missions loadout, ignore weapons on absent ships Also clear ship weapons & weapon-counts when clearing loadout slots
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9668 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
Zacam
b2e1f1d211
From z64555; a better version of r9666's Doxygen comments.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9667 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
Zacam
c49d1a1e6a
Doxygen and clean-up start for making the controls more robust. Doxygen additions: z64555 Tab/Whitespace cleanup: My fault.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9666 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:16 +10:00
The_E
b991499620
From Plombo: Make the FXAA shaders conform to the (absolutely braindead, I might add) GLSL specs. Also makes Mesa happy.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9665 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
niffiwan
9c5fd447fc
Fix for mantis 2855: fix off-by-one, add negative index check, empty invalid slots & enable mprintfs
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9664 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
niffiwan
504fb153db
Revert "Fix for mantis 2802: when restoring last missions loadout, ignore weapons on absent ships" Wrong patch you git!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9663 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
niffiwan
97d228947a
Fix for mantis 2802: when restoring last missions loadout, ignore weapons on absent ships Also clear ship weapons & weapon-counts when clearing loadout slots
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9662 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
m_m
d2cc75561d
Fix for Mantis 2846: Problems with mission loop animations
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9661 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
The_E
cb1f812cef
Fix for Mantis 2857: We need to tell generic_anim_load what to load, really. Otherwise this whole exercise is kinda pointless :P
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9660 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
Echelon9
316308cc40
Fix for Mantis 2833: AddressSanitizer: heap-buffer-overflow in get_char_width()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9659 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
niffiwan
e67daf2afc
Remove a duplicate line in r9657 - thanks to Echelon9 for noticing this
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9658 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
niffiwan
78cb7cc039
Fix mantis 2753: save csg just before mission starts read loadout indexes into int instead of uint & ensure -1 is not used as array index initialise Player_loadout struct during FSO start
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9657 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
Zacam
90151d3e0a
Fix for Mantis 2841: From CommanderDJ, Allows FRED to select/set Main Hall by string input, not just integers.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9656 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
Echelon9
74b89d9fc5
Extra logging functionality for BMPMAN. This helped localise the fix in r9654.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9655 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
Echelon9
aa463ca772
Fix for loading of AVIs in BP. As discussed with The_E on IRC, this bug may have had a range of unintended consequences, although not clear why it hasn't been picked up already.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9654 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
Echelon9
fc555177fd
Fix Mantis 2850: AddressSanitizer: global-buffer-overflow in emp_randomize_chars()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9653 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
niffiwan
b8c625d589
log the correct CSG version
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9652 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
The_E
20abba69dc
Fix my fix from revision 9305: Properly check for null pointer dereference
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9651 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
FUBAR-BDHR
0457fcc9ad
From Yarn fix for Mantis 2849 +Flags: does not select main halls
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9650 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:15 +10:00
Echelon9
0a7fcfc0a5
Fix Mantis 2854: AddressSanitizer: global-buffer-overflow in do_subobj_hit_stuff()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9649 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Echelon9
51c14de891
Fix Mantis 2853: AddressSanitizer: heap-buffer-overflow in change_ship_type()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9648 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Echelon9
e0ed2fa45f
Let form follow substance; when using indentation around if() ensure the approach is clear
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9647 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Echelon9
83bb931baf
Fix for Mantis 2821: AddressSanitizer: global-buffer-overflow in ship_get_secondary_weapon_range()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9646 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Echelon9
7d76471b03
Fix Mantis 2834: AddressSanitizer: global-buffer-overflow in get_max_ammo_count_for_bank()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9645 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Echelon9
690460df8e
Fix Mantis 2824: AddressSanitizer: global-buffer-overflow in obj_snd_delete_all()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9644 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Goober5000
b1191f53d5
code cleanup related to Mantis #2845... straighten out and standardize the differences between the various OPF_SHIP_WING_* argument types make sure all ships using an OPF_SHIP_WING_* type actually specify and handle the type they need to (removing the ones that don't make sense, e.g. you can't set the orientation of a waypoint) enforce type safety by clarifying the distinction between "any ship on a team" and "every ship on a team", and splitting the OSWPT_TYPE_TEAM type to accommodate this (which maintains compatibility with the original OPF_SHIP_WING_TEAM type)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9643 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Goober5000
f865ab85b5
fix the is-in-box sexp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9642 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Goober5000
381f54663b
the fix for Mantis #2845 in isolation
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9641 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Goober5000
8926a4de06
Yarn's patch to make version checking work correctly
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9640 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
chief1983
f5903f771d
More missed filename renames.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9636 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
chief1983
51abff326d
This was probably not letting linking work correctly.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9634 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Zacam
34b7dbe233
Revert r9631: If you are going to make a fix, commit just the fix, not a slew of "oh, also" stuff that ends up breaking things. Especially not immediately preceding an RC phase, kthx.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9632 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Goober5000
be86442006
cleanup due to Mantis #2845... straighten out and standardize the differences between the various OPF_SHIP_WING_* argument types make sure all ships using an OPF_SHIP_WING_* type actually specify and handle the type they need to (removing the ones that don't make sense, e.g. you can't set the orientation of a waypoint) fix num-ships-in-battle and is-in-box which were both broken and make sure the sexp lookup for IFFs uses sexp_determine_team rather than iff_lookup (which is the actual fix for Mantis #2845 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9631 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Echelon9
e773a0a94e
Fix for Mantis 2844: AddressSanitizer: heap-buffer-overflow in pilotfile_convert::csg_import_red_alert csg_convert.cpp:438
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9630 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Echelon9
709f914867
Fix Mantis 2825: AddressSanitizer: global-buffer-overflow in turret_weapon_has_flags() aiturret.cpp:316
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9629 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:35 +10:00
Echelon9
cf8bad999b
Fix Mantis 2828: AddressSanitizer: global-buffer-overflow in ship_subsys_disrupted() ship.cpp:8066
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9627 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:35 +10:00
Echelon9
62600ec156
Fix for Mantis 2820: AddressSanitizer: global-buffer-overflow in os_init_cmdline() cmdline.cpp on Mac
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9626 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:35 +10:00
niffiwan
2b6fea8ff4
From Yarn - Fix mantis 2839: remove overlap in default 640x480 res HUD gauges
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9625 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:35 +10:00
niffiwan
414ab43e64
Fix mantis 2832: conversion functions now use certain consts from the new pilot code when exporting *only*
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9624 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:35 +10:00
zookeeper
aec367efbc
Probably fixes is-secondary-selected not working.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9623 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:35 +10:00
niffiwan
61bf714c51
Fix mantis 2815: store single/multi squad names and images separately (in csg/plr respectively)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9622 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:35 +10:00
Echelon9
d0ca515cef
Fix Mantis 2836: AddressSanitizer: global-buffer-overflow in ai_fire_from_turret() aiturret.cpp:2528
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9621 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:34 +10:00
Echelon9
351da2c864
Fix for Mantis 2835: AddressSanitizer: global-buffer-overflow in ConditionedHook::ConditionsValid() scripting.cpp:338
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9620 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:34 +10:00
Echelon9
a9a1c736c1
Fix use of magic numbers in ConditionedHook::ConditionsValid()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9619 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:34 +10:00
chief1983
86309a5d66
Since the timerbar warning can't be fixed, this should fix the remaining parts of Mantis #2829 by escaping things it confused with xml tags.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9618 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:34 +10:00
Echelon9
2f5fc4a754
CommanderDJ's patch for half of the Doxygen warnings - see Mantis 2829
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9617 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:34 +10:00
karajorma
78b02095e6
Forgot to null check that. Also this SEXP was only designed to work on ships, not wings or teams. I can add that later maybe.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9616 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:34 +10:00
niffiwan
2a7174b1bf
GCC warning: vector.size() is unsigned, no point in checking if it's >= 0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9615 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:34 +10:00
niffiwan
c4115831fc
Fix for mantis 2813: don't let pilot conversion create more than MAX_PILOTS
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9614 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:34 +10:00
niffiwan
9ebbd7efce
Fix for mantis 2814: don't check filename lengths when deleting .csg files Also change win32 to check for last . in filenames, not the 1st
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9613 387891d4-d844-0410-90c0-e4c51a9137d3
2013-04-14 13:00:34 +10:00
Echelon9
f627a66488
Extra validation to help triage Mantis 2828
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9612 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:49 +10:00
The_E
3664486cdb
If the player ships' sensors are out, we need to exit button_function earlier.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9611 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:49 +10:00
m_m
53b8ebeeb4
Fixed scripting functions which use the current camera to also use the main camera when no custom camera is in use. This adds a optional boolean parameter to getCurrentCamera to retain backwards-compatibility.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9610 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:49 +10:00
Echelon9
36363fc419
Fix for Mantis 2823: AddressSanitizer: global-buffer-overflow in hud_escort_ship_hit()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9607 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:18 +10:00
niffiwan
f45b8dbf5a
Update for mantis 2817: this is a better way of removing extra popups There are more types of campaign load failures than just missing campaign files
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9606 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:18 +10:00
niffiwan
45cbfa32e0
Fix for mantis 2817: remove two redundant popups regarding missing campaigns
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9605 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:18 +10:00
Echelon9
9376ad1d51
Fix Mantis 2822: AddressSanitizer: global-buffer-overflow in hud_target_change_check() hudtarget.cpp:4459
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9604 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:18 +10:00
Echelon9
078d065688
Third shot at Mantis 2818, other sections of the code in modelinterp.cpp use -1 is odd ways but nonetheless valid ways
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9603 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:18 +10:00
karajorma
0c4f6bfcdc
Fix Mantis 2811 (Default Campaign File Name was not used).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9602 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:18 +10:00
Echelon9
2d51c3e05f
Have another go at fixing Mantis 2818, this time using the less fatal Warning() report in Debug builds when invalid handles passed to bm_is_valid()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9601 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:18 +10:00
karajorma
ac6796f5af
Add all the strings that had no translation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9600 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:18 +10:00
zookeeper
b4f721c253
Fixed dual fire being available even for secondary banks with only one firepoint.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9599 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:18 +10:00
chief1983
4fe447aab5
Revert r9596 and reopen #2818 .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9598 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:17 +10:00
niffiwan
815ce24d0d
Fix for mantis 2809: re-enable quick-start-missions (g key in debug) Save Recent_missions & last_flown_ship_si_index to CSG
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9597 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:17 +10:00
Echelon9
c348f5b7c0
AddressSanitizer: global-buffer-overflow in bm_is_valid() bmpman.cpp fix
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9596 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:17 +10:00
The_E
8aba499825
Accidentally committed some project files, ooops.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9595 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:17 +10:00
The_E
b4f39e9ece
Patch for Mantis 2808: Player select menu always defaults to Single Player mode regardless of what the last played mode was.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9594 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:17 +10:00
zookeeper
53c90981ea
Fixed even secondaries without a free flight time receiving a decreased initial speed, which was causing particle spews to create a particle with the wrong speed when the weapon is created.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9593 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:17 +10:00
niffiwan
edcb5aa483
Fix for mantis 2810: ensure Last Player from registry/.ini is at the top of the pilot selection list
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9592 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-30 15:36:17 +10:00
niffiwan
8a1666c5aa
derp - fix for r9584; remove 7th entry in the 6-item array Thanks for zookeeper for noticing this
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9585 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:07 +10:00
niffiwan
5c3d105f85
Fix for mantis 2789: replace shield icons drawn with 100's of lines with 6-point polygons
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9584 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:07 +10:00
zookeeper
c105b2ad15
Fixed an accidentally committed debug mprintf.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9583 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:07 +10:00
zookeeper
4eee845335
Restored the code which loads up the default HUD colors from hud_3.hcf. Was apparently accidentally removed in r9549.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9582 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:07 +10:00
zookeeper
95a11f71f8
Fixed gr_opengl_circle drawing the middle horizontal line twice, which is a problem when drawing with alpha.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9581 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:07 +10:00
chief1983
37a37d1a5b
Missing doxproj from Antipodes.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9567 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:06 +10:00
FUBAR-BDHR
07fdf1b3c1
Commit 9473 from anitpodes to prevent standalone crashing never ported over. Original commit message: "From Eli2: Lower the value of MAX_SHIPS_PER_PACKET to 64 in order to keep packet size down"
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9565 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:06 +10:00
Zacam
43f02b201a
For BluePlanet compatibility: change-nebula-pattern SEXP. Also adds a logging nprintf for op_num in add_to_event_log_buffer.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9564 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:06 +10:00
FUBAR-BDHR
13efc81b22
Need to back out temporary commit 9553 or it looks in inferno\inferno and \inferno for pilots.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9563 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:06 +10:00
zookeeper
2490764c1b
Fixed a syntax error.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9562 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:06 +10:00
Zacam
593be42e66
*drum roll* Pilot Code! Originated by taylor. Additional direct work by: The E, niffiwan, CommanderDJ, Pyro3D, Echelon9 (PVS-Studio), Karajorma and Eli2. (If I missed you, don't kill me.)
...
MASSIVE thanks to Mjn.Mixael and Blue Planet for tireless constant testing.
(It's still not perfect, but it probably wouldn't be where it is at without them)
Spans a lot from initial commit to AP Branch in r6835.
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9561 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:06 +10:00
zookeeper
222f632943
Fix turrets not getting can_move = true set for them; fixes at least glowpoints parented to turrets not moving right.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9560 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:26:06 +10:00
chief1983
e22b7a5548
This version string is not used for output filenames, it's more useful indicating to developers that this is a trunk build as opposed to an RC or final release. Also, the same change wasn't made to the Xcode 3 project so they ought to match one way or another.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9555 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
chief1983
b765485d98
Clean up a few more Inferno references.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9554 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
Zacam
11140adf51
aaaaaaaaand finally, lets make sure that we can actually see the "Inferno" directory for all those pilot files. *sighs* That had better be everything.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9553 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
Zacam
0ba6052326
Update to r9550: Make sure that we keep the right directory default for the reading of current player Pilot files until the Pilot code goes in.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9552 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
Zacam
abd6a465f7
And lets not forget Global Section headers.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9551 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
Zacam
16e9892903
Whoops. When removing #ifdefs, check the #else block.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9550 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
Zacam
759b080814
pre-Antipodes Staging Merge: "Inferno" build options go away, INF_BUILD settings now "default" settings. Fixed and made consistent across all projects the Build Output names ("Debug" used for Debug builds at the very end of the file name before the extension and after other options such as SSE, where applicable) Other unused #defines or #ifdefs removed: DEMO build Related, STANDALONE_ONLY_BUILD (already covered by -standalone command line flag)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9549 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
chief1983
104d2d6fce
Update trunk version to 3.6.19 to make sure nightlies are now properly indicated as newer than 3.6.18.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9547 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
karajorma
9531268fd9
Fix Mantis 2797 (Ship Loadout shouldn't remember the previous settings if the mission has changed)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9544 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
Goober5000
3c3d1b4bd1
proper movement of ships attached to other ships fixes Mantis #2787
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9542 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
Goober5000
dc18b7e012
fix Mantis #2796 (capships always have an EMP time of 7.5 seconds) by adding a weapon flag to allow the full value of emp_time to be used
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9540 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
Zacam
8959ecdc07
Follow up to r9536: re-instate -no_warn, but put it behind a compiler level #ifdef flag to enable the ability to use it. And if you don't know how to do that, you have no business using it.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9539 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:46 +10:00
m_m
7f170217a8
Fixed scripting issue with wrong type conversions.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9538 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Goober5000
55d4f0b96c
follow-up to revision 9127: that commit breaks FSPort (causing part of the nameplated Orions to be translucent), so let's just check that "nameplate" is the entire texture name
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9537 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
The_E
129d02eb0d
Removing the -nowarn commandline argument. The encouragement of bad habits is a serious bug.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9536 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
The_E
4bcc9f1716
From AMS: Fix for Mantis 2293: Destroyed/departed AI showing up as present in wingmen display.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9535 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
niffiwan
24037c6e02
Fix for mantis 2786: from Yarn - make +Main Hall: always override +Flags: i.e. so retail-compatible campaigns can use the second main hall in retail and a different main hall in FSO
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9534 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Echelon9
72770939a2
Further spelling fixes, inspired by bugmenot's Mantis 2794
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9533 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
The_E
d1e73bd8b7
Followup for 2788: Fix potential issue while looping through subobjects.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9530 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
The_E
6197c20010
Patch for Mantis 2788: Difficulty-based damage scaling does not work
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9529 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Goober5000
6ab03f2e2b
might as well remove this unnecessary temporary variable
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9528 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
niffiwan
37c132318a
Fix for mantis 2785: when unpausing sounds, use the previous volume, not the detault
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9527 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Echelon9
93d0af04d2
Resolve uninitialised value warnings in load_gauge_warhead_count()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9526 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Echelon9
6fceacafd8
Revise Xcode4 project file to support recommended settings of the current Xcode 4.6 release
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9525 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Goober5000
1409e7d6cf
don't throw errors for missing skybox models... we just won't display the skybox
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9524 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Goober5000
e4d92ae779
don't crash when doing debug stuff
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9523 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
The_E
d02ef204a2
Fix a bug caused by an oversight during refactoring. It should be noted that this wouldn't have happened if this code was using normal scoping in for loops (for (int i = 0.....)) instead of having the loop counter be declared in the outer scope.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9522 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
karajorma
8271a12a53
FUBAR's fix for Mantis 2778 (Game_skill_level goes out of range and causes crashes) with some changes by me.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9520 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Goober5000
6cab0d12bc
no, silly Volition programmer, that's handled elsewhere (fix Mantis #2783 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9516 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Goober5000
28b386633b
this ought to fix Mantis #2326
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9515 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Goober5000
c8b5e8e755
correct the sexp help for string-to-int
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9514 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Goober5000
ebd54319d2
flip these around so that they're less confusing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9513 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Goober5000
94f7a54596
apply m!m's fix for Mantis #2780 also correct the off-by-one error in the range check (path_num must < n_paths, not <=)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9512 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:44 +10:00
The_E
17a48525e7
Prevent the hud-set-frame sexp from accidentally causing badness by setting an invalid frame offset
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9510 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:44 +10:00
niffiwan
f947a5fb5d
Fix for mantis 2776: from onlyjob, fix format-hardening error
2013-01-22 09:57:29 +00:00
m_m
cd19783e69
Fix for Mantis 2763: ETS gauge showing up for ships with no shields if default ship had shields
2013-01-19 13:06:51 +00:00
Goober5000
29a0cc5684
tell who is respawning
2013-01-16 07:13:47 +00:00
Goober5000
a916633b46
onlyjob's spelling fixes, per Mantis #2777
2013-01-13 09:50:08 +00:00
Goober5000
4791df1b17
return special_hitpoints to using a specific value instead of a multiplier;
...
this was extensively tested in both single-player and multiplayer, using change-ship-class and changing ship loadout, against ships both higher and lower in hitpoints, to ensure it didn't re-break Mantis #2326
2013-01-13 09:28:28 +00:00
Goober5000
e26c663c59
wing departure now works
2013-01-13 03:55:09 +00:00
Goober5000
107a61ea13
for Mantis #2097 , straighten out the departure code so that goals to warp cause warping, and comm departures use whatever departure method is specified
2013-01-13 03:03:25 +00:00
Goober5000
9cb9e349ac
FUBAR's changes for Mantis #2775 , plus the addition of the asteroid model
2013-01-13 00:05:21 +00:00
Goober5000
6fe3e087a9
FUBAR's fix for #2779 -- don't crash when launching asteroids
2013-01-12 22:34:30 +00:00
Goober5000
15fb88b8c5
add files to project
2013-01-08 01:56:54 +00:00
Goober5000
9b589d3005
MSVC6 compatibility
2013-01-08 01:44:48 +00:00
Goober5000
ab5c47cdf6
jg18's patch -- don't do irrelevant stuff when we're only querying for flags
...
see http://www.hard-light.net/forums/index.php?topic=83315.0
2013-01-07 23:33:49 +00:00
chief1983
ef9e06fcb1
Reverting 9491.
2013-01-07 16:33:42 +00:00
Echelon9
85e42f57be
Updated Mac Xcode 4 project for the 3.6.16 RC phase
2013-01-07 14:20:24 +00:00
Goober5000
6b62d36e02
change from 1 meter to 0.1 meter
2013-01-07 04:35:36 +00:00
Goober5000
bdb40e07e9
strncpy_s wasn't specified quite right (Mantis #2765 )
2013-01-07 04:07:28 +00:00
Goober5000
c610a1f9a2
FUBAR's fix for Mantis #2770
...
see http://www.hard-light.net/forums/index.php?topic=83122.0
2013-01-07 03:31:46 +00:00
chief1983
2d228279fa
Change output filenames to match those used for 3.6.14 releases.
2013-01-06 19:24:49 +00:00
niffiwan
4b2bfd4bf3
autotools: remove extra -lpng that will break compiles if libpng12 is being used
2013-01-06 05:03:33 +00:00
niffiwan
4e4f551c31
Autotools: check for alternate libpng package name (specifically for opensuse)
2013-01-06 04:14:01 +00:00
niffiwan
7f7179f327
Workaround for mantis 2760: re-order struct shield_hit_info to avoid segfault with gcc & -ftree-vectorize
2013-01-03 06:57:53 +00:00
Goober5000
5a4c6c90c4
be mindful of sending ship-create packets for docked ships in multiplayer -- should fix Mantis #2761
2013-01-01 22:22:11 +00:00
niffiwan
45b98592e6
autotools: exclude lua5.2 because it's not (yet) compatible with FSO
2012-12-31 09:34:27 +00:00
Goober5000
154356924e
allow alternate spelling
2012-12-30 18:01:02 +00:00
niffiwan
3177815a3c
Linux/GCC compilation: -march=athlon64 could cause issues on non-AMD CPUs. Use mtune for more widely compatible binaries.
...
Also enable SSE/SSE2
2012-12-30 03:36:13 +00:00
The_E
71571e40da
Fixes issue with the "no primary linking" weapon flag not working correctly
2012-12-29 23:19:51 +00:00
niffiwan
a218b7d37d
GCC: make install now installs fs2_open_x.y.z - helps Linux packaging tools
2012-12-27 09:47:35 +00:00
Valathil
c8eceec482
Followup to 9454. Only check in the one instance where the crash happened. Ticket 2757
2012-12-25 18:44:09 +00:00
FUBAR-BDHR
8cb31c63e7
Mantis 2759 - Add Warning for null normals on docking points
2012-12-24 06:23:56 +00:00
Valathil
5bce063959
Fix for Mantis 2745: Make it impossible in FRED to select individual ships for reinforcements when in a wing. From FUBAR: Check at mission parse and spit out warnings.
2012-12-23 23:58:58 +00:00
FUBAR-BDHR
2ca8fce056
add -tbp and -jpgtga to the depreciated flags
2012-12-22 23:45:15 +00:00
karajorma
a4489e6b97
Fix Mantis 1818 (PXO Login fails ambiguously if you don't have a password or username)
2012-12-21 07:15:07 +00:00
Goober5000
6e77fe5fbb
enhance debug warning for Mantis #1951
2012-12-20 07:34:38 +00:00
Valathil
3f3b8c128b
Adding an assert to multi_ts_get_team_and_slot so we can get Auto variable data in the crash dump to track down ticket 2757.
2012-12-19 01:58:27 +00:00
Valathil
3fbbaf05fa
Fix for Mantis 2738: Reset buffer state before drawing spheres and lines. Additionally fix the new htl outline rendering in fred by setting the outline color.
2012-12-19 00:11:28 +00:00
The_E
d702b276ef
Rename the model subsystem flag masks to MSS_MODEL_FLAG_MASK and MSS_MODEL_FLAG2_MASK respectively, for readability
2012-12-18 21:55:26 +00:00
The_E
20f7383d4a
Fix for Mantis 2513 by Admiral MS: Fixes issues with two ship classes sharing model data.
2012-12-18 21:46:35 +00:00
Valathil
456290db4e
Fix for Mantis 2364: Load the relevant thruster bitmaps when switching weapons in lab.
2012-12-18 20:09:08 +00:00
Valathil
1a8a03aba2
Fix for Mantis 1901: Update the displayed ship after the loadout is refreshed.
2012-12-18 19:42:59 +00:00
Valathil
7577bacfbc
Fix for Mantis 1928: Recreate the briefing and background dialog when the mission updates.
2012-12-18 18:40:25 +00:00
Valathil
4eaa532ce0
Fix for Mantis 2447: Allow fighters to use anti subsystem weapons when disarming/disabling protected ships.
2012-12-18 17:26:48 +00:00
Goober5000
b3c5bdab7b
properly fix the removal of particles (Mantis #2165 )
2012-12-17 09:36:40 +00:00
Goober5000
6bb4ae42ae
revert revision 9411 in preparation for fixing particles (Mantis #2165 )
2012-12-17 08:59:55 +00:00
Goober5000
5b77af048c
since invisible textures were loaded as -1, they have to be flagged specially to actually replace real textures (Mantis #2340 )
2012-12-17 08:00:17 +00:00
Goober5000
2e2c1afe38
there is actually a way to check for extra sound values per Mantis #2048 , and here it is
2012-12-17 05:54:18 +00:00
Valathil
913aeb0753
Fix for Mantis 2199: Reject objects from being clicked on when selection lock is active.
2012-12-17 01:17:19 +00:00
Valathil
e1f07390e2
Fix for Mantis 2755: Update weapon_info references after weapon_create to get updates from possible substitution
2012-12-16 14:25:21 +00:00
Valathil
0dc6c8fcf7
Set the 3D flag in the new sounds.tbl parsing.
2012-12-15 22:11:57 +00:00
Valathil
f920395b0c
Fix for Mantis 2707: Pass the firing turret to weapon_create so it knows where to look for when using $Substitute.
2012-12-15 21:47:51 +00:00
Valathil
a4974307f5
Fix for Mantis 2737: Recreate the entire orientation matrix not just the forward vector when ships spawn from docking bays.
2012-12-15 19:51:40 +00:00
The_E
0e3003fc93
Change the default toolset for MSVC2012 to "110-XP", to make builds made with VS2012 XP-compatible.
2012-12-15 10:33:35 +00:00
Goober5000
68cb625ce7
allow saving of invisible textures for replacements (Mantis #2340 )
2012-12-15 04:41:52 +00:00
Goober5000
2e783fe37b
fix Mantis #2319 (alt names and callsigns aren't properly removed)
2012-12-15 04:36:27 +00:00
Valathil
fd125acb19
Fix for Mantis 1978: Add eyepoint directions to cameras; Add guncam view for cameras that are bound to turrets
2012-12-14 22:18:45 +00:00
The_E
dee413b32c
Fix for Mantis 2754: Reset the frame offset for custom HUD gauges when reinitializing.
2012-12-14 12:07:30 +00:00
karajorma
4cb7e70068
Fix Mantis 2753 (Customised Loadouts sometimes won't save for next time the mission is played).
2012-12-14 09:27:17 +00:00
karajorma
2e96022d5e
Fix a couple of event logs. Clean up the operators array.
2012-12-14 08:51:22 +00:00
karajorma
eebe54b0b1
Actually fix a bug in Num-ships-in-battle rather than accidentally committing a different minor fix.
2012-12-14 03:31:26 +00:00
karajorma
5c7804cadd
Fix a bug in Num-ships-in-battle
2012-12-14 03:28:40 +00:00
Goober5000
b329c4020a
fix Mantis #2752
2012-12-13 06:14:04 +00:00
Goober5000
13f1705c1b
patch another memory leak
2012-12-13 06:12:24 +00:00
Goober5000
cff8cde651
patch a memory leak
2012-12-13 05:56:28 +00:00
The_E
9ac4d2d0b0
Patch for Mantis 2733: Updates the description for add-nav-waypoint. Also makes it work as intended.
2012-12-12 13:57:34 +00:00
Goober5000
dc66db326a
fix compilation
2012-12-11 03:53:53 +00:00
Zacam
0502b4d648
Revert of 9410. Apparently not ready for prime time, what with older compilers that don't seem to understand C++0x types (and complaints about upgrades to enable it), and it apparently (under said compilers) isn't any faster than stdext::hash_set anyway.
2012-12-10 08:23:19 +00:00
The_E
f0dee720d9
Fix for Mantis 2733: Adds documentation for the 4th argument for the add-nav-waypoint sexp
2012-12-09 22:47:31 +00:00
The_E
38ba853d9b
Rewrite the sexp documentation for most of Kazan's navpoint sexps to follow the formatting established by the rest of the sexp docs.
2012-12-09 22:36:17 +00:00
Valathil
ec32829615
Fix for Mantis 184: Use Vertex shader to replicate nohtl rendering of thruster cones. Also make shader state handling a bit less hackish.
2012-12-09 21:51:20 +00:00
Valathil
982f7e63ff
Fix for Mantis 2146: Move the model_clear_instance call so it doesn't reset the replaced texture.
2012-12-09 21:49:20 +00:00
Zacam
e43f9dcc83
Fixes Mantis 2706: Weapons not colliding
2012-12-09 06:28:56 +00:00
Zacam
fc51dde285
Fixes Mantis 2325: View shakes in 'show ship' flag when far from the mission origin
2012-12-09 04:28:44 +00:00
Zacam
71a9ab8b7d
Fix for Mantis 1496: Ships stopping mid-waypoint; From Admiral MS
2012-12-09 03:45:27 +00:00
Zacam
c10eca5808
Fix for Mantis 2165: Vector iterator becomes invalid in Particle.cpp
2012-12-09 03:31:18 +00:00
Zacam
5f998ff345
Mantis 2746: Fix for geometry batcher, from Valathil. Update for Mac by Echelon9.
2012-12-09 02:59:02 +00:00
The_E
a77e9d3376
From CommanderDJ: Patch for Mantis 2009
2012-12-08 20:25:37 +00:00
The_E
01e45dc8e8
Patch for Mantis 2188 by Admiral MS
2012-12-08 20:23:09 +00:00
The_E
8ef4975eee
Patch for Mantis 2200 by Eli2
2012-12-08 20:21:25 +00:00
Valathil
01cb063bd4
Fix for Mantis 2693: Fix rotating submodels still colliding even if $no_collision or $no_collision_this_only is set. Also fix ships that have $no_collision on detail0 set colliding with bigger ships.
2012-12-06 20:44:29 +00:00
Goober5000
c811f80f2a
set the mini help text to blank if we select an operator
...
make sure special lists of arguments are checked for mini help text
(Mantis #2020 )
2012-12-06 06:50:43 +00:00
Goober5000
0a5392f2aa
fix Mantis #1975
2012-12-06 06:14:24 +00:00
Goober5000
301be27e72
1) don't actually copy the ship object, because it has classes
...
2) fix Mantis #1616 by re-applying the original parsed texture replacements
2012-12-06 04:20:54 +00:00
The_E
291c17f380
Fix for Mantis 1616: Texture replacement data is not copied over when changing ship classes that share models
2012-12-05 19:06:49 +00:00
FUBAR-BDHR
b0d7dfc750
Fix for mantis 2748: Wing delay values not reset when using file->new
2012-12-05 18:09:32 +00:00
niffiwan
fd7fe0dd9e
Goober!!! :) Fix parentheses in r9397
2012-12-05 09:23:29 +00:00
niffiwan
90f25111d9
Fix for mantis 1922: set glowmaps on/off in the hud target box
2012-12-05 09:02:48 +00:00
Goober5000
b11cca1e7d
bulletproof the activation and deactivation of shields; this should fix Mantis #2747
2012-12-05 07:45:47 +00:00
Goober5000
5ac69dc1a2
for Mantis #2346 and #1129 -- munge the data if it runs afoul of the warnings
2012-12-05 04:20:45 +00:00
Valathil
3c9130e39b
From Mantis 2346: Spit out a warning if the two docking slots lie on the same axis as the docking normal.
2012-12-04 23:02:02 +00:00
Valathil
b3465ad929
From Mantis 1129: Spit out a Warning if a model has a docking port with identical slot positions.
2012-12-04 20:25:55 +00:00
Valathil
9cf3151ef4
Fix for Mantis 2743: Strip down 16 Bit files to 8 Bit by adding PNG_TRANSFORM_STRIP_16 to png_read_png
2012-12-04 17:19:05 +00:00
Goober5000
ea4e1acb34
CommanderDJ's patch for #2730
2012-12-04 05:12:48 +00:00
Valathil
96c9a56549
Fix for Mantis 2727: Add Autocenter for debris rendering
2012-12-03 20:45:14 +00:00
Valathil
6ad5a937a9
Fix for Mantis 2736: abs is int in Linux and Mac; change to fl_abs in all instances where floats were used in the codebase.
2012-12-03 00:59:45 +00:00
The_E
552779163b
And another fix for Mantis 2326.
2012-12-02 10:23:23 +00:00
The_E
097673762c
I am just going to assume that this was a hasty application of Ctrl-C Ctrl-V, not some kind of intentional cast of a boolean to a float
2012-12-01 18:12:50 +00:00
karajorma
54a8788cb9
Update SEXP help for ai goal SEXPs to reflect that priorities over 89 are allowed now.
2012-12-01 07:11:29 +00:00
The_E
26b5c3a926
Changing the function descriptions of isLaser() and isMissile() to better explain what they're doing. Also adding isPrimary() and isSecondary(), which are basically the same as the first two, but named better.
2012-11-28 21:38:09 +00:00
The_E
9cec60f23d
Fix for Mantis 1596: Adds "turret-fired" animation trigger
2012-11-28 20:08:07 +00:00
The_E
1a7a74f43e
From FUBAR: Patch for Mantis 2256
2012-11-28 18:32:39 +00:00
karajorma
893701d0b7
This might or might not help with Mantis 1841. Either way Assertion > Int3() anyway.
2012-11-28 09:18:23 +00:00
Goober5000
2014ee4bab
update comment
2012-11-28 06:56:08 +00:00
Goober5000
583f5f39ae
clean out dead_docked list as part of ship_cleanup -- fixes Mantis #2294
2012-11-28 06:55:15 +00:00
Goober5000
48a30b0888
update ship orders when changing ship classes in FRED - fix Mantis #2341
2012-11-27 06:59:48 +00:00
Goober5000
9df9157e3c
improve ship-copy-damage sexp with more robust checks and incidentally a fix for Mantis #2734
2012-11-26 05:49:23 +00:00
Valathil
917bd38692
Fix for Mantis 2735: Port commit 8643 & 8644 to Turrets as well
2012-11-26 01:37:24 +00:00
Echelon9
b4a578314c
PVS-Studio fix: V601 The 'true' value is implicitly casted to the integer type.
2012-11-25 02:45:16 +00:00
The_E
7208989f05
Did you know that WP_BEAM isn't actually used anywhere? I didn't. Neither did the isBeam() scripting function.
2012-11-24 09:17:18 +00:00
karajorma
2d91a76f47
Fix Mantis 2703 (Primary weapons with the child flag prevent any further weapons appearing in the ships-editor->weapons list)
2012-11-24 08:37:25 +00:00
niffiwan
26d70dcb33
Fix for mantis 2664: shockwaves now use bounding box to test distance for damage
2012-11-24 02:40:55 +00:00
karajorma
b5b9b8bc6e
Fix an issue with persistent variables being ignored by the loadout code.
2012-11-23 06:49:04 +00:00
karajorma
e10a41a82e
That buffer needs to be bigger!
2012-11-23 06:37:09 +00:00
FUBAR-BDHR
c2eb2e0840
Log but don't warn about LOD mismatches when running a standalone server.
2012-11-21 18:49:13 +00:00
Valathil
e039a4954e
Fix for Mantis 2207: Use Missiontime for F4 Logscreen entries and fix the calculation.
2012-11-20 23:42:12 +00:00
Valathil
eb434cf828
Fix for Mantis 2376: Don't calculate nose offsets for chase view.
2012-11-20 20:54:28 +00:00
Valathil
c5005adf53
Correct some issues with Help screens that popped up because of glCleanup and undocumented Nvidia driver behaviour.
2012-11-20 18:53:26 +00:00
niffiwan
c38ad85175
Fix mantis 2732
2012-11-20 10:38:52 +00:00
Goober5000
a756cf2960
for Mantis #2636
2012-11-20 00:05:51 +00:00
Goober5000
c9d7673801
fix Mantis #2691 by just ending colorization on whitespace
2012-11-19 23:40:50 +00:00
Goober5000
48f36f569e
addendum to r9340 to fix Mantis #2714 in scripting function (thanks to Admiral MS)
2012-11-19 22:57:41 +00:00
Valathil
374b5afafd
Fix for Mantis 2731: Add a +use_pxo flag in multi.cfg
2012-11-19 17:43:40 +00:00
Goober5000
bc26caba28
follow-up to 9355: since we have a version of get_string that accepts SCP_string, just use that
2012-11-19 05:36:05 +00:00
Valathil
699e69b027
Followup to 9357: Don't flush texture state we don't care about that in shader pipeline and also move the fix to a more efficient place per Swifty's suggestion.
2012-11-18 23:33:01 +00:00
Valathil
666f978756
Fix for Mantis 2719: Clear Vertex Array state after rendering.
2012-11-18 19:07:33 +00:00
Valathil
5997a72a62
Fix for Mantis 2729: Remove the Int3 and make the log entry a little clearer.
2012-11-18 18:01:41 +00:00
The_E
def96b21d2
Increase the buffer size for stuff_string_list(SCP_vector<SCP_string>) to 2048. If this function was used with substrings longer than NAME_LENGTH, this would cause stack corruption due to a buffer overrun.
2012-11-18 17:58:05 +00:00
Zacam
755d7326b3
From Valathil, glCleanup to reduce the amount of calls.
...
First post here: http://www.hard-light.net/forums/index.php?topic=82886.0
Mantis Here: http://scp.indiegames.us/mantis/view.php?id=2728
2012-11-18 10:05:44 +00:00
Zacam
212eee3b31
Warning resolution: grbatch.cpp(806) : warning C4018: '<' : signed/unsigned mismatch; solved by setting 'Batch_buffer_size' from 'int' to 'size_t'
2012-11-17 23:12:17 +00:00
zookeeper
0f198fd677
Fixed the reset button in the HUD config screen not resetting to the default color scheme given to new pilots.
2012-11-16 21:17:18 +00:00
zookeeper
a88b1e145c
Ought to fix bug 2690.
2012-11-16 19:45:24 +00:00
zookeeper
8308920e3b
Fix really stupid mistake.
2012-11-16 11:26:48 +00:00
Zacam
05944baae8
From Valathil: Corrects for dynamic switching regarding Fixed Render Pipeline in the LAB
2012-11-16 04:14:29 +00:00
Goober5000
0a7d226d5f
fix for Mantis #2726 -- proper handling of mismatch of LOD levels
2012-11-15 07:52:45 +00:00
zookeeper
b7335b4f2e
Tweaked some of the settings of the four detail level presets.
2012-11-14 12:05:59 +00:00
zookeeper
a456519b95
Made the default detail level tableable in game_settings.tbl, but kept "very high" as the default.
2012-11-14 11:54:47 +00:00
Echelon9
c6691dc721
PVS-Studio fix: Resolve bug introduced in r201 (9 years, 11 months ago) in relation to an if statement without encompassing curly brackets.
2012-11-12 14:32:57 +00:00
Goober5000
0627377338
Admiral MS's fix for Mantis #2723
2012-11-12 06:57:18 +00:00
Goober5000
92c03d15f2
CommanderDJ's fix for Mantis #2529
2012-11-12 06:48:17 +00:00
Goober5000
429ab61311
fix Mantis #2714 -- hud doesn't change when change-ship-class is called
2012-11-12 03:25:59 +00:00
zookeeper
1b6a87498d
Fix botchedness in r9338.
2012-11-11 20:59:02 +00:00
zookeeper
4e273451b4
Set the default detail level of new pilots to "very high".
2012-11-11 12:09:25 +00:00
Goober5000
b30e2ee226
inspired by recent change to multi_sexp.cpp... in most cases, SCP_string should not be passed by value
2012-11-05 08:31:39 +00:00
Goober5000
14322c5064
a ship that is self-destructed should have the same behavior as one that is destroyed, if going by mission log entries
...
(c.f. thread: http://www.hard-light.net/forums/index.php?topic=82718.0 )
2012-11-05 05:43:28 +00:00
Zacam
815b74691b
Lets see if this handles Mantis 2724.
...
On Valathil's suggestion, pulled the code added in 9312 from 'model_render_glow_points' and 'model_render_thrusters'
2012-11-04 21:50:34 +00:00
Zacam
e9d39c9b57
One more spot to update Build revision from .13 to .15
2012-11-04 15:44:11 +00:00
The_E
ca5dd281bd
Compiler warning removal: Variable initialized but not used
2012-11-04 08:30:20 +00:00
The_E
664c1c383b
Compiler Warning removal: int-to-ubyte conversion
2012-11-04 08:29:46 +00:00
The_E
1032302351
Compiler warning removal: Unused variable, float-to-int cast
2012-11-04 08:27:50 +00:00
The_E
051fcdd770
Compiler warning removal: ubyte/int comparison
2012-11-04 08:25:53 +00:00
Echelon9
ba917667b6
Re: r9305 - while NULL pointer checks in non-Debug are useful, ensure we don't lose the better check in Debug as well.
2012-11-03 23:11:41 +00:00
The_E
43fecf84c8
PVS Studio fix: string last_portion is not used anywhere
2012-11-03 09:39:11 +00:00
The_E
cc8893ca72
PVS Studio suggestion: Create a reference to avoid repeated vector access
2012-11-03 09:38:34 +00:00
The_E
c75469e066
PVS Studio fix: Pointer not checked against NULL
2012-11-03 09:37:29 +00:00
The_E
40536f9069
PVS Studio fix: Pointer shipp is not checked against NULL
2012-11-03 09:36:44 +00:00
The_E
dd098ed217
PVS Studio fix: Really confusing code
2012-11-03 09:35:46 +00:00
The_E
2ab5c72111
PVS Studio fix: "!none_valid" is always true
2012-11-03 09:33:54 +00:00
The_E
1f48d15dcc
PVS Studio suggestion: Create a reference to avoid multiple vector access operations
2012-11-03 09:31:54 +00:00
The_E
4c9333a6f0
PVS Studio fix: String play_callsign is not used anywhere
2012-11-03 09:28:49 +00:00
The_E
35cc7b886e
PVS Studio suggestion: Create a reference instead of repeated vector access
2012-11-03 09:25:48 +00:00
The_E
75ba6a15cc
PVS Studio suggestion: Use ++it for iterators
2012-11-03 09:24:25 +00:00
The_E
a71b5f4247
PVS Studio fix: Add checks against NULL pointer dereferences
2012-11-03 09:23:23 +00:00
karajorma
5769d206e4
Turns out you do need some of those after all. No idea why grep didn't find them.
2012-11-03 09:01:17 +00:00
karajorma
e83c18a7f9
Clear out some cruft from the multiplayer code. Make sure Macros are being used.
2012-11-03 08:25:27 +00:00
karajorma
9dd9dd1581
Object numbers are not guaranteed to the same on the client. Sent the net_sig instead.
2012-11-03 06:08:22 +00:00
chief1983
2ca33c3ee6
He did the job, parse error fixes came with ease, but one couldn't stop it's like he had a disease, he fixed another and another and a sista and her brotha...
2012-11-02 19:48:57 +00:00
chief1983
666aee826f
Darn typos.
2012-11-02 19:41:59 +00:00
chief1983
9f4f3dfd2c
More tweaks for FreeBSD support, and cleanup of configure.ac. Slightly experimental.
2012-11-02 19:36:53 +00:00
chief1983
4e5d3e2e57
Fix all the 'no newline at end of file' warnings I saw thrown by gcc on FreeBSD.
2012-11-02 17:30:17 +00:00
Echelon9
beb0f3915a
Update Xcode4 project file to the latest recommended settings in Xcode 4.5.x
2012-11-01 14:41:07 +00:00
Goober5000
b09e535c3b
Admiral MS's fix to the lab weaponmodel fix
2012-10-31 01:56:35 +00:00
The_E
4bb94b0abf
OOps, forgot a :
2012-10-30 20:09:03 +00:00
The_E
ebd477067d
Fix for Mantis 2679: Adds new setting to game_settings.tbl: "$Weapons inherit parent collision group:", a boolean setting defaulting to FALSE. Setting it to true will cause weapons fired to inherit their parent ships' collision group setting.
2012-10-30 19:37:53 +00:00
karajorma
418135917d
Move the add paste button in FRED. Hopefully this will result in less cursing when people press paste instead of add paste.
2012-10-30 03:26:30 +00:00
karajorma
cfcb883159
Switch the name of the deselect-nav SEXP
2012-10-30 02:07:41 +00:00
Goober5000
91d30c608a
fix an old Volition bug -- properly mark a goal as not achievable if a ship departs, not only if it's destroyed
...
and throw in self-destructed for good measure, per Admiral MS
2012-10-29 20:48:06 +00:00
Goober5000
3b5b154712
fix from Admiral MS -- if there's no explosion, explosion sound shouldn't play either
2012-10-29 20:29:54 +00:00
Goober5000
b9a803a771
fix from Admiral MS -- move waypoints properly when moved via scripting
2012-10-29 20:27:31 +00:00
Goober5000
b8ce4b7a7e
fix from Admiral MS -- page out weapons when lab is exited
...
also, modelnum comparisons should be >= 0, not > 0
2012-10-29 20:26:29 +00:00
Goober5000
ee357c9846
yes, whoops (fix bug noticed by Droid803)
2012-10-29 07:10:01 +00:00
The_E
4d57e2eaba
Make change-team-color multi. Also adds SCP_string overloads for multi_send_string/multi_get_string
2012-10-27 09:24:11 +00:00
The_E
f98e75dde6
A few updates to Team Colors:
...
-Team Colors can now be applied to player ships
-change-team-color sexp for on the fly changes
-New F3 lab controls: T and Y can now be used to cycle team color presets
2012-10-26 18:39:43 +00:00
karajorma
20b614069e
Resaving a mission shouldn't result in any changes other than the date.
2012-10-26 09:44:12 +00:00
karajorma
d822dce5bb
Small error with alter-ship-flag fixed.
2012-10-26 00:28:20 +00:00
chief1983
00abe171bc
Bump trunk revision to 3.6.15. Update output build names for MSVC 2005 through 2012, Xcode 3 and 4, Linux, and internal version strings.
2012-10-25 16:26:11 +00:00
chief1983
b7f8bc6ba8
Add event.log stuff to Xcode3 project file.
2012-10-25 16:03:17 +00:00
niffiwan
6e0bfaa4d1
Add generic_log files to Makefile.am for *nix compiles
2012-10-25 10:16:38 +00:00
karajorma
54f6d864a0
alter-ship-flag SEXP. Now does AI flags too.
2012-10-23 12:02:28 +00:00
IssMneur
fa00353c9d
Name the packfile with the odd header
2012-10-20 03:41:25 +00:00
Swifty
385b8c48bb
Axem's rotating dead subobjects.
2012-10-17 05:58:33 +00:00
Goober5000
8aa23d6a1a
fix for Mantis #2643 (generated shield quadrants displayed in the wrong spots)
2012-10-16 03:20:47 +00:00
Goober5000
d57b46bfe5
add missing files to project
2012-10-16 02:27:14 +00:00
Goober5000
b01a5b3f65
add arrival_delay and departure_delay arguments to set-arrival-info and set-departure-info
2012-10-16 01:08:30 +00:00
Echelon9
2b3def2ade
PVS-Studio fix: V601 The 'true' value is implicitly casted to the integer type. Inspect the first argument.
2012-10-15 10:57:15 +00:00
Echelon9
841032c37a
PVS-Studio fix: V576 Incorrect format. Consider checking the fourth actual argument of the '_snprintf' function. The SIGNED integer type argument is expected.
2012-10-15 10:53:01 +00:00
Swifty
7aadb223ef
Let's simplify that no autoaim in multiplayer commit.
2012-10-15 09:08:20 +00:00
Swifty
3236a1d262
Removed the multiplayer game mode check in unnecessary places in the autoaim/convergence firing code.
2012-10-15 07:31:26 +00:00
Swifty
e4880e319e
Made sure that cockpit models are getting flushed out when unloading a given model.
2012-10-15 06:21:00 +00:00
Swifty
2132f14d60
Fixed scaling and positioning issues with cockpit displays. Added Display Offsets: to all RTT capable gauges.
2012-10-15 04:45:02 +00:00
Swifty
002f143725
Added RTIF settings for DRADIS.
2012-10-15 02:42:10 +00:00
IssMneur
3ae4064268
Added a note to the configure file about letting SCP know about successful builds on our unsupported and less supported platforms.
2012-10-13 21:42:06 +00:00
IssMneur
8f39310eb9
nbspjr's changes for FreeBSD building
...
See: http://www.hard-light.net/forums/index.php?topic=82425.msg1646772#msg1646772
2012-10-13 21:27:42 +00:00
m_m
e2e3eeafed
Adding a few new scripting functions, including support for dockingpoint access for scripting and a function to draw HUD-like brackets around an arbitrary subsystem.
2012-10-12 16:14:47 +00:00
m_m
513caa9ec3
Fix compilation for Visual Studio 2010 and 2012.
2012-10-12 10:39:44 +00:00
Echelon9
52093cf6c6
Documentation: Pass cleaning up a few functions with partial docs
2012-10-08 15:53:14 +00:00
Echelon9
c1121a56bb
Fix: Format string is not a string literal (potentially insecure)
2012-10-08 15:17:43 +00:00
Echelon9
b1fc599517
Support event.log compilation in the Xcode4 project file
2012-10-08 15:03:01 +00:00
karajorma
7769a4e6e1
Okay, this time JUST the event.log stuff!
2012-10-08 09:13:21 +00:00
karajorma
49f63ad88b
Backout that commit. Wrong codebsse!
2012-10-08 09:11:14 +00:00
karajorma
7c25c35243
Commit the event.log feature.
2012-10-08 09:02:44 +00:00
Swifty
ab7c112951
Cockpit display support for a crapload of gauges.
2012-10-07 05:37:50 +00:00
Goober5000
f53f819591
remove all hacks with #weak because FSPort has corrected data
2012-10-07 04:06:29 +00:00
karajorma
5a75b350cb
Fix AI issue where ships ended up with no target to land on.
2012-10-07 01:18:30 +00:00
Swifty
54a668bc1c
Disabled auto aim in multiplayer.
2012-10-06 23:57:29 +00:00
Swifty
38da17a334
Fixed crash caused by certain AI code assuming all objects are Ships.
2012-10-06 23:56:20 +00:00
karajorma
c94d97073c
Talon1024's Nav select/deselect SEXPs.
2012-10-04 02:28:23 +00:00
Goober5000
45c8ad336c
change alloca to standard vm_malloc/vm_free
2012-10-01 06:16:15 +00:00
Goober5000
2c701c592a
update comments
2012-10-01 03:19:46 +00:00
Goober5000
acac926656
update const-correctness
2012-10-01 03:19:31 +00:00
Swifty
4b95d09f8c
Fixed attempted reinitialization of collision pairs. Need to use OBJ_INDEX(objp), not objp->instance as that refers to the ship index, not the object index.
2012-10-01 03:05:20 +00:00
Goober5000
22dc84b6e1
MSVC6 compatibility
2012-09-30 21:08:05 +00:00
Goober5000
3e08e72d5b
Admiral MS's lab patch
...
http://www.hard-light.net/forums/index.php?topic=82192.0
2012-09-30 19:43:24 +00:00
Goober5000
b028b372af
fix a compiler warning
2012-09-28 06:26:34 +00:00
Goober5000
8612ee9f69
fix the techroom bug where #weak weapons appear because they were assigned the player-allowed flag during parsing
2012-09-28 06:26:14 +00:00
Goober5000
e7bcccd4c0
revert r9218 per discussion with karajorma... new fix will follow shortly
2012-09-28 05:36:12 +00:00
Echelon9
3825ce1968
Fix up cmd_brief and cmd_brief_stage struct definitions; some general cleanup of code within missioncmdbrief as well
2012-09-26 10:39:56 +00:00
Valathil
aa5f42f1f1
Fix for Mantis 2709: Use the correct dimensions for updating texture images when texture streaming to fix crashes on hardware not capable of handling non power of 2 texture dimensions
2012-09-25 19:11:05 +00:00
karajorma
e4978a67a4
Allow mods to mark campaigns as ignored.
2012-09-25 13:40:05 +00:00
karajorma
c51f88abd8
Doh! Those two should be the other way round.
2012-09-25 01:08:19 +00:00
m_m
947263a047
Let's try this again, hopefully this time without reverting previous changes. See r9215 for a better description.
2012-09-24 16:17:26 +00:00
karajorma
05215a7ffa
Commit Mission Moods
2012-09-24 11:00:40 +00:00
Goober5000
ef6ccc36f0
play-sound-from-table should work for both 3d and non-3d sounds
2012-09-24 06:58:54 +00:00
Goober5000
424c315575
remove a warning
2012-09-24 06:58:10 +00:00
Echelon9
7b00d3dd45
Support Universal builds (32/64 bit) on Mac OS X 10.6+. Also updates library frameworks to libogg-1.3.0, libvorbis-1.3.3 and libtheora-1.1.1
2012-09-23 15:17:52 +00:00
karajorma
9433f054f3
Stop #weak weapons appearing in the tech room in multiplayer missions.
2012-09-23 08:33:32 +00:00
The_E
1f8dcf5494
Reverting 9215, because it conflicts massively with my fixes for hud_gauges. m|m, did you update your checkout before committing your stuff?
2012-09-22 21:41:23 +00:00
m_m
1faee4f711
Added weapon specific HUD tracking and lock-on sounds and in-flight sounds.
...
New options are $TrackingSnd, $LockedSnd, $InFlightSnd and +Inflight sound type.
2012-09-20 13:05:09 +00:00
karajorma
d5cb354950
Display the skill level on the debriefing stats screen.
2012-09-20 01:05:23 +00:00
The_E
c04b6a54f0
Fixes memory management issues due to duplicated pointers
2012-09-19 19:28:03 +00:00
The_E
1cae449aad
Clear the ship list between gauge configs to avoid multiple huds rendering at once
2012-09-19 18:40:10 +00:00
The_E
dcf8339ae2
And another fix. Apparently, = != ==, who knew
2012-09-19 17:34:09 +00:00
The_E
d324780a3f
And more fixes
2012-09-19 16:52:30 +00:00
The_E
98e4c56c19
Fix a stupid parsing bug
2012-09-19 16:37:34 +00:00
The_E
a736ac2d36
As requested by mjn.mixael: Allows modders to specify a list of ship classes a given hud config can be applied to. To use this, use "$Ships: ("Some ship" "Another ship")" instead of "$Ship: This ship". $Ship has been deprecated.
2012-09-19 15:31:31 +00:00
karajorma
6b7f78965d
Allow subtitles to also display remappable keys.
2012-09-18 09:22:21 +00:00
karajorma
3780eb6a86
Looks like Do-Nothing went walkabout. Putting it back.
2012-09-16 13:30:18 +00:00
karajorma
a8cccb2168
Send a keep alive packet when loading icons as sometimes this can take quite a while (for instance in debug).
2012-09-16 09:09:19 +00:00
karajorma
ee52320146
Fix Mantis 2712 (Change-ship-class does not update clients). Only a partial fix as cockpit and HUD are not updated.
2012-09-16 08:30:48 +00:00
karajorma
683e8cf2a4
Axem's Radians -> Degrees fix for FRED
2012-09-16 01:27:32 +00:00
karajorma
0d0a8b644a
Axem's SEXP reorganisation.
2012-09-15 03:28:36 +00:00
karajorma
abd9b6a3f7
Add the debug SEXP.
2012-09-13 09:35:13 +00:00
karajorma
67d106ae15
We really shouldn't be doing that on the standalone
2012-09-13 04:47:27 +00:00
IssMneur
bc713b68bb
Fixes mantis 2711. AudioStream handles are leaked under certain conditions.
...
AudioStream handles that were to destroy and fade would not if the stream was already finished or not started.
2012-09-12 02:41:08 +00:00
The_E
c69f00d90e
Fixes issue with Team Colors accidentally causing a null pointer dereference. Thanks to mjn.mixael for prodding at this.
2012-09-11 22:24:45 +00:00
Valathil
ac5c8dc798
Only use offsets for thruster distortions. Fixes weird framebuffer explosions.
2012-09-11 12:50:43 +00:00
niffiwan
adecd7fe12
From m!m: Fix for mantis #0002695
2012-09-11 10:02:59 +00:00
Swifty
849976985a
Created Primary Weapons Gauge and Secondary Weapons Gauge.
2012-09-10 07:09:32 +00:00
Swifty
2b857771fc
Created Hardpoints gauge.
2012-09-10 06:58:59 +00:00
Swifty
aba9b4515e
Created Warhead Count gauge.
2012-09-10 06:51:14 +00:00
Swifty
087d9c04db
Added additional parameters for the Wingman Status gauge.
2012-09-10 06:35:33 +00:00
Swifty
cafad3bb24
Added text color parameters for the auto target and auto speed gauges.
2012-09-10 06:31:03 +00:00
Swifty
a3fafcb248
Added Bottom Background Offset: and Max Line Width: to Directives gauge.
2012-09-10 06:23:46 +00:00
Swifty
9c3ef3c636
Added Bottom Background Offset: to Squad Message gauge.
2012-09-10 06:14:06 +00:00
Swifty
4c9ca0c336
Added parameters to adjust subsystem name, integrity, and status offsets for the Target Monitor.
2012-09-10 06:04:24 +00:00
Swifty
e4af974b70
Added Desaturated rendering to the Target Monitor.
2012-09-10 05:59:55 +00:00
Swifty
2ca77f899a
Added alpha masking support for the Target Monitor gauge.
2012-09-10 05:53:53 +00:00
Swifty
67767e77ff
Added a variety of parameters to the Weapon Energy gauge.
2012-09-10 05:43:10 +00:00
Swifty
b83644c8a0
Added a variety of parameters to the Throttle gauge.
2012-09-10 05:38:02 +00:00
Swifty
c32052a1a0
Added Bottom Background Offset: and Ship Name Max Width: parameters to the Escort gauge in hud_gauges.tbl.
2012-09-10 05:35:49 +00:00
Swifty
2f22a5ce67
Created Flight Path Marker gauge.
2012-09-10 05:33:17 +00:00
Swifty
e2ee74c387
Added bottom offset parameter to the Damage gauge in hud_gauges.tbl
2012-09-10 05:21:46 +00:00
Swifty
6dfa635811
Added better object and weapon cleanup code for the new collision detection code when max object and weapon counts are reached.
2012-09-10 05:08:16 +00:00
Swifty
87436e4eec
Added OpenGL color masking functions to the graphics code.
2012-09-10 05:06:36 +00:00
Swifty
de89915514
Added OpenGL alpha testing functions to the graphics code.
2012-09-10 05:05:14 +00:00
Swifty
d2d9f4e74b
Forgot to add these stubs for the graphics code stencil functions.
2012-09-10 05:03:33 +00:00
Swifty
0ef190c33a
Added basic OpenGL stencil support. Valathil, feel free to alter this implementation if you need to get things working with deferred shading.
2012-09-10 05:00:26 +00:00
Swifty
eeeeb2ce96
Base support for desaturated model rendering.
2012-09-10 04:51:11 +00:00
Swifty
63e43021ed
Added method to the HudGauge class that renders full color bitmaps.
2012-09-10 04:39:41 +00:00
Swifty
967c28c87d
Allowed resizing of scaled HUD gauges even if we're using GR_640 or GR_1024.
2012-09-10 04:32:28 +00:00
Swifty
0a4f6b332d
Added "$Radar Color Image 2D:" to ships.tbl. Adds full color radar image blips on top of IFF-colored image blips.
2012-09-10 04:22:07 +00:00
Swifty
e23a729ec5
HUD Config Options will properly set Text Messages and Messages to its defaults when reset.
2012-09-10 04:01:17 +00:00
Swifty
d8d6e86fd6
Collision caching properly resets between missions.
2012-09-10 03:58:14 +00:00
Swifty
22b51105e7
Fixed change_ship_type to use proper collision functions.
2012-09-10 03:57:00 +00:00
Swifty
11e355757b
Fixed crash when using viewing from a ship using the "show ship" flag.
2012-09-10 03:55:46 +00:00
Echelon9
42a4aef344
Fix LLVM warning: Declaration shadows a field of 'NavPoint'
2012-09-06 17:01:51 +00:00
Echelon9
fae7e022ad
Fix LLVM warning: Declaration shadows a local variable (modelread.cpp)
2012-09-06 16:59:02 +00:00
Echelon9
b28e57f86d
Fix LLVM warning: Declaration shadows a local variable (ship.cpp)
2012-09-06 16:57:52 +00:00
Echelon9
530aa28cfa
Fix LLVM warning: Declaration shadows a local variable (missionparse.cpp)
2012-09-06 16:56:47 +00:00
Echelon9
a8ee61c0fa
Fix LLVM warning: Declaration shadows a field of 'HudGaugeRadarDradis'
2012-09-06 16:51:06 +00:00
Echelon9
a59c092fc6
Fix LLVM warning: Declaration shadows a field of 'WE_BSG'
2012-09-06 16:47:59 +00:00
Echelon9
d919dc2cb2
Fix LLVM warning: Declaration shadows a field of 'LoopingSoundInfo'
2012-09-06 16:45:52 +00:00
Echelon9
ffa4efd64a
Fix LLVM warning: Declaration shadows a field of 'cockpit_display_*'
2012-09-06 16:44:16 +00:00
Echelon9
9abd596b72
Fix LLVM warning: Declaration shadows a field of 'waypoint_list'
2012-09-06 16:40:18 +00:00
Echelon9
73a487aab6
Fix LLVM warning: Declaration shadows a field of 'waypoint'
2012-09-06 16:38:15 +00:00
Echelon9
fa671f18fc
Remove some unused variables
2012-09-06 15:51:52 +00:00
The_E
9901ad613d
This warning needs to be a bit more helpful
2012-09-05 15:29:56 +00:00
zookeeper
45da46eddd
Fix the disabled flag not getting initialized right for controls which don't have an entry in controlconfigdefaults.tbl.
2012-08-31 19:23:44 +00:00
zookeeper
83871b3aa3
Added support for hiding/disabling keybinds in controlconfigdefaults.tbl. Patch from http://www.hard-light.net/forums/index.php?topic=81727.0
2012-08-30 06:45:22 +00:00
Valathil
71cd726349
Fix for Mantis 2705: Add Jump Nodes to the list of object types that are models so they are rendered at the right time
2012-08-28 18:50:53 +00:00
Goober5000
5785885641
Admiral MS's patch for destroy-instantly and destroy-subsys-instantly
2012-08-27 02:50:05 +00:00
Goober5000
1c5823030c
this actually does exactly the same thing, but it's more consistent with the rest of the code
2012-08-25 23:49:32 +00:00
Goober5000
4ab6f03c9e
make red-alert not dependent on whether the HUD is visible or not
...
(fixes Mantis #2683 )
2012-08-24 04:09:05 +00:00
The_E
c163a453ce
Also revert 9132. That was actually meant to go through review first.
2012-08-22 16:35:49 +00:00
The_E
4142a964bd
Revert 9131 for real
2012-08-22 16:35:18 +00:00
The_E
ee6afdd724
Double oops, I don't know why I committed this
2012-08-22 16:30:27 +00:00
The_E
d36e568a76
Ooooops, forgot a ":" in the parser
2012-08-22 16:26:06 +00:00
Goober5000
4d6b42a298
variable tokens can be quite a bit longer than standard tokens due to their unusual format; handle this properly
...
(fixes Mantis #2670 )
2012-08-22 05:31:40 +00:00
Goober5000
0537dff6d6
the initialized value should match the default value
2012-08-22 02:00:03 +00:00
niffiwan
3c14c37fde
Replace RamTable memory management with something a bit faster
2012-08-21 10:32:05 +00:00
The_E
f591b04348
Adding nameplate textures to the list of texture names that trigger the transparency renderer.
2012-08-20 19:00:28 +00:00
Goober5000
271d344f01
spelling
2012-08-20 01:42:45 +00:00
Goober5000
8e807f0fff
sync ai_profiles.cpp with def_files.cpp and with wiki page
2012-08-20 01:04:49 +00:00
Echelon9
460dab24f8
Fix Mantis 2699: Replace deprecated hash_map on systems that support std::tr1::unordered_map. Code review following ni1s initial patch and suggestions.
2012-08-19 14:14:20 +00:00
Goober5000
6422270049
there is indeed one minor bug -- switching flags for flags2
2012-08-19 07:53:12 +00:00
Goober5000
ca08b3813a
reverting 9121 -- I'll give karajorma the benefit of the doubt and assume he just didn't see the compatibility additions
2012-08-19 07:20:06 +00:00
karajorma
8e043a0019
Revert 9119 and 9120 since at least one of them breaks compatibility with 3.6.12
2012-08-19 06:13:45 +00:00
Goober5000
53f080ea67
all mod_table flags should also default to NO
...
also, change the generic_anim flag on whether to use the HUD color settings to be a bit more descriptive
2012-08-19 03:27:31 +00:00
Goober5000
4fa40e49c4
LESS -> FEWER
...
also, all ai profiles flags should default to NO
2012-08-19 02:06:26 +00:00
Valathil
8ea85e3004
Fix for Mantis #2697 : That was supposed to be the other way round. DIVIDE BY 0 OH SHIII...
2012-08-18 17:47:13 +00:00
The_E
f5ebe4be4a
Fix for Mantis 2685: Glowpoints attached to a modelled subsystem will be rendered even if that subsysstem has been destroyed
2012-08-18 16:57:48 +00:00
Swifty
7c7c64e769
Fixed rendering when using fixed function OpenGL pipeline. (Mantis 2696)
2012-08-18 10:39:20 +00:00
Swifty
50c649a030
Restored set object position functionality for OSWPT_TYPE_SHIP since they no longer should be sharing the same code with OSWPT_TYPE_WAYPOINT. See Mantis 2612.
2012-08-17 06:47:19 +00:00
Echelon9
3623cb6d79
Fix Mantis 2687: In weapon selection window, glowpoints can be seen through a ships hull. Note this is similar to the fix in r9031.
2012-08-16 10:05:22 +00:00
IssMneur
76a889a027
Fixes 2266 by reverting ds_get_free_channel to retail
2012-08-16 04:42:21 +00:00
Valathil
ff47353bd7
Followup to 9109: Add some error handling to handle 1 frame "animations" and missing frame 0 image files
2012-08-16 01:16:05 +00:00
zookeeper
7a50e19311
Turned $Comms Menu Hides Messages from a global HUD flag to a +Messages gauge flag.
2012-08-15 19:18:25 +00:00
zookeeper
ea81983597
Added a hud_gauges.tbl boolean flag to allow one to override the default behaviour of messages not being displayed while the comms menu is open.
2012-08-15 14:27:12 +00:00
Valathil
48e0517e0d
Allow generic_anim's to reuse bmpman and texture_cache slots and implement eff streaming. Changed talking heads to use generic_anim. Fixes Mantis 2417
2012-08-14 23:48:23 +00:00
Valathil
71ccf2e274
Fix for Mantis #2612 : Allow set-object-position to work with waypoints. Patch by Admiral MS
2012-08-14 20:25:23 +00:00
zookeeper
dbb5988dc7
Added some default mod_table comments.
2012-08-14 05:53:49 +00:00
The_E
ecd363ed3e
Adding stub functions for maybe_create_shader, set_team_color, enable_team_color and disable_team_color
2012-08-13 19:43:21 +00:00
Swifty
f913017200
BSG FTL effect modified to use soft particle rendering if available.
2012-08-11 21:40:01 +00:00
Swifty
c6c12fc251
go_even_faster: Improved collision detection performance by rewriting broadphase and narrowphase testing.
2012-08-11 21:14:53 +00:00
Swifty
6ba0da6020
go_even_faster: Improved rendering performance of particles by sending vertex data via buffer object.
2012-08-11 21:01:13 +00:00
Swifty
638ff917a1
go_even_faster: Added framework to improve rendering performance by reducing OpenGL state changes between vertex data binds.
2012-08-11 20:20:24 +00:00
The_E
4550188f8b
Removing the "run_launcher" function, since as far as I know, it hasn't worked for a looooong time
2012-08-11 15:18:23 +00:00
niffiwan
0619953c14
Also check we have a valid bitmap before trying to render it
2012-08-11 09:39:43 +00:00
niffiwan
bd05b0c1e7
Switch mprintf to Warning - if these are missing you can get bmpman assertions
2012-08-11 09:27:20 +00:00
Echelon9
a4813e38dc
Clean up the Xcode 4 project file, to work default on Xocde 4.4.1 (latest)
2012-08-08 14:24:10 +00:00
niffiwan
6579133220
Remove unnecessary Int3() - already gracefully handles running out of turret swarm slots
2012-08-07 09:11:41 +00:00
Goober5000
2ceecf9405
fix for Mantis #2694 : homing breaks when free_flight_time is 0
...
also, correctly set default free_flight_time to retail value of 0.5 second
2012-08-07 05:59:35 +00:00
chief1983
b2f566a5d8
Fix compile errors about an ambiguous call when using the Xcode project and Xcode 3.
2012-08-06 18:12:02 +00:00
The_E
e8b23a5b03
Correcting a few mistakes that somehow happened
2012-08-04 06:18:00 +00:00
The_E
bc682b8e12
Changing "use" to "enable"
2012-08-04 05:44:51 +00:00
The_E
9a54bd0cc4
New game_settings.tbl setting: "$Enable External Shaders:", which allows the use of, you may have guessed it, external shaders. Default is off.
2012-08-03 20:31:57 +00:00
The_E
64d55a67a1
Fix to make glowpoints respect clip planes during warpout again
2012-08-03 18:19:35 +00:00
The_E
340ee49db3
Fixes issue with team color setting resetting itself when tbms become involved
2012-08-02 14:24:14 +00:00
niffiwan
a66665dd73
remove memsets on game_snd vars - struct now has vectors in it...
2012-08-02 10:17:32 +00:00
The_E
b0ab2b96d2
Aaargh, derp again
2012-08-01 17:32:48 +00:00
The_E
33d8d4cdf7
A bit of un-derping.
2012-08-01 17:23:05 +00:00
The_E
f26a189cc2
Fix for Mantis 2692: Invalid memory access in initial ship status editor. Also adds a line to ships.tbl "$Enable Team Colors: <BOOL>", inserted after the "$ND:" block and before the "$Default Team" entry, which can be used to switch on Team Colors without specifying a team.
...
Also adds a "None" entry to the Team color selection that can be used to switch off team colors.
2012-08-01 16:40:33 +00:00
zookeeper
93758084dc
Fixed includes forgotten from last commit.
2012-08-01 10:06:54 +00:00
zookeeper
20b3d8c94d
Prevent garbage collection of texture handles which still have a non-zero load count. Underlying reason for why this can happen in the first place still unknown.
2012-08-01 09:45:26 +00:00
The_E
371b827014
Patch from Pecenipicek that allows a "none" team color to be defined in ships.tbl
2012-07-31 18:27:07 +00:00
The_E
b52453ee9b
Remove a define from the builtin shader that was causing issues now that AMD has fixed their driver's clipping behaviour
2012-07-31 14:18:27 +00:00
chief1983
28e04bf7d1
From pecenipicek: Fix team colors bug in built-in shaders.
2012-07-30 06:34:04 +00:00
Goober5000
f33c101224
clean up some of the CString code in FRED
2012-07-30 01:49:57 +00:00
Goober5000
0ad86d78f6
unherp the derp
2012-07-29 20:59:44 +00:00
Goober5000
bbcd26c2d7
remove warning
2012-07-29 20:57:35 +00:00
Goober5000
a5f80ab4bb
move the selection effect settings into game_settings.tbl because putting them in ai_profiles.tbl is incorrect and misleading
...
also, fix game_settings.tbl to not leave some settings uninitialized
2012-07-29 20:57:20 +00:00
Goober5000
cc45955cf2
m!m's patch for returning invalid IDs
2012-07-29 19:22:48 +00:00
The_E
e120d533a3
Do not penalize for linking weapons with WIF3_NOLINK
2012-07-29 17:54:23 +00:00
The_E
4762aa6191
A few fixes for the On Weapon Fired hook.
2012-07-29 17:31:08 +00:00
Goober5000
68bf7db7c6
hooray for parentheses
2012-07-29 17:00:18 +00:00
The_E
6da6894f22
New weapons.tbl flag: "no primary linking" Weapons with this flag can not be linked with other weapons. This also introduces a third (!) field for weapon flags.
2012-07-29 11:32:39 +00:00
The_E
535d91bae8
New weapons.tbl flag: "anti-subsystem beam" Enabling this allows the turret AI to use beams against subsystems
2012-07-29 11:09:36 +00:00
Goober5000
f1c4e57300
more warning reduction
2012-07-29 07:47:49 +00:00
Goober5000
e541cf0180
m!m's modular sounds patch, with minor modifications
2012-07-29 07:35:37 +00:00
Goober5000
db351f77dd
this gets rid of the "conversion to ushort" warning, strangely
2012-07-29 07:34:46 +00:00
The_E
aa19416dbe
Ooops, this should not be here twice
2012-07-28 21:13:37 +00:00
The_E
3b1a94b751
After a long time being tested in TAP, Team Colors are now stable. Please refer to http://www.hard-light.net/forums/index.php?topic=79743.0 for details.
2012-07-28 20:53:57 +00:00
Echelon9
90069f176b
Fix commit 2628 - treatment of is_training_mission(). Nothing like fixing 6.5 year old bugs.
2012-07-26 14:01:32 +00:00
Goober5000
fcbf33aeab
some const stuff, useful for the sounds patch
2012-07-26 07:46:35 +00:00
niffiwan
b1f32b5087
Fix 4 for #2590 : don't use "j" when its value could be greater than the array size - thanks to Zacam & Goober for finding this
2012-07-24 10:02:11 +00:00
Goober5000
3eeb334d77
allow skyboxes to be rendered at a custom orientation
2012-07-24 03:53:25 +00:00
Goober5000
b3c0f7a58b
I guess these need to be listed in the project file?
2012-07-24 03:37:40 +00:00
Swifty
7645c6628a
Fixed glow points in the Tech Room.
2012-07-22 08:35:44 +00:00
Goober5000
9d08a95283
standardize conversion to radians
2012-07-20 23:19:11 +00:00
Echelon9
5c9b9044e0
PVS Studio fix: V619 The array 'Players' is being utilized as a pointer to single object. hudsquadmsg.cpp 2595
2012-07-19 14:38:01 +00:00
Goober5000
d001f8ebea
these arguments are needed
2012-07-19 03:31:37 +00:00
Goober5000
dd847005af
update SCP credits, add $Music: for credits.tbl
2012-07-19 02:31:10 +00:00
Swifty
ad6e68d819
Corrected glow point directional attenuation. Need to use world coordinates of glow points, not local.
2012-07-18 08:07:47 +00:00
Echelon9
ddbbe72630
PVS-Studio fix: V601 The 'true' value is implicitly casted to the integer type. Inspect the fifth argument. lua.cpp 6982
2012-07-16 12:19:00 +00:00
Echelon9
3ec3849598
PVS-Studio fix: Subtle one, as FALSE (the define) is not the same as false (the boolean).
...
V601 The 'false' value is implicitly casted to the integer type. hudtarget.cpp 1346
2012-07-16 12:14:28 +00:00
Echelon9
11fbc7b5cf
PVS-Studio fix: V601 The 'true' value is implicitly cast to the integer type. Inspect the second argument.
2012-07-16 12:08:57 +00:00
Echelon9
46d854d9f0
PVS-Studio fix: There is only one PI.
...
V624 The constant 3.14159 is being utilized. The resulting value could be inaccurate.
2012-07-16 11:44:22 +00:00
Echelon9
e337c91482
Whoops, fix commit r9020
2012-07-16 11:34:02 +00:00
Echelon9
e5ff246f1b
PVS-Studio fix: V619 The array 'shipp->ab_info' is being utilized as a pointer to single object. shipcontrails.cpp
2012-07-16 11:26:43 +00:00
Echelon9
0efe864dd1
PVS-Studio fix: V619 The array 'v' is being utilized as a pointer to single object. gropengldraw.cpp
2012-07-16 11:16:28 +00:00
Goober5000
1adc301bde
prevent ships with mismatched models and tables from causing crashes later on (Mantis #2689 )
2012-07-15 22:54:47 +00:00
Goober5000
a687fbbf1b
this is a slightly modified version of m!m's patch for Mantis #2688
2012-07-15 18:48:42 +00:00
Echelon9
35d9af7e5f
Commit contribution from community for Lua debug as preference, while preserving old behaviour. Sorry I don't have the name of the contributor or can find the original thread containing this patch.
2012-07-15 15:53:51 +00:00
Goober5000
10e1e1d8ef
add four useful sexps: set-arrival-info, set-departure-info, set-debriefing-toggled, set-subspace-drive
...
also, fix a hole in the oswpt routine (and a few sexps) dealing with wings that weren't present yet
2012-07-15 05:21:12 +00:00
Goober5000
8cf4e79607
this really ought to be a Warning, not an Error
2012-07-15 05:16:13 +00:00
Goober5000
dfc0d6ec15
m!m's fix for signed/unsigned mismatch
...
(IT'S OVER 9000!!!)
2012-07-14 18:11:21 +00:00
Goober5000
fdd685fb8a
we want to truncate based on number of lines, not number of characters
...
also, we want to truncate the FRED error message boxes too
(this is a better fix for Mantis #2658 )
2012-07-14 06:23:45 +00:00
Goober5000
d05d04ec4f
that's an order of magnitude too high for integers
2012-07-14 05:34:44 +00:00
Goober5000
5654733692
check to make sure a wing that has a player does not also have an arrival delay (Mantis #2678 )
2012-07-13 05:06:08 +00:00
Swifty
3fff8216ed
Target direction arrow properly disappears when target is placed under reticle. Fixes Mantis 2504.
2012-07-12 07:26:45 +00:00
karajorma
e620a3e5e1
It's about time these changes got committed. They've been tested by Diaspora for over a year without issue.
2012-07-12 06:27:36 +00:00
The_E
ab868da2d9
Various fixes and additions to the lua API from m!m:
...
Matrix vectors: getUvec(), getFVec() and getRVec()
equals operators for weaponclass and shipclass to improve performance where a string comparison was needed before
Cockpit display interface. Allows scripting to access the cockpit displays defined in ships.tbl and render to them using RTT
A getParent() function in the subsystem handle which returns the parent object of the subsystem
Numerous fixes in the way turret subsystems are handled which now results in more correct behavior
Targetable variable in subsystem which specifies if the subsystem is targetable or not
getNextFiringPosition() function in subsystem which returns the position and the direction of the next firing operation of the specified turret
Scripting access to post processing values
getCurrentCamera() function to retrieve the currently active camera
setLineWidth() to modify the width of the lines that are getting drawn
setClip() and resetClip() to set the clipping areas used for drawing
2012-07-11 17:19:33 +00:00
Goober5000
1798c9b750
add the mission cutscene save type, per Karajorma and MjnMixael
2012-07-09 06:48:53 +00:00
Goober5000
1d0e73adcf
in the interest of avoiding mysterious and subtle differences in AI behavior, restore retail behavior where:
...
a) the player's wing forms on him at mission start
b) wings in the Starting_wings list will form on the player if they arrive later in the mission
c) no other wing automatically forms on its leader
2012-07-09 05:29:43 +00:00
Goober5000
807a3cf7cd
also revert the "nohtl" part of r8977 for FRED (Mantis #2676 ) because no-HTL models shouldn't use HTL rendering
2012-07-07 21:01:27 +00:00
Goober5000
497d11c7af
revert r8975 because this fix adds unwanted diagonal lines to the jump node model (Mantis #2396 )
2012-07-07 21:00:37 +00:00
Goober5000
4195945a36
niffiwan's fix for Mantis #2681
2012-07-07 20:51:39 +00:00
The_E
a28dc8beff
Fix for Mantis 2682: extra glowpoints are rendered for targeted ships
2012-07-07 14:31:14 +00:00
The_E
227f6cc8ef
*sigh* And because MSVC6 is a bit on the stupid side (read: Does not know about this little thing called C++0x), I have to do this bit of ugliness.
2012-07-07 08:41:12 +00:00
Goober5000
af4e7c3069
restore this extra space, which is necessary for formatting purposes
2012-07-07 07:39:46 +00:00
The_E
585db085ea
Removing the rest of the glBegin()/glEnd() pairs.
2012-07-07 06:45:35 +00:00
niffiwan
ab5709ecb2
Fix number 3 for mantis #2590 - move array overflow detection to correct place in loops
2012-07-07 01:39:27 +00:00
niffiwan
1ef253a65a
Sync linux binary name format between 3.6.14 & trunk
2012-07-04 10:13:25 +00:00
Goober5000
8910b50d96
replace variables in recommendations too
2012-07-04 05:38:51 +00:00
Echelon9
cda28dba2f
Fix for Mantis 2677: Compiler errors following r8973, thanks to niffiwan
2012-07-03 13:13:23 +00:00
niffiwan
fdafa3f2a4
Linux release compilation back to using -Wall, but with -Wno-write-strings
2012-07-03 10:01:20 +00:00
Goober5000
5c6261c229
fix a rather important variable initialization
...
(follow-up to r8967)
2012-07-03 05:12:24 +00:00
Goober5000
53bc8c5821
this is the equivalent of r8975 for FRED (Mantis #2676 )
2012-07-03 05:05:33 +00:00
Goober5000
5346544807
attacking a protected target will remove its protected flag, so don't allow this if hit by EMP
...
(Mantis #2192 )
2012-07-03 05:02:32 +00:00
Goober5000
eac17f338e
Zacam's fix for Mantis #2396
2012-07-03 05:01:33 +00:00
Goober5000
93c89a19ab
fix for Mantis #2179 , proper afterburner shutdown
2012-07-03 03:46:18 +00:00
The_E
cc2b907673
Changes the glBegin()/glEnd() stuff we were using in some places to the more modern glDrawArrays() way of doing things. Thanks to Kromaatikse for the initial implementation.
2012-07-02 15:48:56 +00:00
Goober5000
495ab7fdb2
fix Mantis #1972 : hotkey brackets are drawn around stealth ships
2012-07-02 06:00:41 +00:00
Goober5000
358d860542
fix TD2192...
...
[derp, wrong game]
fix Mantis #2192 , EMP brings play-dead fighters back to life
2012-07-02 03:47:53 +00:00
Goober5000
ec5f9ccf81
CommanderDJ's set-player-throttle-speed
2012-07-02 02:17:35 +00:00
Goober5000
89eca40235
wings that are initially docked will now arrive in mission correctly
2012-07-02 01:59:35 +00:00
Goober5000
4cfd7f903a
follow-up to r8922: this part isn't actually a problem
2012-07-01 19:54:22 +00:00
Goober5000
3a47eae3a7
make the dock leader code more robust, and make FRED mark dock leaders in wings correctly
2012-07-01 08:17:59 +00:00
Goober5000
7200341deb
add more error checking for initially docked ships, per Mantis #1658
2012-07-01 05:56:15 +00:00
Goober5000
30ebd4ecfd
looks like this was never actually implemented!
2012-07-01 05:54:26 +00:00
Goober5000
3e983aa390
add mod.tbl flag for Mantis #82
2012-07-01 04:32:03 +00:00
Goober5000
e1d4e74092
remove extension if user didn't
2012-07-01 04:17:22 +00:00
Goober5000
00d4f23209
this should fix all of the issues with docked fighters and bombers (Mantis #945 )
2012-07-01 03:24:41 +00:00
Goober5000
b0af0aa71a
fix for Mantis #2673 , following Valathil's detective work
2012-06-30 23:31:48 +00:00
karajorma
e23449f911
Minor fixes to the message.tbl settings I just added.
2012-06-25 14:23:00 +00:00
Goober5000
d71f6dda5f
fix the old Volition bug where a docked ship would execute its default behavior even when the preceding comment explicitly said that it should "just sit here" :-/
...
also guard against a few edge cases related to this
(all of this is in regards to Mantis #945 )
2012-06-25 10:39:26 +00:00
Goober5000
fcb0d8149d
remove unused variable
2012-06-25 07:06:03 +00:00
Goober5000
9b885aca84
CommanderDJ's fix for Mantis #2628
2012-06-25 06:41:06 +00:00
Goober5000
3fd421d432
fine-tune Valathil's error message
2012-06-25 04:27:26 +00:00
The_E
72bfeef335
Changing glowpoint rendering from being a separate step during model rendering to being a part of the batch renderer. This makes glowpoint rendering much faster.
2012-06-24 20:17:46 +00:00
Valathil
bf0756be2f
Fix for Mantis 2671: Skip submodels that have been blown off in ship-ship collisions.
2012-06-24 18:12:43 +00:00
Valathil
f97eac7851
Fix for Mantis 2670: Followup: Fix the bug without breaking mission parsing.
2012-06-24 14:04:16 +00:00
karajorma
480931fa17
Additions to message.tbl to allow users to specify the frequency of builtin messages.
2012-06-24 11:36:45 +00:00
IssMneur
9d335569f1
No warnings for release linux builds.
2012-06-23 21:19:41 +00:00
Valathil
bd3a0fe0de
Fix for Mantis 2670: Truncate tokens to their maximum length and pop up a MessageBox for the user.
2012-06-23 20:54:05 +00:00
Goober5000
583d702c80
synchronize the ship classes that evade shockwaves
...
(this fixes Mantis #2548 )
2012-06-23 11:51:47 +00:00
Goober5000
715727c333
restore retail behavior for chaining by reverting r8603 -- this fixes Mantis #2667
...
also add descriptive comment in header file
2012-06-23 10:31:42 +00:00
niffiwan
56ab99d5cd
Fix for mantis #2666 : call the new HUD renderBitmap function for the red alert notification background image
2012-06-23 03:02:33 +00:00
The_E
f0254524db
From CommanderDJ: Fix for Mantis 2657 (Alt-Shift-E does not clear escort list)
2012-06-22 15:55:43 +00:00
Echelon9
40983c4f40
GCC warning: variable set but not used
2012-06-17 13:32:04 +00:00
Goober5000
7ef1c9f99a
MSVC6 compatibility
2012-06-17 05:43:28 +00:00
Goober5000
367278315b
revert r8893 since it's no longer needed and since RTTI adds overhead
2012-06-17 05:42:54 +00:00
Goober5000
1990e4a635
since the if() block already checks for a specific gauge type, we can safely do the static_cast
2012-06-17 05:41:47 +00:00
Goober5000
e5e06d1e32
MSVC6 project should have Run-Time Type Information enabled
2012-06-17 05:04:48 +00:00
Valathil
6d7674967f
Fix for Mantis 2665: Include Player Ship's in the search for valid Message Sources
2012-06-14 21:52:23 +00:00
niffiwan
9a6611198e
GCC warnings: more 'variable set but not used'
2012-06-14 11:21:09 +00:00
niffiwan
bcea3057f5
GCC warnings: declaration of ‘ship_obj’ shadows a global declaration (weapon/*.cpp)
2012-06-14 10:30:01 +00:00
IssMneur
271d05ecc9
Recommit 8843 with a simpler fix to the build failure with GCC.
2012-06-14 04:44:13 +00:00
IssMneur
dccd2d9811
Reverse 8843 as requested by Goober5000. Breaks compilation with GCC.
...
- This fix is too confusing.
2012-06-14 04:41:16 +00:00
Echelon9
79da099645
GCC warning: variable set but not used (related to HUD)
2012-06-13 14:50:57 +00:00
Echelon9
20ac5cb868
GCC warning: defined but not used
2012-06-13 14:43:08 +00:00
Echelon9
e5ef4467da
GCC warning: missing initialiser for member ‘opengl_shader_file_t::attributes’
2012-06-13 14:26:30 +00:00
Echelon9
d029db7f88
GCC warning: statement has no effect (clearing this warning as it was prevalent throughout)
2012-06-13 14:18:56 +00:00
Echelon9
43a7fd178a
GCC warning: missing initialiser for member ‘<anonymous struct>::bitmap’
2012-06-13 14:10:52 +00:00
Echelon9
2214bb7ac6
GCC warning: missing initialiser
2012-06-13 14:07:37 +00:00
Echelon9
dcbe91136b
GCC warning: variable set but not used (further)
2012-06-13 14:07:05 +00:00
Echelon9
e9f103dfd2
GCC warning: variable set but not used (fireballs.cpp)
2012-06-13 13:20:04 +00:00
Echelon9
65adaf51a9
GCC warning: variable set but not used (within AI code)
2012-06-12 16:45:36 +00:00
Echelon9
eceb337219
GCC warning: variable set but not used (further cases)
2012-06-12 16:09:22 +00:00
Echelon9
65c6a8f51e
GCC warning: suggest curly brackets (braces) around empty body in an ‘else’ statement
2012-06-12 15:57:21 +00:00
Echelon9
791146c9ac
GCC warnings: first pass of warning: variable is set but not used
2012-06-12 15:32:47 +00:00
niffiwan
d19c6702cf
GCC warning: weapon/shockwave.cpp - variable set but not used
2012-06-11 10:12:09 +00:00
niffiwan
09c4bc2b00
GCC Warnings: mission/missiontraining.cpp - variable set but not used
2012-06-11 09:56:13 +00:00
niffiwan
c8c0a213bf
GCC Warnings: mission/missiontraining.cpp - variable defined but not used
2012-06-11 09:51:16 +00:00
Valathil
ae1327c7b1
Fix for Mantis 2631: Take the main hall of first mission of the fallback campaign as the current one and save the campaign to the pilot struct.
2012-06-11 04:53:35 +00:00
niffiwan
a6d501de98
Fix for last bit of mantis #2410 : show training messages when hud-disabled-except-messages
2012-06-11 03:45:12 +00:00
Goober5000
39fc7d8834
Valathil's fix for Mantis #2652
2012-06-11 03:22:48 +00:00
Goober5000
03b8f478b1
remove the unnecessary null sets
2012-06-11 03:17:55 +00:00
Goober5000
e683881ac3
remove the vestiges of free_flight_time, which never worked
2012-06-11 02:52:43 +00:00
Goober5000
b14d2c4938
fix some aspects of homing (pun not intended), including hopefully Mantis #2652
2012-06-11 02:40:05 +00:00
Goober5000
bfe3f3f60c
parentheses are A-1 SUPAR
2012-06-11 01:04:46 +00:00
Sushi
3ae15d873d
Mastadon's fix to make auto-target pick the nearest enemy ship instead of the nearest ship attacking the player.
...
http://www.hard-light.net/forums/index.php?topic=80906.msg1614837#msg1614837
2012-06-09 01:33:53 +00:00
The_E
1413eddcd2
From CommanderDJ: Fix for Mantis 2663 (hud-set-color only works once per mission)
2012-06-08 14:45:41 +00:00
The_E
8e271af26b
As requested and tested by VA, bumping MAX_INSTANCE_DEPTH to 10
2012-06-06 10:50:23 +00:00
Sushi
22ae177ba7
Fix Evil Turret Bug of Doom. :)
2012-06-06 06:17:23 +00:00
IssMneur
c429e1ddec
Reformat the function modified by 8842 so that we don't jump over a variable initialization
...
This issue was not picked up by VC, and was brought to my attention by ZekeS on #scp and his GCC build. Fix was tested by ZekeS.
2012-06-02 23:25:08 +00:00
IssMneur
a28d92456e
From Mastadon: "target nearest attacker" now selects only *attacking* hostiles
...
Fixes #2659
2012-06-01 02:07:56 +00:00
IssMneur
218ce9ed3f
From Mastadon: "Target closest attacker" cycles through all attackers; misc code cleanup.
...
- Changed "target closest attacker" command to cycle through the other baddies gunning for you by pressing the "target closest attacker" command repeatedly.
- The new functionality behaves similarly to the "target closest hostile" key.
- Moved the esct (or, the "Evaluate Ship as Closest Target" struct) to hudtarget.h, where a type declaration belongs.
- Moved the documenting comments for hud_target_closest() to be just above the function definition.
-- Also, converted these comments to doxygen format.
2012-06-01 02:05:14 +00:00
niffiwan
cc222f1b53
Add mod_table.* to codeblocks
2012-05-30 08:48:47 +00:00
Echelon9
3df38b912b
Implement EModelAnimationPosition enum to more completely address boolean issue fixed in r8837
2012-05-29 10:27:52 +00:00
niffiwan
553766600d
GCC Warning: declaration shadows a global declarationa (hudparse.*)
2012-05-29 10:24:00 +00:00
Echelon9
26e1226478
PVS-Studio fix: The 'false' value is implicitly casted to the integer type.
2012-05-29 09:55:54 +00:00
Goober5000
fae70dbb8d
truncate assert strings, warnings, errors, and dump buffers if they are too long
...
(this should fix Mantis #2658 )
2012-05-28 22:24:53 +00:00
Echelon9
e20a418c94
PVS-Studio fix: The 'false' value is implicitly casted to the integer type.
2012-05-28 13:35:39 +00:00
Echelon9
a04a14170f
PVS-Studio fix: The 'modified' variable is assigned values twice successively. Perhaps this is a mistake (freespace.cpp:4666,4668)
2012-05-28 13:20:40 +00:00
niffiwan
2cded90031
Mantis 2419: add a new ETS gauge that behaves like the retail one
2012-05-28 08:13:35 +00:00
Echelon9
fd56997cdf
GCC warning: Absence of curly brackets in initialiser
2012-05-27 15:00:40 +00:00
Echelon9
b0e614c410
GCC warning: base_res[0] and base_res[1] may be used uninitialised in this function
2012-05-27 14:52:56 +00:00
Echelon9
a8c54f5b9d
GCC warning: initialisation reorder
2012-05-27 14:46:00 +00:00
Echelon9
68faf910cd
GCC warning: suggest brackets (parentheses) around '&&' within '||'
2012-05-27 14:38:53 +00:00
Echelon9
4dcb3a7a16
GCC warning: comparison between signed and unsigned integer expressions
2012-05-27 14:23:41 +00:00
Echelon9
7dfa5bdd7a
GCC warning: passing NULL to non-pointer argument, in hudtarget.cpp
2012-05-27 14:16:00 +00:00
Echelon9
4d31532aad
GCC warning: passing NULL to non-pointer argument, in gropenglpostprocessing.cpp
2012-05-27 14:13:25 +00:00
Echelon9
7c41319714
GCC warning: missing curly brackets (braces) around initialiser for 'vec3d::<anonymous union>::<anonymous struct>'
2012-05-27 14:07:34 +00:00
Echelon9
55703bb600
GCC warning: Defined by not used, in lua.cpp
2012-05-27 14:00:17 +00:00
Echelon9
28c20e0468
GCC warning: converting to non-pointer type 'int' from NULL
2012-05-27 13:53:04 +00:00
Echelon9
592c9421ac
GCC warning: Fix absence of parentheses, further
2012-05-27 13:35:05 +00:00
Echelon9
bd405ee457
GCC warning: converting to non-pointer type 'char' from NULL
2012-05-27 13:32:08 +00:00
Echelon9
0ba6d38a31
GCC warning: Fix absence of parenthesis
2012-05-27 13:07:53 +00:00
Goober5000
9fd70fd5a9
fix for Mantis #2117 (dock names with trailing spaces cause errors)
2012-05-22 08:39:13 +00:00
Goober5000
b5aa89a8e1
restrict multi-editing for Mantis #1681
2012-05-22 06:43:38 +00:00
Goober5000
7bc7c4297e
time the briefing stages appropriately for text-to-speech (Mantis #2637 )
...
also, make the briefing speech timing, which is badly written, a little bit more like the command briefing, which is a bit better written
2012-05-21 08:05:18 +00:00
Goober5000
f36a76ff5b
the Microsoft documentation was misleading; there is a hidden "queued to speak" state
2012-05-21 05:24:47 +00:00
Goober5000
f3a0a1921d
project changes to enable simulated speech
2012-05-21 03:53:58 +00:00
Goober5000
9785871010
if a movie fails to play, give back the mouse cursor
2012-05-20 20:50:17 +00:00
Goober5000
dc456c667b
restore code that was inadvertently deleted, fixing Mantis #2478
2012-05-20 19:25:38 +00:00
niffiwan
381d50c74c
Documentation for head-ani's && messages
2012-05-20 10:07:21 +00:00
niffiwan
c634b65d24
GCC: remove trivial warning: multi-line comment [-Wcomment]
2012-05-20 06:31:09 +00:00
niffiwan
3eb66f7bae
save a tiny amount of RAM when creating BMP_AABITMAP bitmaps
2012-05-20 06:15:23 +00:00
niffiwan
b1b2920ea9
Fix for mantis 2655: play messages at least until head ani finishes
2012-05-20 06:03:24 +00:00
niffiwan
7dc94578b5
Fix for mantis 2411: allow repeated messages to play head anis
2012-05-20 05:41:53 +00:00
zookeeper
b4c53dba03
Decoupled height and normal maps in one more place.
2012-05-19 10:10:12 +00:00
The_E
10a2e8d1d3
Ooops, forgot the safety check
2012-05-19 09:27:36 +00:00
The_E
aa67e7dd1f
Decoupling height and normal maps
2012-05-19 09:22:11 +00:00
The_E
749fee1a3d
Turn -height into -noheight, to follow the precedent set by the other flags.
2012-05-19 08:51:12 +00:00
karajorma
f883224269
Niffiwan's fix for 2590 seems to have introduced a bug of it's own. Easy enough to fix it though.
2012-05-19 02:28:41 +00:00
zookeeper
af997d2b5d
Added changes missing from previous commit.
2012-05-18 17:02:49 +00:00
zookeeper
3f34b57fb3
Allowed detail spheres to provide an $offset: x,y,z prop to offset the sphere from the model center.
2012-05-18 15:24:45 +00:00
Echelon9
de48302de6
GCC: Remove unused variable
2012-05-17 17:51:51 +00:00
Echelon9
9fc2a7c908
GCC: warning: converting to non-pointer type 'char' from NULL
2012-05-17 17:36:55 +00:00
Echelon9
d71a32677e
Remove some unused variables
2012-05-17 17:20:36 +00:00
IssMneur
ea75b099ff
From jg18: Allow FSO to actually fetch the max anisotropy value rather than hard capping at 2.0.
2012-05-17 03:10:12 +00:00
IssMneur
bcab66cd87
Fixes #2624 . The sound environment should now track the camera correctly.
2012-05-17 02:57:33 +00:00
Goober5000
1d4dee495a
if we are ignoring whitespace and we encounter a newline, don't eat it
2012-05-15 01:27:38 +00:00
Goober5000
896f0721dc
make the closing color span brace be $} instead of $c}
2012-05-15 01:26:36 +00:00
Goober5000
270a4111c0
add capability to specify different nested default colors
...
(see http://www.hard-light.net/forums/index.php?topic=80766.0 )
2012-05-14 06:48:47 +00:00
Goober5000
e704974a1b
remove small warning
2012-05-14 06:32:58 +00:00
Goober5000
3cc5be68d8
other people than me also deprecate sexps now
2012-05-14 06:23:05 +00:00
The_E
e0c1c21bae
Fix for Mantis 2647, take two: Remove the pointers in question
2012-05-13 19:38:21 +00:00
Echelon9
5782378e6f
Fix PVS-Studio warnings: The 'rval' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: freespace.cpp:8277, 8281.
...
The 'then' statement is equivalent to the 'else' statement. freespace.cpp:8311.
2012-05-13 05:00:31 +00:00
The_E
be86dc5254
Introduces "-misc" maps, which can be used to pass information to shaders using the sMiscmap sampler and FLAG_MISC_MAP shader define.
2012-05-12 21:08:15 +00:00
The_E
d03af34eed
Add a log print for my previous mod.tbl addition
2012-05-11 11:30:19 +00:00
The_E
b006d8de1a
Since we can't change the default cutscene camera behaviour (switching off the HUD when cutscene camera is active), this introduces a mod.tbl setting to alter this behaviour.
...
The new setting is called "$Cutscene camera disables HUD:", is a boolean, and defaults to true.
2012-05-11 07:57:01 +00:00
Goober5000
6812854419
supernova-stop sexp, written by CommanderDJ
2012-05-11 06:34:49 +00:00
The_E
17a99ac973
Partial fix for 2410: Fixes Directive gauge ignoring hud-disable-except messages
2012-05-10 21:38:15 +00:00
The_E
acffa5b358
Fix for Mantis 2606: Local SSMs fired in swarm may cause propagating NaN errors
2012-05-10 20:54:40 +00:00
The_E
a57e263c7c
Make sure we use a valid pointer for 8768
2012-05-10 15:06:41 +00:00
The_E
4d8c498628
Fix for Mantis 2647: Pointers becoming invalid when going out of scope during armor calculations (PVS Studio warning)
2012-05-10 15:04:05 +00:00
The_E
c4f103e1d7
From CommanderDJ: Patch for Mantis 2650 (Allow 0 door animations in mainhall.tbls/tbms)
2012-05-10 12:32:19 +00:00
karajorma
998c7eb207
Add a SEXP allowing the FREDder to change the orders a player can give to a ship.
2012-05-09 05:09:40 +00:00
niffiwan
a09306b31c
From m!m: Fix for mantis #0002648 - skip intercom mainhall sounds when none are defined
2012-05-08 07:28:45 +00:00
Echelon9
04b12cf599
PVS-Studio fix: The conditional expressions of the 'if' operators situated alongside each other are identical. multi_ingame.cpp: 1073, 1086
2012-05-06 14:23:11 +00:00
Echelon9
5bc51383b7
Fix The_E's partially broken commit in r8757 -- there is no wi_flags3 or WIF3_NOLINK yet
2012-05-06 06:47:12 +00:00
niffiwan
65aedf36ad
From CommanderDJ: Fix for mantis #0002646
2012-05-06 03:46:03 +00:00
The_E
0330dbf493
Fixes a few more bugs with the On Weapon Deselect hook
2012-05-05 22:05:46 +00:00
zookeeper
a1ab5a725d
Fixed a pointer assignment which should have been a value assignment.
2012-05-05 15:01:14 +00:00
The_E
9d3faf893e
Adds ability for scripting to manipulate subsystem armor classes and shield armor classes as well.
2012-05-05 14:39:49 +00:00
The_E
2b40344bc7
Adds scripting access to a ships' armor type.
2012-05-05 14:07:31 +00:00
The_E
57d7fb7fbd
Clarifies the code for the On Weapon Fired hook. also adds On Primary Fire and On Secondary Fire hooks.
2012-05-05 13:46:24 +00:00
The_E
49466254c7
Change this little piece of code to avoid a potentially very baffling null pointer dereference later on
2012-05-05 12:50:06 +00:00
Valathil
a6d112c192
Fix for transparent submodels that are children of submodels.
2012-05-04 21:26:49 +00:00
Valathil
bded282738
Fix for transparent cockpits that should'nt be transparent. Breaks lightshafts for cockpit models with glass which don't use "-trans". This may be remedied in the future.
2012-05-04 18:49:34 +00:00
Echelon9
6e51b354d1
Fix Mantis 2644: Replace vector<bool> with proper STL deque<bool>, thanks IssMneur and CommanderDJ
2012-05-02 15:20:57 +00:00
Echelon9
e21ad72877
Utilise the CLAMP() utility macro in a further range of appropriate locations
2012-05-02 15:15:48 +00:00
Echelon9
8a839fa159
Use CLAMP utility macro in lightin.cpp
2012-05-02 14:48:22 +00:00
Echelon9
721b3af9d7
Documentation: Doxygen comments for lighting.cpp
2012-05-02 14:35:50 +00:00
chief1983
dd13785941
Remove ltests from Xcode 3 project file.
2012-05-01 18:48:28 +00:00
karajorma
d7d6009ea1
Fix a bug that caused bombs to be indestructible by the player for much longer than they should be according to the table settings given.
2012-04-30 07:47:23 +00:00
karajorma
e5b2ebd02e
Fix the bug in closing the event editor that caused it to take minutes with some missions rather than seconds.
2012-04-30 07:26:44 +00:00
Echelon9
5b7190ea39
Fix Assert and Assertion for non-MSVC compilers, due to changes in r8692; Fix use of C++11 cbegin/cend() STL operators as these are not going to be supported widely yet, due to changes in r8693
2012-04-29 11:10:29 +00:00
IssMneur
cc521fcaa4
Make the asteroid.tbl parser generate a more useful error messages.
...
- Converts asteroid_info into the class that it is.
- Changes the asteroid.tbl parser to parse the table as specified
- Also removes the attempts at being clever from the asteroid.tbl parser.
2012-04-29 04:10:58 +00:00
IssMneur
a95091db20
Rename the args of Assert and Assertion macros to be more helpful than just 'x' and 'y'.
2012-04-29 03:52:30 +00:00
Echelon9
15e5adf31d
Documentation: Doxygen comments throughout mainhallmenu.cpp
2012-04-29 03:49:00 +00:00
The_E
a415a803ee
Update the MSVC projects to remove ltests.c from the lua library.
2012-04-27 11:01:24 +00:00
Echelon9
9e4f1cc30c
Upgrade internal Lua interpreter to 5.1.5 bugfix release; announcement details http://lua-users.org/lists/lua-l/2012-02/msg00639.html
2012-04-25 13:40:32 +00:00
Echelon9
5828d17ac7
Fix Mantis 2640: Double free in missionbriefcommon.cpp, thanks 3dL3XAqPiDaS5WF2
2012-04-22 13:44:06 +00:00
Echelon9
52b421c56b
Documentation: Remove redundant #includes
2012-04-22 13:36:31 +00:00
Echelon9
c4c33bea34
Fix Mantis 2642: Cockpits are rendered incorrectly when post-processing is disabled, thanks m_m
2012-04-22 13:34:37 +00:00
Echelon9
cbc7b49399
Setting the floats correctly in avd_movement constructor
2012-04-22 11:27:31 +00:00
Echelon9
51ad3f97eb
Eradicate the memset(this...) paradigm within ade_table_entry
2012-04-22 11:25:15 +00:00
Echelon9
33918a1a17
Eradicate the memset(this...) paradigm within class avd_movement
2012-04-22 10:54:59 +00:00
Sushi
5669c03872
Add support for weapon spread over time (+FOF Spread Rate, +FOF Reset Rate, +Max FOF)
2012-04-21 15:40:06 +00:00
Echelon9
f28bd3e167
These two variables were missed; the sort of overlooked error that is easy with this odd method of copy constructing...
2012-04-19 13:22:44 +00:00
Echelon9
1da3f30ff4
warning C4018: '<' : signed/unsigned mismatch
2012-04-15 09:02:10 +00:00
Echelon9
4820ef1fdf
warning C6246: Local declaration of 'i' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '1037'
2012-04-15 07:55:27 +00:00
Echelon9
b74f0dd2a1
warning C6246: Local declaration of 'i' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '832'
2012-04-15 07:44:11 +00:00
Echelon9
267a88eb59
warning C6246: Local declaration of 'i' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '1350'
2012-04-15 07:17:51 +00:00
Echelon9
81bd5a98f1
warning C6246: Local declaration of 'curspeed' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '1877'
2012-04-15 07:14:58 +00:00
Echelon9
8befbc7adf
warning C6246: Local declaration of 'subsys' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '443'
2012-04-15 07:12:28 +00:00
Echelon9
fd74d06398
warning C6246: Local declaration of 'exp' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '8063'
2012-04-15 07:02:18 +00:00
Echelon9
12fbf17af5
warning C6246: Local declaration of 'pm' hides declaration of the same name in outer scope.
2012-04-15 06:57:05 +00:00
Echelon9
e798ee0f5e
Ensure that the Xcode 4 project file can build Mac binaries for OS X 10.6, as well as 10.7
2012-04-15 06:20:56 +00:00
Goober5000
908557be9f
fix for Mantis #2630
...
(LUA is not mentioned, but the problem might affect that too)
2012-04-13 07:01:45 +00:00
Echelon9
172ff073ef
Documentation: Some extra notes within aiturret.cpp
2012-04-12 16:09:33 +00:00
Echelon9
3ce3fea911
Correct copy/paste error -- refer functions above for similar pattern used correctly
2012-04-12 16:05:57 +00:00
Echelon9
6bebe3c397
Documentation: Attempt to begin getting aiturret.cpp under control
2012-04-12 15:55:57 +00:00
Goober5000
63a78e79fd
modular credits.tbl, courtesy of m!m
...
(with a few tiny tweaks)
2012-04-12 03:49:47 +00:00
Goober5000
34bfc4a12e
const-correctness in preparation for modular credits.tbl, courtesy of m!m
2012-04-12 03:48:24 +00:00
Echelon9
a10b5ae804
warning C6011: Dereferencing NULL pointer 'wp->turret_subsys'
2012-04-11 14:44:59 +00:00
Echelon9
6ed3ce07d7
warning C6011: Dereferencing NULL pointer 'lowest_vol_osp'
2012-04-11 14:44:05 +00:00
Echelon9
067724f5a8
warning C6280: 'tmp_Player' is allocated with 'new', but deleted with 'free'
2012-04-11 13:04:28 +00:00
Echelon9
8947768fda
warning C6246: Local declaration of 'props' hides declaration of the same name in outer scope
2012-04-11 13:00:28 +00:00
Echelon9
968f2e6423
warning C6246: Local declaration of 'temp' hides declaration of the same name in outer scope.
2012-04-11 12:59:16 +00:00
The_E
ae084d47e0
Do shader compilation during modelload, in order to avoid having to compile shaders during gameplay as much as possible
2012-04-09 12:43:20 +00:00
Swifty
edb5762d9c
Optimization: sped up rendering of trails by switching out g3_draw_poly with gr_render. Removed extra memory allocation.
2012-04-08 22:00:16 +00:00
Echelon9
13ca0a1c67
Remove redundant #includes to fs2open's internal linked list implementation
2012-04-08 01:39:34 +00:00
Echelon9
c0df634874
Documentation: Complete documentation of CJumpNode
2012-04-07 23:31:23 +00:00
Echelon9
a0e59defd6
CJumpNode class code convention; convert to UpperCamelCase for class and function name; ensure all private variables adopt m_ prefix
2012-04-07 11:07:30 +00:00
Echelon9
7b1d5e1ece
Documentation: A bit of code cleanup
2012-04-06 08:52:15 +00:00
The_E
66b5912d7b
Converting this Assert() to an Assertion(), for better error logging
2012-04-04 22:01:32 +00:00
The_E
6157334fe8
MSVC Analyze warning fix: Incorrect type passed as parameter in call to function printf()
2012-04-03 19:44:39 +00:00
The_E
7cb8876976
MSVC Analyze warning fix: Local declaration of variable hides variable of same name in outer scope
2012-04-03 19:35:37 +00:00
The_E
3383b20893
Change the MSVC2012 projects to use the MSVC2012 toolset
2012-04-03 19:34:22 +00:00
Echelon9
164581168d
Fix Mantis 2632: Sounds assigned to objects get dropped when limit hardcoded gets reached. Patch from m_m
2012-04-02 21:32:47 +00:00
The_E
c2d19384f5
Fixes LLVM and Doxygen errors
2012-04-02 15:01:31 +00:00
The_E
95f56d3af7
New shader initialization code. This removes the big, ugly GL_Shader_file[] array, and changes shader compilation behaviour to only compile shaders on demand, not on program startup
2012-04-02 10:20:31 +00:00
zookeeper
c3fe50ecce
Made @Laser Color2 work even with a value of 0,0,0.
2012-04-02 06:35:19 +00:00
The_E
5d8b95c2f5
Same for secondary weapons
2012-04-01 15:09:24 +00:00
The_E
2f72134675
Fix for Mantis 2635: Invalid memory access when saving a mission due to a weapon bank set to empty.
2012-04-01 14:57:09 +00:00
Echelon9
8157463c4b
Fix Doxygen documentation for wl_draw_ship_weapons()
2012-04-01 08:25:53 +00:00
Echelon9
0c9cfdfc93
PVS-Studio fix: The 'Player' pointer is used simultaneously as an array and as a pointer to single object.
2012-04-01 08:06:21 +00:00
Echelon9
0a45d3df33
PVS-Studio fix: The 'Players' pointer is used simultaneously as an array and as a pointer to single object. Check lines: 1392, 1410.
2012-04-01 08:05:29 +00:00
Echelon9
491793adcd
PVS-Studio fix: The 'Weapon_info' pointer is used simultaneously as an array and as a pointer to single object. Check lines: 2962, 2975.
2012-04-01 08:04:40 +00:00
Echelon9
8caa385786
Xcode4: Add the common schemes
2012-04-01 04:58:26 +00:00
Echelon9
a9a9c43ea2
Remainder of Xcode4 project files
2012-04-01 04:44:45 +00:00
Echelon9
0fdfef37d4
Add Xcode4 compatable project file, along with SDL v1.2.15 that addresses Mac OS X 10.7 compatability
2012-04-01 04:28:04 +00:00
The_E
6badeadd54
As per discussion for Mantis 2633, Reverting revision 8544 due to timer drift.
2012-03-31 20:30:09 +00:00
zookeeper
7ebb6f53a3
Fixed a screwup in $detail_sphere distance calculation.
2012-03-31 20:10:26 +00:00
The_E
21ef9c620a
Adding a few newlines here
2012-03-30 16:25:06 +00:00
Goober5000
913edc6294
revision 8155 inadvertently made ALL weapons area-effect... so don't add an automatic inner radius (for Mantis #2634 ) but still be careful about potential divide-by-zero
2012-03-30 05:58:55 +00:00
Zacam
2cb5b15bd8
Nukes changes to the Armor Table for Difficulty Scaling and additional options.
...
Potentially handles Mantis issues 2493 and/or 2494.
http://www.hard-light.net/forums/index.php?topic=78277.0
2012-03-28 06:25:26 +00:00
Sushi
92e593fb37
Gliding bugfix: only "decay" glide speed when actually thrusting.
2012-03-27 15:31:08 +00:00
The_E
28410c9ec9
Removing -img2dds, since it's highly unlikely that anyone would run into issues with it.
2012-03-25 21:22:27 +00:00
zookeeper
a5279f786c
Fixed a typo ("$Fix Turret Collisions:" -> "$Fixed Turret Collisions:").
2012-03-22 06:52:35 +00:00
zookeeper
a02fb5a869
Moved the features from r8621 and r8622 behind two game_settings.tbl flags.
2012-03-22 06:15:39 +00:00
Sushi
f941c56597
Make $Max Turrets per Target only affect small ships (we can add a separate one for large ships later, if needed)
2012-03-21 15:07:28 +00:00
zookeeper
8890b61350
Made hits which directly impact a subsystem's submodel always deal damage to that subsystem first, even if other subsystems are closer to the point of impact.
2012-03-21 12:34:34 +00:00
zookeeper
c14399cfb1
Made hits to a turret's barrel count as hits to the turret subsystem itself.
2012-03-21 12:31:02 +00:00
zookeeper
c87c2cbd63
Added a "collide submodel" subsystem flag, which makes the subsystem take local damage only from shots which actually impacted its submodel.
2012-03-17 17:40:53 +00:00
Goober5000
8cd3cbc721
considering that both the HUD and sexp_replace_variable_names_with_values work with SCP_string, just use SCP_string directly and remove the character limit
...
also, MESSAGE_LENGTH isn't 32 characters
2012-03-16 04:09:30 +00:00
karajorma
2b445b41c0
Fix a rather unhelpfully vague piece of the SEXP documentation.
2012-03-16 03:28:57 +00:00
Swifty
bebf5e8fbf
Added hud-clear-messages. Clears active messages currently displayed.
2012-03-14 05:25:07 +00:00
Swifty
d84d9a8f5d
Allowed hud-set-directive and hud-set-message to set custom gauge text up to MESSAGE_LENGTH instead of NAME_LENGTH.
2012-03-13 06:54:13 +00:00
niffiwan
d315a55fbe
Update to 8602 - an even simpler fix
2012-03-12 10:08:10 +00:00
Goober5000
1372ff8a17
this isn't needed
2012-03-12 06:52:32 +00:00
Goober5000
e022277a42
redo the fix for Mantis #2627 so that we don't create temporary SCP_strings
2012-03-12 06:49:28 +00:00
Echelon9
124cbbfb99
Fix for Mantis 2629: PVS-Studio warning: The variable j is being used for this loop and for the outer loop. (controlsconfig.cpp 1613)
2012-03-11 11:19:06 +00:00
niffiwan
3163f80518
Fix for mantis #0002627 : save filename to temp var in generic_anim_init
2012-03-10 04:01:51 +00:00
chief1983
596d99d685
This is probably a better way to add silent rules support.
2012-03-09 23:09:24 +00:00
chief1983
8dbc4660e2
Fix line ending issues from happening here too.
2012-03-09 18:32:17 +00:00
karajorma
6f4227e21d
Well I find it hard to believe that in over eight years three senior SCP coders couldn't find THAT!
...
Fix Mantis 0082 (Repeat count sexp does not work reliably)
2012-03-08 15:19:42 +00:00
niffiwan
9489e74d9c
Reorder setting of filename in game init to stop missions crashing in load screen
2012-03-08 10:55:33 +00:00
niffiwan
5a873d6646
Fix gcc compile error with yet more const ness
2012-03-08 10:55:22 +00:00
Goober5000
b146b10403
MOAR const-correctness!
2012-03-08 08:12:56 +00:00
Goober5000
a378cfe005
sexp strings are now SCP_string
2012-03-08 06:48:44 +00:00
Goober5000
9683410dbb
const-correctness and SCP_string which is useful for sexp string conversion
2012-03-08 06:46:25 +00:00
Goober5000
c743b37a77
fix a derp by Echelon9 (local variable was hiding the member field)
2012-03-08 03:09:40 +00:00
niffiwan
2950030649
From Echelon9, fix for mantis #0002621
2012-03-07 09:23:34 +00:00
Goober5000
7d4fd7ee2a
convert briefing and debriefing to use SCP_string
2012-03-07 05:23:21 +00:00
Goober5000
19fc7728ba
one more bit of const-correctness
2012-03-07 05:22:55 +00:00
Goober5000
15d603b2e8
revert 8515 per Mantis #2607
2012-03-07 02:50:10 +00:00
Goober5000
5127340279
per discussion with mjn.mixael, fix error function so that it doesn't break on messages that are too long
2012-03-07 01:52:30 +00:00
karajorma
dc9de13d85
Get the default chance of a pilot praising his own kills from mod.tbl rather than the hardcoded magic number it currently uses.
...
Switch mod.tbl to automatically read the default table first, then look for the one the mod uses. This guarantees that variables are initialised to something and simplifies the logic for mod.tbl a lot.
2012-03-07 00:45:28 +00:00
The_E
c075661087
Mea culpa. I made a stupid mistake, goober's version was correct.
2012-03-06 12:35:12 +00:00
The_E
9b43020e26
Reverting 8581. If you are breaking freespace2.fc2, something is wrong with your code.
2012-03-06 12:20:59 +00:00
The_E
d1607ffa3c
Switches -glow, -normal, -spec and -env to be on by default. Renames commandline options to -noglow, -nospec, -nonormal and -noenv. Also renames -flightshaftsoff to -nolightshafts for consistency.
2012-03-06 11:53:41 +00:00
karajorma
2c1db51681
Allow modders to define a default campaign using mod.tbl
2012-03-06 11:21:29 +00:00
niffiwan
f75e83c900
Fix for Mantis #0002604 : using m_m's patch, allow swarm/corkscrew bank to keep firing if current bank changes
2012-03-06 10:09:04 +00:00
Goober5000
42942750e0
no need for this #define now
2012-03-06 05:16:16 +00:00
Goober5000
1e23f07948
fix the algorithm for trimming whitespace
2012-03-06 05:11:55 +00:00
Goober5000
d4adf75ffa
change command briefing text to use SCP_string
2012-03-06 04:58:45 +00:00
Goober5000
a01d54e808
another change to parsing of XSTR ids because an id can be one digit long
2012-03-06 04:52:14 +00:00
Goober5000
75232cc2f3
const-correctness which will be useful for SCP_string
2012-03-06 03:41:57 +00:00
The_E
a75d03ac05
Fix for Mantis 2619: Adds .png to FRED's list of recognized file formats for loading screens.
2012-03-05 23:00:06 +00:00
The_E
5c18143aa1
From casual_pilot: Fix for Mantis 2395 (incorrect index values passed to OpenGL)
2012-03-05 12:01:44 +00:00
The_E
88dbf09947
Properly updating all the projects to VS11 beta. Also sets toolset property to use the VS2010 toolset; given that almost noone has the MSVC2011 redistributable installed.
2012-03-05 11:33:52 +00:00
Goober5000
4e9915cc9b
change fout routines to use SCP_string instead of large C string buffers
2012-03-05 09:23:01 +00:00
Goober5000
0d3f28e8d4
enhance vsprintf for SCP_string to be more intelligent in how it handles specifiers
2012-03-05 09:09:15 +00:00
Goober5000
bc9023f5ad
fix a bug in the way XSTR ids were interpreted
2012-03-05 08:18:11 +00:00
Goober5000
97002e90ca
use SCP_string internally in stuff_and_malloc_string to remove the need for huge temporary buffers
...
also fix a Volition derp with the function prototype: if you're mallocing a string, you don't need a maximum length
2012-03-05 06:20:23 +00:00
Goober5000
b0079dc0ce
we might XSTR these at some point
2012-03-05 06:00:33 +00:00
Goober5000
589f7f332e
use SCP_string for great justice
2012-03-05 05:55:43 +00:00
Goober5000
79e4c58064
just derping along
2012-03-05 05:49:25 +00:00
Goober5000
d22ad134fd
a vsprintf equivalent is useful
2012-03-05 05:24:15 +00:00
Goober5000
f03eb16119
mjn.mixael's required weapon feature
2012-03-05 02:37:09 +00:00
Goober5000
806492779a
partial revert of 8561: vm_malloc should never return null, so the Assert is necessary, and will immediately flag the error as it happens instead of leaving a mine to be triggered later
2012-03-04 19:19:11 +00:00
zookeeper
8e8d11962b
Fixed the inability to use ship:TargetSubsystem to set the player's subsystem target during one frame even if the ship was not already being targeted.
2012-03-04 13:48:40 +00:00
Echelon9
8891526368
Fix for Mantis 2327 - Strange behavior with key-press, patch from Eli2
2012-03-04 13:05:41 +00:00
Echelon9
165721374a
Fix for Mantis 2616 - Lua forward controls don't get applied to player controls, patch by m_m
2012-03-04 13:02:48 +00:00
Echelon9
f2856015ad
PVS-Studio fixes: Resolve some warnings about use of pointers before checking for a null pointer
2012-03-04 08:51:59 +00:00
Echelon9
9ae918ead4
Fix SCP_string parselo code - std::string.c_str() function means it's a string being passed to Error(), not the whole std::string object
2012-03-04 07:50:47 +00:00
Goober5000
e2ccd37673
derp
2012-03-04 06:54:56 +00:00
Goober5000
83b09269f4
add variants of replace_one and replace_all
2012-03-04 03:59:29 +00:00
The_E
48977af19a
Mod.tbl adjustments for VS2011
2012-03-04 00:44:52 +00:00
Goober5000
02def13365
add SCP_string variants of parselo functions
2012-03-04 00:20:09 +00:00
Goober5000
297725ee76
small project fix
2012-03-03 08:05:20 +00:00
Goober5000
138148c92a
const correctness for fhash
2012-03-03 07:57:54 +00:00
Goober5000
a52b1e0c1b
this is a fix that doesn't require #including another file
2012-03-03 02:02:32 +00:00
Echelon9
2fd00900f6
Fix Mantis 2620 - PVS-Studio warning: Consider inspecting the '(strlen(filename) > 6)' expression. A 5 year old bug.
2012-03-03 00:22:49 +00:00
Echelon9
e04e570078
PVS Studio fix: The conditional expressions of the 'if' operators situated alongside each other are identical (aicode.cpp)
2012-03-03 00:00:16 +00:00
Goober5000
805374a5d8
fix compilation for MSVC6
2012-03-02 22:00:33 +00:00
chief1983
52c60b1711
stdint.h and inttypes.h moved, and let's fix some paths that VC6 botched up for us again.
2012-03-02 20:29:19 +00:00
Goober5000
687cc4b87b
mod_table project updates
2012-03-02 19:58:07 +00:00
Goober5000
abeb98a566
change stuff_vector to stuff_vec3d for clarity, since "vector" now refers to a dynamic list and "vec3d" now refers to the three-float struct
2012-03-02 04:26:44 +00:00
zookeeper
e98ff51535
Eli2's minimal timer fix patch(es) from http://www.hard-light.net/forums/index.php?topic=79070.0
2012-03-01 19:16:31 +00:00
karajorma
76f8d96721
Fix a bug where placing the host in team 2 of a TvT mission would cause the clients to crash out.
2012-03-01 09:58:39 +00:00
chief1983
e290d97228
Add mod_table files to Xcode project.
2012-02-29 17:41:06 +00:00
Sushi
1af1c1644c
Update VS2010 project to work with mod_table stuff.
2012-02-29 16:07:31 +00:00
Echelon9
5eb4e7728c
Related to Mantis 2617 - there is no way this is correct, now we have a properly functioning constructor for mc_info
2012-02-29 14:13:22 +00:00
Echelon9
53aa9752f2
Fix Mantis 2617: LLVM warning: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to dereference it?
2012-02-29 14:09:42 +00:00
niffiwan
adb2475528
Update makefile for new mod_table files
2012-02-29 10:33:58 +00:00
karajorma
caf038d3fc
Commit game_settings.tbl / -mod.tbm
2012-02-29 07:13:49 +00:00
karajorma
f856776a6e
Fix ignore-keys not blocking joystick or mouse buttons. (Mantis 2611)
2012-02-29 06:07:08 +00:00
Echelon9
35e26fb068
Diaspora code: Fix for Mantis 840 - Sounds for DRADIS, patch by m_m
2012-02-28 14:19:34 +00:00
Echelon9
621d82e1dd
Diaspora code: Fix for Mantis 768 - Tabled explosion sounds for ships, patch my m_m
2012-02-28 14:17:07 +00:00
Valathil
fe511293fa
Fix for Mantis 2614: Remove that statement, it works fine without exponentiating the offset.
2012-02-27 16:45:29 +00:00
The_E
d1c6d894eb
Forgot newlines
2012-02-24 23:51:03 +00:00
The_E
5287c93dfe
Deprecating stuff: Good. Printing messages to the log: Good. Using Warning() instead of mprintf(): Bad.
2012-02-24 23:25:00 +00:00
zookeeper
535c0f3bb5
Added subsystem:NextFireTimestamp scripting variable, exposing the ship_subsys->turret_next_fire_stamp variable to Lua.
2012-02-20 10:10:50 +00:00
zookeeper
56a62f6a46
Added subsystem:TurretLocked scripting variable, providing a way of directly getting/setting the locked status of a turret (also without the random delay incurred by the turret-free SEXP).
2012-02-20 10:07:38 +00:00
zookeeper
6198e29bad
Added weapon:ParentTurret scripting variable, providing a handle to the turret (if any) which fired the weapon. This allows $On Turret Fired hooks to easily get a handle to the fired turret.
2012-02-20 09:59:34 +00:00
zookeeper
9f3bc98876
Fixed a few typos in scripting documentation.
2012-02-20 09:53:24 +00:00
The_E
bff9ebae74
Fix for 8515: Need to init Use_GLSL earlier
2012-02-19 18:04:15 +00:00
The_E
19de3c06c9
From CommanderDJ: Fix for Mantis 2594 (FRED is unable to open mission files from the commandline or shell)
2012-02-16 13:54:45 +00:00
The_E
7284622f4a
Fixes GLSL detection to switch off GLSL support if reported GLSL version is below 1.2
2012-02-16 13:00:18 +00:00
Zacam
b78ad057e5
Reported by ni1s: GCC complaint about missing .c_str() in the updated dynamic MAX_SHIELD_ICON dynamic change.
2012-02-15 07:58:46 +00:00
zookeeper
472837efb3
Added the "no disappear" subsystem flag. http://www.hard-light.net/forums/index.php?topic=79093.0
2012-02-15 07:54:38 +00:00
niffiwan
a7681b38d9
From CommanderDJ, fix for mantis #0002601 : create constructor for player struct
2012-02-14 10:27:03 +00:00
zookeeper
19326e0a18
Proper way to fix what was attempted in r8439.
2012-02-11 16:42:16 +00:00
The_E
8163db606f
Not only did rev 8439 not do what it was supposed to, it also broke subsystem scanning
2012-02-11 12:37:39 +00:00
The_E
a95b79c879
Fix for Mantis 2603: Fullscreen_window window not centered.
2012-02-10 18:45:06 +00:00
The_E
6b4fd467a4
Given that hitting this assert can cause crashes in release builds, it's probably better if it's turned into an Error() instead.
2012-02-10 18:09:43 +00:00
zookeeper
9dfb30b67d
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.
2012-02-09 19:51:23 +00:00
zookeeper
924a188ac7
Made subsystems contain an objnum reference to their parent ship.
2012-02-09 16:06:37 +00:00
The_E
f929dc0a49
Amendment to 8431: Introduces AI Profiles flag "$countermeasures affect aspect seekers:", which governs the behaviour in 8431
2012-02-09 14:40:59 +00:00
Zacam
15f7e72fc6
From CommanderDJ: Makes MAX_SHIELD_ICONS dynamic
2012-02-09 12:40:15 +00:00
Goober5000
b0585fe5c1
Mantis #2524
2012-02-08 07:28:27 +00:00
Valathil
3f69eafcbc
Don't wait for brackets for messages without a target.
2012-02-08 02:49:34 +00:00
Valathil
21de0f9f73
Fixed the annoying OpenAL error messages in the log. AL_DOPPLER_FACTOR is only valid for alGet. Changed all instances to the correct alDopplerFactor.
2012-02-07 19:12:21 +00:00
zookeeper
828c766337
Slightly relocated the triggering of $On Turret Fired hooks as well as the setting of a few weapon variables. Makes sure that the variables only get set when a weapon is actually created and that all the weapon variables have been set before the hook is triggered.
2012-02-06 21:09:16 +00:00
Swifty
d8118c3f8b
Minor optimization when rendering tris that do not use distortion effects and therefore do not require calling glDrawBuffers.
2012-02-06 10:19:56 +00:00
Swifty
dd1c4a436c
Fixed Mantis 2413. hud-set-color changes to the HUD will no longer reset when pausing or entering options menu. Introduced Color entry fields for hud_gauges.tbl.
2012-02-06 10:01:01 +00:00
niffiwan
fe25fc41d2
Fix for mantis #0002597 : fix some GCC compiler warnings
2012-02-05 04:27:18 +00:00
Swifty
3affb86b52
Removed configOverride from HudGauge class since we don't even use it.
2012-02-05 03:41:31 +00:00
zookeeper
b9aea9b532
Makes subsystem targeting brackets always get drawn in the right place in the targeting box.
2012-02-04 22:43:28 +00:00
The_E
747841add1
Make the OS_SUBSYS_ROTATION sound depend on the SSF_ROTATES flag
2012-02-04 22:08:45 +00:00
The_E
b8c1a68989
Makes the $AliveSnd, $DeadSnd and $RotationSnd entries for subsystems work. NOTE: This will apparently not work correctly for nested subsystems.
2012-02-04 21:50:49 +00:00
The_E
855fe8cb34
Removing superfluous SSM alert message spawning.
2012-02-04 21:05:02 +00:00
The_E
d8026058d5
Ooops, I accidentally broke flaks.
2012-02-04 19:25:20 +00:00
Valathil
eea597decd
Make $FlyBySnd actually do something and allow primaries as well.
2012-02-04 17:13:45 +00:00
The_E
09b28e2b71
Make aspect lock weapons react to countermeasures the same way as heatseekers do instead of going dumbfire.
2012-02-04 17:04:40 +00:00
The_E
6145ae753a
A bit of cleanup in flak.cpp. Removes #defines made obsolete by previous commits, especially the hardcoded need for the "flk2" animation, which wasn't referenced anywhere in the actual code.
2012-02-04 13:48:58 +00:00
The_E
8636e43dbd
oops, forgot to remove this terminal command
2012-02-04 13:32:03 +00:00
The_E
928ef7a91b
A few parameters for Flak weapons as requested by fury. Changes:
...
-Arm Radius now determines how far a flak shell will have to travel before being able to detonate (used to be hardcoded to 10 meters)
-New weapons.tbl parameter "Flak Detonation Accuracy" to determine how far from a target a flak shell may explode (used to be hardcoded to 65 meters)
-New weapons.tbl parameter "Flak Targeting Accuracy" to determine the amount of jitter applied to turrets targeting other objects. Used to be hardcoded to 60 meters, applied as a radius around the target position
-New weapons.tbl parameter "Untargeted Flak Range Penalty" to determine the range penalty a flak weapon is subjected to when firing without a target. Used to be hardcoded to 20 meters.
2012-02-04 13:28:02 +00:00
niffiwan
f5eb49e652
Fix for mantis #0002593 : structs containing vectors don't like being memset to zero...
2012-02-04 11:01:18 +00:00
Valathil
1d64312266
Fix for Mantis 2534: Separate Warp IN and OUT when checking if the thrusters are behind the clip plane and don't do any checks for the "Hyperspace" warp type
2012-02-03 19:05:01 +00:00
Valathil
5fcc1c513e
Add a random offset to the thruster distortion to make thruster clusters look better.
2012-02-03 15:27:24 +00:00
The_E
1c1ad1214d
Given how often the particle shaders are called, moving them up to the beginning of the shaders array makes sense.
2012-02-03 10:27:33 +00:00
Zacam
3b865b16d3
Apologies to Swifty, this line change got truncated from the Font Fix.
2012-02-02 00:41:02 +00:00
Zacam
dd6fb0d27b
100ms was perhaps a bit too long. The answer is, of course, 42.
...
Wait, what was the question...?
2012-02-01 23:13:11 +00:00
Valathil
b9599be1cc
Fix for Mantis 2588: Messages without voice files now show the target brackets for at least "Message Length" * 100ms
2012-02-01 20:27:25 +00:00
Zacam
cf017ba490
From Swifty: Alternative fix to the font distortion problem by glyph realignment at the font creation phase rather than by manipulating the draw stage.
...
http://www.hard-light.net/forums/index.php?topic=79807.0
2012-02-01 20:07:36 +00:00
Zacam
d56a2a188b
Fix for the Fix for Mantis #2374 : Had only updated the Effect 2 portion of the missionscreencommon. Don't I feel silly now. Did a little housekeeping while at it.
2012-02-01 17:31:19 +00:00
Zacam
82f68b59f5
Fix for Mantis #2374 : Adds "+Closeup_pos:" and "+Closeup_zoom:" as entries following "$Tech Model:" for the weapons.tbl. For entries not using a dedicated $Tech Model, simply specify the $Tech Model as the same POF used in $Model to adjust Loadout Screen viewing position and zoom.
2012-02-01 14:11:45 +00:00
niffiwan
1b1ede220f
Fix for mantis #0002590 : fix array overruns caused by starting wings have > MAX_WING_SLOTS ships
2012-02-01 09:23:05 +00:00
Goober5000
ef62e392b0
more robust saving of dockpoint indexes (again for Mantis #2587 )
2012-01-31 04:53:37 +00:00
Echelon9
b43c50e178
Adopt the mprintf() macro correctly. It needs the braces to wrap the format string and variables
2012-01-30 16:58:23 +00:00
Valathil
3a26811c1d
Follow up to 8408: torename is a bad name since jnp is actually the jump node to be renamed
2012-01-30 15:24:46 +00:00
Valathil
9d1659aba9
Fix for Mantis 2523: Actually add the jump node to the vector after creating it and fix some new renaming code checks to work when you're trying to rename a node to the same name it had before.
2012-01-30 14:47:43 +00:00
Valathil
770593930a
Fix for Mantis 2589: Deactivate the Special* buttons while no ship is selected
2012-01-30 12:53:16 +00:00
Valathil
eb658ce53e
Fix for Mantis 2458: Initialize stuff before calling the point_to_vec function so it has the right matrices for calculation, also fixed scripted sphere drawing
2012-01-30 09:29:32 +00:00
Zacam
4541545bed
Slight touch up to Trunk Commit 8401: (! switch to !( to resolve a C4806 warning in MSVC.
2012-01-29 17:38:50 +00:00
The_E
858426d06a
Fixes issue where the jumpnode destructor would try to use obj_delete() on already deleted objects. Also changes obj_delete() to no longer assert when called on an already deleted object; will print a message to the log now.
2012-01-29 16:37:52 +00:00
The_E
2583d974e5
Adds weapons.tbl flag "ciws". This allows a flak weapons' blasts and shockwaves to damage bombs (essentially a reversal of the way the "takes blast/shockwave damage" flaks work)
2012-01-29 12:13:12 +00:00
The_E
c14dd6fa82
As requested by Diaspora: Adds "render flak" flag to weapons.tbl. This will allow the game to render flak shells.
2012-01-29 11:47:00 +00:00
Goober5000
ff4218e405
undo animations for undockings that happen from exploding or jettisoning cargo
2012-01-29 09:58:59 +00:00
Goober5000
5e2d53fba5
coded for Mantis #2587 but not actually used... this can allow a series of animations to be pushed and then popped
2012-01-29 09:19:40 +00:00
Goober5000
1732520514
fix Mantis #2587
2012-01-29 09:19:07 +00:00
Goober5000
b44df6f7be
tweaks
2012-01-29 06:53:42 +00:00
Goober5000
0b8089d07f
Vasudan Admiral's fix for the modelanim code
2012-01-29 05:05:59 +00:00
niffiwan
e2be31bff0
Fix for mantis #0002591 : add braces based on code indentation
2012-01-29 04:38:45 +00:00
Goober5000
c535100ae6
remove another four warnings
2012-01-29 03:24:36 +00:00
Goober5000
87b23a8184
remove warning
2012-01-29 03:23:12 +00:00
Goober5000
c84812fbda
herp a big derp
2012-01-29 02:58:29 +00:00
Goober5000
ceb53cbb30
derp
2012-01-29 02:32:19 +00:00
Goober5000
f8c5a31a6a
VA says this might work?
2012-01-29 02:26:26 +00:00
Goober5000
8b95cbb92b
wait until animation finishes before separating during undocking
2012-01-29 02:12:09 +00:00
Valathil
09b5e02331
Fix for Mantis 2521: Don't use the ship list for updating when we're in the middle of creating it.
2012-01-28 21:00:51 +00:00
The_E
1460805856
Given that there's an exit path available right here, changing this Assert() into a Warning() seems appropriate.
2012-01-28 19:32:09 +00:00
Zacam
938a122440
Fix for Mantis 2538: From Eli2, corrects for looping fade issue reported by FelixJim.
2012-01-28 15:48:19 +00:00
Zacam
eb4a6f6fff
Getting annoyed by -mipmap being used when it doesn't need to be. Moving it out of general graphics and into troubleshooting where it more appropriately belongs.
2012-01-28 13:02:40 +00:00
niffiwan
35d796d7cb
Fix for mantis #0002370 : ignore missing starting wing indexes during mission restart
2012-01-28 11:10:30 +00:00
Goober5000
cd7874e856
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
2012-01-28 07:56:26 +00:00
Zacam
a3c0ed6880
Fix to Trunk r8379, for want of a ; a compile was lost.
2012-01-28 07:07:07 +00:00
Goober5000
7d99d1016a
update docking code some more
...
add code logic to (theoretically) set submodels instantly to initial or final positions
2012-01-28 02:51:42 +00:00
Goober5000
e4c749ed2c
enhancement for bug 2582: trigger animations on BOTH ships undergoing docking
2012-01-27 07:42:13 +00:00
Goober5000
86e53c60b7
remove unnecessary warning
2012-01-27 07:40:23 +00:00
zookeeper
fe604aaf4a
Added support for the $detail_sphere submodel prop.
2012-01-26 14:25:20 +00:00
Goober5000
a54cfd15de
partial fix for Mantis #2582 :
...
--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
2012-01-26 03:57:23 +00:00
Zacam
b0d077677b
From Eli2: Mantis #2538 : 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)
2012-01-24 05:54:55 +00:00
Valathil
d637e02f30
Fix for Mantis 2556: Check if the mouse cursor is really there before drawing it.
2012-01-24 04:11:13 +00:00
Valathil
6d7ce503d5
Fix for Mantis 2583: Reinitialize the timer right when changing selection modes.
2012-01-24 00:13:21 +00:00
The_E
64ce84c367
Makes a very strangely coded warning more readable and useful.
2012-01-24 00:11:07 +00:00
Goober5000
de6eb9460d
upgrades to the docking system to incorporate docking animations -- incidentally, fixes Mantis #2581
...
also, remove DOCK_BACKUP_RETURN_VAL which never did anything even in retail
2012-01-23 23:27:06 +00:00
Valathil
a8206df327
Follow up to 8289 + 8310: Make the sprite rotation independent of the camera direction and revert the docking change and make it simpler
2012-01-23 22:50:01 +00:00
Valathil
3d045470eb
Fix for Mantis 2580: Use the texture matrix in the vertex shader to support texture panning.
2012-01-23 19:12:16 +00:00
The_E
eed196e9ba
Followup to 8327: Texture names from pofs are provided without extension, so we have to make sure to account for it.
2012-01-23 13:51:13 +00:00
Goober5000
43fdfaa209
fix Mantis #2579
2012-01-23 02:48:33 +00:00
The_E
9b15f2bc0f
Fix for Mantis 1997: "Filename too long" warning for nonexistant textures.
2012-01-23 01:25:08 +00:00
chief1983
46d1ff7d7f
Fixes #2578 - Change the < in these checks against NAME_LENGTH to <=.
2012-01-23 01:22:05 +00:00
Valathil
2184d3698b
Follow up to 8289: Change the rotation back to relative cause of flipping out billboards at certain viewing angles and fix the dock rotation another way.
2012-01-22 14:01:18 +00:00
Echelon9
7b5b59e913
Fix for Mantis #2523 : FRED Waypoints/Jumpnode Refuses Rename Leading To Unescapeable Loop
2012-01-22 12:00:08 +00:00
Echelon9
bedaf72b94
Fix LoopingSoundInfo constructor, as reported by Goober
2012-01-22 09:30:01 +00:00
Echelon9
a8c5c80a39
Fix for Mantis #2540 - confirmed by Goober to resolve the constructor warnings
2012-01-22 09:19:57 +00:00
Goober5000
64e430b586
quash a warning
2012-01-22 09:19:22 +00:00
Echelon9
ac96bad97b
Documentation: pedantic rename of this function to describe it better
2012-01-22 08:52:31 +00:00
Goober5000
599efc960f
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
2012-01-22 06:51:53 +00:00
Echelon9
f95628f94d
Documentation: Missionweaponchoice.cpp and related changes. Removed a few redundant functions.
2012-01-22 06:47:55 +00:00
Goober5000
854e55c843
don't remove the escort flag from invisible ships that aren't on the escort list (fixes Mantis #2057 )
...
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
2012-01-22 06:40:12 +00:00
Goober5000
149797ae75
the proper way to fix Mantis #2441 is by modifying the team_visibility_update function
...
also, clarify terminology: in-frustum/not-in-frustum replaces visible/invisible
and do some minor rewrites for additional clarification
2012-01-22 05:37:09 +00:00
Zacam
3514f7a961
From Valathil: Adjusts view point rotation in 3rd Person/chase view. This is especially apparent in Nebula missions where rotating in Chase View is radically different from cockpit view. This fix corrects that, and has additionally been tested in Multiplayer.
2012-01-22 03:13:33 +00:00
Zacam
256c881885
Purely aesthetic. I have no idea what a packlock is.
2012-01-22 02:30:02 +00:00
Goober5000
9ab3a0728f
tie scramble-messages and unscramble-messages into the communications subsystem status so that they will affect all aspects of communications in a consistent way (squadmsg menu, dashed text, etc.)
...
also make hud_communications_state() be a pure function, i.e. one without side effects
also fixes Mantis #2577
2012-01-21 22:08:38 +00:00
Valathil
49c31e34cd
Fix for Mantis 2575: Don't increment array indices without checking for the maximum.
2012-01-21 19:52:00 +00:00
zookeeper
c12fa5c183
Small scripting documentation fix: modeltextures -> modeltextures_h.
2012-01-21 15:52:31 +00:00
zookeeper
ab34afd212
Added the $On Turret Fired scripting hook.
2012-01-21 15:16:53 +00:00
The_E
a915fda2f5
Fix a few unused variable warnings that popped up after recent commits by Echelon9
2012-01-21 12:40:53 +00:00
Valathil
c39576fce8
Fix for Mantis 2522: Moved the calculation of the sprite rotation to get the updated orientation matrix after dock calculation.
2012-01-21 10:33:57 +00:00
Goober5000
17bdae26b5
project file changes for wxfred
2012-01-21 08:41:15 +00:00
Goober5000
bc9cfe782f
VC6 compatibility
2012-01-21 07:58:07 +00:00
Echelon9
90b17eacd0
LLVM Warnings fix: Value stored to is never read and related, in mission folder
2012-01-21 07:48:24 +00:00
Echelon9
447af95475
LLVM Warnings fix: Value stored to * is never read, in missionweaponchoice.cpp
2012-01-21 07:27:49 +00:00
Echelon9
bc8e853ae5
LLVM Warning fix: Various warnings within hudtarget.cpp and ancilliary changes
2012-01-21 07:21:51 +00:00
Echelon9
3d05a92ace
LLVM Warning fix: Value stored to goal_changed is never read
2012-01-21 06:44:12 +00:00
Echelon9
0c56cdc7f1
LLVM Warning fix: Value stored to percent_left is never read
2012-01-21 06:42:29 +00:00
Echelon9
4923b671f2
LLVM Warning fix: Value stored to num_offsets_on_this_line is never read. Btw no need to clear this specific variable as it is defined within the while() loop, unlike the others.
2012-01-21 06:36:52 +00:00
Echelon9
9557a779de
LLVM Warning fix: Value stored to ship_is_ballistic is never read
2012-01-21 06:34:11 +00:00
Echelon9
7501ff2bef
LLVM Warning fix: Value stored to target_objp is never read
2012-01-21 06:27:54 +00:00
Echelon9
2873a28131
LLVM Warning fix: Value stored to enemy_ship_type is never read
2012-01-21 06:25:30 +00:00
Echelon9
3ec5e94ff2
LLVM Warning fix: Remove this dead code to ai_shipname
2012-01-21 06:18:22 +00:00
Echelon9
f0746c2524
LLVM Warning fix: This is a dead store to the value done_reading.
2012-01-21 06:10:45 +00:00
Echelon9
e67348d4e6
LLVM Warning fix: This is all dead code, removing.
2012-01-21 06:09:50 +00:00
Echelon9
eb8d60d281
LLVM Warning fix: No need to assign value to entry.ship_class twice.
2012-01-21 05:57:42 +00:00
Echelon9
3251ea5c95
LLVM Warning fix: Resolve an order of precedence issue with && and ||
2012-01-21 05:40:58 +00:00
Valathil
dd810fa34e
Fix for Mantis 2576: Use the beam direction as the applied force vector
2012-01-21 04:07:27 +00:00
Goober5000
9ace109aa0
update to revision 8263: one should probably reset the special shields if you reset special hitpoints
2012-01-21 03:58:42 +00:00
Valathil
41a875c5e2
Fix for Mantis 2461: Check to see if the reduced damp timestamp is valid so we don't get ridiculous acceleration values.
2012-01-21 01:54:17 +00:00
The_E
438aee9862
These error messages need to be waay clearer
2012-01-20 14:55:06 +00:00
Zacam
49e9c6a1d5
From CommanderDJ: makes the maximum number of intercom sounds, misc anims and door anims dynamic (v2)
...
http://www.hard-light.net/forums/index.php?topic=78856.msg1574656#msg1574656
2012-01-20 02:13:38 +00:00
Valathil
16df14125d
Fix for Mantis 2574: Timestamps do not work that way, also fixed the rapid fire "Out of Energy" sound for fighter beams.
2012-01-20 01:35:19 +00:00
Valathil
dd6fa1c906
Fix for Mantis 2553: Fix overdrawing subspace glows by changing them from thrusters to normal bitmaps therefore avoiding a render time problem with the thruster geometry batcher.
2012-01-19 19:15:43 +00:00
The_E
a3e00635d6
Fix for Mantis 2573: Special Hitpoint settings get carried over when deleting and adding ships in FRED
2012-01-19 11:41:19 +00:00
Goober5000
3f0914f407
need to use subsystem_stricmp for subsystems
2012-01-19 07:05:50 +00:00
Valathil
e3773925ee
Fix for Mantis 2572: Just dont render 0.0 Laser Length weapons
2012-01-18 19:21:38 +00:00
niffiwan
a3fc01c2d6
Fix for mantis #0002480 : when emptying secondary banks use the standard function to select the next bank
2012-01-18 10:12:38 +00:00
Valathil
42a0fd0626
Fix cockpit simulated brightness for lightshafts: Recalculate even if falloff is 1.0 and use the actual sample number
2012-01-17 17:13:01 +00:00
Zacam
351922e042
Slight update to unify the formating of the built in shaders. This behaviorally changes nothing, just their presentation.
2012-01-17 00:18:22 +00:00
chief1983
a5fae58600
Fixes #2571 - Changes a value in each config to match the config name.
2012-01-16 01:34:01 +00:00
The_E
149ec390d1
Followup to 8232: Fixes slight mistake in the usage of boolean operators
2012-01-16 00:09:49 +00:00
Zacam
23b6548390
Update to Commit 8223: When adding more lines to an IF, brace it please.
2012-01-15 23:33:49 +00:00
The_E
f89d327e48
Made the failure message for failed model loads include the model filename.
2012-01-15 17:07:37 +00:00
The_E
f93cd55032
Fix for Mantis 2441: "friendly-stealth-invisible" flag doesn't work
2012-01-15 14:14:46 +00:00
The_E
f23c5ebba7
Fix for Mantis 1768: Cutscene bars do not display properly.
2012-01-15 13:29:00 +00:00
Echelon9
45ba7fd411
Removing the redundant weapon_create_names(). If you want to find Weapons by name, the Weapon_names[i] approach is not the right one. Found by Eli2.
2012-01-15 12:08:31 +00:00
Echelon9
e57fc904b5
Fix initialisation bug in the weapon_info struct, from within init_weapon_entry(). Patch from Eli2
2012-01-15 11:19:14 +00:00
niffiwan
13274d4fc5
Fix for Mantis #0002443 : allow primary weapons to have fire_waits longer than 5 secs
2012-01-15 10:55:09 +00:00
Goober5000
494bdf6493
yeesh... part of the original iff_defs feature that wasn't updated
2012-01-15 08:13:50 +00:00
Echelon9
dc4371680a
Clear a whole set of LLVM warnings - some of these would have caused memory fubars, so should marginally improve stability
2012-01-15 08:08:15 +00:00
Echelon9
d57bcd41a1
Ensure we don't leak memory on Mac OS X. Any object created with a CF*Create() function must have CFRelease() called upon it.
2012-01-15 07:27:41 +00:00
Echelon9
53d407332f
Fix LLVM warnings in weapon folder
2012-01-15 07:05:20 +00:00
Valathil
86dcd45e50
Fix for #2570 : Changed the external camera messages to be IFF color and internal messages back to green
2012-01-15 03:11:12 +00:00
Valathil
b126751503
Fix for #2549 & #2457 - Fixed rendering of bars and moved earlier in code so we dont overdraw the hud messages
2012-01-15 00:09:59 +00:00
The_E
7f49ef1a9d
Fix for Mantis 1803: Lensflares are rendered with no sun in sight
2012-01-14 23:20:05 +00:00
Valathil
bca5096e9a
Fix OpenGL errors caused by animated shaders when not rendering to a fbo
2012-01-14 19:24:29 +00:00
Valathil
80c44ab1f0
Fix "Unable to get shader uniform location" warning for distortion shaders
2012-01-14 19:03:55 +00:00
The_E
3477e1d968
Fix for Mantis 2568: "Fog Near/Far Mult:" being written to mission files even when in retail compatibility mode.
2012-01-14 10:55:13 +00:00
Echelon9
cccabac1af
Fix for #2567 - LLVM warning: Semantic issue in lua.cpp
2012-01-14 00:31:14 +00:00
Echelon9
7270d1fb88
Fix for #2566 - GCC warning: NULL used in arithmetic in lua.cpp (lua_getstack(L,n+1, ar) == NULL)
2012-01-14 00:22:58 +00:00
Echelon9
a24370a2e2
Fix for #2565 - GCC warning: Use of unary operation that may not be intended in lua.cpp (type =- 1;)
2012-01-14 00:17:03 +00:00
Echelon9
4389dae0e0
Fix for #2564 - GCC warning: Use of NULL in arithmetic operation in ship.cpp (winfo_p->pre_launch_snd != NULL)
2012-01-14 00:13:25 +00:00
Echelon9
f8fddac844
Fix for #2563 - GCC warning: Equality comparison with extraneous parentheses in ship.cpp (Ai_tp_list[i].obj_type == -1)
2012-01-14 00:00:31 +00:00
Echelon9
2a00ead369
Fix for #2562 - Expression result unused in ship.cpp (ship_system->turret_swarm_num)
2012-01-13 23:54:19 +00:00
Zacam
5e34a60d35
Okay. This was ridiculous running all these changes separately. This setts svn:eol-type across the board for types that were not previously set to LF as they should have been.
2012-01-13 18:44:18 +00:00
Zacam
6c702a11e6
svn:eol-type set to LF.
2012-01-13 18:37:09 +00:00
Zacam
f6ad6b14b6
Synchronization of differences between Antipodes and Trunk. Cause unknown, just commit drift issues. Regular auditing will catch these faster, but people need to pay more attention when syncing Trunk changes over to Antipodes.
2012-01-13 17:49:57 +00:00
The_E
6b1bf3ea0f
Various scripting patches from m!m:
...
--Eyepoint access to the model handle
--getCollisionDistance() to the collision info handle to get the precomputed distance to the hit point
--A Disabled variable for the ship handle
--getTimeUntilExplosion() for the ship handle to get the time until the ship finally explodes
--A change to the documentation of ad.play3DSound() to reflect that the function also takes position parameters
2012-01-13 17:46:36 +00:00
The_E
10713cebc4
Fix for Mantis 2561: Rotating guns don't rotate. Allows gun rotation property to be set by using "$gun_rotation".
2012-01-13 10:44:55 +00:00
chief1983
bea9ef7c36
Fix for #2559 - new frameworks file that strips the metadata files out of the archive.
2012-01-11 17:43:26 +00:00
The_E
b9f9b49e4f
Make sure the FXAA pass only draws to COLOR_ATTACHMENT0
2012-01-11 17:41:52 +00:00
karajorma
bfb54ea844
Split the Locked flag in two so that you can lock Ships or Weapons independently.
2012-01-11 07:57:36 +00:00
karajorma
a15a260245
Change the define to one that is a little less confusing.
2012-01-11 01:46:50 +00:00
karajorma
28db28427b
Not that it matters much since it's that's what it's ending up as anyway but since the variable that uses it was switched to unsigned we might as well change this.
2012-01-11 01:44:24 +00:00
Zacam
93c43bfced
Fix for Mantis 0002558 : Resolves the issue by updating the libpng provided to version 1.5.7.
2012-01-10 21:43:30 +00:00
Valathil
164898ee8e
Made WIF2_SMALL_ONLY weapons on turrets not fire on HUGE ships when grouped with other weapons that are not WIF2_SMALL_ONLY
2012-01-10 18:34:50 +00:00
The_E
d36f05218d
Another Assert->Assertion change. Also changes parsing code to throw warnings when a shockwaves' inner radius is zero.
2012-01-07 00:44:48 +00:00
The_E
03d9233618
Remove incomprehensible Comment
2012-01-06 18:20:44 +00:00
The_E
ecb11b095c
We were disabling the framebuffer a bit too soon here.
2012-01-06 01:03:37 +00:00
zookeeper
9b5dbe6674
Added support for a fourth targeting box render mode and re-structured some of the targeting box rendering code to make it easier to read and extend.
2012-01-05 20:13:14 +00:00
zookeeper
a42c430650
Added support for the $Targetbox Shader Effect option in hud_gauges.tbl.
2012-01-05 19:48:39 +00:00
Zacam
61a9ed4700
spotted by ni1s: Need an '#include <limits.h>' to make compilers happy when using MAX_INT.
2012-01-03 15:13:17 +00:00
The_E
4c0c94f70d
Removed an unused #define
2012-01-02 15:51:04 +00:00
The_E
9bc2ac733f
Small fix to make gcc happy.
2012-01-02 12:28:58 +00:00
karajorma
fb561c55c3
Remove a magic number. This number will probably become something defined in mod.tbl eventually but for now at least it's easy to find again.
2011-12-31 06:51:21 +00:00
karajorma
e95201e041
Training weapons shouldn't cause smoke to come off of ships which haven't really taken any damage.
2011-12-31 06:49:30 +00:00
karajorma
4be0d29712
Switch from the directive-is-variable SEXP to the more powerful directive-value one.
2011-12-31 06:46:47 +00:00
Valathil
f7ccb35817
Fixed font rendering at high resolutions
2011-12-29 18:16:04 +00:00
zookeeper
2a79bd427e
Fixed stupid mistake in previous commit.
2011-12-29 08:37:44 +00:00
zookeeper
0815b6f5a6
Fixes ships not rendering during hyperspace warpin due to r7936.
2011-12-29 08:13:27 +00:00
IssMneur
d53bf32cb8
From CommanderDJ: - Fully vectorize and stringify mainhall.tbl internals
...
- replaces all arrays with SCP_vectors
- replaces all c-strings with SCP_strings
- depreciates +Misc Anim Handles: and +Misc Anim Flags: because they are just cruft
-- +Misc Anim Handles: has not been hooked up for years
-- +Misc Anim Flags: are dealt with automatically
2011-12-29 06:28:05 +00:00
The_E
b84060a437
Fixing an old mistake I made back in September 2010. Note: Assertions are optimized out of release builds, leaving this necessary skip out.
2011-12-29 00:53:49 +00:00
chief1983
dd4026f82a
Make sure to include the right lua headers on all platforms, as pointed out by rhl.
2011-12-28 19:53:50 +00:00
The_E
ebf89c9ef2
We do need to bind the correct depth buffer for rendering, else things get all confused.
2011-12-26 16:20:38 +00:00
The_E
34e536cd90
We only need to set up Scene_Depth_texture once, there must have been a merge gone wrong somewhere
2011-12-23 17:17:55 +00:00
The_E
41d68f3aca
From m|m: Fix for Mantis 2400 (RTT rendering broken in current builds). Also changes GL_rendering_to_framebuffer to the more aptly named GL_rendering_to_texture.
2011-12-23 13:09:39 +00:00
Echelon9
e98f25198c
Adjust alignment when shader debug logs are written.
2011-12-23 00:15:46 +00:00
Valathil
04af86b7a4
Added hardware accelerated YUV to RGB conversion with shaders to the ogg video renderpath.
2011-12-22 16:40:50 +00:00
The_E
09b8d1e3d1
Adds an intermediate render target for FXAA to work against, this removes a previous reliance on undocumented behaviour in OpenGL.
2011-12-22 15:12:18 +00:00
Valathil
7ffe518adb
Allow for FS1 shader effect to be customized in post_process.tbl
2011-12-22 14:40:30 +00:00
Zacam
226cd53d8a
From CommanderDJ: SCP_Vector-izes some more of the Main Hall structures (intercom and misc anim mostly)
2011-12-22 00:13:31 +00:00
zookeeper
6353841820
Removed the unused "Ghost Save" entry from Object_type_names, because it was causing an off-by-one when using the getBreedName() scripting function. Also added "Beam" to the list since it's a valid object type.
2011-12-21 08:30:34 +00:00
The_E
8ca2106ad5
Fix for Mantis 2498: Invalid species reference in ships.tbl is not detected.
2011-12-21 01:14:01 +00:00
Valathil
da24970b18
from zookeeper: make hv.Player availiable in "$On Gameplay Start" scripting hook
2011-12-20 21:50:38 +00:00
Valathil
4096a41ac3
Fixed Swarm Salvo turrets Spamming their ordinance since 7981
2011-12-18 16:52:35 +00:00
The_E
0bbca2cd79
Removing two unused variables
2011-12-18 16:36:49 +00:00
The_E
90982854b2
Fix for Mantis 2545: Default ship in FRED is not the ship defined by #Default Player Ship
2011-12-18 16:35:10 +00:00
The_E
07b03ff2b3
Fix for Mantis 2550: Text in multiplayer is rendered outside the textbox if custom fonts are in use
2011-12-18 16:00:26 +00:00
Goober5000
c7b38b0b92
fix for Mantis #2547
2011-12-18 08:45:47 +00:00
Goober5000
47a51b8e37
make sexp category stuff accessible
...
fix Mantis #2551
2011-12-18 08:43:37 +00:00
Zacam
fa6fc231b5
Tortoise Merge somehow screwed the application of the patch for Commit 8093, my apologies to everybody.
2011-12-15 18:53:41 +00:00
Valathil
d839351511
Fix rendering of Sun Coronas and Lens Flares
2011-12-15 18:45:13 +00:00
Zacam
e6d7b56a3b
From CommanderDJ: Corrects the timing problem caused by commit 8079 regarding the playing of Main_hall misc_anim sounds.
2011-12-15 15:31:20 +00:00
Zacam
1ad0e977ff
Fix to the sexp_ship_effect causing an assert when used against ships that get destroyed before the event triggering it fires off. (From The E)
2011-12-13 16:32:17 +00:00
The_E
a3e0dedf6f
Fix for trunkated command briefs when custom fonts are in use
2011-12-13 16:11:49 +00:00
IssMneur
e2ad4c2064
From CommanderDJ: parse the mainhall only on first load.
...
Adds -reparse_mainhall to enable the previous behaviour of parsing the mainhall on every viewing of the mainhall.
2011-12-10 17:56:15 +00:00
Echelon9
faa029e540
Fix small compile issue on Apple OSX with new Valathil lightrays code
2011-12-09 09:48:35 +00:00
IssMneur
bc71e0abaa
From ni1s: Apparently gcc chokes on this without the space.
2011-12-09 07:23:36 +00:00
IssMneur
2eff95c4ea
Allow names in mainhall.tbl sound lists.
...
Allows sound names in addition to sound indexes in the sound lists:
+Intercom sound:
+Misc anim sounds:
+Door sounds:
Extends parse_sound to search in the interface sound table instead of the main sound table.
2011-12-09 06:38:16 +00:00
IssMneur
58ebb97d26
Fix breaking of FRED by revision 8069. Sun_spot was only declared in freespace.cpp which fred doesn't have linked in.
2011-12-09 06:24:07 +00:00
IssMneur
e496117892
From CommanderDJ: add check_for_eoln() to parselo.cpp.
2011-12-09 05:48:35 +00:00
chief1983
40372c53e4
Fix stdint's existence breaking OS X compiling.
2011-12-08 23:05:56 +00:00
Valathil
8208aecf1b
Fix crash when framebuffer shockwaves are enabled but no weapon loads the standard shockwave animation
2011-12-08 21:58:16 +00:00
Valathil
a0d1c8445a
Added Lightshafts as a replacement for sun glare. Look at http://www.hard-light.net/forums/index.php?topic=78923.80 for post_processing.tbl format
2011-12-08 20:57:11 +00:00
The_E
e767e7dc01
Oops, infinite loops are bad in a sexp.
2011-12-06 17:09:00 +00:00
The_E
2538ed6814
Adds a sexp to switch the thrusters on a given ship or list of ships on and off.
2011-12-04 17:29:02 +00:00
Echelon9
b06fa6d7f9
Fix r8054: Const char* to char* conversion was causing GCC compile errors
2011-12-04 03:16:56 +00:00
Echelon9
da95aa8a14
Clear old commented out line
2011-12-04 03:06:24 +00:00
Wanderer
82ddb4a305
fix to autoaim
2011-12-03 17:27:22 +00:00
The_E
1a9b5aa980
Hellzed's french keyboard layout stuff
2011-12-03 14:18:14 +00:00
Wanderer
1a8745c960
zookeeper's change to locating subsystem positions
2011-11-30 21:33:31 +00:00
karajorma
5dbb9c3295
Make it possible to localise a couple of extra sentences.
2011-11-30 03:12:06 +00:00
Wanderer
badf45b75d
zookeeper's addition of new scripting hook that runs right before entering mission.
2011-11-29 21:32:57 +00:00
Wanderer
7bb10d8408
changes to the order in which autoaim/convergence modes are used
2011-11-29 20:44:39 +00:00
Goober5000
9eb2eacee0
make weapon parsing more robust for Mantis #2369
2011-11-29 06:03:15 +00:00
Zacam
72a80fb925
From CommanderDJ: Since "neb2_eye_changed()" contains "Neb2_regen" why not use it instead?
2011-11-29 04:07:42 +00:00
Zacam
fd66bdcab3
From CommanderDJ: Nebula distance check for set-object-position's regeneration of local nebula.
2011-11-29 01:54:34 +00:00
Echelon9
21c2449f0b
Documentation: Changes such that the Doxygen log reports clean, in anticipation of 3.6.14 release
2011-11-28 13:03:38 +00:00
The_E
a1c0483f86
Since the +RGBA Inner and +RGBA Outer options aren't used anywhere in the code, we can just remove them.
2011-11-27 18:37:48 +00:00
Goober5000
2fac8f1899
fix revision 7971: Echelon9, if you add statements to a single-line if(), make sure you also add braces
2011-11-23 05:18:18 +00:00
Goober5000
94e13d761b
add to the project file too
2011-11-23 04:26:20 +00:00
Goober5000
977ea25a6d
approximate the standard function for MSVC6 compatibility purposes
2011-11-23 04:25:50 +00:00
Goober5000
b243f3151a
these ought to appear in the project file
2011-11-23 03:10:57 +00:00
Goober5000
e5367f49dd
LOL and DERP, whoever coded this didn't even read his own comment
2011-11-23 02:47:43 +00:00
Goober5000
14bc0e2230
zookeeper's initial velocity patch
...
http://www.hard-light.net/forums/index.php?topic=79069.0
2011-11-20 19:48:53 +00:00
IssMneur
5f7fc07507
Fixes a crash when a jumpnode targeted by the player is hidden. See MANTIS#2541
2011-11-19 23:17:51 +00:00
The_E
24a0c18cd9
Another one from zookeeper: More fixes for thrusters
2011-11-19 19:14:57 +00:00
The_E
717ea3a2dd
From zookeeper: Proper fix for thrusters attached to rotating submodels
2011-11-19 19:11:47 +00:00
The_E
c33749ac82
Those filters are just too helpful
2011-11-19 17:43:57 +00:00
karajorma
31bc16cd6e
That's a rather pointless test when we don't have AI smart missiles.
2011-11-19 09:04:06 +00:00
Echelon9
fc9fbdd8f7
Fourth part of fixing jump_nodes refactor, clearing FRED compile errors.
2011-11-19 05:59:41 +00:00
Echelon9
5bf63e8c8d
Third part of fixing jump_nodes refactor, remove the union approach to linking Jump_nodes into Objects[]. First go at clearing the FRED errors.
2011-11-19 04:07:30 +00:00
Echelon9
d340f7ec2e
Documentation: Take out some old commented out code
2011-11-19 03:25:52 +00:00
Echelon9
f1060979fd
Second part of fixing jump_nodes refactor, using cleaner attribute variables
2011-11-19 03:05:44 +00:00
Echelon9
e9c91374e0
Documentation: code/hud/hudtargetbox.cpp
2011-11-19 01:40:58 +00:00
Echelon9
84c96eaac6
First part of fixing jump_nodes refactor, use the set_name() function properly as it is available
2011-11-19 01:11:35 +00:00
Echelon9
12eda6154e
Documentation: Code cleanup in weapons.cpp
2011-11-17 11:33:17 +00:00
Echelon9
19ae6528e0
Cases of commented out Int3() indicate areas of old, redundant code.
2011-11-17 11:07:53 +00:00
The_E
8b65d3e3ce
Patch for Mantis 2391 (again): Removes a few leftovers from the old HUD code that generated warnings unnecessarily.
2011-11-15 23:25:50 +00:00
The_E
0f2f77d2d5
Fix for Mantis 2544: Crash when opening the "Class Variables" window for a weapon.
2011-11-15 22:54:21 +00:00
The_E
66c2741772
Fix for Mantis 2543: Windows in F3 lab aren't getting closed.
2011-11-15 21:50:41 +00:00
The_E
3fd09a9828
Slight fix for the "thrusters on rotating subobjects" thing: Only account for rotations that are actually happening.
2011-11-15 21:39:39 +00:00
Sushi
6a1f8a692c
Add $Armor Type support for missiles (table entry goes right after $Weapon Hitpoints)
2011-11-15 19:05:30 +00:00
Goober5000
6147c19496
clean up ship maneuvers
...
significantly improve sexp help for those sexps
2011-11-15 09:36:27 +00:00
Sushi
f542f19fcc
Add "only target if can fire" turret flag
2011-11-14 18:26:55 +00:00
Zacam
69ec80042e
From zookeeper: Correction to the getAnimationDoneTime in lua.cpp time_s calculation.
2011-11-14 09:45:20 +00:00
niffiwan
e5ebb22d49
Fix for 7977 - explicitly include <algorithm> so gcc will compile
2011-11-14 03:55:08 +00:00
niffiwan
ee0358ee79
cfile: change Assert to Assertion
2011-11-14 03:55:01 +00:00
Goober5000
1eec8f5093
add is-in-mission sexp
2011-11-13 09:59:10 +00:00
Goober5000
6dff3d4179
fix compilation on MSVC 6
2011-11-13 03:52:01 +00:00
niffiwan
8312d0a1e1
Documentation: cf*_string_len in cfile.h
2011-11-13 03:10:41 +00:00
Zacam
bcf9fd90be
From zookeeper: allow thrusters to follow a rotating engine
...
http://www.hard-light.net/forums/index.php?topic=74290.msg1557431#msg1557431
2011-11-12 15:22:48 +00:00
Zacam
403fef79ec
From zookeeper: mod-wide disable of the warp camera
...
http://www.hard-light.net/forums/index.php?topic=78748.0
2011-11-12 14:53:59 +00:00
Zacam
6b2af30314
From zookeeper: fix $Shots for turret-fired weapons
...
http://www.hard-light.net/forums/index.php?topic=78832.0
2011-11-12 14:39:02 +00:00
Zacam
ef5f145d5a
From zookeeper: customizable warpout engage time
...
http://www.hard-light.net/forums/index.php?topic=78913.0
2011-11-12 14:36:31 +00:00
Zacam
6c87b2c5bc
Small cleanup to last two commits, Tortoise Patch apparently decided to eat some line returns along the way. Additionally, some spacing adjustments to line things up a little better.
2011-11-12 14:20:25 +00:00
Zacam
8c8974b215
From zookeeper: customizable asteroid death explosions and radius
...
http://www.hard-light.net/forums/index.php?topic=78762.0
2011-11-12 14:01:38 +00:00
Zacam
3323847094
From zookeeper: customized asteroid split rules
...
http://www.hard-light.net/forums/index.php?topic=78755.0
2011-11-12 13:51:22 +00:00
Zacam
1b403a4505
Might as well include the missing inttypes.h file as well, just in case we ever come around to needing to use it, sine it's another file that MSVC doesn't ship with as part of it's C99 support.
2011-11-12 06:59:41 +00:00
Zacam
98b93e572d
As per commit message r7963, uint64_t is not supported on MSVC out of the box. This is because stdint.h is not shipped with MSVC, so <include>ing it doesn't do any good when it doesn't exist. Since stdint.h can be distributed without modification, it is now in globalincs and the include is ifdef'd to MSVC to use the globalincs version, all other platforms will use the C++ ISO standard library version.
2011-11-12 06:45:39 +00:00
Echelon9
3f0761e4c7
Documentation: More code cleanup of missionparse.cpp and missionparse.h
2011-11-10 13:46:11 +00:00
Echelon9
4ad4d98c93
Documentation: Code cleanup of missionparse.cpp
2011-11-10 13:21:03 +00:00
Echelon9
0564ae99b8
Fix Mantis 2343: Assert on arriving from destroyed ship
2011-11-10 12:21:34 +00:00
Sushi
f333133656
Add workaround so that AI landings consistently work
2011-11-09 18:24:12 +00:00
Echelon9
f04551523d
Documentation: General
2011-11-09 14:21:16 +00:00
Echelon9
0615fe46f6
Mantis 2537: Help track down a memory leak problem
2011-11-09 14:01:06 +00:00
Echelon9
ac90d940a1
Fix Mantis 2539: Valgrind: Memory leak - parse_ship_values(ship_info*, bool, bool, bool)
2011-11-09 13:38:01 +00:00
Echelon9
3a28d938ea
Documentation: Code cleanup of missioncampaign.cpp
2011-11-09 12:48:35 +00:00
Echelon9
9e127ca7f9
Documentation: Code cleanup in graphics/bmpman
2011-11-09 12:12:33 +00:00
The_E
e7e279ca10
uint64_t is not supported out of the box on MSVC.
2011-11-09 09:36:23 +00:00
The_E
f92eae073f
Fix for Mantis 2533 from Eli2: Integer overflow in mission-time-msecs
2011-11-09 09:25:59 +00:00
Zacam
4dd05cde7f
Originally spotted by zookeeper: "$gun_rotation:" should be set to "!= NULL" like the other entries around it.
2011-11-08 04:48:50 +00:00
Sushi
cdfacd5f67
Oops, committed the wrong version of the player autoaim patch
2011-11-07 20:58:29 +00:00
The_E
17a420c92a
Reverting the texture cache stuff due to issues with some models
2011-11-07 09:26:37 +00:00
niffiwan
047f2ab811
Linux: remove -g (debug symbols) flag from release builds & switch optimisations from -Os -to -O2
2011-11-07 03:32:42 +00:00
Sushi
113465660a
Add "$Player Autoaim FOV:" to AI Profiles (optionally allows autoaim only for the player on a per-difficulty-level basis)
2011-11-06 12:46:33 +00:00
Echelon9
86f53da049
Documentation: General code cleanup of fireballs.cpp
2011-11-06 12:14:31 +00:00
Echelon9
2ed77792fe
Documentation: Code cleanup in modelread.cpp
2011-11-06 11:25:15 +00:00
The_E
e004154986
Eep, missed a "!"
2011-11-05 19:52:02 +00:00
Valathil
0fe89eedd4
Fixed min(0) and max(0) being recognized as macros on Windows
2011-11-05 19:42:29 +00:00
The_E
593d3c00c1
Changing opengl_render_pipeline_program to avoid unnecessary texture uploads.
2011-11-05 19:23:39 +00:00
The_E
fff1a1c60b
Reverting 7938: Bugfix breaks existing missions relying on old behaviour.
2011-11-05 19:20:17 +00:00
Echelon9
9f711bf53e
Documentation: General code cleanup for 64bit
2011-11-05 08:12:04 +00:00
Echelon9
c852d3a466
Fix Mantis 2535: Game crashes in player select menu, patch from Eli2
2011-11-05 07:09:58 +00:00
Echelon9
90601fce4d
Bug fix: This looked to be an accidental copy paste. See further gamesnd_get_by_iface_tbl_index() and gamesnd_get_by_tbl_index()
2011-11-03 14:39:37 +00:00
Echelon9
181fbfed52
From Eli2: patch removes leftovers of the conversion from arrays to Vectors.
2011-11-03 14:32:52 +00:00
chief1983
c00f931cfa
From niffiwan: Fix our linking order to work with --as-needed
2011-11-02 16:23:42 +00:00
The_E
96ef05f89c
From Eli2: Fix for Mantis 2533 (integer overflow in mission-time-msecs)
2011-11-02 11:40:51 +00:00
Goober5000
289169f96a
zookeeper's hyperspace patch
...
http://www.hard-light.net/forums/index.php?topic=65427.msg1558799#msg1558799
2011-10-29 22:22:39 +00:00
Echelon9
ce0d6fc978
Fix Mantis 2531: Issues with cockpit sounds, from Eli2
2011-10-29 03:09:05 +00:00
The_E
c8d456a784
Moving this up a bit more
2011-10-28 11:21:25 +00:00
The_E
2a80a598f7
This line shouldn't have been removed in m previous commit. No idea how that happened, but I moved it closer to where it's actually used.
2011-10-28 10:41:01 +00:00
The_E
327afbc262
From zookeeper: Adds kill() function to asteroid objects
2011-10-28 10:01:54 +00:00
The_E
681c2a356e
From m!m: Reworked scripting sound API
2011-10-28 09:59:31 +00:00
Goober5000
1bcea87036
the ship copy flag needs to be able to recognize ships that appear later in the table
2011-10-26 07:51:31 +00:00
Goober5000
91fc326a17
we have some preconditions, so let's enforce them
2011-10-26 06:35:19 +00:00
Zacam
fde2022fa2
from zookeeper: [FotG] Fixes collision problem with the hyperspace warpin type introduced by r7889
2011-10-23 19:00:04 +00:00
Echelon9
22219ed382
Documentation: Code cleanup of shockwaves.cpp and ancilliary changes
2011-10-23 05:00:49 +00:00
Echelon9
457e36c511
Documentation: Fix typo in the Doxygen comment block
2011-10-23 02:36:12 +00:00
IssMneur
29b4a6c922
From m!m: patch to add support for customizable cockpit sounds. See: http://www.hard-light.net/forums/index.php?topic=78675.0
2011-10-22 22:11:31 +00:00
Echelon9
648723e2ff
Documentation: cleanup and documentation of gamesnd.h from Eli2
2011-10-22 10:29:48 +00:00
Echelon9
684b59e500
Fix Mantis 2526: Valgrind: Conditional jump or move depends on uninitialized value(s) - init_anim_instance()
2011-10-20 20:25:39 +00:00
Echelon9
9f4a1ac309
Fix Mantis 2525: Valgrind: Conditional jump or move depends on uninitialized value(s) - parse_ship_values()
2011-10-20 13:37:58 +00:00
Zacam
876289a4b2
From ni1s: -Wreorder warnings clean up for GCC output.
2011-10-19 07:36:21 +00:00
Echelon9
6c9598b2ae
And found another offender of the STL capacity() / size() / reserve() type
2011-10-17 13:10:17 +00:00
Echelon9
8543045b15
STL types again. Some of these are just inefficient, like reserving one extra slot for each additional element, and then pushing that element onto the STL type
2011-10-17 13:07:24 +00:00
Echelon9
598bd73413
STL types are tuned to handle their own memory allocations. Code like this is never going to be optimal in all situations, and likely to be sub-optimal in many situations
2011-10-17 13:01:48 +00:00
Echelon9
366fc7b342
Huh? This Assert() check doesn't make any sense
2011-10-17 12:58:31 +00:00
Echelon9
69dbd07c88
STL types are tuned to handle their own memory allocations. Code like this is never going to be optimal in all situations, and likely to be sub-optimal in many situations
2011-10-17 12:56:47 +00:00
Echelon9
7a573539cc
It's small, does lead to a slightly longer (but not necessarily less concise) code... but it is slightly faster. Tested on OS X, Intel Core 2 Duo, compiled with GCC 4.0
2011-10-17 12:42:34 +00:00
Echelon9
a2199e6b81
Looks pretty unneeded now, odd commented out definition in cmdline.h
2011-10-16 05:27:03 +00:00
Echelon9
cb0326a38e
Convert the geometry map batcher lookup functions to use size_t, in line with the STL types
2011-10-16 05:22:34 +00:00
Echelon9
41919ee15b
Clarify some aspects of the geometry map and distortion map batchers, as well as clarifying and making consistent the function calling conventions throughout the code.
2011-10-16 05:08:33 +00:00
Echelon9
61791b01cc
Fixing Eli2's commit in r7905. Where the -keyboard_layout commandline hasn't been used, the code was causing a CTD rather than handling gracefully the fallback option
2011-10-16 04:23:42 +00:00
The_E
76923c1613
From Eli2: Allows adjustment of the keyboard layout on Linux/MacOS. Right now, only german layout is added in, use "-keyboard_layout qwertz" to activate it.
2011-10-14 13:58:50 +00:00
Zacam
183c57dc03
Wrong EOL type on these two.
2011-10-12 17:44:40 +00:00
niffiwan
cb293f60c5
Improve performance of jpeg byte swap operation
2011-10-12 10:37:27 +00:00
Valathil
965c251ce6
Fix the transparency delay framework to work with submodel_render()
2011-10-11 15:55:43 +00:00
Echelon9
563fd4db10
min (lowercase) is not cross-platform, MIN (uppercase) is
2011-10-11 13:45:44 +00:00
niffiwan
8d59b5954a
Add RGB / BGR byte swap to jpeg reading - libjpeg now doesn't need jmorecfg.h to be updated
2011-10-10 21:45:20 +00:00
Sushi
c206ba8548
Remove unneeded warnings
2011-10-10 15:22:22 +00:00
Zacam
ea52bab005
from zookeeper: [FotG] Makes adjustments to the Hyperspace warp type to allow the arrival/departure acceleration/deceleration rate to be controlled, $Warpout speed to be used as well as maintains initial velocity after warpin
2011-10-10 09:57:24 +00:00
Echelon9
b45a5ee281
From m\!m: access to the Viewer_mode as I need to know if the view is currently in the cockpit or not
2011-10-09 12:57:39 +00:00
The_E
2341c9aef3
Change the log message here to better explain what's happening.
2011-10-09 12:24:35 +00:00
niffiwan
2713be7140
From Eli2: fix for mantis 2517: loop sounds are always at 100% volume locked and afterburner fade out sound not work
2011-10-09 11:10:13 +00:00
Echelon9
e150a93cfb
Testing Assert() to track down a series of bugs reported by QuantumDelta
2011-10-09 10:52:24 +00:00
Zacam
cc2323b578
found by Valathil; in "int obj_in_view_cone( object * objp )", codes=g3_rotate_vector(&tmp,&pt); works out better than running the check, then discarding it since g3_code_vector calls to run g3_rotate_vector anyway.
2011-10-09 10:37:27 +00:00
Echelon9
a1e054190e
Documentation: Clean up of globals.h
2011-10-09 03:00:53 +00:00
Echelon9
375ca512ad
Documentation: Code cleanup of iff_deffs.cpp and related
2011-10-09 02:52:41 +00:00
Zacam
015a70bc48
Adds Success/Average/Fail music selections to the Debriefing Editor.
...
http://www.hard-light.net/forums/index.php?topic=78504.0
2011-10-08 15:38:07 +00:00
Zacam
5b7883128c
From zookeeper: [FotG] makes hyperspace warp type use a longer distance for the collision check
2011-10-08 15:15:46 +00:00
Echelon9
3c7dad3563
Fix for medal room crash reported by QuantumDelta
2011-10-08 07:31:06 +00:00
Echelon9
9314724fc3
Documentation: Code cleanup of bmpman.cpp and ancilliary changes
2011-10-08 06:22:41 +00:00
The_E
4237db0536
Fixes issue with the mn.Asteroids and mn.Debris scripting tables, as these were accidentally 0-indexed instead of the Lua-standard way of starting indices from 1.
2011-10-06 15:09:26 +00:00
Echelon9
3d97037b87
Documentation: Code clean up of medals.cpp and medals.h
2011-10-06 12:51:15 +00:00
Goober5000
d5ee76453f
enhance are-waypoints-done-delay to allow ships to complete waypoint paths multiple times
...
make count check more robust in has-docked-delay and has-undocked-delay; Assert shouldn't be used for mission data entered in FRED
2011-10-06 04:33:52 +00:00
Zacam
de9864b36a
Remove the empty hudresource.cpp/.h files from /code/hud and all projects.
2011-10-05 09:14:19 +00:00
Goober5000
d6b23cc1c0
PVS-Studio V581 in revision 7779 was actually a false alarm; overzealous cleanup created a condition where a negative array index could occur, triggering either an assert or a crash (Mantis #2514 )
2011-10-04 06:34:47 +00:00
karajorma
e28573fe30
CommanderDJ's fix for Mantis 2276 set-object-speed SEXPs don't work in multiplayer.
2011-10-04 05:03:09 +00:00
Echelon9
77c852e15a
A few further changes for Windows support under the new jump_nodes STL refactor
2011-10-03 13:26:03 +00:00
Echelon9
27900ec1a9
Refactor of the jump_node code to use the STL's std::list, rather than Volition's in-house written linked_list.
2011-10-03 12:15:55 +00:00
niffiwan
24f253971a
Fix: Mantis 2470 - $Flags: ("untargetable") does not work on turret subsystems
2011-10-03 10:37:30 +00:00
Echelon9
6d4f266e52
Use SCP_* types to access STL types wherever possible. This allows more complete memory monitoring
2011-10-03 09:06:56 +00:00
Echelon9
17e9ace62a
Documentation: Code cleanup in modelinterp.cpp and ancilliary changes
2011-10-03 08:35:36 +00:00
Echelon9
500859ae98
Documentation: Only need update_min_max() because CLAMP() doesn't handle pointers
2011-10-03 07:46:04 +00:00
Echelon9
227b835116
Documentation: Code cleanup in aicode.cpp and ancilliary changes
2011-10-03 07:40:09 +00:00
Echelon9
b9ec80682d
Documentation: Code cleanup in debris.cpp and ancilliary changes
2011-10-03 06:03:55 +00:00
The_E
ca52181adb
From Eli2: Patch for Mantis 2489: adjust-audio-volume doesn't affect subspace
2011-10-02 11:08:41 +00:00
Zacam
1b1895abdb
Finish removing dbugfile.cpp/.h from the rest of the projects.
2011-10-02 08:09:04 +00:00
The_E
42fcf8052c
Make force-jump cancel glide mode.
2011-10-01 20:09:00 +00:00
The_E
dd1d682d9b
From m!m: Allows per-ship customization of ship sounds in ships.tbl. See Wiki for details.
2011-10-01 19:16:38 +00:00
Echelon9
5dfb30dfce
PVS-Studio fix: V507 Pointer to local array 'title_str' is stored outside the scope of this array. Such a pointer will become invalid.
2011-10-01 06:54:43 +00:00
Echelon9
6d0ac6b2f3
Remove the variables.cpp and variables.h redundant references from the Xcode project file
2011-10-01 04:32:55 +00:00
karajorma
a52ba3d462
Remove dbugfile from VC2008 project files so that it will build.
2011-10-01 00:03:38 +00:00
The_E
939f1f949f
Damn, wrong line changed.
2011-09-30 17:54:01 +00:00
The_E
766486b103
Update to ad.playMusic to allow control over whether or not to loop the passed sound file.
2011-09-30 17:53:06 +00:00
The_E
ac82e45cd5
Removing dbugfile.cpp/.h from the project, since it doesn't seem to be useful.
2011-09-30 14:52:33 +00:00
The_E
d85fb17efc
Change this for loop to use an iterator for better performance
2011-09-30 10:22:34 +00:00
Goober5000
0d96fc1bff
partial revert of 7825... don't remove the sound index
2011-09-29 06:03:30 +00:00
niffiwan
dd66475b75
Reapplying 7790, seems to have been mistakenly swatted by 7802
2011-09-28 11:23:27 +00:00
Zacam
b306018b92
This is now in the .14 Branch, we'll keep it there and leave the "final" code for putting to Trunk when AP is merged/Final is released.
2011-09-27 21:23:46 +00:00
Zacam
5c8f8f0cae
This file is not binary nor an application. Silly SVN.
2011-09-27 20:54:56 +00:00
Zacam
b1428c9eb7
What the? There were two Inferno Debug SSE/SSE2 project setups in libpng project file.
2011-09-27 07:02:25 +00:00
Sushi
2b6ef14077
Add set-docked SEXP
2011-09-27 03:32:05 +00:00
IssMneur
3ec2689d39
A bunch of audio code hacks to address the concerns in http://www.hard-light.net/forums/index.php?topic=77889.0 until proper fixes of the sound code are completed.
...
+F -donotenforce = to turn off concurrent playback limit for sounds.
+F -percent_flashtobang = sets the default percentage of nebula flashes get converted to bangs. Default is 50, max 100, min 0.
+T lightning.tbl +flash_to_bang_percent: = sets the percentage of nebula flashes that get converted to bangs for the storm type.
-- Audio gain of OpenAL is set to 65% of max.
2011-09-27 03:04:11 +00:00
niffiwan
ece4ad88bc
Fix for mantis 2501
2011-09-26 11:17:06 +00:00
Zacam
02a23b22b1
From CommanderDJ: Fix for Mantis 2224 "Chat messages may end up unreadable due to unfortunate color choice"
...
Allows for the specification of colors via a colors.tbl
(Wiki Documentation here: http://www.hard-light.net/wiki/index.php/Colors.tbl )
2011-09-26 05:40:07 +00:00
The_E
9710f64934
Aargh. NOW it's fixed correctly
2011-09-25 20:47:31 +00:00
The_E
e8d36eac79
And a final fix here
2011-09-25 20:46:22 +00:00
The_E
c052cbe1e2
Fix for subsystem flags resetting erroneously. Thanks to zookeeper for noticing this.
2011-09-25 10:50:08 +00:00
Zacam
206279c5fd
Sync Drift: Apparently still some lingering ifdefs for OEM/Multiplayer_Beta and non-AP specific things not having made it to trunk for some reason.
2011-09-25 08:26:45 +00:00
The_E
6b90b35f56
FRom CommanderDJ: Patch for Mantis 2307, set-object-position weirdness when in nebula
2011-09-25 07:50:07 +00:00
IssMneur
1ac6127251
Fixes Mantis 2510 - Rotation periods for submodels of less than 1.0 seconds cause uncontrolled rotation of submodel.
2011-09-25 04:00:06 +00:00
Echelon9
e3195a82d6
Code cleanup: We should be really careful with using these scoring struct elements, as the types were changed from ushort to int at some point.
2011-09-25 02:42:27 +00:00
The_E
0f51dc1925
Redo 7777 without breaking anything else in the process
2011-09-24 19:47:47 +00:00
The_E
531a7c71bb
Revert 7791. Something went wrong there.
2011-09-24 18:31:20 +00:00
The_E
4ce7dfe9e4
Revert 7789
2011-09-24 17:42:56 +00:00
The_E
a982eb153d
Remove more useless encryption stuff. NOTE FOR PROJECT FILE MAINTAINERS: parse/encrypt.(cpp|h) should no longer be part of the project.
2011-09-24 17:37:12 +00:00
The_E
b964c63d6e
From niffiwan: Fix for Mantis 2477
2011-09-24 15:59:00 +00:00
The_E
24d6ca3bad
PVS Studio related: False alarms
2011-09-24 15:46:24 +00:00
The_E
5f0cf81cd2
PVS Studio fix: Rearranged struct to decrease size
2011-09-24 15:46:03 +00:00
The_E
6511cfdddf
From eli2: Change the control defines into a more manageable enum
2011-09-24 15:45:13 +00:00
The_E
05f3578109
PVS Studio fix: V547, <variable> >= 0 check on size_t variable
2011-09-24 14:26:04 +00:00
The_E
0e66893f32
Remove unused variable
2011-09-24 14:22:35 +00:00
Echelon9
cd1cc88640
Xcode project file cleanup: Xcode 3 thinks these sections are unnecessary after the encrypt.cpp file was removed recently
2011-09-24 01:35:19 +00:00
Echelon9
7d9ea6b21c
Documenation: Code cleanup of keycontrol.cpp
2011-09-24 01:34:25 +00:00
Echelon9
911025d835
A small code cleanup patch from Eli2. Thanks.
2011-09-24 01:19:29 +00:00
Echelon9
8e1c689f32
PVS-Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 2056, 2061 (multiteamselect.cpp)
2011-09-23 20:28:06 +00:00
Echelon9
2866b4fb3b
PVS-Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 2039, 2044 (multiteamselect.cpp)
2011-09-23 20:27:25 +00:00
Echelon9
82a36997cb
PVS-Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 2172, 2186 (sexp.cpp)
2011-09-23 20:26:32 +00:00
Echelon9
efcdac911e
PVS-Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 1977, 1986 (sexp.cpp)
2011-09-23 20:24:43 +00:00
The_E
ad0581dd4d
Fix for Mantis 2134: set-fov sexp has no effect at mission start. This moves the camera initialization stuff up a few lines to run before game_simulation_frame, thus ensuring the main camera is set up when sexps are evaluated.
...
Many thanks to CommanderDJ for tracking this down.
2011-09-23 19:09:23 +00:00
Swifty
e329d4542f
Fixed Mantis 2502. Messages gauge will no longer calculate string sizes using the incorrect font.
2011-09-23 09:14:02 +00:00
Echelon9
586491f150
PVS-Studio fix: V512 A call of the 'memset' function will lead to underflow of the buffer '&stackFrame' (mspdb_callstack.cpp).
2011-09-22 13:42:07 +00:00
Swifty
0ab6ecd58c
Further fix for Mantis 2500. Directives should now be using sexp overrides.
2011-09-22 06:28:49 +00:00
Echelon9
2db013e321
Documentation: Code cleanup of grbatch.cpp and work to prepare for 64bit with size_t
2011-09-21 14:37:36 +00:00
Zacam
cf5125d6a0
Revert enabling Speech and Voice Recognition, as it doesn't play well with Express versions of MSVC (at least not without a lot of work)
2011-09-21 06:37:56 +00:00
IssMneur
023c267374
- renamed +frequency to +period to reflect what the code actually does (as Valathil pointed out)
...
- +period: or +index: is no longer required for $substitute: (default is +index: 0)
- removed unnecessary check on +period: (1 is now a valid period)
2011-09-20 02:47:39 +00:00
The_E
c428e55ee2
Move this check outside the for loop for better performance
2011-09-19 18:01:56 +00:00
The_E
5c05db7c40
Small fix for the logic here
2011-09-19 15:53:11 +00:00
The_E
e689c90703
As requested by zookeeper: Adds "play fire sound for player" subsystem flag
2011-09-18 17:31:41 +00:00
Echelon9
83bc0e33fa
From niffiwan: Fix for Mantis 2468 - Change-Ship-Class does not change armor type
2011-09-18 05:24:34 +00:00
Zacam
c88660eca9
Also from Eli2: Code cleanup
2011-09-18 01:03:23 +00:00
Zacam
0a4f360908
Project cleanup for the removals of cryptstring, scramble, and crypt.cpp/.h.
2011-09-18 00:35:48 +00:00
Valathil
7a810e1dde
From Eli2_: Change cheat codes to not use that useless crypto function anymore
2011-09-17 23:00:58 +00:00
The_E
9f4d15b9d6
Make sure ETS settings carry over when changing ship class, as well as making sure that weapon selection are still valid after the change.
2011-09-17 22:11:34 +00:00
The_E
7751e8c076
Another case where one should use the case-insensitive check found and fixed.
2011-09-17 21:48:46 +00:00
Valathil
fe8f7ebaec
Reinitialize collision checks when executing the change-ship-class sexp
2011-09-17 21:02:33 +00:00
Valathil
4c4258eb6d
Reordered shaders for performance reasons
2011-09-17 20:55:03 +00:00
The_E
704908f74e
Since this header and cpp define a single function used in a single place, let's move the function to where it's used, and get rid of these files
2011-09-17 20:25:49 +00:00
The_E
d031406000
And another obsolete tool goes away
2011-09-17 20:08:13 +00:00
The_E
75790a647d
These are unused as well.
2011-09-17 20:00:29 +00:00
The_E
b692311667
These files are referenced nowhere, so away they go
2011-09-17 19:53:27 +00:00
The_E
b1fc8971de
Little change to fix bug with external post shaders not loading
2011-09-17 19:36:24 +00:00
Valathil
df80d5a1c3
Add Ships.tbl flag to disable lighting
2011-09-17 18:00:38 +00:00
Valathil
7074db9287
Don't do a boolean check on Floats could be -0.0 which is boolean true
2011-09-17 14:36:29 +00:00
The_E
c4ea493f9e
From m!m: Make the player object and mn.* table available in an $On Mission Start hook
2011-09-17 13:03:52 +00:00
The_E
5b53430da5
From m!m: Adds isTurret() and isAfterburnerActive() Scripting functions
2011-09-17 12:59:54 +00:00
The_E
5cb8835238
Highly experimental project files for the highly experimental MSVC 2011.
2011-09-16 21:17:02 +00:00
The_E
8c129cfc3d
Reverting 7733. This is clearly not ready for primetime, let alone a release.
2011-09-16 10:01:10 +00:00
The_E
5ec132d6e4
Adding support for the $On Weapon Fired: hook going off when turret weapons are firing
2011-09-15 11:46:33 +00:00
The_E
2997266ce9
Fix for the $On Weapon fired: scripting hook firing on every frame as long as the fire button is pressed
2011-09-15 11:35:32 +00:00
Zacam
1c324758f0
Enable Text-to-Speech (SVN Include) and Voice Recognition. (MSVC 2010)
2011-09-15 03:29:05 +00:00
Zacam
cc14debd26
Enable Text-to-Speech (SVN Include) and Voice Recognition.
2011-09-14 22:44:50 +00:00
Zacam
9b9b172e9e
EOL inconsistencies corrected to match the rest of the files.
2011-09-14 19:25:15 +00:00
The_E
7d5bce148f
strcmp != stricmp. Using stricmp is necessary to avoid breaking old missions.
2011-09-14 18:49:06 +00:00
The_E
49fe727218
Fix for the $On Weapon Fired: scripting hook
2011-09-14 12:21:45 +00:00
Backslash
28c482a2f1
Add radar gauges to Hud_gauge_types list, so that hud-activate-gauge-type sexp can affect radar. Also a bit of code sorting to make it easier to make sure all gauges are accounted for.
2011-09-14 02:53:12 +00:00
chief1983
f07609e6db
Update codeblocks project file.
2011-09-13 22:00:26 +00:00
The_E
36aaaf018e
Since this is the only place where r1 and r2 are variable, let's safeguard it.
2011-09-13 20:36:41 +00:00
The_E
4c838f2014
Adding an exit path here.
2011-09-13 20:26:23 +00:00
Echelon9
dacd3337c7
Documentation: Code cleanup in hudnavigation and hudobserver
2011-09-12 13:52:07 +00:00
Echelon9
8c272b61ae
Documentation: Code cleanup in fvi.cpp
2011-09-12 13:31:38 +00:00
Echelon9
5d2e1444e6
Documentation: Code cleanup in font.cpp and font.h
2011-09-12 12:52:33 +00:00
Echelon9
c17fbdbcfc
Documentation: Code cleanup in flak.cpp and flak.h
2011-09-12 12:45:19 +00:00
Echelon9
7f6e6e0b03
Documentation: Remove the old CreditWins from credits.cpp. These were unused for some time
2011-09-12 12:38:36 +00:00
The_E
debdb78531
A few fixes for the $Weapon Class scripting hook and associated actions
2011-09-12 12:35:08 +00:00
Echelon9
0ebe034272
Documentation: Big code cleanup of the collide**.cpp files
2011-09-12 12:34:49 +00:00
Echelon9
10f9ecac09
Documentation: Code cleanup of camera.cpp and camera.h, and removal of redundant function
2011-09-12 12:15:27 +00:00
IssMneur
dedd73a3f5
Lets try this again without templates that VC6 doesn't like (this time for real).
...
Use const strings in split_str.
2011-09-12 05:14:58 +00:00
Goober5000
3597538bde
revert 7705... it did, in fact, contain templates that VC6 doesn't like
2011-09-12 05:01:57 +00:00
IssMneur
10809783f9
Lets try this again without templates that VC6 doesn't like.
...
Use const strings in split_str.
2011-09-12 04:03:56 +00:00
Valathil
a899b8601f
Allow customization of the thruster distortion effect in species_defs.tbl and ships.tbl
2011-09-12 03:59:45 +00:00
Echelon9
eb56cc982d
Documentation: Code cleanup of asteroid.cpp and asteroid.h
2011-09-11 13:56:10 +00:00
Echelon9
1f07c6fcb1
Documentation: Code cleanup of alphacolors.cpp
2011-09-11 13:38:17 +00:00
Echelon9
6c4e057035
Documentation: Code cleanup of afterburner.cpp
2011-09-11 13:36:33 +00:00
Zacam
f779a5b8a8
Fix for Trunk r7677 causing map corruption on model cache rebuild.
2011-09-10 21:14:55 +00:00
Zacam
b781d3220c
From Goober5000: Fix for model read for 'submodel_get_two_random_points' failing to find any points in the POF 'defpoints' as reported by Nighteyes.
2011-09-09 15:13:23 +00:00
Zacam
83045f7d4c
Some more Parity/drift correction between Antipodes and Trunk: cfile update for better handling.
2011-09-09 14:06:29 +00:00
Zacam
f15c81fdd0
Part Three: Synchronization pass of Trunk and Antipodes Differences.
...
Catching on anything missed in the first two passes.
2011-09-09 10:38:14 +00:00
Zacam
a63dbe572c
Part Two: Synchronization pass of Trunk and Antipodes Differences.
...
Removes all extraneous ifdefs (Demo, E3, Multi Beta, etc).
Leaves Debug and Inferno.
2011-09-09 10:23:53 +00:00
Zacam
9678d18bc3
Part One: Synchronization pass of Trunk and Antipodes Differences.
...
Whitespace/tab mostly.
aicode does have a change of an Int3 to an Assertion.
bmpman has an update to bm_next_handle.
2011-09-09 09:37:45 +00:00
Zacam
efaa50fd0c
From Valathil: Fixes thrusters with -trans textures
2011-09-08 17:12:25 +00:00
Goober5000
6c2f4f3c30
PVS-Studio fixes:
...
V506 Pointer to local variable 'Default_video_settings' is stored outside the scope of this variable. Such a pointer will become invalid. code 2d.cpp 507
V506 Pointer to local variable 'pos' is stored outside the scope of this variable. Such a pointer will become invalid. code shipfx.cpp 1075
2011-09-08 06:55:50 +00:00
Goober5000
fd4dc268d4
made show/hide jumpnode work on more than one argument
2011-09-08 06:41:38 +00:00
IssMneur
0717ad3d13
PVS-Studio fix: V512 A call of the 'memcpy' function will lead to overflow of the buffer '& x'. (pstypes.h:131)
2011-09-08 05:39:53 +00:00
IssMneur
dd3404b441
PVS-Studio: These are not false positives. Variable args can only be PODs, changing the "class" to a structure makes ade_odata a POD which should stop PVS-Studio from flagging this.
2011-09-08 05:38:21 +00:00
Echelon9
3eb9602696
Documentation: Complete code clean up of the 3d/2d code
2011-09-07 14:33:26 +00:00
Echelon9
f1cd24101f
Documentation: Code clean up in 3dlaser.cpp
2011-09-07 14:26:25 +00:00
Echelon9
dd99b7b035
Documentation: Code cleanup of 3ddraw.cpp
2011-09-07 14:22:03 +00:00
Echelon9
687b91d197
Documentation: Code cleanup to 2d.cpp, 2d.h and 3d.h
2011-09-07 14:10:41 +00:00
Echelon9
23d689e087
PVS-Studio fix: V512 A call of the 'memcpy' function will lead to underflow of the buffer 'szcode'.
2011-09-07 12:46:35 +00:00
Echelon9
6de5b02e77
Documentation: Code clean up of psnet2.cpp
2011-09-07 12:28:18 +00:00
Echelon9
dece779168
PVS-Studio fix (courtesy of niffiwan): V512 A call of the 'memcpy' function will lead to underflow of the buffer '& bit_24'.
2011-09-07 12:00:21 +00:00
Echelon9
9086c95131
PVS-Studio fix (courtesy of niffiwan): V512 A call of the 'memcpy' function will lead to underflow of the buffer (psnet2.cpp)
2011-09-07 11:58:47 +00:00
Zacam
c946bc4a45
PVS-Studio fix (courtesy of niffiwan): V512 - A call of the 'memcpy' function will lead to overflow of the buffer '& ip_addr.sin_addr'.
2011-09-07 10:00:03 +00:00
Zacam
0dac515506
MSVC Analysis: Local declaration of <variable> hides previous declaration at <line> of <file>: 'Scene_texture_width'/'Scene_texture_height' in gropengldraw lines 56 & 57.
2011-09-07 09:57:37 +00:00
karajorma
d7274c3714
Fix Mantis 2497 (SEXP help text not available in the ships editor)
2011-09-07 02:50:05 +00:00
Valathil
388fd3bb81
Delay transparent texture rendering to fix z-buffer ordering issues
2011-09-06 17:17:58 +00:00
Echelon9
f678baabde
Documentation: Major code clean up of shield.cpp
2011-09-06 14:39:53 +00:00
Echelon9
6d245f7bc2
PVS-Studio fix: V524 It is odd that the body of 'multi_xfer_reset' function is fully equivalent to the body of 'multi_xfer_close' function (multi_xfer.cpp, line 185).
...
Remove duplicate, unused function
2011-09-06 12:29:56 +00:00
Goober5000
f3349119b8
end string at hash symbol for jump nodes too
2011-09-06 08:59:29 +00:00
karajorma
7e97177a75
Fix Mantis 2492 (Confusing help messages for the get-x-ammo SEXPs)
2011-09-06 02:29:47 +00:00
Goober5000
d94416f71b
remove unreferenced variable
2011-09-05 19:50:26 +00:00
Echelon9
aacaa2d331
Documentation: Major code cleanup of ship.cpp
2011-09-05 14:30:34 +00:00
Echelon9
7d56f961e5
PVS-Studio fix (courtesy of niffiwan): V568It's odd that the argument of sizeof() operator is the '(short) method' expression.
2011-09-05 12:49:37 +00:00
Echelon9
1de8a20958
PVS-Studio fix (courtesy of niffiwan): This is a false positive, BUT IT REALLY SHOULD be rewritten with an STL container
2011-09-05 12:47:12 +00:00
karajorma
1fe4fdeaef
Fix the cloaked ship flag not saving.
2011-09-05 00:05:20 +00:00
Valathil
02848eb577
Fixed a little misunderstanding of the collision query framework in the sun occlusion test
2011-09-04 20:01:34 +00:00
The_E
5ea6138708
A bit of cleanup here. Removed unnecessary "if (true)" and changed the sexp code to use the already written armor_type_get_idx function
2011-09-04 19:33:09 +00:00
Valathil
944ea0b367
Implemented Sun occlusion for Cockpit models and shown Ship models
2011-09-04 15:48:05 +00:00
Echelon9
47ce96863f
PVS-Studio fix: Mark a false positive reported by niffiwan
2011-09-04 15:30:34 +00:00
The_E
e63a8680f9
PVS Studio fix: V535 The variable 'j' is being used for this loop and for the outer loop.
2011-09-04 12:36:33 +00:00
The_E
c187041e9f
PVS Studio fix: Variable "item_index" was assigned values twice in succession
2011-09-04 12:35:14 +00:00
The_E
d283d5800d
Another false alarm from PVS Studio
2011-09-04 12:33:00 +00:00
The_E
834e383c26
Marking a bunch of PVS Studio warnings as false alarms. While the warnings are technically correct, none of these are in places where performance matters.
2011-09-04 12:31:33 +00:00
The_E
5bec06b168
PVS Studio fix: V803 Decreased performance. In case 'obji' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator.
2011-09-04 12:14:35 +00:00
The_E
b92c6402a4
More false alarms from PVS Studio
2011-09-04 12:13:31 +00:00
The_E
124138ae07
PVS Studio related: Mark false alarms as such
2011-09-04 10:14:17 +00:00
The_E
790dba1d3d
PVS Studio related: Mark false alarms as such
2011-09-04 09:35:08 +00:00
The_E
383403967c
PVS Studio fix: V510, class type argument passed to sprintf
2011-09-04 09:31:30 +00:00
The_E
c14d9213d2
Change batch_render_* to use iterators
2011-09-04 08:19:21 +00:00
Swifty
8e2fbd8b9e
Thrusters render in the proper position when drawing an auto centered model.
2011-09-04 06:54:09 +00:00
Goober5000
001baa29a2
remove unneeded Assert
2011-09-04 05:43:42 +00:00
Goober5000
bab303963b
fix a bug from the waypoint conversion
2011-09-04 00:41:05 +00:00
Goober5000
0e278350d7
d'oh... in most cases, atoi(CTEXT(n)) should be eval_num(n)
2011-09-03 21:46:49 +00:00
Valathil
107f02d8d6
Fix tcache_set() OpenGL Errors by not using vertex attributes when drawing distortion Thrusters
2011-09-03 16:17:19 +00:00
Echelon9
e3c100d5fa
Documentation: A few documentation fixes
2011-09-03 09:06:00 +00:00
Echelon9
67658b89c8
Documentation: A few documentation fixes so that Doxygen 1.7.5.1 outputs a clean log
2011-09-03 08:25:53 +00:00
Echelon9
eda7103399
PVS-Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 1281, 1312.
2011-09-03 05:38:28 +00:00
Echelon9
6c55c061c4
Suppress a PVS-Studio false positive
2011-09-03 05:34:08 +00:00
Echelon9
f701d00d0a
PVS-Studio fix: V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present (starfield.cpp).
2011-09-03 05:31:12 +00:00
Echelon9
4f2574dddb
PVS-Studio fix: V592 The expression was enclosed by parentheses twice: '((cur_sep > 0.9f * desired_sep))'. One pair of parentheses is unnecessary or misprint is present (aicode.cpp).
...
I think this is the right fix. In addition the code comments did not reflect what was happening, so I've updated these to reflect the if() comparison.
2011-09-03 05:20:27 +00:00
Goober5000
3b5512d60a
whoops
2011-09-03 04:30:23 +00:00
Goober5000
725762bf35
The_E made the wrong fix; this is the right one
2011-09-03 02:34:14 +00:00
Goober5000
70a1873c86
a bunch of small PVS-Studio fixes (mostly duplicate assignments)
2011-09-03 02:25:39 +00:00
Goober5000
43cbdb0783
wl_fury_missile_offset_hack was only applicable for FS1
2011-09-03 02:21:20 +00:00
Goober5000
eee761ab79
PVS-Studio fix: V507 Pointer to local array 'name' is stored outside the scope of this array. Such a pointer will become invalid. code missioncampaign.cpp
...
(This is a Volition bug! In all other locations, Campaign_file_names and Campaign_names are set using strdup.)
2011-09-03 01:48:06 +00:00
Goober5000
c7ddf2f619
PVS-Studio fix: V506 Pointer to local variable 'terminus' is stored outside the scope of this variable. Such a pointer will become invalid.
2011-09-03 01:45:56 +00:00
Goober5000
2ce8ca62cf
PVS-Studio fix: V804 Decreased performance. The 'strlen' function is called twice in the specified expression to calculate length of the same string.
2011-09-03 01:32:07 +00:00
Goober5000
09bb4ab771
PVS-Studio fix: V804 Decreased performance. The 'strlen' function is called twice in the specified expression to calculate length of the same string.
2011-09-03 01:15:20 +00:00
Goober5000
ee4e1f2afa
PVS-Studio fix: V805 Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) != 0' construct. A more efficient way is to check: str[0] != '\0'.
...
(and sorry Kazan, you don't get to call your for statement a work of art if you use strlen inefficiently)
2011-09-03 01:05:00 +00:00
Valathil
22c4cf13da
Changed Sun glow and lens flare rendering to not be obscured by objects
2011-09-01 19:35:17 +00:00
Valathil
a67f2d4f29
Enable alpha channel on render to texture targets and provide scripting functions with alpha capabilities
2011-09-01 16:16:03 +00:00
Echelon9
45f8701e68
Documentation: Code cleanup of missionbriefcommon.cpp
2011-09-01 13:50:37 +00:00
Echelon9
4201582786
Let's have another go at this one... around we go again
2011-09-01 13:08:32 +00:00
karajorma
7df5137ac4
Fix a mismatch.
2011-08-31 14:06:19 +00:00
Echelon9
a20c658026
cppcheck fix: Memory leak in icon table parsing.
2011-08-31 13:53:14 +00:00
Echelon9
3063b2cd85
Undo my rather silly patch, apply niffiwan's patch as a temporary measure (at least).
2011-08-31 13:48:23 +00:00
Echelon9
2abd999dd9
PVS-Studio fix: V522 Dereferencing of the null pointer 'snd' might take place. Check the logical condition (autopilot.cpp)
2011-08-31 13:25:14 +00:00
Echelon9
9be05a4d7f
PVS-Studio fix: V523 The 'then' statement is equivalent to the 'else' statement (psnet2.cpp).
...
This one was particular bad as it code have lead to remotely induced crashes over the network with oversize packets.
2011-08-31 13:12:46 +00:00
Echelon9
dc29308c31
PVS-Studio false positive: V581 The conditional expressions of the 'if' operators situated alongside each other are identical.(hudtarget.cpp)
2011-08-31 13:02:44 +00:00
Echelon9
81f5d8ee99
PVS-Studio false positive: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 185, 189 (dscap.cpp)
2011-08-31 13:00:57 +00:00
Echelon9
bcb60d8bd0
PVS-Studio false positive: V537 Consider reviewing the correctness of 'y' item's usage (3dmath.cpp)
2011-08-31 12:58:58 +00:00
Zacam
64efa9f2fa
Clean up the commented out code from niffiwan's PVS-Studio patches. (from niffiwan)
2011-08-31 10:58:33 +00:00
Zacam
10445ba0c3
MSVC Analysis C6244: Local declaration of <variable> hides previous declaration at <line> of <file>. (lock_world_pos; 31; hudlock.cpp)
2011-08-31 09:59:55 +00:00
Zacam
def9877ade
MSVC Analysis C6246: Local declaration of <variable> hides declaration of same name in outer scope. (wip, swp, objp, j)
2011-08-31 09:37:20 +00:00
Zacam
e21235bfb9
Fix for 7590: Shipp can be NULL, which would lead to a crash. This resolves that crash from happening.
2011-08-30 22:59:57 +00:00
The_E
0525e871d0
PVS Studio related: Mark false alarms as such.
2011-08-30 17:46:49 +00:00
The_E
724f1be9d3
Removing the RELEASE_REAL define from ye olde ✌️ days. We really don't need it anymore.
2011-08-30 17:46:03 +00:00
The_E
9e8f902ed3
PVS Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical.
2011-08-30 17:40:00 +00:00
Swifty
fa54551e26
Engine glows no longer render when on the wrong side of a warp-in/out.
2011-08-30 17:39:48 +00:00
The_E
9d9d2d0eb2
PVS Studio fix: V576 Incorrect format. A different number of actual arguments is expected while calling 'Format' function. Expected: 2. Present: 3.
2011-08-30 17:29:56 +00:00
The_E
57fae21a9c
PVS Studio fix: V567 Undefined behavior. The 'index' variable is modified while being used twice between sequence points.
2011-08-30 17:28:39 +00:00
The_E
27e0c1b3b2
PVS Studio fix: V547 Expression 'character <= 127' is always true. The value range of signed char type: [-128, 127].
2011-08-30 17:26:57 +00:00
The_E
0ce71ca239
PVS Studio fix: V541 It is dangerous to print the string 'base' into itself.
2011-08-30 17:24:50 +00:00
The_E
b15d864aac
PVS Studio fix: V541 It is dangerous to print the string 'ani_name' into itself.
2011-08-30 17:23:01 +00:00
Echelon9
3453cc9c70
PVS-Studio fix: V576 Incorrect format. Consider checking the [third] actual argument of the 'sprintf' function. The SIGNED integer type argument is expected.
...
Fixes a number of this class of issue with sprintf formats.
2011-08-30 15:39:29 +00:00
Echelon9
a03118b88d
PVS-Studio fix: V805 Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) == 0' construct. A more efficient way is to check: str[0] == '\0' (missioncampaign.cpp).
2011-08-30 15:17:28 +00:00
Echelon9
a5bd4b9845
PVS-Studio fix: V523 The 'then' statement is equivalent to the 'else' statement (shipfx.cpp).
...
Also take opportunity to clean up the BSG warp effect code. That duplice if() else() had been included since the original WMC commit in r5261.
2011-08-30 14:32:10 +00:00
Echelon9
64d2e8b9fb
PVS-Studio fix: V803 Decreased performance. In case 'aip->wp_index' is iterator it's more effective to use prefix form of decrement. Replace iterator-- with --iterator.
2011-08-30 14:06:03 +00:00
The_E
e3039d3ea4
PVS Studio fix: V570 The 'end_angle.a1d [axis]' variable is assigned to itself.
2011-08-30 13:55:36 +00:00
The_E
2a723f78b0
PVS Studio fix: V547 Expression is always true. Unsigned type value is always >= 0.
2011-08-30 13:48:56 +00:00
The_E
c7422150fc
PVS Studio fix: V535 The variable 'i' is being used for this loop and for the outer loop.
2011-08-30 13:46:00 +00:00
The_E
003ed628c7
PVS Studio fix: V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 279, 287.
2011-08-30 13:40:36 +00:00
The_E
32bc367306
PVS Studio fix: "delete operator applied to non-pointer"
2011-08-30 13:38:33 +00:00
The_E
1aa806a3ab
PVS Studio fix: duplicated "!strlen(filename)" check
2011-08-30 13:21:28 +00:00
Echelon9
5a0dc8f6b1
PVS-Studio (courtesy of niffiwan): V523 The 'then' statement is equivalent to the 'else' statement (techmenu.cpp).
2011-08-30 13:12:51 +00:00
Echelon9
8a4482c827
PVS-Studio fix (courtesy of niffiwan): V523 The 'then' statement is equivalent to the 'else' statement (missiontraining.cpp).
2011-08-30 13:06:28 +00:00
karajorma
7ca92457b4
PVS-Studio fix: V512 A call of the 'memset' function will lead to underflow of the buffer 'type'.
...
Never really would matter but it's a waste of memory declaring an int buffer and then only using 1/4 of it
2011-08-30 11:50:23 +00:00
Goober5000
2ef9fa11b6
add fire-beam-at-coordinates, which is as awesome as it sounds
2011-08-30 07:29:57 +00:00
Goober5000
3f1fcf2e71
having null iterators is apparently a no-no according to the C++ standard, so use a globally defined invalid iterator instead
2011-08-30 07:27:32 +00:00
karajorma
af96b121b6
Gliding remains on when the player restarts a mission.
2011-08-30 04:12:55 +00:00
Goober5000
3ce69f150a
waypoints and waypoint paths now have dynamic limits
2011-08-30 03:35:42 +00:00
karajorma
caff640862
Documentation for the Multiplayer SEXP system.
2011-08-30 00:18:32 +00:00
Echelon9
9a76fcfe78
PVS-Studio fix: V515 The 'delete' operator is applied to non-pointer (hud.cpp).
2011-08-29 16:08:03 +00:00
Echelon9
e58723d589
PVS-Studio fix (Courtesy of niffiwan): V523 The 'then' statement is equivalent to the 'else' statement (barracks.cpp and missionhotkey.cpp).
2011-08-29 13:19:58 +00:00
Echelon9
b55516dfdb
Documentation: Code cleanup of sexp.cpp
2011-08-28 15:10:07 +00:00
Echelon9
a5249cf57c
Reverting 7545: Due to some odd errors coming through as Asserts in cfile.cpp
2011-08-28 12:48:20 +00:00
Echelon9
81c9c92479
PVS-Studio fix: V516 Consider inspecting an odd expression. Non-null function pointer is compared to null: 'jumpnode_get_by_name == 0' (sexp.cpp).
...
Ironic that check_sexp_syntax() appeared to have a mistake in it's check functions.
2011-08-28 09:49:02 +00:00
Echelon9
5386b9da7c
PVS-Studio fix: V555 The expression '(now - bi->last_down_check) > 0' will work as 'now != bi->last_down_check'.
...
Due to unsigned int type wrapping the former code would have always returned true.
2011-08-28 09:41:54 +00:00
Echelon9
9c0edf2d64
Documentation: Code cleanup in multi_obj.cpp
2011-08-28 09:36:18 +00:00
Echelon9
66dd978878
PVS-Studio fix: V519 The 'num_users' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 2296, 2297 (multi_pxo.cpp)
2011-08-28 09:34:09 +00:00
Echelon9
91f01706fd
PVS-Studio fix: V519 The 'player_index' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1389, 1392 (multi_obj.cpp)
2011-08-28 09:32:55 +00:00
Echelon9
9bd9ea619d
PVS-Studio fix: V519 The 'list_size' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 597, 604 (gropenglpostprocessing.cpp)
2011-08-28 09:31:21 +00:00
Echelon9
b765ca37b9
PVS-Studio fix: V519 The 'path_index' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 12782, 12809 (aicode.cpp)
2011-08-28 09:30:07 +00:00
Echelon9
cb07f76f6c
Documentation: Clean up lua.cpp
2011-08-28 08:54:10 +00:00
Echelon9
80a027a400
PVS-Studio fix: V803 Decreased performance. In case 'tvs' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator.
...
For further discussion see, http://www.viva64.com/en/b/0093/
The scenarios where it will improve performance are under Debug builds. This improvement will however allow quicker use of other profiling tools that need to run on Debug builds.
Note. Code with size_t does not see the performance improvement comparison to iterators due to absence of array overrun check.
2011-08-28 08:31:25 +00:00
Echelon9
2226ca29d8
Revert r7546 -- will need more work.
2011-08-28 07:39:56 +00:00
Echelon9
34084aebe6
PVS-Studio fix: V501 There are identical sub-expressions '(stricmp (szCmd, "372") == 0)' to the left and to the right of the '||' operator.
...
and
V501 There are identical sub-expressions '(stricmp (szCmd, "375") == 0)' to the left and to the right of the '||' operator.
2011-08-28 07:27:53 +00:00
Echelon9
2d01954585
PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 80 to 76 bytes by rearranging the fields according to their sizes in decreasing order.
2011-08-28 07:16:42 +00:00
Echelon9
9fa25a9ae4
PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 50 to 48 bytes by rearranging the fields according to their sizes in decreasing order.
2011-08-28 07:08:40 +00:00
Echelon9
58b77fb8f9
PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 52 to 48 bytes by rearranging the fields according to their sizes in decreasing order.
2011-08-28 07:03:57 +00:00
Echelon9
93622a3748
PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 40 to 32 bytes by rearranging the fields according to their sizes in decreasing order.
2011-08-28 07:00:38 +00:00
Echelon9
499c698ba8
PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 24 to 20 bytes by rearranging the fields according to their sizes in decreasing order.
2011-08-28 06:55:00 +00:00
Echelon9
a93f7d50fd
PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 28 to 24 bytes by rearranging the fields according to their sizes in decreasing order.
2011-08-28 06:50:02 +00:00
Goober5000
7931831cbe
add dynamic vector stuffing
2011-08-28 03:31:46 +00:00
Goober5000
13366ad45b
add linked lists, woot
2011-08-27 05:27:24 +00:00
Goober5000
9ef2aac09a
return special exp values to ints, per discussion with Zacam awhile ago
...
while we're at it, change kamikaze damage to int since it's treated as such
2011-08-27 05:08:39 +00:00
Goober5000
7f5d1b362f
enhance end-mission to possibly dump player to main hall
2011-08-27 04:39:18 +00:00
Goober5000
3b2b76206f
add infrastructure and parsing support for mission forks (vs. mission loops)
...
mission fork interface art and selection logic still needs to be written
2011-08-27 03:57:16 +00:00
Zacam
c6beca2629
Fix for Mantis 2467: untargeted heat seekers ignore ship protect
...
from niffiwan: http://www.hard-light.net/forums/index.php?topic=78001.0
2011-08-26 00:17:45 +00:00
Zacam
2115469681
Alt Name field for ships not being set was interfering with displaying the ship class or name in the loadout screen when selecting a weapon said ship could not carry. This fixes that. From Wanderer, via Karajorma.
2011-08-25 07:33:49 +00:00
Zacam
9bbc485f0c
Slight update to optimize the built in main-f.sdr.
2011-08-25 02:42:05 +00:00
karajorma
7952433415
I've already removed this section of code once! Let's see if it stays out this time!
2011-08-25 02:36:10 +00:00
Sushi
04af101eda
Add "$Max Turrets per Bomb" and "$Max Turrets per Target" turret attributes. Allow per-turret control over maximum number of targeted bombs and ships (respectively). Works like "$Max Turret Target Ownage" but on a per-turret basis, and with the ability to affect incoming bombs as well.
2011-08-25 01:33:44 +00:00
Echelon9
0b17acff72
Documentation: Cleanup a few comments in pstypes.h
2011-08-24 21:27:07 +00:00
The_E
fe0ec8dffa
Update for the ad.playMusic() function so that it accepts a volume parameter
2011-08-24 15:20:04 +00:00
Echelon9
d208740bcd
PVS-Studio fix: V524 It is odd that the body of 'ds_eax_set_preset' function is fully equivalent to the body of 'ds_eax_set_environment' function (ds.cpp, line 2091).
2011-08-24 15:06:22 +00:00
Echelon9
a47f5b4069
PVS-Studio fix: V525 The code containing the collection of similar blocks. Check items 'Scene_color_texture', 'Scene_color_texture', 'Scene_depth_texture' in lines 2073, 2076, 2079. code gropengldraw.cpp
2011-08-24 14:56:48 +00:00
Echelon9
c2e41e4a95
PVS-Studio fix: V524 It is odd that the body of 'l_Object_getrvec_f' function is fully equivalent to the body of 'l_Object_getfvec_f' function (lua.cpp, line 4735).
2011-08-24 14:52:05 +00:00
Echelon9
dbcce6b112
PVS-Studio fix: V524 It is odd that the body of 'fireball_level_close' function is fully equivalent to the body of 'fireball_close' function (fireballs.cpp, line 970).
2011-08-24 14:48:17 +00:00
Echelon9
a248a37d58
PVS-Studio: Fix V805. Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) > 0' construct
2011-08-24 13:37:01 +00:00
karajorma
56f758967a
Fix several SEXPs for multiplayer use. This should fix Mantis issues 2401, 2483 and 2382.
...
In addition, fix a bug caused by SEXPs that do a callback but don't send any data.
2011-08-24 08:37:11 +00:00
Goober5000
f5ad44950a
change the units on rotation acceleration to bring them in line with rotational velocity
...
this is not a compatibility break because acceleration didn't work until just a few days ago :D
2011-08-24 02:41:07 +00:00
Goober5000
b232661a78
supposedly these two checks were forgotten
2011-08-24 02:23:44 +00:00
The_E
94bb513f0f
Another FXAA change to stop it from murdering our pretty pretty starfields.
2011-08-23 19:07:58 +00:00
The_E
34e7c0c927
Removing a preprocessor define from the fxaa fragment shader that we're not using.
2011-08-23 18:41:19 +00:00
Echelon9
745ec904d5
Documentation: Minor tweaking to ai.cpp
2011-08-23 13:50:24 +00:00
Zacam
ec58a7388f
Formating the shaders entries for soft particles to match the rest of the shaders.
2011-08-22 22:18:06 +00:00
Zacam
c8d0e343e2
From jg18: Platform flag exclusion, Soft Particles wiki link.
...
(reformatting/spacing is mine)
2011-08-22 22:17:34 +00:00
Valathil
da6727d9d1
Let's try this again. Adding Framebuffer distortion thrusters and explosions.
2011-08-22 17:57:01 +00:00
The_E
14ac7a3cbf
object:checkRayCollision() for scripting, from m!m
2011-08-22 12:57:01 +00:00
karajorma
9aa338ecd8
Add a version of the event-true-delay SEXP which works using milliseconds rather than seconds.
2011-08-22 10:44:41 +00:00
Goober5000
a74ae93a14
wow... it looks like the subsystem acceleration sexp never worked until now...
2011-08-22 08:38:02 +00:00
Goober5000
f492ce292c
revert 7508, which MSVC6 doesn't like
2011-08-22 07:58:00 +00:00
IssMneur
80d3b0ed84
- make split_str use const strings were appropriate.
...
- make brief_color_text_init use const strings where appropriate.
2011-08-21 17:05:04 +00:00
Zacam
583f5c976f
Revert 7498: You should also test without optional command lines present, yellow disco screens of death in-mission are bad.
2011-08-21 04:04:45 +00:00
Goober5000
b1ad28efdb
add an option to fire-beam to force the beam to fire
...
combine fighter_beam flag into flags field
2011-08-21 01:11:24 +00:00
Goober5000
6346fc6de6
fix string length
2011-08-21 00:43:31 +00:00
Goober5000
8e27e23acc
Zacam's patch for bringing MSVC 2005 up to date
2011-08-21 00:29:11 +00:00
Valathil
89da5f6fdc
Added thruster heat distortions and explosion framebuffer effects
2011-08-20 23:31:07 +00:00
Swifty
fe605149c4
Soft sphere sprite rendering for particles, explosions, shockwaves, and thrusters.
2011-08-20 22:14:52 +00:00
Sushi
68b036a4af
Add "Fog Near Multiplier" and "Fog Far Multiplier" options for missions. Allows the FREDder to tweak distances at which ships fade out in a nebula.
2011-08-20 15:06:18 +00:00
Goober5000
bc1b977c77
rewrite facing and is-facing to be more clear; I think I also fixed a bug in the process
2011-08-20 08:25:39 +00:00
Goober5000
5a28b96872
the key should be in the training category along with the other key sexps
2011-08-20 05:55:14 +00:00
Valathil
9c5e18225e
Fixed a crash in the Ship effect SEXP so it doesn't crash the game if you try to cloak a wing with destroyed/departed/vanished ships.
2011-08-19 14:49:04 +00:00
karajorma
c56684cf43
Fix Mantis 2397 (Variables do not use more than one column when using replace data or replace variable unlike all other data)
2011-08-19 10:10:53 +00:00
karajorma
4dfa577114
Add options to send objects, shorts and ushorts via the multiplayer SEXP system.
2011-08-19 08:09:50 +00:00
Goober5000
ce48784a5f
add some sanity protections against overstuffing arrays
2011-08-19 04:39:12 +00:00
Goober5000
017699d8a3
minor tweaks
2011-08-19 04:32:24 +00:00
The_E
bb2c773d7b
Fix for Mantis 2484: Default text length for EFF files was far too short.
2011-08-18 20:21:05 +00:00
Echelon9
555a9033de
Documentation: General clean-up and function documentation
2011-08-18 16:47:54 +00:00
karajorma
77745bdb75
Doh, missed one!
2011-08-18 07:56:31 +00:00
karajorma
1a577f6473
Fixes and clean up for the multiplayer SEXP packet system.
...
- Make the system more robust against accidental attempts to write data to the packet without proper initialisation.
- Improve the error messages and function names to make clear the difference between the packet the game actually sends and the abstracted packets the coder seems to create and send in sexp.cpp
- Add a convenience methods to deal with SEXPs that don't need to write any data.
2011-08-18 07:48:59 +00:00
karajorma
df0722f929
Fixes for the multiplayer SEXP packet to prevent errors caused by the coder taking too little data out of the packet before reporting that they are done.
2011-08-18 05:24:27 +00:00
Echelon9
13d8c4e97c
Diaspora feature: Control configs override and default table
2011-08-17 14:40:13 +00:00
karajorma
dc980ecc21
Halleck's bomb scoring code
2011-08-16 09:45:14 +00:00
Goober5000
a60c3d5a2d
compilation fix
2011-08-16 04:55:47 +00:00
IssMneur
9395281267
From jg18: Add some missing wiki urls in the flag file output.
2011-08-14 23:10:08 +00:00
Zacam
608880bae5
Fred2 Open debug log now records build version data, just like fs2_open.log.
...
Updated the fs2_open.log output to declare "FreeSpace 2 Open version" instead of just "FreeSpace version"
2011-08-14 16:42:47 +00:00
The_E
d5c065bf74
When loading FXAA shaders, always use the built-in defaults.
2011-08-14 15:08:28 +00:00
Echelon9
639fd1951a
PVS-Studio fix: Expression 'b->type < 0' is always false. Unsigned type value is never < 0.
2011-08-14 14:07:11 +00:00
Goober5000
570aaf88ae
change warnings to mprintfs
2011-08-14 08:42:50 +00:00
Zacam
0054d25e0b
Shader Update: main-f updated with latest cloaking code. small amount of cleanup done as well.
2011-08-14 02:36:33 +00:00
Echelon9
37097f2d83
PVS-Studio fix: Duplicate comparison check for stricmp('FRED2_Open', scp->data.name). Instead use the second comparison to check for the same naming format as stricmp('FS2Open', scp->data.name)
2011-08-13 08:22:51 +00:00
Echelon9
c45aa93a9a
PVS-Studio fix: Calling empty() on an STL vector does not modify the content of the vector in any way. To clear, use clear(). In addition, this commit also fixes the spelling of the containing function and turns on Doxygen documentation.
2011-08-13 08:19:55 +00:00
Echelon9
3a9f72c231
PVS-Studio fix: A call of the 'memset' function will lead to underflow of the buffer 'txt'. In HudGaugeMultiMsg::render()
2011-08-11 15:31:44 +00:00
Echelon9
ddb6039161
PVS-Studio fix: The '&' operator is applied to bool type value. You've probably forgotten to include parentheses or intended to use the '&&' operator. In UI_SLIDER2::draw()
2011-08-11 14:59:16 +00:00
Echelon9
5b60b84cfd
PVS-Studio: The '&' operator is applied to bool type value. You've probably forgotten to include parentheses or intended to use the '&&' operator. In process_event_update_packet()
2011-08-11 14:56:43 +00:00
Echelon9
71255d6ba5
PVS-Studio: A call of the 'memset' function will lead to underflow of various buffers in multi code.
2011-08-11 14:53:11 +00:00
Echelon9
f25f912848
PVS-Studio fix: Fix r5260 - A call of the 'memset' function will lead to underflow of the buffer 'Valid_builtin_message_types'.
2011-08-11 14:35:03 +00:00
Echelon9
fe1c83e4eb
PVS-Studio fix: Expression 'i >= 0' is always true. Unsigned type value is always >= 0.
2011-08-11 14:18:26 +00:00
Echelon9
2808f6624d
PVS-Studio fix: Expression 'idx < 0' is always false. Unsigned type value is never < 0.
2011-08-11 14:15:05 +00:00
Echelon9
682936b8d7
PVS-Studio fix: XYZ co-ordinated were not correctly copied and pasted in parse_ship_values()
2011-08-10 16:11:29 +00:00
Zacam
1c4dacdafc
Logging update: Major/Minor/Build update so that "Build" will always be available/log correctly even when "0" (ex: 3.7.0) without also needing "Revision" present.
2011-08-10 14:23:51 +00:00
Echelon9
f2f77ccc5f
PVS-Studio fix: This if...then...else block was redundant in HudGaugeSupport::render(), as each 'then' block did the same thing
2011-08-10 14:01:15 +00:00
Echelon9
148c68b9f4
PVS-Studio fix: This if...then...else block was redundant in player_select_init(), as each 'then' block did the same thing
2011-08-10 13:58:25 +00:00
Echelon9
e7f07441f9
PVS-Studio fix: Incorrect logic within ping time colour indicator in multi_join_display_games() was overrepresenting yellow at the expense of red. Also replaced magic number with a definition.
2011-08-10 13:55:33 +00:00
Echelon9
913c4effe7
PVS-Studio fix: No need to set sinfo variable again immediately after first assignment to a different value in send_secondary_fired_packet()
2011-08-10 13:51:31 +00:00
Echelon9
283753bffa
PVS-Studio fix: No need to set Current_stage variable again immediately after first assignment to a different hard coded value
2011-08-10 13:49:42 +00:00
Echelon9
139bb5afa9
PVS-studio fix: Ensure that both x and y of Player->current_target are reset correctly in hud_lock_determine_lock_point()
2011-08-10 13:47:06 +00:00
Echelon9
8531488d1b
PVS-Studio fix: Remove duplicate if...then conditional within fs2netd_get_pilot_info()
2011-08-10 13:45:14 +00:00
Echelon9
127ac8d051
PVS-Studio fix: Remove duplicate if...then conditional within ai_process()
2011-08-10 13:43:18 +00:00
Echelon9
989916e0a7
PVS-Studio fix: Correct duplicate attempt to set the docker_aip->support_ship_signature in ai_do_objects_undocked_stuff()
2011-08-10 13:40:53 +00:00
IssMneur
973efc2865
From jg18: various polish details and a description clarification, based from descriptions within sandmanjack's launcher
2011-08-09 04:37:59 +00:00
Swifty
f6ba2141b4
Shockwaves and death explosions will stay oriented independently of player's bank.
2011-08-07 09:55:18 +00:00
The_E
abd7134e0e
ALtered according to feedback from Valathil.
2011-08-06 19:11:43 +00:00
IssMneur
1c130bbc8a
From Valathil: Fixes a problem with a min-max lifetime smart spawn weapons where it wouldn't fire except at close range
2011-08-06 18:20:34 +00:00
The_E
20346118c6
Another sprite rendering fix from Valathil
2011-08-05 21:39:14 +00:00
Swifty
f35b322397
Ship-specific gauges will only get preprocessed once.
2011-08-05 09:06:31 +00:00
The_E
154f90823c
Another sprite rendering fix from Valathil
2011-08-04 21:46:21 +00:00
The_E
55427f1690
Patch for sprite orientation from Valathil
2011-08-04 16:25:19 +00:00
Zacam
7cb68f6de2
Resolves MSVC complaint about "'i' : unreferenced local variable" for the size_t in "void game_render_hud(camid cid)"
2011-08-04 13:58:46 +00:00
The_E
e6f0e0e956
Ooops, meant to use a pointer there.
2011-08-04 13:34:33 +00:00
The_E
4dd9021e9c
Resolve an "uninitialized Variable" warning
2011-08-04 13:33:35 +00:00
The_E
aa9bb91dd7
And another one.
2011-08-04 13:17:55 +00:00
The_E
300ee6f9e9
Slight correction to make nvidias GLSL compiler happy
2011-08-04 13:16:32 +00:00
The_E
ac8b7c4c10
From m!m: Adds access to collision data to the Lua API.
2011-08-04 11:05:25 +00:00
Swifty
5283c36d34
Let's try this again without breaking the orb radar: Optimized BSG radar and cockpit displays. Fixed cockpit models not switching when changing ships.
2011-08-04 11:01:28 +00:00
The_E
47b1f57435
Adding the function "ship::addShipEffect(string name, int duration)" to the LUA API.
2011-08-04 10:58:28 +00:00
IssMneur
bb75f7fc4e
Move clear-subtitles to the camera subcategory in FRED.
2011-08-03 04:12:46 +00:00
The_E
4a488dd7f0
Reverting 7411 due to it breaking the standard 3D radar.
2011-08-02 13:02:34 +00:00
Swifty
043d56b3f7
For Diaspora: Optimized BSG radar rendering and cockpit displays. Fixed cockpit models not switching when changing ships.
2011-08-02 10:49:51 +00:00
The_E
43e220aa68
Fix for issue with the weapon select sound not playing when weapon_choice_3d was active
2011-08-01 20:39:31 +00:00
IssMneur
64ff2ba5a5
Complain correctly about pilot name length (actually say that the name is too long rather than just an assert).
2011-08-01 20:10:51 +00:00
The_E
ab30a9662d
Updating the internal shaders a bit
2011-08-01 18:38:04 +00:00
The_E
91e54218a7
Correcting a little oversight with the $Selection Effect: tbl entries
2011-08-01 18:06:58 +00:00
The_E
fd29f15e12
Make external weapon models cloak when the mothership is cloaking.
2011-08-01 11:56:06 +00:00
The_E
ebf412d9f4
From Valathil: Allow shader effects to be less wrong if the Post-processing framebuffer is not active
2011-07-31 20:37:42 +00:00
The_E
d366751420
Request by MjnMixael: clear-subtitles sexp
2011-07-31 20:35:34 +00:00
The_E
245ed41f71
Moving ai_profiles parsing up a few lines to fix issue with $Default Weapon select effect
2011-07-31 20:21:35 +00:00
Echelon9
e4125bab11
Picked up by MSVC analyser: Lock down these cases of unsafe string operations
2011-07-31 13:41:13 +00:00
Echelon9
7d8ec67a99
Fix Apple support for vglDrawBuffers, part of the new shader code
2011-07-31 08:03:04 +00:00
The_E
43c6cd2539
Updating the sexp description
2011-07-30 23:21:28 +00:00
The_E
4c919f0a59
Fixes issue with post_processing.tbl parsing
2011-07-30 22:45:53 +00:00
The_E
2dc34f3e1f
This is the correct version now.
2011-07-30 22:39:49 +00:00
The_E
7f219cad2c
Reverting due to bugs
2011-07-30 22:32:09 +00:00
The_E
3a702bdc1a
This should have been committed as well
2011-07-30 21:43:30 +00:00
The_E
32c5491d83
Adding support for the new cloaking effect.
2011-07-30 21:13:02 +00:00
The_E
c1ed95995d
Fixes issue regarding UI sounds and built-in retail ship/weapon effects being of different length.
2011-07-30 19:49:49 +00:00
karajorma
04348d856d
Ignore-key SEXP and the changes needed to support it.
2011-07-30 18:54:02 +00:00
The_E
466441a58b
Slight fix for issue with SSMs hitting the player ship
2011-07-30 07:31:24 +00:00
The_E
9e423a8bca
Fixes issue with Default ship/weapon select ai_profiles entries.
2011-07-29 13:53:35 +00:00
The_E
23f7fcfd07
Woops, built-in shader was incorrect
2011-07-27 14:44:43 +00:00
The_E
8fb2085a9d
Adding the realtime ship/weapon select effects by Valathil.
2011-07-26 22:02:12 +00:00
Zacam
9d212a5f07
From Plombo: sets "force_s3tc_enable" for some linux drivers to be able to render DDS textures.
...
http://www.hard-light.net/forums/index.php?topic=77196.0
2011-07-25 22:10:32 +00:00
The_E
83d1fe8f5f
Update to FXAA 3.11
2011-07-23 10:14:36 +00:00
Echelon9
ea27c04867
Documentation: Resolve a Doxygen warning on the unpack_frame() and unpack_frame_from_file() functions
2011-07-23 04:38:16 +00:00
Zacam
96925143c1
Resolves SSE detection issues on #including <xmmintrin.h> for GCC/G++ and MSVC6.
...
GCC/G++ users (Apple, Linux) should look to adding intrinsics to their compile options. (-msse)
2011-07-23 02:07:19 +00:00
The_E
76dfdc4ba7
Another change to make compilers happy. This time, it's ATi's turn.
2011-07-22 20:54:46 +00:00
Zacam
f2cc1239dd
If we declare inv2A as a float up top, we no longer need to brace out any instances which resolves cross initialization as well as still allowing MSVC6 to remain operational (per 7372). Minor formating cleanup as well.
...
Thanks to Goober and Plombo for feedback.
2011-07-22 18:32:22 +00:00
Goober5000
96736a29ea
fix compile problems on MSVC6
2011-07-22 05:56:46 +00:00
Goober5000
8dac846455
fix Mantis #2474
2011-07-22 05:55:04 +00:00
Goober5000
6422ac62e0
revert 7368: these are most certainly not graphics options
2011-07-22 05:13:28 +00:00
The_E
646046538c
Small change to make nvidias' GLSL compiler happier
2011-07-21 20:44:26 +00:00
The_E
39a1a01a63
Moving the -window and -fullscreen_window cmdline options to the "Graphics" section
2011-07-21 16:29:49 +00:00
The_E
bbae282db5
Update FXAA to 3.10. Also changes the fxaa preset selection method to recompile shaders when preset changes, should yield some speed improvements.
2011-07-21 12:18:37 +00:00
Zacam
6e8265278a
This is not a repeat of 7340/7344. It is necessary however that we be able to tell users the value found before we reset it to zero, otherwise the warning will only ever return 0 instead of the bogus value.
2011-07-21 06:02:42 +00:00
The_E
7f5c3d343e
Valathil's code cleanup patch.
2011-07-20 18:04:43 +00:00
The_E
a61116b42b
Remove unreferenced variable.
2011-07-20 15:54:28 +00:00
The_E
519819b550
More lighting patches from Valathil
2011-07-20 15:27:59 +00:00
The_E
60c4ca8eb3
Changing this Warning to an mprintf. We really do NOT want to generate warnings with retail data, don't we?
2011-07-19 22:00:27 +00:00
The_E
1d3aa79e6b
Split the fxaa shader in two for better compiler compatibility
2011-07-19 21:51:37 +00:00
The_E
084465a613
Updating the built-in fxaa shaders to 3.9
2011-07-19 18:23:32 +00:00
Echelon9
c6d0f6170d
For Valathil: Fix distance check in beam.cpp
2011-07-19 13:25:42 +00:00
The_E
c57dd1ed07
From m!m: Gives scripting access to debris chunk size data
2011-07-18 17:58:49 +00:00
Sushi
bbfc33eb40
Revert 7340 and 7344, since they derped hard. (Kept 7341)
2011-07-18 14:54:41 +00:00
Zacam
1e7caaccda
Update:
...
libpng now at 1.5.2 (with update to pngutils)
zlib now at 1.2.5
(Files are in "LF" instead of "CRLF" this time around.)
MSVC6-2010 and XCode project updates included.
2011-07-17 05:46:14 +00:00
Zacam
1e7c5e65b3
Update to Post_Processing for split controls on Brightness and contrast.
...
Spacing/formatting clean-up.
2011-07-17 04:39:10 +00:00
Zacam
8cbffd6065
From Valathil: Beams now use Tube lighting. Updates to main shaders accordingly.
2011-07-17 04:36:00 +00:00
Swifty
6488b73b0a
Corrected directive gauge to use both X and Y offsets.
2011-07-14 07:08:53 +00:00
The_E
7b2c8f7086
From Valathil: Do light sorting only once per object
2011-07-13 09:03:03 +00:00
Goober5000
a308e6f45f
Valathil's fixes for #weak weapon variants
...
http://www.hard-light.net/forums/index.php?topic=77060.0
2011-07-13 07:33:29 +00:00
Zacam
513d2d7182
Copeh Pasteh does not make for al dente.
2011-07-11 19:09:10 +00:00
Goober5000
2eb4bb3aec
deal with string truncation on MSVC6
2011-07-11 02:10:48 +00:00
Goober5000
bff6c5d16d
Valathil's method will fail on a string that is less than 60 chars and does not contain a :, so use memset, which is the historical technique
2011-07-11 02:05:27 +00:00
Zacam
cc46867722
Additional warning messaging for parsing the ai_profiles.tbl or -aip.tbm.
2011-07-10 17:21:33 +00:00
Zacam
8438530258
From Valathil: ai_profiles tbl/tbm will now parse set_flags and warn on unrecognized declarations when found.
...
Credits to Spoon and WoD for unveiling this over-sight.
2011-07-10 17:05:57 +00:00
The_E
53428e2b62
Reverting 7334 and 7333, following feedback from valathil
2011-07-09 13:14:49 +00:00
Echelon9
872f8589b7
Fix r7325: Asset() =/= Assertion()
2011-07-07 12:59:38 +00:00
Zacam
1dd78de5ff
Directional Lights sorting probably should not have been flipped, the rest seem to be okay though.
...
(Sun facing sides of ships were going pitch dark when lots of beams were active)
2011-07-06 23:07:09 +00:00
Zacam
a312b49bc9
From Valathil: Correction to commit 7292. Light sorting now takes place in the proper order.
2011-07-06 20:55:45 +00:00
The_E
4fdfd96b8f
Major change to FXAA. Now doing a prepass to convert the main shaders' RGBA output into RGBL. Also enables minor speedup for OpenGL 4/4.1 capable chips. Default preset changed to 6.
2011-07-06 10:48:56 +00:00
Goober5000
0244c64214
a wee bit more is needed
2011-07-06 05:06:22 +00:00
Goober5000
b175a91843
make things compile
2011-07-06 04:44:25 +00:00
Goober5000
eeeb1a8898
don't assert on a benign conflict
2011-07-06 04:39:40 +00:00
IssMneur
2272fd28e2
From Valathil: Vary the intensity of lighting from warp fireballs (wormhole) based on the radius of the fireball.
2011-07-06 04:22:09 +00:00
The_E
4fa70b61db
New FXAA shaders. These have an increased preset range, going from 0 to 9 inclusive. Presets 0 - 4 use the "Console" version of the algorithm, 5 - 9 get the "PC" version
2011-07-05 12:35:18 +00:00
The_E
9db07896e1
Wasn't supposed to change this
2011-07-04 14:59:12 +00:00
The_E
28bbbdab09
Reverting, due to unforeseen consequences
2011-07-04 14:55:07 +00:00
The_E
48610b1de5
Small update to the FXAA shaders. Also adds a function for shader uniform access that was previously missing.
2011-07-04 13:59:02 +00:00
karajorma
d6767809b1
Add a separator between paste and add paste in the event editor.
2011-07-04 02:22:26 +00:00
Zacam
c284047c36
I should sleep more. 7307 was to add a "{ "glUniform4fARB", 0 }," not another v.
2011-07-03 14:44:16 +00:00
The_E
5674ce0c3e
Updating these to current official versions
2011-07-03 08:40:21 +00:00
The_E
b6548dfb50
And -oldfire, which does nothing, goes to the grave.
2011-07-02 19:45:46 +00:00
The_E
eaf03bb480
And -safeloading bites the dust too.
2011-07-02 19:43:02 +00:00
The_E
e23da70624
Removing several deprecated/unused cmdline options. Victims this round are: -cell, -timerbar and -d3d_bad_tsys
2011-07-02 19:33:23 +00:00
Zacam
e0ae11af61
Fix for SSM usage causing Assert. If warp lifetime must be 4 seconds or greater, how about we warn them (in parsing) before they try and use it (and thus set it to at least 4.0) instead?
...
Thanks to bigchunk1 for catching this one and to IssMneur for the assist and review.
2011-07-02 05:07:57 +00:00
Zacam
c2452b69fa
This is the right way to do it.
...
Correct version of 7304.
2011-07-02 01:02:26 +00:00
Zacam
54644adfb8
...but apparently not that way.
2011-07-02 00:14:04 +00:00
Zacam
9f00e84edf
OGL_UNIFORM4FV should be (and now is) preceded by OGL_UNIFORM4F.
2011-07-01 23:37:30 +00:00
The_E
5d210146e3
Built-in bloom shader adjusted for higher quality
2011-07-01 19:09:25 +00:00
The_E
ff7b3cdaaf
Minor typo correction. Thanks to Valathil for finding it.
2011-07-01 19:00:57 +00:00
The_E
f768943284
Swifty's collision detection improvements.
2011-07-01 17:00:31 +00:00
The_E
f22bef9b5e
Another small change to the built-in shaders
2011-07-01 11:33:09 +00:00
The_E
c806651d11
From Valathiel: enables light sorting. Reduces light flickering in some cases.
2011-07-01 10:00:55 +00:00
The_E
9d6e0936cd
Minor adjustment to the built-in shaders
2011-06-30 10:06:01 +00:00
The_E
a46de9340f
Fix for Mantis 2395: Introduces troubleshooting flag to switch between using glDrawElements and glDrawRangeElements
2011-06-28 20:20:25 +00:00
The_E
aaba640733
Fix for Mantis 1983: Do not process lightning info when in standalone mode
2011-06-28 19:48:20 +00:00
The_E
d60e3787d1
Fix for Mantis 2424: Crashes in multiplayer when <Wingname> 1 is not a player ship
2011-06-28 19:24:13 +00:00
The_E
3a451f36b5
When will I get it right....
2011-06-28 14:13:21 +00:00
The_E
a955dfa6dc
Aaaargh, messed up AGAIN.
2011-06-28 14:10:23 +00:00
The_E
28e82d9c5b
Ooops, fucked this one up a bit.
2011-06-28 14:07:34 +00:00
The_E
28db0bfe1f
How did these values start colliding all of a sudden? Must have been my fault, sorry.
2011-06-28 09:38:06 +00:00
The_E
59cbde3d9e
Adds sexps to manipulate a ships' collision groups. If two objects are members of the same collision group, they will not collide with each other.
2011-06-28 08:36:54 +00:00
Goober5000
e4266af9cf
add string-get-substring, string-set-substring, and string-get-length; needed for Blue Planet
2011-06-28 04:08:59 +00:00
Zacam
524099c68e
Some "\n"'s to help with logging during multi. "Scoring:" wasn't using any, so it would run on the next item right at the end.
2011-06-28 01:03:03 +00:00
The_E
c57ede0cc1
Adding a piece of sanity checking here, to avoid crashing the release build under certain strange circumstances
2011-06-27 22:16:41 +00:00
The_E
a60d32e669
Disable warning that is meaningless ("why are G_predicted_pos and G_fire_pos the same?"), and only serves to confuse people.
2011-06-27 13:52:45 +00:00
The_E
fb21bc4272
Patch for Mantis 2050: Renaming the log file may cause crashes
2011-06-27 13:45:19 +00:00
The_E
4b5d6f939a
From m!m: Patch for Mantis 2459 (Calling ts.createParticle with an invalid effect handle causes an Int3())
2011-06-27 12:49:42 +00:00
Sushi
e661586a3f
Add "wait for animation" turret flag (turret won't fire until associated animation completes)
2011-06-26 18:10:54 +00:00
The_E
590cbf0b2b
Patch from m!m to give scripting access to debris metadata
2011-06-25 14:15:44 +00:00
Swifty
a7383cba89
Introduced the preprocess() method in HudGauges. Allowed the HUD to peek at the HUD message buffer when HUD is disabled.
2011-06-25 09:30:47 +00:00
The_E
f8fef5c56f
Patch for Mantis 2326: Standalone server crashes when ship classes are changed in loadout.
...
I hope.
2011-06-25 08:03:52 +00:00
Zacam
d15c9259cd
Standalone execution now creates it's own log file (fs2_standalone.log)
2011-06-21 19:23:56 +00:00
The_E
503fa0d19b
Fixes issue with padlock view messages not appearing
2011-06-19 12:57:26 +00:00
The_E
bafed3f964
Fix compiler warnings re: signed/unsigned mismatch
2011-06-18 21:36:05 +00:00
Sushi
3a7c0f2cee
Halleck's glide sound patch (mantis 2452)
2011-06-18 00:44:41 +00:00
The_E
2f01d3f0ce
Bumping the max number of files CFile can handle to 2^16
2011-06-16 17:09:30 +00:00
Zacam
1b6bfd2c89
Adds "/MP" as an Additional compiler Option for MSVC 2008.
2011-06-16 15:59:59 +00:00
Sushi
83b4d80566
Added is-in-box SEXP
2011-06-16 02:59:44 +00:00
chief1983
0a06eff122
Update OS X Ogg libraries in the Frameworks archive.
2011-06-15 20:04:07 +00:00
karajorma
65d6013539
Get and set SEXPs for countermeasures.
2011-06-15 12:46:02 +00:00
The_E
a5a34af86d
Oops, small typo
2011-06-14 16:45:35 +00:00
The_E
f187ed531e
This will make various text boxes react correctly to changes in font height.
2011-06-14 16:40:20 +00:00
Goober5000
2bdaac8c52
add mjn.mixael's credits image specification feature
2011-06-13 03:42:24 +00:00
The_E
695db665e3
Adds "$disable weapon damage scaling for player:" AI profiles option, which does what it says on the tin.
2011-06-11 19:26:56 +00:00
Sushi
4f8e6da7b9
Halleck's pre-launch sound patch (mantis 2451)
2011-06-10 04:52:35 +00:00
Zacam
0801b6861f
Back port from AP: removes a couple of Unreachable NULL returns
2011-06-07 02:30:00 +00:00
Sushi
4b6d7192a1
Merged from Diaspora: Slight bump in contrail limit and max reinforcements
2011-06-04 16:42:43 +00:00
Sushi
ed340e193f
Merged from Diaspora branch: Make "+Shield_Hit_ani" optional
2011-06-04 16:02:21 +00:00
Sushi
14717f3368
Turn Z-buffering back on for BSG warp effect.
2011-06-03 23:54:30 +00:00
The_E
cd9663f015
A small change to make Apple's GLSL compiler happy
2011-06-03 18:02:29 +00:00
chief1983
f7c4aa5221
Fix a typo reported by ElGuillermo.
2011-06-03 16:53:39 +00:00
Zacam
6f4725b0d9
In crawling through XT Branch, noticed this.
...
"%sÀÄ%s" should be "%s:%s"
2011-06-03 05:18:10 +00:00
Sushi
fcbce45a2c
Fix nasty pointer bug
2011-06-03 03:02:48 +00:00
The_E
6037493ae9
Another Assert -> Assertion conversion to help in mission debugging.
2011-06-02 09:36:24 +00:00
The_E
c71012a829
Patch for Mantis 2421 from m!m: Adds scripting controls for particles.
2011-06-01 19:41:07 +00:00
Goober5000
8d10c0864d
extra small enhancement
2011-05-30 21:20:32 +00:00
Goober5000
5fb4a6db18
add ability to set the duration of the ship death roll
2011-05-30 21:06:11 +00:00
The_E
2eab7d90f2
From m!m: Patch for Mantis 2446: Scripts not pausing when game is paused.
2011-05-30 18:47:27 +00:00
Goober5000
c6b4fc32d3
fix sanity check for too-long messages (Mantis #2412 )
2011-05-30 06:47:27 +00:00
Goober5000
600936b331
reverting 7211 because it is not a proper fix
2011-05-29 06:56:17 +00:00
The_E
5c628d2abd
Adding a code comment here to remind people about necessary bumpings
2011-05-28 14:37:48 +00:00
Zacam
e1c107a483
Back in r6952 "HUD_OBJECT_PING," was added to "static int retail_gauges[] = {" but "int num_default_gauges = 43;" was not bumped up, resulting in "HUD_OBJECT_FIXED_MESSAGES" not displaying.
2011-05-27 23:38:14 +00:00
Sushi
2106903cbc
Fixing some HUDs showing from other ships when they shouldn't, take 2
2011-05-27 14:36:14 +00:00
The_E
23b121a108
Patch for Mantis 2441 (friendly-stealth-invisible" flag doesn't work) from pyro3d
2011-05-27 09:11:51 +00:00
The_E
649c0fb3c4
Reverting commit 7203. If you wish to exclude certain gauges from rendering depending on camera mode, you need to edit that gauges's constructor function, NOT the canRender() method.
2011-05-26 20:45:12 +00:00
Goober5000
358343b813
break strings into bite-size pieces for ease of compiler digestion
2011-05-26 03:58:00 +00:00
Goober5000
0a8f93d474
fix minor pierce-shields table flag bug (Mantis #2442 )
2011-05-26 03:40:07 +00:00
Sushi
6f11196106
Added an Assertion to help track down a sound error
2011-05-24 15:03:09 +00:00
Sushi
368029ec59
Fix some HUD gauges being rendered while viewing other ships externally
2011-05-24 14:40:57 +00:00
Sushi
1d4d3c0b6f
Update thruster rendering (consistently render based on acceleration instead of speed, don't render distant/tiny thrusters)
2011-05-21 20:25:14 +00:00
The_E
784da1e0d0
Adding the FSU main shaders, FSU post-processing.tbl, as well as the post-processing and FXAA shaders to def_files.
2011-05-21 17:07:41 +00:00
The_E
3cbf515fe3
Since bloom can now be changed in-game, we always need to compile the shaders.
2011-05-20 15:56:30 +00:00
The_E
6526b86bc5
Patch for bug encountered by Zacam: Ship model instance data was not being reset correctly when changing ship classes.
2011-05-19 21:32:02 +00:00
The_E
444936ec21
This will make the lab more useful, as it is now possible to adjust the bloom intensity on-the-fly by pressing b (for more bloom) or n (for less bloom).
2011-05-19 14:51:51 +00:00
Zacam
99cdc82be6
Stupidest typo ever. "GS_STATE_END_OF_CAMPAIGN" not "_EMD_"
2011-05-19 12:20:22 +00:00
Sushi
63444087e2
Fix BSG warp effect shockwave
2011-05-19 00:50:27 +00:00
The_E
ad1297167d
Adding a bit of configurability to the FXAA business. This alters the F3 Lab so that the number keys correspond to FXAA presets (with 0 being lowest and fastest, default being 3). Also adds the "-fxaa_preset" commandline argument, which accepts a single int parameter. New Shaders needed to take full advantage of this, see forum thread ( http://www.hard-light.net/forums/index.php?topic=76145.0 ) for details.
2011-05-18 11:37:27 +00:00
The_E
814f9777c5
Adding an error message in case FXAA shader compilation fails.
2011-05-17 16:29:43 +00:00
The_E
41bfa86911
This will enable FXAA support in FSO (Read: Antialiasing as a post-process stage). In order to use it, the shaders found here: http://blueplanet.fsmods.net/E/stuff/FXAA-shaders.7z need to be in data/effects.
2011-05-17 14:57:33 +00:00
The_E
c1c9096d82
Converting a few more Asserts to Assertions. Also added a graceful exit path.
2011-05-15 08:38:22 +00:00
Sushi
8c3150455a
Fix clipping problems with deathcam and cutscene bars.
2011-05-14 16:58:29 +00:00
Echelon9
365bd811c2
Documentation: First pass of AI code functions
2011-05-12 13:44:20 +00:00
Echelon9
38257bead8
Documentation: 3D clipper functions
2011-05-12 13:43:42 +00:00
Echelon9
e1fa804c1c
Documentation: Animation code function documentation
2011-05-12 13:43:00 +00:00
The_E
70d1c6f8b1
Fixes issue where both the 2D and 3D radars were visible at the same time. Code should now respet the commandline flags properly.
2011-05-10 15:26:46 +00:00
The_E
c684705e01
This makes the "Form on Wing" AI order accessible to FREDers as an AI goal.
2011-05-08 11:17:34 +00:00
Sushi
4324ca87d6
Updated "alt1" path mode so that it respects the cap-waypoint-speed SEXP.
2011-05-07 11:31:30 +00:00
The_E
033f06ec20
Aargh, this might have been catastrophic
2011-05-01 15:05:01 +00:00
The_E
c65a175d2c
Fix compile warnings here.
2011-05-01 15:00:53 +00:00
Echelon9
e55068ccf1
ds.cpp: Back this change back out until the wholesale change can be made at once
2011-05-01 14:59:31 +00:00
Echelon9
f55260cc0e
Fix Diaspora Mantis 772: Player is able to fire countermeasures when player-use-ai SEXP is used. Also document.
2011-05-01 13:03:39 +00:00
Echelon9
761266b768
Two small comment typo corrections for model.h and ship.cpp
2011-05-01 12:00:26 +00:00
Echelon9
8138efbcf9
Documentation: Commentary for modelanim.cpp|h
2011-05-01 11:59:40 +00:00
Echelon9
aa708f6d26
Fix Valgrind report: Use of uninitialised value &freq in alcGetIntergerv(); requires braces to address GCC crosses initialisation error due to the goto in this function
2011-05-01 11:07:26 +00:00
Echelon9
dab00c94bf
Documentation: Help save some trees
2011-05-01 09:06:12 +00:00
Echelon9
4669a7613c
As we don't do Unicode properly yet, this character corrupts. In French it still means Hat Back (joystick control)
2011-05-01 08:53:13 +00:00
Echelon9
5565e0ac8b
Documentation: hud.cpp and hud.h files
2011-05-01 06:05:48 +00:00
Echelon9
aa1601bb36
Documentation: Fix a few syntax errors reported in Doxygen's log
2011-05-01 03:54:01 +00:00
The_E
744a247f67
Change syntax and help text of the set-jumpnode-model sexp, as it was rather broken before.
2011-04-30 16:23:05 +00:00
Echelon9
9a4d348bc0
Xcode project file: Generate debug builds with a DWARF plus dsym file, so that analysis tools can retrieve source code line numbers
2011-04-30 06:24:08 +00:00
Echelon9
09a360c284
Documentation: sound/ds.cpp
2011-04-30 06:18:03 +00:00
The_E
a858e90a6d
And now set-jumpnode-name is even multi compatible.
2011-04-29 14:54:38 +00:00
The_E
83bd54130b
Added warning to the sexp help for set-jumpnode-name
2011-04-29 14:10:52 +00:00
The_E
6c5013760a
set-jumpnode-name, as implemented by CommanderDJ
2011-04-29 14:05:45 +00:00
karajorma
68645bd224
Fix for Mantis 2427 (Directive-Is-Variable SEXP doesn't allow you to change the variable name.
2011-04-28 12:46:01 +00:00
Sushi
2992e88315
Add $Path Metadata and +departure rvec to ships.tbl
2011-04-27 14:22:22 +00:00
The_E
b79a54b67a
Okay. No more screwing around with this.
2011-04-26 11:13:56 +00:00
The_E
a71d012ef6
Ooops, this armor type business isn't ready yet
2011-04-26 11:09:19 +00:00
The_E
e821ae2ccd
Fix for Mantis 2428: Decal parsing deprecation error
2011-04-26 09:24:54 +00:00
The_E
d71a5d5b90
Fixes issue with custom HUD gauges not resetting to their default values between missions.
2011-04-24 17:19:21 +00:00
Wanderer
2eb06e1787
fixes to turret rotation handling (swarm issue) and to secondary turret angle checks
2011-04-23 21:53:19 +00:00
Wanderer
06a3381dd9
fix for mantis 2309's corkscrew issue
2011-04-23 12:18:30 +00:00
The_E
7e50611a02
Guarding against a null vec3D in vm_vec_normalize here.
2011-04-21 16:12:54 +00:00
Wanderer
e04d475345
related to mantis 2406 - ai profiles option to make beams deal damage to weapons
2011-04-20 15:40:29 +00:00
Wanderer
94faf22283
Fix for mantis 2406 for weapon vs. weapon collisions (not beam vs. weapon collisions however)
2011-04-20 08:17:24 +00:00
IssMneur
e6f43f6f0f
Make this a more useful error message.
2011-04-20 04:16:42 +00:00
Sushi
39d6889f86
Add "$ai path mode:" to ai_profiles. This allows an alternate method of path following that works better in some cases, such as with high-damp ships.
2011-04-18 14:08:31 +00:00
karajorma
1bba558d70
Add a SEXP to allow variables to set the counter in a directive.
2011-04-18 05:34:18 +00:00
Echelon9
5d635a262b
DOC: Amendment to frand_range()
2011-04-17 00:33:51 +00:00
Echelon9
e12f71c83d
DOC: Documentation of floating.cpp
2011-04-17 00:18:59 +00:00
Wanderer
39e8a24663
fix for issue noticed by Zacam in the particle effect changes
2011-04-15 14:34:31 +00:00
The_E
f4c90eff0c
Woops, this shouldn't have gone in
2011-04-15 12:44:24 +00:00
The_E
e5efa336c1
Fix for Mantis 2416 (Messages do not display when in padlock view)
2011-04-15 12:34:11 +00:00
The_E
ceb68d44bd
Fix for Mantis 2240 (HUD anis and training messages do not display if hud_disable_except_messages is active)
2011-04-15 12:16:17 +00:00
Wanderer
bf66734ded
adds table controls for various particle effects, and explosions related to ship death event. per ship class base deathroll time.
2011-04-14 18:59:06 +00:00
Zacam
973fab655e
Reported by chief1983, adds closing brace to line 2346.
...
Mac's should be happy now.
2011-04-12 23:35:58 +00:00
The_E
5cbf11ff6b
Of course, I did it wrong. However, this works now.
2011-04-12 13:32:27 +00:00
The_E
b68ef9b9b0
Requested by Axem: Allow beams to tag targets.
2011-04-11 15:44:33 +00:00
Echelon9
362241cf22
Documentation: hud_sensors_ok() function comment
2011-04-10 13:09:24 +00:00
Echelon9
247ac6373e
Second go at patch r7110
2011-04-08 13:00:51 +00:00
Echelon9
0a7e8be8f4
Fix two buffer overflows: missionweaponchoice.cpp(3580): warning C6386: Buffer overrun: accessing 'slot->wep', the writable size is '28' bytes, but '4194244' bytes might be written & missionweaponchoice.cpp(3585): warning C6386: Buffer overrun: accessing 'slot->wep_count', the writable size is '28' bytes, but '4194244' bytes might be written
2011-04-08 12:38:19 +00:00
The_E
9a6f8a8be7
Removing an Assert in favour of more elegant error handling.
2011-04-06 10:25:18 +00:00
The_E
092ea635c3
Fix for issue with the "no ETS" flag where subsystems were not getting recharged properly.
2011-04-05 12:05:32 +00:00
The_E
67175970a4
2011-04-05 09:44:43 +00:00
The_E
72287264e3
FSF's fix for Mantis 2371 (Hotkey selection does not work for additional wings)
2011-04-04 14:48:27 +00:00
The_E
9b580610ca
Fix for Mantis 2409 (Directive gauge is rendered despite hud-disable-except-messages)
2011-04-04 13:07:17 +00:00
The_E
406b57e5b0
Fix for Mantis 2391 (Erroneous warning about missing assets due to changd HUD loading mechanisms)
2011-04-04 13:03:29 +00:00
The_E
42ff356ad2
Fix for Mantis 2422 (Target Shield indicator behaves like a duplicate of the player shield indicator)
2011-04-04 12:56:59 +00:00
The_E
0aa44e3b12
Correction: Previous commit broke AWACS behaviour.
2011-03-30 09:42:52 +00:00
The_E
e635eb373b
Add a sanity check here.
2011-03-29 18:06:04 +00:00
The_E
ef2681eb69
Change an Assert to an Assertion for better debugging.
2011-03-29 17:17:15 +00:00
Zacam
223920ded6
7092/7093 were meant for Antipodes, not Trunk.
2011-03-29 13:55:04 +00:00
Zacam
8501ffa53f
Reported by rsaxvc (Probably due to MAX_INT being used)
...
http://www.hard-light.net/forums/index.php?topic=75332.0
2011-03-29 13:50:17 +00:00
Zacam
9c0144dd96
Pull the "demo" dir out of the makefile.
2011-03-29 13:42:57 +00:00
Echelon9
6628e967b3
DOC: Update some documentation in missionbriefcommon.cpp
2011-03-24 12:53:44 +00:00
Wanderer
db8b44191d
feature commit - damage and impact particle spew controls, control for setting a multiplier for propagating explosion radius.
2011-03-19 22:37:32 +00:00
The_E
a1acb0601d
And more from m!m, as seen here: http://www.hard-light.net/forums/index.php?topic=44821.msg1487355#msg1487355
2011-03-19 21:49:42 +00:00
The_E
808a3dd1e0
A few tweaks and additions by nuke
2011-03-19 21:37:51 +00:00
The_E
9d8caf5f2a
m!m's corrections to subsystem:fireWeapon() as seen here: http://www.hard-light.net/forums/index.php?topic=44821.msg1486751#msg1486751 . Slightly adjusted to use model instances. Also tweaked ship_get_global_turret_gun_info() to use model instances.
2011-03-18 21:47:17 +00:00
Sushi
5469769936
Add "$Detail Distance Multiplier"
2011-03-18 14:33:50 +00:00
Goober5000
b9a1eca909
improved version of hud_squadmsg_wing_valid(); fixes Mantis #2415
2011-03-11 07:21:27 +00:00
karajorma
a561ecc2a3
Remove a few annoying compilation warnings
2011-03-10 00:26:45 +00:00
Goober5000
af39be3120
add another ship class to the list of FSPort changed names
2011-03-09 04:04:33 +00:00
Goober5000
c6f40a74bb
finish patching subsystem comparison
2011-03-03 07:00:42 +00:00
Swifty
225f16f754
Memory leaks involving Polymodel_instances plugged.
2011-03-02 14:08:22 +00:00
Goober5000
e765702121
use subsystem_stricmp where appropriate
2011-02-28 08:27:52 +00:00
Echelon9
444c6b293b
Update SVN ignore keyword so we don't get documentation output in SVN
2011-02-26 01:18:16 +00:00
Echelon9
d52f90c076
First version of our Documentation system, using automated Doxygen source code comments
2011-02-26 01:15:51 +00:00
Echelon9
2c8dc2722d
Effective STL: Use Container.empty() instead of Container.size() == 0 in if() statements
2011-02-25 14:38:28 +00:00
Goober5000
b0dcbfbc56
change the subsystem warning to an nprintf, since it's a pretty benign notification and sexps don't notify you anyway
2011-02-23 05:09:24 +00:00
Echelon9
d549d06728
DOC: Further instructions on initialisation of the pseudo random number generator
2011-02-22 12:05:31 +00:00
Echelon9
634dcc7e23
Accompanying changes to aicode.cpp following staticrand.cpp
2011-02-21 14:15:34 +00:00
Echelon9
80d622f56f
A couple of other small changes to staticrand.cpp|h to address readability
2011-02-21 14:13:23 +00:00
Echelon9
1c687e4b4e
Initial testing of something very exciting for the coders...
2011-02-21 12:50:16 +00:00
Goober5000
750df36303
add slash and backslash
2011-02-19 04:51:02 +00:00
karajorma
92be430fdb
Add the Num-Valid-Arguments SEXP.
2011-02-15 08:18:58 +00:00
Goober5000
315bd423dc
rename subsystem type fields so as to better distinguish them
...
some consistency checks
add "no aggregate" flag to exclude a subsystem from aggregate hitpoint calculations
2011-02-14 08:33:23 +00:00
The_E
9f9a294e9d
More lua stuff from m!m
2011-02-13 19:45:12 +00:00
Sushi
5a9202910f
Fix a bug with friendly shield manage/cm usage
2011-02-12 17:02:23 +00:00
Goober5000
dbd13bba38
activate the OF_IMMOBILE flag, and clean up the obj_move_all loop slightly
2011-02-12 05:00:13 +00:00
Goober5000
a5cd0f8de0
gaaaah, fix a whole bunch of bugs with the no-ets flag:
...
checkbox ui settings were incorrect
checkbox wasn't hooked into the event loop
resource #define's overlapped
FRED never saved the ship flag
ship flag did not have an equivalent parse flag
sexp(s) to modify ship flag did not use the existing ship flag sexp architecture
2011-02-07 09:08:39 +00:00
Goober5000
9b0b26b643
fixed compilation error
2011-02-06 08:18:26 +00:00
The_E
13ade13402
More fixes for Mantis 2372. Should now allow longer descriptions.
2011-02-05 09:18:04 +00:00
The_E
fe51ef9df0
Minor whoopsie. This shouldn't have been committed just yet.
2011-02-05 08:59:26 +00:00
The_E
ebab2d44ff
Adding patch for Mantis 2385. This adds a "+sub_name" option to the animation code, which comes after/replaces "+sub_type" for a few triggers, such as the "weapon fired" trigger.
2011-02-04 17:18:39 +00:00
The_E
e36d312d73
Adding a bit of verification here to catch a very strange bug
2011-02-04 17:12:48 +00:00
The_E
0b9429b9ea
Adding a few error messages
2011-02-04 17:02:49 +00:00
Echelon9
9ec0215ad8
Remove last references to the redundant Intel_anim_filenames array
2011-02-04 15:31:44 +00:00
Zacam
720ad2127a
Nukes Particle Code update (for more particle types)
...
http://www.hard-light.net/forums/index.php?topic=74165.0
2011-02-04 14:10:59 +00:00
Zacam
bed42975da
Karajorma's "Clean up" code. (Not for credit, but because I'm trying to reduce the "open" number of "Code Reviews" so that we don't get too backlogged with them)
...
http://www.hard-light.net/forums/index.php?topic=74066.0
2011-02-03 07:41:16 +00:00
FUBAR-BDHR
c0df5578c8
Add node-targeted sexp
2011-02-02 06:26:21 +00:00
Goober5000
f570348ee2
--the behavior of cargo index -1 (which can only happen for capships) and cargo index 0 is substantially the same, so let's standardize on index 0... this prevents crazy stuff happening with bitwise operators on negative numbers :-/
...
--also, remove the restriction on capship cargo where ships must have the "scannable" flag
--because of the above constraints, "nothing" cannot be a meaningful subsys cargo, but then again, scanning a subsystem with "nothing" didn't do anything in the old code, so this doesn't change anything
2011-01-31 10:04:37 +00:00
Goober5000
c77551181c
fix for Mantis #2390
...
errors in handling the CARGO_NO_DEPLETE flag for ship subsystems
2011-01-31 09:18:21 +00:00
Goober5000
9df7a37f3f
fix some errors with sexp numbering that free up 2 Change slots
...
merge the Nav operators into other categories
add the new Change2 category and set up hacks so that its operators will display in Change's menu
2011-01-30 09:17:15 +00:00
Goober5000
eae11de29b
commit the "immobile" flag, requested by Black Wolf, Diaspora, etc. This is just the infrastructure; the flag doesn't actually do anything yet.
2011-01-30 08:19:17 +00:00
Goober5000
e68c34eb90
fix ship flag dlg layout, which got messed up in The E's commit
2011-01-30 08:12:42 +00:00
Goober5000
32c70d3f96
someone made a bug here!
2011-01-30 07:55:05 +00:00
Goober5000
3a9ed93730
fix compilation
2011-01-30 07:07:33 +00:00
Zacam
398523e3cc
It would have been NICE if Tortoise had actually _deleted_ the files when it asked if I wanted them removed. Stupid !@$^*&# Tortoise.
2011-01-30 06:09:42 +00:00
Zacam
9254dae233
Resolves LNK4221 under MSVC. multi_oo and psnet are not actually linked/used, so references pointing to them now go to multi_obj and psnet2 respectively. (Same as Antipodes 6881)
...
http://www.hard-light.net/forums/index.php?topic=73147.0
2011-01-30 05:59:36 +00:00
Zacam
4517320ffd
Microsoft Visual Studio 6/2005/2008/2010 project updates to use newer libjpeg code committed on 6980.
2011-01-30 01:40:18 +00:00
Echelon9
fb8910635e
Update libjpeg in source to v8c (16-Jan-11) from 6b (27-Mar-98). For more details see http://www.hard-light.net/forums/index.php?topic=74110.0
2011-01-30 01:33:52 +00:00
Goober5000
d03d5b95e7
this should fix the weird crashes in localization
2011-01-29 09:41:13 +00:00
IssMneur
a468eeb878
Allow a primary or secondary weapon shot be substituted with any other weapon in any arbitrary pattern.
...
http://www.hard-light.net/wiki/index.php/Weapons.tbl#.24Substitute :
2011-01-27 05:35:13 +00:00
Echelon9
f9fd5807d8
Resolve circa 800 warnings that occur on Xcode due to symbol visibility scoping issue.
2011-01-26 11:30:56 +00:00
Echelon9
4be2c7e94d
Small fix: Correct the spelling of a NavPoint function
2011-01-25 14:37:43 +00:00
Echelon9
04fe584c87
Chase down radardradis.h from the same location in Xcode
2011-01-25 13:10:37 +00:00
Echelon9
55c3409cf8
What's radardradis.cpp doing in that spot of the Xcode project file?
2011-01-25 13:05:58 +00:00
Echelon9
b1be9e56e0
We don't need a specific Copy Bundle Resources stage to put the Info.plist file in the Mac .app bundle, as well as setting the INFOPLIST_FILE setting. Using Copy Bundle Resources doesn't use the C preprocessor and then puts the file in the wrong location anyway.
2011-01-25 13:03:00 +00:00
Echelon9
89102e2c31
shipfx_large_blowup_init() function can have the void return type, as the caller never checks.
2011-01-25 12:25:59 +00:00
Zacam
df749e6d45
A tiny over-sight. Now incorrect values on "hud_speed_multiplier" will actually report as such.
2011-01-25 07:51:02 +00:00
The_E
4a414205a3
Fix for Mantis 2372 (+Description field in Ships.tbl is being ignored)
2011-01-23 21:20:04 +00:00
The_E
824dd0cae8
Fix for Mantis 2380 (Setting target subsystem through scripting doesn't work)
2011-01-23 17:10:53 +00:00
The_E
34b7cbe0b7
Resolves a few signed/unsigned warnings
2011-01-23 17:06:58 +00:00
The_E
76e7f656d1
Adds "no ets" ships.tbl flag.
2011-01-23 16:03:04 +00:00
Echelon9
7d7ca9eb15
Fix: warning C6246: Local declaration of 'i' hides declaration of the same name in outer scope.
2011-01-23 12:47:08 +00:00
Echelon9
e09dea7a79
Revert this change to size_t; will require the wholesale update of the weapon code indices at the same time
2011-01-23 12:30:06 +00:00
FUBAR-BDHR
9f29b454b5
Fix for FRED not compiling with new nebula lightning from r6958
2011-01-23 06:56:01 +00:00
FUBAR-BDHR
41b1476b23
Fix bug in sexp_ship_set_damage_type()
2011-01-22 06:52:43 +00:00
Echelon9
a8db22bc65
Refactored nebula lightning & removed limits on Lightning.tbl
2011-01-22 05:35:43 +00:00
Sushi
b38fa48e7e
Add "starts locked" subsystem flag (that turret starts out locked by default and needs to be turret-freed before it will fire)
2011-01-22 00:44:44 +00:00
Goober5000
110cd3bccc
add turret-protect-ship and turret-unprotect-ship
2011-01-21 08:55:26 +00:00
Goober5000
ab8808e35a
get-object-speed-* are status sexps, not change sexps!
2011-01-21 08:49:54 +00:00
IssMneur
efff8a5d83
get-object-speed-{x,y,z} added.
2011-01-21 06:28:37 +00:00
Swifty
6e52dbd299
Resolved some issues involving the Ping Indicator not displaying.
2011-01-19 09:21:22 +00:00
karajorma
b742eac806
LuaPineapple's fix for Mantis 2322.
...
Some comment clean up.
2011-01-19 08:24:26 +00:00
The_E
b4db3b3ecf
FUBAR's damage type sexps. Tested ad nauseum by BP.
2011-01-18 16:21:36 +00:00
Goober5000
34fd0c53ad
make subsystem-vanish consistent with ship-vanish
...
clarify sexp help and fix name (using deprecation, so that old missions will still work)
2011-01-16 08:20:08 +00:00
Goober5000
42fc6e461c
add if-then-else and perform-actions
2011-01-16 08:18:09 +00:00
Echelon9
6c4bed411e
Fix Mantis 2379: Last available nebula storm type in Lightning.tbl wouldn't be used in game
2011-01-15 03:54:50 +00:00
Echelon9
400331d4ec
Cleanup cmeasure.*: Remove dead code, use size_t as for loop array index not a signed int
2011-01-15 03:05:01 +00:00
Echelon9
822110405a
Prevent potential overflow of Escort_ships[] array
2011-01-15 02:33:34 +00:00
Sushi
95a713128c
Add "hide from radar" weapon flag to force bombs not to show up on radar
2011-01-12 16:51:38 +00:00
Goober5000
eafc0ca82e
fix a return value error
...
also, cut down on the number of warning messages shown for background bitmap loading
2011-01-12 10:03:45 +00:00
Goober5000
230da289d2
change xor (but not bitwise-xor) to use any number of arguments, not just 2
...
enhance string-to-int to ignore non-numeric characters (so turret07 becomes 7)
2011-01-12 02:10:22 +00:00
Goober5000
330fee1b3b
commit string-concatenate and int-to-string
2011-01-12 01:37:03 +00:00
Swifty
98b65e2dba
Eliminated pesky bug involving some gauges not being properly updated with necessary HUD config data. Took a while to figure out.
2011-01-11 07:58:03 +00:00
Goober5000
0cc190e9f1
stupid brain fart
...
fix Mantis #2375
2011-01-11 01:03:48 +00:00
The_E
ebff760cca
There is no function with the signature "double pow(int, int)" in math.h
2011-01-10 16:10:54 +00:00
Goober5000
8370567747
remove for-each-of
...
add a note regarding string-to-int to for-counter
supernova-start takes a positive argument
2011-01-10 11:55:15 +00:00
Goober5000
2f0324048b
Added the following sexps:
...
pow (power function)
xor (logical operator)
set-bit, unset-bit, is-bit-set (for working with individual bits in integers)
bitwise-and, bitwise-or, bitwise-not, bitwise-xor
2011-01-10 11:29:24 +00:00
FUBAR-BDHR
55de86a47d
Add the ability to define detail distances for weapons.
2011-01-09 22:35:02 +00:00
FUBAR-BDHR
c07f1a1c1d
Fix for Mantis 2368. Subsystems with vanish flag still play sound from player ship
2011-01-07 22:01:36 +00:00
Goober5000
ea4cc1e870
the repeated messages get really annoying, so log them and display one message
2011-01-07 10:16:10 +00:00
Goober5000
66c82d58c1
added two awesome sexps, for-each-of and for-counter
...
as part of the sexp infrastructure, add test_argument_vector_for_condition so that argument sources are not limited to sexp nodes
2011-01-07 09:11:02 +00:00
chief1983
5ffb61b26c
Fix for #2365 : Assert to Assertion so we can tell the user a little more about the crash.
2011-01-06 05:07:51 +00:00
Swifty
4a9e605e56
Support for PNG/JPG/TGA based EFFs for the HUD and other graphics that previously required ANI/PCX.
2011-01-05 08:54:14 +00:00
Zacam
5b9ceff06a
GLSL version Detection fix.
...
http://www.hard-light.net/forums/index.php?topic=73712.0
2011-01-05 07:12:48 +00:00
FUBAR-BDHR
1529f948f2
Add flag that applies damage to subsystem as if it were the hull.
2011-01-05 00:12:01 +00:00
Goober5000
0ee79b269f
resolve a conversion warning pointed out by FUBAR
2011-01-02 00:35:05 +00:00
Goober5000
08e86d0192
re-add Echelon9's commit, with proper logging, and also with parallel fix to bmpman.cpp
2011-01-01 09:17:36 +00:00
Sushi
65f7c760d8
Add "$ai aims from ship center:" and "$allow primary link delay:" AI profiles flags
2010-12-31 20:03:16 +00:00
Goober5000
6d4b0efd39
add sexps for object orientation
2010-12-31 07:41:01 +00:00
Goober5000
4f7f79732e
missed one file
2010-12-31 04:28:37 +00:00
Goober5000
d57ab51162
change fl_radian to fl_radians so as to be consistent
2010-12-31 04:02:41 +00:00
chief1983
34d11f1295
Fix the DirectInput commit r6902 breaking compiling on nix
2010-12-29 18:18:44 +00:00
Echelon9
337786ef26
Remove from Xcode project file two non-existant source code files
2010-12-29 07:45:10 +00:00
Zacam
5ae8d90656
Thanks to Goober5000, this is the correct way to be doing this.
2010-12-28 04:49:05 +00:00
Zacam
802d5956f3
Fixes the index so that Player Main Hall changes will actually save properly. Should have caught this back in 6860.
2010-12-27 20:59:16 +00:00
Sushi
9a71e9b080
Add -disable_di_mouse command-line option to force the game to use Windows mouse input instead of DirectInput. For some people, this results in more reliable mouse input.
2010-12-27 16:17:54 +00:00
Zacam
900fd755b1
Fixes reports of Retail data showing "0 ms" for ships Velocity in Ship Selection Screen. When multiplying an INT by a FLOAT, setting the fl2i() on the float is a good idea.
2010-12-27 15:27:48 +00:00
Swifty
aa71f4a817
Clear the active display list when this ship is beleeted.
2010-12-27 09:28:17 +00:00
Echelon9
0da3dff1c1
Fix a small typo in Diaspora feature's comment
2010-12-27 08:26:04 +00:00
Echelon9
0557c1e4cd
Correct 2 comment typos
2010-12-27 08:18:39 +00:00
Echelon9
9410909ee1
Fix: Mantis 2351 - Animated subsystems not counted as rotating allowing max to be exceeded
2010-12-27 08:00:31 +00:00
Echelon9
db1e2a891e
This check can go back in, the real cause was fixed in r6893. Good work Assert()
2010-12-27 07:48:31 +00:00
Swifty
0c67dd9abc
Get Lua ray tests to use model_instances for collision detection. Fixes the failed assertion associated with this.
2010-12-27 07:36:49 +00:00
Echelon9
7fa59778c5
Fix a comment typo
2010-12-27 06:47:03 +00:00
Swifty
a5be8facf6
Limit the setup of cockpit displays to only the player ship.
2010-12-27 05:52:33 +00:00
Swifty
4d3bf36f48
Fixes the weapons list gauge bug where a blank space would render when no secondaries are loaded.
2010-12-27 05:43:52 +00:00
Zacam
fdd529621a
Revert 6884. Not a good thing to do apparently.
2010-12-26 19:46:00 +00:00
The_E
38d2da68a3
Fix for Mantis 2350 (Sound assignments get lost/become bogus when changing ship class)
2010-12-25 15:15:28 +00:00
Zacam
f98be5dcde
Fix: MSVC signed/unsigned mismatch.
2010-12-25 13:15:55 +00:00
FUBAR-BDHR
c3550e55dc
Fix for mantis 2356: Turret-free-all in an every-time acts as turret-lock-all
...
Fixed turret-free, beam-free-all, and beam-free as well
Removed generic subsystem argument from those as well as turret-tagged-specific as they do not have code to process it.
2010-12-22 18:39:40 +00:00
The_E
083a84feff
Swifty's go-swift stuff. Makes collision detection slightly less insane.
2010-12-22 14:42:21 +00:00
The_E
1f1640d47d
2010-12-20 19:53:52 +00:00
Sushi
c7eac88eec
Fix oversight from AI.tbl overhaul a while ago
2010-12-20 16:57:13 +00:00
Echelon9
08eeeedff3
A further two spots where the MSVC 2008 compiler doesn't like SAFE_STRINGS changes
2010-12-20 07:50:23 +00:00
Echelon9
cd7da4d94e
Mantis 1889: Utilise all three hud target box rendering styles (inclusion of a rendering style with proper lighting)
2010-12-20 07:46:38 +00:00
Echelon9
f3359d1547
MSVC compiler doesn't like some of these SAFE_STRINGS changes, GCC does...
2010-12-20 06:14:08 +00:00
Echelon9
eb129200a1
Fix: Convert a further subset of strcpy() to the SAFE_STRINGS strcpy_s() version
2010-12-20 04:28:01 +00:00
Echelon9
7b9d36e105
Guarding against array out of bounds error, ahead of conversion to STL type
2010-12-20 03:04:54 +00:00
Echelon9
10dd0c57d5
Clean up redundant checks
2010-12-19 02:03:41 +00:00
Echelon9
25b199c25c
Two further cases of typo referenced in r6861 fixed
2010-12-19 01:28:38 +00:00
Echelon9
1a98990c3c
Remove redundant Invalid_demo_keys[] and associated control_config_valid_action()
2010-12-19 01:24:50 +00:00
Echelon9
78496b1953
Remove redundant #ifdef check
2010-12-19 01:09:38 +00:00
Echelon9
f278ca0e85
Correct typo in comments
2010-12-19 01:06:58 +00:00
Echelon9
b19fc28a7e
Fix: Local declaration of 'i' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '786'
2010-12-15 12:51:51 +00:00
Echelon9
91fbebd307
Fix: Local declaration of 'i' hides declaration of the same name in outer scope.
2010-12-15 12:48:24 +00:00
Echelon9
178963e78a
Clear out commented #IFDEF INTERPLAYQA section
2010-12-15 12:39:11 +00:00
Echelon9
bacb819e5f
Fix: Local declaration of 'retail_gauge_loaded' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '392'
2010-12-15 12:27:14 +00:00
Goober5000
2e7dea0018
set certain flags that used to be in ship_info via ship_set and change_ship_type, which is the correct thing to do, rather than in the middle of parsing, which was a red herring
...
(fixes Mantis #2169 )
2010-12-13 07:33:35 +00:00
Goober5000
c8dd5e1bab
bypass weird compiler error
2010-12-13 07:24:38 +00:00
Zacam
81bf3cec47
Reverts commits 6681, 6683 and 6684. Adds C4101 Warning suppression for Release Builds (only) so that "catch" doesn't cause an unreferenced parameter warning.
2010-12-13 05:51:49 +00:00
The_E
0b292a1652
Fix for Mantis 2349 (Invalid number of arguments not detected by FRED). This adds a new function to sexp.cpp (check_operator_argument_count()), which can be used to handle cases like send-message-list.
...
Also adds a warning to change-iff-color in case the FREDer supplied an invalid rgb argument (Mantis 2256)
2010-12-13 04:10:08 +00:00
Zacam
09fad95070
Antipodes 7 Merge: HUD Overhaul, by Swifty.
2010-12-12 20:34:15 +00:00
Echelon9
b1c2a85faa
Fix: Local declaration of 'template_id' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '1062'
2010-12-12 01:09:02 +00:00
Echelon9
06d24df914
Clean up up logic check on packet length overrun
2010-12-12 01:08:10 +00:00
Echelon9
6c50ba90ba
Fix: Local declaration of 'wip' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '5444'
2010-12-12 01:07:03 +00:00
Echelon9
ebc0d3b6f4
Fix: Local declaration of 'rship' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '6450'
2010-12-11 13:49:06 +00:00
Echelon9
d0e05d5417
Fix: Buffer overrun: accessing 'struct NavPoint * Navs', the writable size is '352' bytes, but '396' bytes might be written: Lines: 1597, 1600
2010-12-11 12:54:02 +00:00
The_E
214e0daf00
Fix for Mantis 1647 (Message brackets linger around when player turns traitor)
2010-12-11 06:03:45 +00:00
Goober5000
257f92441f
use standard font to output the "more" indicator
2010-12-10 08:39:21 +00:00
FUBAR-BDHR
17776c091e
Fix for mantis 0002337: lock-rotating-subsystem affects more than it should
2010-12-09 23:30:04 +00:00
The_E
e38b68bee5
Partial fix for Mantis 2277. This moves the "Turret Firing" animation trigger so that it only triggers when the turret really is firing.
2010-12-09 23:13:46 +00:00
The_E
5db4e2a6b3
Fix for Mantis 2306 (Destroy subsystem cheat does not work in release builds)
2010-12-09 20:28:16 +00:00
The_E
bf578e51ef
Genghis' fix for Mantis 2164 (Better feedback and error handling for invalid muzzleflash definitions)
2010-12-09 19:55:46 +00:00
The_E
254cd2f2d2
Aaaand done. Now it's fixed.
2010-12-09 18:54:28 +00:00
The_E
dc91321cba
Fix for Mantis 2111 (Bank indicator alignment issues in weapon loadout select screen)
2010-12-09 18:07:44 +00:00
The_E
649f1ff6c3
Fix for Mantis 2055 (Allow/break/never/fix-warp sexps don't work on the AI)
2010-12-09 16:24:54 +00:00
The_E
82efd3434b
Fixes issue with "external model launcher" flag, where secondary weapons would use the models for primary weapons noticed y Droid803
2010-12-08 20:08:25 +00:00
The_E
109f962350
What in the nine hells is happening here? Did noone ever use set-armor-type to reset an armor type?
2010-12-08 04:25:14 +00:00
The_E
8f1f95c273
Fix for Mantis 2257. This adds the options "+HUD Message:" (Boolean, whether or not firing this SSM generates a notification on the HUD), and "+Custom Message:" (if you want to use something other than "Firing Artillery!") to ssm.tbl.
2010-12-07 16:33:58 +00:00
Goober5000
32dd5f9306
follow-up to 6804... fix secondary as well as primary
2010-12-07 07:57:00 +00:00
FUBAR-BDHR
ce8024ce15
Oops on the use of /n instead of \n. Good catch IssMneur
2010-12-07 06:31:53 +00:00
The_E
5dcdc79c4e
Fix for Mantis 2336 (Countermeasure type assignment doesn't survive ship class change)
2010-12-06 23:27:46 +00:00
FUBAR-BDHR
a79d51b357
Fix backward LOD warning message.
2010-12-06 22:00:14 +00:00
The_E
0b4fb309ae
Turning this assert to an Error, after feedback from Goober
2010-12-05 18:07:28 +00:00
The_E
4925eb8412
Turning these Warnings into Assertions, as it's something that really needs to be fixed.
2010-12-03 23:27:58 +00:00
The_E
3f21f1fe5e
Converting this Assert() to an Assertion() for better feedback
2010-12-03 22:41:44 +00:00
The_E
60ac096301
Taylor's fix for Mantis 2172
2010-12-03 17:44:23 +00:00
Sushi
1389b67bd4
Fix an additive weapon velocity bug (main symptom: collision detection going wonky sometimes).
2010-12-03 15:37:44 +00:00
The_E
9441cc7eef
Okay, I'm disabling this Int3(). It's far too easy to hit, even with perfectly valid data.
2010-12-02 21:06:32 +00:00
Echelon9
b8f3fe13bc
Fix 2339: Intermittent crashes in add_sexps
2010-11-29 10:28:47 +00:00
Goober5000
e20b95bba4
add_data_dup when we're working with a temporary string
2010-11-29 08:36:31 +00:00
The_E
c52d8a4763
Adding a break here
2010-11-27 08:13:53 +00:00
Goober5000
2afc961a62
bump number of misc anims to 32
2010-11-26 04:03:56 +00:00
Goober5000
4faa94a9e3
add feature to select a random animation from a miscellaneous animation group
2010-11-25 23:51:22 +00:00
The_E
04e252c1ea
Thanks to Goober for noticing the right way to do this.
2010-11-25 20:48:07 +00:00
Goober5000
81607f7ddc
move the error nprintf to a place where it will trigger before the crash it tests for
...
fix a loop boundary check
2010-11-25 20:10:13 +00:00
The_E
8726f7e0fb
Fix for Mantis 2344 (Post-processing sexps don't show correctly in FRED)
2010-11-25 18:48:00 +00:00
The_E
507631cf86
Moving post processing flag back to graphics section
2010-11-25 15:11:04 +00:00
The_E
e978adbbdf
Adding a return and Warning in case of a null pointer here
2010-11-24 11:35:21 +00:00
Goober5000
04c5416de9
add error detection for arrays that exceed maximum
...
num door sounds = num door animations
(how did that ever work before?)
2010-11-24 07:18:05 +00:00
Goober5000
5214560f70
how was that accidentally deleted?
2010-11-24 06:39:22 +00:00
Goober5000
2eda13c3e8
remove #defines that were obsolete since after FS1
...
fix an nprintf bug
change the method of pausing anims so that more than one anim can play in the same spot
(this means that the first frame of an anim won't be drawn until the anim actually starts playing but I think that's okay; it is really only noticeable for the crane animation in the Bastion main hall when the "new player tips" box appears)
2010-11-24 06:33:53 +00:00
Goober5000
d069b8ede7
ugh; formatting ftw
2010-11-24 04:53:41 +00:00
Goober5000
b3db43f54c
slight cleanup
2010-11-24 04:35:10 +00:00
FUBAR-BDHR
31853b77de
Fix issue with beams not doing damage due to the traitor beam fix.
2010-11-24 02:22:46 +00:00
Goober5000
0c945c210d
revert Echelon9's commit 6754 which needs to be discussed first
2010-11-23 08:27:18 +00:00
The_E
f02e83320d
Fix two instances where an object instance number was used as an index into Weapon_info[]
2010-11-23 08:20:56 +00:00
Goober5000
2b01993d64
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.
2010-11-23 08:11:16 +00:00
Goober5000
10d6e21c9d
fix some things that Zacam noticed
2010-11-23 07:30:36 +00:00
chief1983
e7e1a07a4b
Finish matching vm_mallocs and vm_frees
2010-11-22 17:21:12 +00:00
Echelon9
4ccc6ba9a0
MAGIC numbers aren't for hiding in code...
2010-11-22 13:01:41 +00:00
Echelon9
e4e5775b63
Fix: Local declaration of 'i' hides declaration of the same name in outer scope.
2010-11-22 12:51:59 +00:00
The_E
66596f519c
Fix for commit 6756: -1 is a perfectly valid value for current_secondary_bank at that point.
2010-11-22 06:14:11 +00:00
FUBAR-BDHR
e818f7840f
Fix for Mantis 2190 - Player beams do not cause traitor.
2010-11-21 06:34:27 +00:00
Echelon9
8bc8deffd6
Fix: Local declaration of 'num_lines' hides declaration of the same name in outer scope.
2010-11-20 18:45:34 +00:00
Echelon9
8ba4f6c3c6
Corrected sprintf format, as 'Changed from 'int' to 'float' by Zacam 10/2010'
2010-11-20 17:27:45 +00:00
Echelon9
184b004e19
Fix: Use of swp->current_secondary_bank when equal to -1 as an array index. Very broken.
2010-11-20 16:25:33 +00:00
Echelon9
f96d7fc1be
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
2010-11-20 15:10:14 +00:00
Echelon9
5bf9697227
Fix a range of potential NULL dereferences
2010-11-20 12:22:03 +00:00
Echelon9
9f361b791d
Fix a few malloc/vm_malloc changes to properly track memory usage; fix a potential NULL dereference in parse/lua.cpp
2010-11-20 08:25:16 +00:00
IssMneur
318d3f032b
Back to how the no configure worked before, because it does work just IssMneur is a dummy. Thank you ni1s for pointing it out :P
...
Added a clarifying comment to autogen.sh.
2010-11-15 21:13:53 +00:00
IssMneur
c898573e58
Modify autogen.sh so that it can be run without running configure. To run autogen.sh without running configure pass --noconfigure as first parameter.
2010-11-15 20:40:25 +00:00
Goober5000
b7acaf9177
remove the mprintf per discussion with taylor
2010-11-14 05:42:47 +00:00
Goober5000
8ba6a7035c
add SCP_string variants of sprintf, sexp_replace_variable_names_with_values, replace_one, replace_all, and lcl_replace_stuff
...
change the death message to use an SCP_string
change the set-death-message sexp to accept actual messages
2010-11-14 02:07:45 +00:00
Goober5000
91fd779f86
add missing files to MSVC 2005 project
2010-11-14 01:53:21 +00:00
Goober5000
a1f6c70318
Bad IssMneur! No biscuit!
2010-11-13 22:49:22 +00:00
IssMneur
9ce801e175
Remove redundant weapon_name_lookup().
...
Make the parameter to weapon_info_lookup a const char* (like it should be).
2010-11-13 07:27:45 +00:00
FUBAR-BDHR
f7f6e0e94b
Fix for mantis 2174: ERANGE: String error in multiui.cpp
2010-11-12 23:46:24 +00:00
The_E
52529f597a
Reverting that again to help tr5ack this down further
2010-11-11 09:54:18 +00:00
The_E
142649e968
Adding proper FRED-side support for special message source "<none>"
2010-11-11 08:45:25 +00:00
The_E
09f9dca972
Replacing a few asserts with proper error handling (in this case, simply CLAMPing the offending values to valid ranges).
2010-11-11 08:41:34 +00:00
The_E
1b00dda9dd
Fix for Mantis 2333 (Random crashes caused by snd_get_duration())
2010-11-08 23:04:34 +00:00
The_E
60eda39ca7
Adding a few checks here to guard/catch Mantis 2333
2010-11-08 01:36:43 +00:00
The_E
727da9031c
Fix for Mantis 2329 (Malloc fail on invalid sound files)
2010-11-06 04:44:17 +00:00
The_E
371307eb1f
Woops. This fixes screwed up test for MOI validity
2010-11-05 00:34:29 +00:00
FUBAR-BDHR
367ff95e79
Remove sexp_turret_subsystem_targeting_disable() and sexp_turret_subsystem_targeting_enable() and changes them to use the new generic function.
2010-11-04 05:28:39 +00:00
FUBAR-BDHR
09e6972731
4 new sexps to control Wanderer's subsystem flags from r6581
...
Fix for Mantis 2330 subsystem targetable/untargetable in multi.
2010-11-04 05:17:52 +00:00
chief1983
7192a2d8fe
More compatibility fixes for Solaris
2010-11-02 21:20:09 +00:00
The_E
afcf923c43
Remove bogus debug warning from the :V: days
2010-11-01 15:25:27 +00:00
The_E
d5b15a0567
Adding check for invalid MOI values
2010-11-01 15:24:07 +00:00
chief1983
4ccadf51fe
This should fix a OS X 10.5 crash, possibly others.
2010-10-29 19:09:26 +00:00
The_E
c4fe142f3a
Woops. How did I screw this up?
2010-10-29 04:14:13 +00:00
The_E
7c58abb9eb
Fix for faulty check
2010-10-29 02:44:14 +00:00
The_E
09343bfa46
Adding a warning and proper error handling to the "/" operator in order to catch div-by-zero scenarios.
2010-10-29 02:22:51 +00:00
The_E
5f5cea2c6a
Patch for minor snafu, from FUBAR
2010-10-29 01:10:19 +00:00
The_E
7fada6171a
2010-10-26 23:42:14 +00:00
The_E
e11fe6515a
Changing this sanity check to pop up a warning in FRED, but print to log in FS.
2010-10-26 22:56:58 +00:00
The_E
339ba7cca3
Fixes issue with the wrong mainhall being loaded on startup. Note: If a value gets initialized to -1, don't change it to a ubyte and init it to 0, even if that fixes a conversion warning. In this case, casting explicitly is a valid course of action, and should be taken. Here endeth the lesson on refactoring.
2010-10-26 22:23:56 +00:00
The_E
4e2fb80608
Removing lua.c from the VS2010 project
2010-10-25 15:09:17 +00:00
chief1983
416e725e22
Let's get rid of lua.c for Xcode then too
2010-10-25 14:57:53 +00:00
karajorma
f5ff35c3bf
Looks like we forgot to update the save functions when we changed the special_explosion to use floats.
2010-10-25 13:53:31 +00:00
Zacam
c45f22ff98
...and then it helps to actually initialize it to something.
2010-10-25 03:59:15 +00:00
Zacam
252f2b4e6c
Should have paid more attention on that last one, need to define what 'err' is outside of where it is.
2010-10-25 03:54:48 +00:00
Zacam
3e613ff431
Let see how unreachable all this really was.
2010-10-25 03:48:01 +00:00
Zacam
b64d1991e1
Fix for Release Build warning for 'err'
2010-10-25 03:43:02 +00:00
Zacam
984df3b5ec
'lua.c' not needed for liblua.
2010-10-25 03:34:33 +00:00
Zacam
0050b48e80
Clears up the rest of the type conversion warnings listed in MSVC.
2010-10-25 03:26:03 +00:00
Zacam
a58a8b21af
Warnings Resolutions: 'int' to 'ubyte' conversion warnings.
...
Some formatting cleanup done on the affected files.
While not necessary, some {} put in by suggestion of output from GCC and to improve readability.
2010-10-25 00:03:29 +00:00
karajorma
284fd79740
Not 100% a bug fix but this will have the effect of making it harder to hit the bug and will warn when it hits it. See http://www.hard-light.net/forums/index.php?topic=72160.0 for more details
2010-10-24 05:28:30 +00:00
Wanderer
724c77afc2
adding blank scripting state to the game
2010-10-23 19:54:39 +00:00
The_E
c885611291
Adding special message source "<none>"
2010-10-22 23:17:44 +00:00
Echelon9
a8d31d4ae4
Update project file listing
2010-10-22 22:53:48 +00:00
The_E
89ae5cf458
m!m's function to access the "affected by gravity" flag
2010-10-22 20:43:27 +00:00
The_E
26ac4b804a
Fix for Mantis 2171 (documentation out of sync for gr.getVectorFromCoords)
2010-10-22 13:45:33 +00:00
The_E
332f94886b
Thank you code analysis. This could have been ugly....
2010-10-20 20:06:55 +00:00
The_E
0f38bee49b
Change an Assert to a more elegant way of handling this.
2010-10-20 19:38:34 +00:00
Sushi
c9b6c3a4ee
Fix bug where changing AI goals while gliding can cause them to get stuck in glide
2010-10-20 05:21:51 +00:00
chief1983
d731767ea6
Wrong way with this fix, should have gone from trunk to antipodes
2010-10-19 22:16:26 +00:00
chief1983
1d9c341c07
Use appropriate line endings
2010-10-19 22:14:52 +00:00
Zacam
6e46c4668d
From FUBAR: Turret ROF Sexp
...
http://www.hard-light.net/forums/index.php?topic=71884.0
2010-10-18 21:23:16 +00:00
chief1983
b0bd068e4d
Pedantically correct a comment
2010-10-18 21:18:10 +00:00
Zacam
2b44f6325b
The hell...? Missed one somehow.
2010-10-18 20:55:08 +00:00
The_E
2349ec5695
Warnings done properly. Thanks, chief
2010-10-18 20:17:01 +00:00
The_E
770953a051
This case shouldn't ever be hit, but it's still bad form to Int3() there.
2010-10-18 19:57:12 +00:00
Zacam
59a360a139
Sun OS compatibility: "Sun" is a reserved word, so (*sun) becomes (*sun_ptr), (bool sun) becomes (bool is_a_sun), etc.
...
Also: void stars_delete_instance_FRED is now void stars_delete_entry_FRED in the CPP to better match the H.
White-space clean-up took place too.
2010-10-18 19:29:38 +00:00
Zacam
75043ff5b1
go_faster from Antipodes 6. Everybody, say "Thank you, taylor!"
2010-10-18 18:32:37 +00:00
chief1983
0cbb97861b
FORCE:MULTIPLE for VC6 in advance of Antipodes 6
2010-10-18 18:08:52 +00:00
chief1983
d0e20484ee
FORCE:MULTIPLE for VS2005 in advance of Antipodes 6
2010-10-18 18:03:10 +00:00
IssMneur
253a4b4dc9
Reimplement VerifyEx to soothe any concerns about the WinAssert use and remove any potential problems for non-VC.
2010-10-18 06:33:54 +00:00
IssMneur
3292e4eee4
Extended Verify to allow a developer to give a more detailed message.
2010-10-17 22:27:04 +00:00
Goober5000
b8736c0c0b
sanity check +Team: values, because older versions of FRED saved crazy values like 1301728
2010-10-17 20:12:09 +00:00
karajorma
f5065880dd
Fix the camera-shudder SEXP to work in multiplayer.
2010-10-17 09:33:08 +00:00
karajorma
ffd9b2cdac
Add the -parse_cmdline_only option to prevent the command line being parsed in FRED (and FSO for that matter).
2010-10-16 05:17:46 +00:00
The_E
b352e39494
m!m's team:getColor() function for scripting.
2010-10-15 19:45:02 +00:00
IssMneur
85c4032ef7
Added a couple of mprintf lines to help diagnose where exactly Openal fails to load.
2010-10-15 17:20:50 +00:00
IssMneur
1482cac08b
Fix a crash that occurs when the player turns off auto-targeting.
2010-10-15 16:39:43 +00:00
chief1983
1f61ee9025
Add the FORCE:MULTIPLE option to the linker for VS2008 and VS2010, in advance of the Antipodes 6 merge
2010-10-13 16:47:12 +00:00
karajorma
baf028bdb7
Mantis 2324 (Missiontime-msecs gives the wrong value after SHORT_MAX milliseconds)
2010-10-13 06:18:36 +00:00
karajorma
9bcf6d9521
Change Alt_Type into an int to fix a compiler warning.
...
Move the multi_sexp_ship_change_callsign function (Multi_ functions should sit directly below the server side function that calls them so that they can be updated at the same time).
2010-10-13 02:16:34 +00:00
Zacam
7d8fae55f0
Output name updated to "fred2_open_3_6_13" in MSVC2005.
2010-10-12 23:40:48 +00:00
Zacam
52b5f2fbb1
Project Synchronization: Trunk vs Antipodes
...
2005: Set PDB and Map Exports to explicitly FALSE on Release builds.
Removed <File Configuration> lines (save for in the case of phrases.xml) as they are unnecessary bloat.
2008: Set PDB and Map Exports to explicitly FALSE on Release builds.
2010-10-12 22:37:50 +00:00
chief1983
d4bfce509e
Pull this fix for VC6 from Antipodes since it's unrelated to go_faster
2010-10-12 16:06:27 +00:00
IssMneur
39e516af3f
Add some variable verification to hud_cease_subsystem_targeting.
2010-10-12 04:27:17 +00:00
Zacam
93c819e215
Warning Fix: in "opengl_make_gamma_ramp"
...
'int' to 'ushort' conversion addressed.
2010-10-08 23:32:54 +00:00
Zacam
53a78a859b
Warning Fix: (audiostr.cpp "WaveFile::Read" / ds.cpp "ds_load_buffer")
...
Sets 'float **pcm' to start as NULL
2010-10-08 23:30:15 +00:00
Zacam
55cb3c209a
Warning Fix: in "bool message_filename_is_generic"
...
signed/unsigned mismatch
2010-10-08 23:24:36 +00:00
Wanderer
57a2f2955c
feature commit - diaspora subsystem options
2010-10-08 21:32:48 +00:00
Wanderer
caae28adfa
feature commit - diaspora turret related patch
2010-10-08 21:05:40 +00:00
The_E
4bb193a519
Patch for Mantis 1963 (Optional argument for set-object-facing and set-object-facing-object doesn't work)
2010-10-08 12:01:11 +00:00
The_E
cf04d1b6de
Fix for Mantis 1817 & 2323 (Glide does not get reset on mission restart/player respawn)
2010-10-08 10:15:40 +00:00
Zacam
f14b184c81
Warning Fix: "sexp_show_subtitle_text"/"sexp_show_subtitle_image"
...
No more 'float' to 'int'. (not the best way, but it is expedient and doesn't risk breaking things)
2010-10-07 02:21:15 +00:00
Zacam
95a89874e8
Warning Fix: in "void beam_get_binfo"
...
"miss_factor" is a 'float', not an 'int'.
(some odd 'tab' spacing cleaned up in the function as well)
2010-10-06 20:03:05 +00:00
Zacam
76c4083cbd
Warning Fix: for "set_special_explosion"
...
Corrects conversion of 'float' to 'int', by setting set_special_explosion related entries to 'float'
2010-10-06 19:18:38 +00:00
Zacam
7acab9ba98
Warning Fix: in "object *ship_find_repair_ship"
...
"min_time_till_available" is a 'float', not an 'int' and so is "howlong" that it is compared to.
2010-10-06 18:45:58 +00:00
karajorma
42fba98066
FUBAR's fix to allow the callsign SEXP to work properly in multiplayer.
2010-10-06 08:53:28 +00:00
Goober5000
2e4143013a
fix some old fat-fingering from r1601 (Mantis #2226 )
2010-10-06 03:58:21 +00:00
Wanderer
2200196cd5
fix to corkscrew missile emitted particles issue
2010-10-05 08:01:23 +00:00
karajorma
4bf6dc5201
Missed one.
2010-10-05 06:45:51 +00:00
karajorma
4e40f145db
Some minor future-proofing/magic number removal.
2010-10-05 06:44:02 +00:00
karajorma
3a578fa70d
Fix Mantis 2321 (Weird values for Team when saving events).
2010-10-05 06:08:31 +00:00
Zacam
8c4e0e9614
Double-Trouble: Noted by FUBAR, somebody made a copy-paste mistake
2010-10-04 23:14:27 +00:00
IssMneur
134abc8f09
Make VS2010 copy *every time* that it rebuilds the binaries, not just when a change is made to a file in Freespace2 or Fred2 projects (ie. when it inserts code changes from code.lib into the binary).
2010-10-04 04:27:55 +00:00
The_E
b192612b57
More checking to guard against Mantis 2205
2010-10-03 20:35:48 +00:00
Echelon9
f54e6a1c86
Second case of mprintf fubar this week. MSVC thought this was valid?
2010-10-03 09:06:47 +00:00
Wanderer
4b26c34625
Feature commit - option to adjust turret ROF by multiplier or by the number of firepoints.
2010-10-03 07:19:43 +00:00
The_E
4ee64c07f1
Adding a better explanation here.
2010-10-03 03:45:01 +00:00
Echelon9
0968f851bf
Correction to r6555 to use mprintf correctly
2010-10-02 07:06:17 +00:00
The_E
4512219c9f
Adding the ad.stopMusic() function to scripting
2010-10-01 22:27:37 +00:00
The_E
2d062ff380
Print warning here as well.
2010-10-01 19:14:24 +00:00
The_E
fe38a382f9
Adding a deprecation warning to the log
2010-10-01 19:09:17 +00:00
The_E
97634e590a
Readding parsing for decals so we don't break stuff unnecessarily.
2010-10-01 18:12:31 +00:00
taylor
ecc9c970fd
allow duplicate when same file exists as both 2D and 3D in sounds.tbl
2010-10-01 16:42:06 +00:00
taylor
a06e48966b
easier to follow debug messages for sound loading
2010-10-01 16:42:05 +00:00
taylor
f7d8b9ef26
only need half size for mono buffer memory
2010-10-01 16:42:04 +00:00
taylor
3b5f674ba6
remove decal files
2010-10-01 16:42:03 +00:00
The_E
6c059f30c4
Adding a sanity check here.
2010-10-01 07:53:03 +00:00
Sushi
6500943b41
Get rid of compiler warnings
2010-10-01 04:20:40 +00:00
Zacam
db96e9fa26
Removed "grammar.h" and added to 'ignore' list. Also added phrases.cfg to 'ignore' list.
2010-10-01 04:10:03 +00:00
The_E
e8aa478524
Another compilation warning fix.
2010-10-01 03:06:09 +00:00
The_E
05e68890f4
Fix compilation warning
2010-10-01 01:36:44 +00:00
The_E
044df34584
Adding the "force-glide" sexp by request of Axem
2010-10-01 00:38:58 +00:00
The_E
93b1740848
Fix for Mantis 2289 (Invalid commandline arguments passed to FRED)
2010-09-30 17:22:58 +00:00
Zacam
b9b5237123
Purging of the Decal system. Includes Projects updates for codeblocks, MSVC 6-2010 and Xcode.
2010-09-30 05:50:04 +00:00
The_E
c6fe7ad5a0
Bumping MAX_SPOOLED_MUSIC to 50.
2010-09-30 00:00:49 +00:00
The_E
4f6fcc566e
Removing an Int3() that isn't as impossible to hit as expected. Since we can exit gracefully here, we should.
2010-09-29 19:01:04 +00:00
Wanderer
9a10b6b0b4
Fix for mantis 2304 - 2nd take
2010-09-27 11:55:21 +00:00
Goober5000
2d3f566691
use the warning loop, same as the other half of the if() block
2010-09-27 05:51:28 +00:00
Goober5000
46f48ee3a6
fix redefinition of local variable 'i'
...
remove unused local variable 'wip'
2010-09-27 05:27:27 +00:00
The_E
6fccf9f790
Ooops. Now this is a proper sanity check.
2010-09-27 04:46:08 +00:00
The_E
f5d8a1354d
Hopefully fixes an Int3() encountered by FUBAR, where the AI submode of a ship was set incorrectly.
2010-09-27 04:03:06 +00:00
The_E
55d7ca153e
Better error checking for adjust-audio-volume, fixes Mantis 2314. Thanks to Echelon9 for noticing this.
2010-09-26 15:54:19 +00:00
Wanderer
2a6727136e
Fix for mantis 2303 and related issue in lua.cpp
2010-09-26 11:32:18 +00:00
The_E
acf8f56b41
Reverting 6513 due to errors found in the implementation
2010-09-25 21:38:37 +00:00
Wanderer
eb660e86c1
Fix to prevent global damage (shockwaves etc) from creating debris shards that spawn in empty space
2010-09-25 20:50:33 +00:00
Wanderer
1015cfe7e9
Fix for mantis 2304 - non standard uvec/fvec turrets did not have proper collision detection
2010-09-25 20:49:05 +00:00
The_E
536203d7e3
Adding the "On Weapon Selected", "On Weapon Deselected", "On Weapon Equipped" and "On Weapon Fired" scripting actions.
2010-09-25 19:43:45 +00:00
The_E
18e539c27b
Moving this assert to a better place
2010-09-25 19:08:27 +00:00
The_E
5daf4591b7
Less ugly hacks is good as well. Why compute the object index, when it's passed as a function argument?
2010-09-24 06:31:52 +00:00
The_E
78f7d9f737
Added an Assertion() to further narrow down the cause of the "ai_find_path tries to find path that doesn't exist" bug
2010-09-24 06:29:46 +00:00
The_E
fa7d8cb479
Avoiding a possible Int3() due to invalid data being passed; since the documentation for get-object-* doesn't specify that you need to give all 3 "relative coordinate" arguments, this needs to be checked.
2010-09-24 06:28:25 +00:00
Zacam
4465400d13
Add a description to config.h as to what 4290 is. (Thanks Goober for catching that)
2010-09-22 22:59:06 +00:00
Zacam
bdcb906c6c
Adding 4290 to the pragma warning(disable:) list for easier testing of some code changes.
2010-09-22 21:13:10 +00:00
IssMneur
730ac54217
Fix bug in the new support ship sexp noted by Goober5000.
2010-09-22 03:05:57 +00:00
The_E
4b1dd8e719
Same here.
2010-09-22 00:41:52 +00:00
The_E
a9f02aab7b
And another variable declaration overwriting a declaration in an outer scope.
2010-09-22 00:38:08 +00:00
The_E
a92b28abdf
Moving this counter variable to be declared as local for the loops.
2010-09-22 00:32:39 +00:00
The_E
f421af5016
Another potential var name collision. Thankfully, this one's part of the decal code, so it's likely it never was a problem.
2010-09-22 00:25:01 +00:00
The_E
667a557e15
Avoiding a name collision between a global and a local variable
2010-09-22 00:15:29 +00:00
The_E
3efcad84a7
Flags are bitfields, so an "&" needs to be used instead of an "&&"
2010-09-22 00:06:20 +00:00
IssMneur
654be5a6e7
Removes the hard restriction (compile time) on the maximum number of "active" support ships per team. Controlled by an optional seventh argument to set-support-ship. Also fixes glitch where only "max concurrent ships" number of support ships would actually respond to support requests.
2010-09-21 05:16:23 +00:00
The_E
3617bb9809
Another Assert()->Assertion().
2010-09-17 20:59:39 +00:00
IssMneur
e852ecf115
I thought I fixed that typo before committing.
2010-09-17 03:59:11 +00:00
IssMneur
a29ca275a7
Converted 4 Asserts into Warnings.
2010-09-17 03:54:46 +00:00
The_E
d98efc0675
Changing a string literal to the proper XSTR lookup
2010-09-17 00:01:58 +00:00
The_E
467c7d1e39
Fixing typos noticed by FUBAR
2010-09-16 21:41:10 +00:00
The_E
99dff69a3f
Another assert->Assertion conversion.
2010-09-15 22:00:51 +00:00
Sushi
26c2725ccd
Fix a typo
2010-09-15 05:06:23 +00:00
karajorma
d181d77744
Mantis 2159 - Add the last of Ghengis' code with a switch from debug output to a warning.
2010-09-15 00:53:15 +00:00
karajorma
d4e8bd4bf3
Fix Mantis 2278 (Adding a variable can mess up team loadout variables)
2010-09-15 00:50:28 +00:00
karajorma
eb1889327f
More SEXPs fixed for multiplayer.
2010-09-15 00:49:14 +00:00
karajorma
e960a14280
Add the has-primary/secondary-weapon SEXPs
2010-09-15 00:47:08 +00:00
The_E
e7fa7f021d
Averting a potential div by zero
2010-09-14 23:56:26 +00:00
Sushi
8c6895a029
Re-added collision physics, added basic landings support (still needs some work)
2010-09-13 14:27:42 +00:00
The_E
e76761a84a
...For real
2010-09-12 19:38:48 +00:00
The_E
fe50ee7231
Fix for is-facing (hopefully)
2010-09-12 19:30:10 +00:00
The_E
3e390ecfdc
... right this time.
2010-09-11 16:55:10 +00:00
The_E
14ae54ad3c
Adding ship:getEMP() for scripting.
2010-09-11 16:52:36 +00:00
Goober5000
c4a337e391
partial revert on 6444... don't forget, someone recently fixed a five-year-old bug in the countermeasures code :)
2010-09-11 00:08:57 +00:00
The_E
439c2c78cd
Adding object:getrvec() and object:getuvec() for completeness' sake
2010-09-10 23:11:28 +00:00
The_E
d863626f26
Adding the vector:getNormalized() and object:getfvec() functions
2010-09-10 20:51:55 +00:00
karajorma
8b1460aa30
Fix sexp_show_subtitle_image to work properly in multiplayer.
2010-09-10 10:42:12 +00:00
The_E
840d11d53d
....And another fix for is-facing.
2010-09-08 16:42:58 +00:00
The_E
a41728df77
Thanks to Goober for the warning.
2010-09-08 14:58:41 +00:00
The_E
820fa1dc73
Two more Asserts turned into Assertions() for better explaining
2010-09-08 10:56:31 +00:00
The_E
67a5ae2d27
Another int3() -> Assertion() conversion
2010-09-07 15:14:36 +00:00
The_E
a31d34a991
Bah, stupid typo (!= is != <!)
2010-09-07 15:11:01 +00:00
The_E
a1ef957423
Adding the is-facing sexp, as per Axem's request
2010-09-06 22:11:25 +00:00
The_E
c28989e121
2010-09-04 13:56:02 +00:00
Goober5000
e40cef7e4f
make the if check simpler, cause part of it was redundant
2010-09-04 06:55:10 +00:00
Goober5000
a129508de7
made the AWACS hack less ugly, by making the filename replacement much more efficient
...
--this also allows stuff to be added past the #End of messages.tbl
improve message_filename_is_generic to consider #Simulated Speech Overrides specified in messages.tbl
2010-09-04 06:51:50 +00:00
Goober5000
3cab590e03
none.wav is redundant in this check
2010-09-04 06:40:46 +00:00
The_E
a5cd35a1b9
Ooops.
2010-09-03 22:51:42 +00:00
The_E
5d625a2473
More cleanup
2010-09-03 22:45:18 +00:00
The_E
5249397161
More dead code be gone.
2010-09-03 22:41:08 +00:00
The_E
b7c9f0e8dd
Dead code removal
2010-09-03 22:31:25 +00:00
Goober5000
ef46114a12
disable the warning about Assertion since it clutters the build output
2010-09-03 21:44:54 +00:00
chief1983
682a517129
MSVC, why on FSM's green earth does this compile?
2010-09-03 15:04:05 +00:00
Goober5000
8733ab557a
don't simply assume that something is a ship!
2010-09-03 02:57:49 +00:00
Goober5000
455b7f9d81
no need to check if other_objp is a capital ship in these if statements, since the first capital+ check would have already returned the function
...
this also removes the assumption that other_objp is always a ship! it isn't!
2010-09-03 02:50:54 +00:00
Goober5000
61f66f13d6
yeah, asteroids and debris are pretty much the same thing
2010-09-03 01:26:49 +00:00
Goober5000
8e5dfc2d33
maintain the original hull, shield, and subsystem percentages when changing ship class, since we might be changing it from a briefing loadout (Mantis #2301 )
2010-09-03 00:34:38 +00:00
Goober5000
31db1efaff
partial revert (just one file) of Sushi's collision physics feature as it causes all kinds of crashes in asteroid fields
2010-09-03 00:16:45 +00:00
Goober5000
39f3d1d663
fix polymodel gettage since heavy_obj could be an asteroid
2010-09-03 00:14:10 +00:00
The_E
25c80ca56f
...and here.
2010-09-03 00:08:31 +00:00
The_E
83bb23a989
...and here...
2010-09-03 00:07:50 +00:00
The_E
931cd6bf3a
Better feedback here, as well
2010-09-03 00:06:52 +00:00
The_E
431b8955e8
Another Assert() redirected to more useful things
2010-09-03 00:06:01 +00:00
The_E
bae585b910
...Aaaaand another Assert()->Assertion() to make modellers happy
2010-09-02 21:48:53 +00:00
The_E
e282c07427
And another int3() turned to something more useful
2010-09-02 21:25:54 +00:00
The_E
2bf6c518ac
A useless int3() turned into a useful Assertion()
2010-09-02 20:27:33 +00:00
The_E
ccd0401a02
More asserts turned to assertions.
2010-09-02 19:57:18 +00:00
The_E
314c4dfdc3
Removing game_load_palette(). It was useless and commented out anyway.
2010-09-02 07:47:09 +00:00
Goober5000
30feeae3d0
fix the passengers tag so that it works more like the cargo tag
2010-09-01 06:43:08 +00:00
Zacam
273be5d221
-timerbar now has the same message as -decals and is a disabled launcher command. Launcher will (or should) no longer list it as an available command and a msgbox will pop-up if in an existing command line anywhere.
2010-09-01 03:17:10 +00:00
The_E
8458f75d76
weapon_info::subtype is not a bitfield
2010-08-31 22:40:30 +00:00
chief1983
5b775e7a88
Fix Assertion on GCC to support 2 arguments, and revert hacked calls to their 2 argument state
2010-08-31 21:09:15 +00:00
Goober5000
5f85e34b3f
update project file
2010-08-31 19:55:12 +00:00
Goober5000
972bdcfd15
don't generate debug information on release builds
2010-08-31 18:18:15 +00:00
chief1983
0fbcb2a2b6
Actually fix the Assertion instead of just disabling it.
2010-08-31 17:41:50 +00:00
The_E
2bfd50b5dc
Change assert to assertion. Also allowed usage of non-anis or effs as muzzleflashes.
2010-08-31 13:12:45 +00:00
The_E
ca37eeaf8e
Changing Assert() to Assertion() again.
2010-08-31 12:52:50 +00:00
The_E
c0fc384c8a
Change Assert() to Assertion() for better feedback to modders
2010-08-31 12:43:04 +00:00
The_E
a5c10c3ce9
Several minor touchups.
2010-08-31 12:42:39 +00:00
Goober5000
12e4d3713b
add +Tech title for ships.tbl
2010-08-29 06:07:22 +00:00
Goober5000
fa1f780227
fix compile errors
2010-08-29 04:51:15 +00:00
Goober5000
cc46e18d68
handle clearing alt-name too
2010-08-29 04:45:51 +00:00
Goober5000
6bd68fdeaf
add a #define
2010-08-29 04:30:21 +00:00
Goober5000
3445ce4cb8
FUBAR's change-callsign patch
2010-08-29 03:46:48 +00:00
The_E
9fbe036484
Ooops, slight typo
2010-08-26 23:42:04 +00:00
The_E
3397d3a21e
From FUBAR: Patch to redirect a warning popup to the log when in standalone mode.
2010-08-26 22:56:36 +00:00
The_E
ee27823042
Change Assert() to Assertion(), again to better explain why it fails.
2010-08-26 12:17:51 +00:00
The_E
3d3fbb3002
Fixes a crash when "Test Load Ship" was used with a ship that has turrets with rotation sounds defined.
2010-08-25 20:24:34 +00:00
The_E
17b4aeac33
Change Int3() to assertion for better explaining and stuff.
2010-08-22 12:59:01 +00:00
The_E
e5416e3506
Remove hardcoded piece of interface code in favour of something generated dynamically. Fixes issue with too many pilot names being displayed in the pilot select screen if a custom font is in use.
2010-08-21 20:19:48 +00:00
Sushi
f045a26eed
Updated random sidethrust ($Random Sidethrust Percent) to include strafing attacks vs big ships, as well as making it a bit more situational for fighter vs fighter.
2010-08-21 19:55:44 +00:00
The_E
a47698230b
Adding a bit of sanity checking here...
2010-08-21 16:22:57 +00:00
The_E
ffe6397e66
Fix issue reported by droid803 where non-player ships that have an afterburner need shield icons as well, causing debug warnings. Changed the check so that it only triggers on player ships.
2010-08-20 23:13:44 +00:00
The_E
a1ecfe158b
Adding the adjust-audio-volume sexp.
2010-08-19 19:45:28 +00:00
IssMneur
5dac806c8e
Adds support to Voice Acting Manager in FRED for putting the speaker's name into the generated file name.
...
Also makes the "Generate Filename" function set the modified flag for FRED if any file names get changed.
2010-08-17 23:52:20 +00:00
IssMneur
26ae5efb0f
Fixes mantis 2275: Improving remove-background-bitmap and remove-sun-bitmap so that they issue an Error if an invalid index is passed via the sexp.
2010-08-17 05:42:55 +00:00
IssMneur
ad9759d2fa
Clarify the help text for set-object-speed-x, set-object-speed-y, and set-object-speed-z
2010-08-17 05:37:38 +00:00
The_E
31b88687d0
And of course, I screwed it up a bit. Reading the documentation is A1 SUPAR.
2010-08-16 23:18:10 +00:00
The_E
0ac5a17102
Allow scripting to override turret AI target selection
2010-08-16 22:04:23 +00:00
The_E
bde583461f
Fix for assertion encountered with the warp-effect sexp. Also updated sexp help to indicate correct usage.
2010-08-11 13:08:51 +00:00
The_E
6032c0b463
Remove requirement for SM3. While this will not allow cards that are only capable of SM2 to use the standard shaders, now shaders can be written for them.
2010-08-10 18:41:12 +00:00
Sushi
b64303a19e
Support for allowing bombs to be destroyed by weapon blast and/or shockwaves. Weapon flags are "takes blast damage" and "takes shockwave damage"
2010-08-05 14:17:20 +00:00
chief1983
19319a4835
Whoops hangovers and VNC don't go well together, did not mean to commit this at all.
2010-08-04 19:38:29 +00:00
chief1983
f5e236e408
2010-08-04 19:33:54 +00:00
karajorma
47f157a9f7
Fix 4 more SEXPs for multiplayer.
2010-08-04 17:44:40 +00:00
Sushi
679430d654
Added to ships.tbl:
...
$Collision Physics:
+Bounce
+Both Small Bounce
+Friction
+Rotation Factor
2010-08-04 02:08:14 +00:00
taylor
25987a680d
various FS2NetD fixes:
...
- increase sleep time during reconnect
- better handling of disconnects from connection errors
- proper disconnect in case of login failure
- log stats request calls
- don't try to read stats from packet when there aren't any to read
- allow proper connection resetting with standalone
- change auto-reconnect timeout from 30 minutes to 5
- count server traffic among activity instead of just client traffic
- reduce uneccessary client->server traffic
2010-08-03 08:22:02 +00:00
taylor
e27d61bbae
fix debug message
2010-08-03 08:21:59 +00:00
Goober5000
b48eb270f9
don't generate debug/pdb/map info for release builds on VC6
2010-08-02 04:07:28 +00:00
Goober5000
b00b61ccd2
revert using motion debris in asteroid fields
2010-08-02 03:52:16 +00:00
Zacam
342640920a
This is the same as 6335, but for FRED. 2008 and 2010.
2010-07-30 16:21:21 +00:00
Zacam
7185348ea9
Removes /DEBUG from the Linker Properties, no longer Generating PDB files for Release builds. This should also resolve the "no disk in drive" issues. MSVC 2008 and 2010.
2010-07-30 16:13:46 +00:00
The_E
063dea2f89
Patch for issue with ai-waypoints not working correctly. The ship's goals were accidentally cleared after a single run through the waypoint path.
2010-07-29 22:30:02 +00:00
Sushi
d391e3f093
Changed "big ships manage shields" to "all ships manage shields." No difference in behavior, just named more accurately.
2010-07-29 00:30:57 +00:00
The_E
c6589187e4
Fix/Workaround for Mantis 2272 (Int3() in hudtarget.cpp)
2010-07-27 15:28:09 +00:00
The_E
dd60442914
Change short to ushort to avoid issues with high-poly models.
2010-07-25 23:30:18 +00:00
Echelon9
b7c1dcff02
Fix for reinforcement menu bug - Mantis 2246
2010-07-25 05:04:14 +00:00
Goober5000
7df3e81080
add feature requested by BWO: group send-message-list messages at beginning of script
2010-07-22 07:51:32 +00:00
chief1983
e691fa8f94
Should allow INT_MAX to be visible on POSIX-compliant systems
2010-07-21 18:50:19 +00:00
chief1983
e9e3333c73
IssMneur's fix for Mantis #2240 , allow gaps after the hardcoded retail sound entries.
2010-07-20 21:59:36 +00:00
chief1983
2d43f0b847
Per IssMneur, fix the root directory detection on *nix systems.
2010-07-19 15:50:50 +00:00
The_E
d12eec674f
Fix for the "is-ai-class" sexp. Previously, the sexp would compare the given AI class against the ship class' tbl default AI class, which produced erroneous results.
2010-07-19 02:12:43 +00:00
The_E
dc54a7d11d
No wonder it didn't really work. I was looking in the wrong array.
2010-07-18 02:18:40 +00:00
chief1983
3aba1b9f73
Bump to MAX_SHIP_FLAGS and a subtle reminder for posterity
2010-07-17 22:27:14 +00:00
chief1983
251fe9a34a
One more autopilot fix for 3.6.12, per IssMneur
2010-07-17 22:18:20 +00:00
The_E
4d5008fcc1
Fix for Mantis 2263 (Objectives list is still displayed despite disable-hud-except-messages being active)
2010-07-17 14:59:32 +00:00
The_E
4f2942e440
Slight cockup on my part here. Pain flashes were not supposed to be gone for everyone.
2010-07-16 18:35:13 +00:00
The_E
3c412bef42
Updated the credits after god knows how long
2010-07-16 16:16:27 +00:00
The_E
7bcd8d162b
Reverting the revert (Yay for feedback), as the ships flag solution seems to be what people really want.
2010-07-15 14:55:59 +00:00
chief1983
b60eb681e6
Fix an Assertion usage issue on *nix platforms.
2010-07-14 15:31:17 +00:00
chief1983
cbe541598e
IssMneur's autopilot fixes (hooray\!)
2010-07-13 22:45:54 +00:00
The_E
c1f1c47fa8
Patch for Mantis 2205 (Division by zero in do_random_sidethrust())
2010-07-10 15:06:33 +00:00
Sushi
9c766c1315
Added "$big ships manage shields:" AI profile/AI class flag
2010-07-09 13:11:37 +00:00
Zacam
58d378134d
Added the following (recursively) to the svn:ignore: .ncb, .suo, .user, desktop.ini, thumbs.db.
2010-07-08 03:51:39 +00:00
Zacam
7ad97943fd
From blowfish: Mac Icon update based on: http://www.hard-light.net/forums/index.php?topic=44371.0
2010-07-08 03:35:57 +00:00
The_E
52f424a0b0
While the other code that was commented out might be unnecessary, this fvec still needs to be set up properly
2010-07-07 15:27:37 +00:00
The_E
854ff6cff9
If lock-perspective is active, the perspective should stay locked.
2010-07-07 02:19:06 +00:00
The_E
3b93ad2ba9
Reverting 6279, and making it more intelligently (Thanks Goober for the heads-up)
2010-07-07 00:04:32 +00:00
Goober5000
3cdf9d3f12
fix a bug noticed by The_E: object types are not bitfields
2010-07-05 05:43:08 +00:00
Goober5000
131805bb51
use motion debris in asteroid fields, per Galemp
2010-07-05 05:41:57 +00:00
The_E
7a8973eade
Introducing new SIF2 flag ("no pain flash") to turn off the pain flash. I guess all the peeps who want to do capship missions can rejoice now.
2010-07-05 02:28:48 +00:00
Echelon9
8383d11490
Update Lua interpreter to 5.1.4 (patch 2) to fix the following bugs http://www.lua.org/bugs.html#5.1.4
2010-07-03 02:48:03 +00:00
The_E
437b27c460
A few more dialogues added
2010-06-27 21:46:50 +00:00
Goober5000
51f9cbb20a
make FRED be intelligent about mission directory (Mantis #2236 )
2010-06-27 08:30:45 +00:00
Goober5000
c8ef8d38ef
remove unreferenced variables
2010-06-27 07:13:33 +00:00
Goober5000
614f60968c
use 2_ animations in the tech room, just as in the command brief (Mantis #2231 )
2010-06-27 07:05:01 +00:00
Goober5000
af2ac0a7eb
remove a bit of code that should no longer be necessary due to previous upgrades/fixes
2010-06-27 06:04:48 +00:00
Backslash
5263673023
Add a $Max Directives: option to hud_gauges.tbl -- works just like $Max Escort Ships
2010-06-26 19:34:59 +00:00
Wanderer
0718bc2921
fix for potential null vec issue when using limited base rotation turrets
2010-06-24 18:21:31 +00:00
Wanderer
999ec32353
fix for salvo + check hull bug found by fubar
2010-06-24 17:56:19 +00:00
Sushi
6d29c1a462
Removed unpopular circle strafe changes to make circle-strafing AI more aggressive (like in RC2)
2010-06-24 02:33:48 +00:00
Goober5000
7edfdb32ad
this is just a bit cleaner
2010-06-23 06:56:45 +00:00
Goober5000
06216fce4f
remove not-kamikaze, since it was never implemented, and since its behavior is incorporated into the kamikaze sexp
2010-06-23 06:19:43 +00:00
Goober5000
be6ea31534
fix for Mantis #2056 (sexps may not want to process every ship)
...
also, account for the fact that Command may not be "#Command"
2010-06-23 03:05:26 +00:00
Goober5000
6966b3a57d
fix a silly bug noticed by karajorma
...
also, slightly compact the knossos check
2010-06-22 02:29:53 +00:00
The_E
1ae587f819
Fix for null vec3d error mentioned in Mantis 1888 by Woolie Wool
2010-06-22 00:51:12 +00:00
Wanderer
fd6c3a84f6
allow lua to track if ship is 'dying' during the frame (bugfix for flashy deaths script)
2010-06-21 22:06:49 +00:00
Wanderer
4d1f5f6a1c
fix for the ai profile issue (mantis 2228)
2010-06-21 19:25:00 +00:00
chief1983
6284da4654
Fix the Assertion to not break Macs and Linux.
2010-06-21 17:12:23 +00:00
chief1983
eed85feae9
IssMneur's fix for #1888 (finally): Much better autopilot behavior.
2010-06-21 14:59:36 +00:00
Goober5000
f8efafb0f2
minor modification of karajorma's warp effect so that Knossos can be used for both warpin and warpout; Babylon5 still switches appropriately
2010-06-21 07:41:26 +00:00
Goober5000
5141cf6dab
fix some problems with set-explosion-option (viz. all options need to be set if a special explosion is being used)
2010-06-21 07:14:54 +00:00
Goober5000
f8e3aee161
add set-explosion-option to edit explosions (needed after karajorma's new special-exp code)
2010-06-21 01:21:40 +00:00
Wanderer
e047ba0155
Fix lua ray collision checks against debris pieces
2010-06-20 14:07:30 +00:00
Wanderer
c0862e47bc
add a null vec check - hit by fubar
2010-06-20 14:06:34 +00:00
The_E
6ead2d8d87
Stopgap fix for Mantis 2224 (Black text is unreadable in the multiplayer chat). Turned black into pink (as that colour wasn't used before).
2010-06-18 18:18:27 +00:00
karajorma
725ce08f38
Remove the -tbp command line.
2010-06-18 05:03:32 +00:00
Zacam
d50cb3841c
Commit of PNG Data fix as suggested and supplied by Armchair Commander and marvn.
...
(Read: http://www.hard-light.net/forums/index.php?topic=68405.0 )
2010-06-17 19:46:46 +00:00
Goober5000
33f47d53c7
add awesome logical operators
...
(I wonder why nobody added these until now)
2010-06-16 02:38:24 +00:00
Goober5000
db2e20e59a
add mission-time-msecs
2010-06-16 02:10:48 +00:00
The_E
67e89bdd8d
Fix for Mantis 2212 (Interface animations start at frame 1, not 0)
2010-06-15 17:24:03 +00:00
The_E
c0e55de8f0
Fix for Mantis 2210 (Ship models in ship selection do not always show up properly)
2010-06-15 12:04:50 +00:00
Echelon9
0d2c96ba09
Project file update to include bitarray.h
2010-06-14 14:12:45 +00:00
The_E
02e76c00e9
Project file update to include bitarray.h
2010-06-14 07:36:07 +00:00
Goober5000
7b8c035320
revert portej05's removal of the bitstring code
2010-06-14 06:56:52 +00:00
The_E
d41fa67715
Don't increase the total number of loaded menu music files if a tbm with +nocreate is loaded.
...
This also neatly fixes the somewhat screwed up music selection list in FRED (remember all those empty lines?), albeit not completely.
2010-06-14 01:59:15 +00:00
Goober5000
7cfdf27b78
sync file for proper string length
2010-06-12 21:23:56 +00:00
Goober5000
5cc6f5e4fd
sync case
2010-06-12 20:47:22 +00:00
Wanderer
4b66b6e42c
related to mantis 2187 - fix to improve autoaim accuracy if additive velocity is enabled
2010-06-12 16:10:31 +00:00
The_E
8edeb00886
Some stuff for wxFRED. Slowly making progress.
2010-06-10 01:29:17 +00:00
Wanderer
c01b067c1a
better handling of 'dying' weapons for lua scripting.cpp
...
added lua controls for accessing beams
2010-06-09 16:49:20 +00:00
Goober5000
9940f9a752
add OPF_SOUND_ENVIRONMENT for Taylor's sexps
...
also, some tweaks for sexp checks and for SEXP_NONE_STRING
2010-06-09 07:38:27 +00:00
Wanderer
9d75c04e99
fix for target priorities and sif2 flags issue
2010-06-09 05:19:54 +00:00
The_E
56c1699aee
Project File for wxFRED.
2010-06-09 05:18:45 +00:00
Wanderer
a9e043f156
fixes for the external weapons patch (accidentally uploaded outdated patch)
2010-06-07 12:48:53 +00:00
Wanderer
2296b885b5
changes to external weapon model handling
2010-06-07 12:22:54 +00:00
The_E
36f1acb0ae
Not quite sure how this one went broken for so long....( FSO specific .libs were not loaded on non-SSE2 configurations, leading to broken builds.)
2010-06-07 11:10:11 +00:00
Wanderer
add696869b
mantis 1988 - error checking for the targeting priorities
2010-06-07 10:53:34 +00:00
Goober5000
a6066d79a9
ignore generated file
2010-06-07 07:02:18 +00:00
Goober5000
bbeba26c70
adjust coordinates for The E's latest 640x480 art
2010-06-07 06:35:40 +00:00
Goober5000
b59580e84c
FUBAR's feature for LOD naming: http://www.hard-light.net/forums/index.php?topic=68901.0
2010-06-07 03:58:47 +00:00
Goober5000
a992f0687c
tweak fiction viewer coordinates
2010-06-07 02:13:44 +00:00
The_E
5d5b377ad8
A missing ) is bad for parsing.
2010-06-06 18:12:29 +00:00
taylor
a971f3d768
make sure to stop deathroll effect too (Mantis #2215 )
2010-06-06 14:50:38 +00:00
taylor
5e943b843c
add some missing safety checks for Snds[] (Mantis #2216 )
2010-06-06 14:50:36 +00:00
Echelon9
67a5d89d47
Removed defined but unused variables
2010-06-06 08:35:19 +00:00
taylor
f80dcd4a87
make sure to always close context and device when searching through valid devices
2010-06-06 03:10:40 +00:00
taylor
96d93607dd
fix OS X compile issue
2010-06-06 03:10:38 +00:00
The_E
03d0b66214
Same here.
2010-06-05 02:45:13 +00:00
The_E
719eb41cd8
Remove unused files from the project file
2010-06-05 02:36:41 +00:00
Goober5000
f37ff6da68
minor fix to the -wcs flag removal
2010-06-03 06:28:06 +00:00
karajorma
3005e447d3
Kill the -wcs flag. Should have done this years ago.
2010-06-02 12:01:13 +00:00
The_E
1dbe105933
Fix for Mantis 2214 (toparc2 and toparc3 hud anis [The Enemy Missile threat and Enemy Missile lock indicators] may have a length > 2 now, instead of being fixed at 3 frames)
2010-06-02 11:49:24 +00:00
taylor
04cac71fe9
revert r6151
...
Per source doppler factor is part of the EFX spec, which means all full 1.1 implementations.
2010-06-01 02:44:15 +00:00
The_E
4bee746897
According to the OpenAL programmer's guide, AL_DOPPLER_FACTOR is not a valid parameter for alSourcef
2010-05-31 10:38:00 +00:00
Wanderer
4b34460f06
Certain fixes for Bobs animation code issues. Please report if this renders any current anims invalid.
2010-05-30 19:28:21 +00:00
Echelon9
af574dacff
codec1.cpp and codec1.h included in Xcode project file when no such source files present
2010-05-30 05:14:00 +00:00
The_E
e101736d8f
Project file update for new sound code.
2010-05-30 02:17:21 +00:00
taylor
f06ef36ca6
more sane memory reserve
2010-05-29 15:53:28 +00:00
taylor
1491795451
fix endless loop
2010-05-29 15:53:27 +00:00
taylor
0a17554c4f
disable doppler for the time being
2010-05-29 15:53:24 +00:00
taylor
b287ecfef9
new sound code
...
- Mantis #58
- Mantis #1769
- many other fixes and improvements
2010-05-29 15:53:18 +00:00
taylor
a7bac8679c
fix view skew math issue (Mantis #2213 )
2010-05-29 14:55:04 +00:00
taylor
f72d0a4cd5
bah! remove debug code that slipped in with safety fixes
2010-05-29 10:55:33 +00:00
taylor
d3e750edf7
support for newer versions of automake (Mantis #2145 )
2010-05-29 10:55:30 +00:00
The_E
7f9df9c09e
Fictionviewer interface adjusted for new, official interface art found here: http://blueplanet.fsmods.net/E/FictionViewer.7z
2010-05-28 20:07:05 +00:00
Wanderer
89d7a512af
add read access for lua to weapon and ship info index. enable to check 'weapon_armed' status
2010-05-28 19:15:05 +00:00
karajorma
61af589c21
Swap the engage enemies messages over.
2010-05-28 06:09:53 +00:00
Sushi
270734b6f3
Fixed a parsing bug in AI.tbl that scaled Glide Attack Percent, Glide Strafe Percent, Circle Strafe Percent, and Random Sidethrust percent between 0 and 1 instead of 0 and 100 (as is the case for AI profiles.tbl)
2010-05-25 18:09:59 +00:00
Sushi
5704dce248
Fix a bug where additive weapon velocity would sometimes cause primary shots to pass through a target
2010-05-25 16:25:41 +00:00
The_E
f993f7ced1
Altered the project file to allow FRED release compilation on VS2010
2010-05-25 01:11:46 +00:00
Goober5000
04436d634f
remove message from queue the correct way, thus fixing the training message crash
2010-05-19 04:28:43 +00:00
Sushi
e63505510b
Added $Random Sidethrust Percent to AI Profiles and AI.tbl. Allows ships with sidethrust capability to sometimes randomly use it in dogfighting situations to make life more miserable for the player.
2010-05-17 19:10:34 +00:00
Goober5000
c5e3600bef
reverted fix. It has problems, which is why I'm going over it first.
2010-05-16 22:26:58 +00:00
The_E
acdc56272b
Committing IssMneur's fix for Mantis 2183.
2010-05-16 15:40:11 +00:00
Goober5000
7a44b33152
better handling of missing models
2010-05-15 22:53:41 +00:00
Goober5000
ec2542fa1e
misc silly fixes
2010-05-15 21:48:23 +00:00
Goober5000
1eb544da58
fix subsystem alignment on ship class change (Mantis #1181 )
...
fix a bug with Bobboau's external missiles feature
2010-05-15 21:31:32 +00:00
Sushi
71ba95081c
Added $No extra collision avoidance vs player flag. Makes the AI less likely to didder around like an idiot at close range.
2010-05-14 20:43:32 +00:00
Sushi
b01b4a1778
Small fix for circle strafe
2010-05-14 18:57:58 +00:00
Sushi
e46ba43891
Fix for Mantis 2099
2010-05-12 19:40:09 +00:00
The_E
e2c5ff679c
Swarm weapons should respect "$Free flight time" as well
2010-05-10 17:17:49 +00:00
The_E
132ba60085
Patch for Mantis 2202 (Children of swarm weapons do not inherit parent target)
2010-05-09 14:53:29 +00:00
Echelon9
fdb7de88da
Remove commented out code (still in SVN history if needed) and the overhead of an empty function call every frame
2010-05-09 06:12:06 +00:00
Echelon9
44886e1ba5
Benefit from our use of STL vectors be removing a now unnecessary variable in cutscenes.cpp and making code cleaner and easier to read
2010-05-08 15:09:08 +00:00
Sushi
63b9efeb3a
Some fixes/updates for the Circle Strafe behavior. The AI should use it a bit more effectively now.
2010-05-07 17:03:23 +00:00
chief1983
e702ce2267
Quick fix for the WarningEx breakage on *nix
2010-05-05 16:47:12 +00:00
karajorma
de0c889d10
Fix compilation under OSX and Linux with WarningEx
2010-05-04 12:34:05 +00:00
The_E
e2fbbb5e19
Genghis' fix for Mantis 2162 (Thruster cones have collision detection)
2010-05-03 12:32:42 +00:00
karajorma
27f58de890
Add the (in)validate-all-arguments SEXPs
2010-05-03 12:03:57 +00:00
karajorma
c07d555346
Genghis' fix for Mantis 2159 (Certain parsing errors are never reported)
2010-05-02 10:24:48 +00:00
karajorma
2f635ad879
Genghis' fix for Mantis 2157 (Invalid subsystems not properly detected on mission parse).
2010-05-02 06:00:50 +00:00
karajorma
10d6940145
GencGenghis' fix for Mantis 2155 (No error checking for certain ship problems in the lab that FRED does pick up).
2010-05-02 05:54:26 +00:00
karajorma
c6b8d515a4
Genghis' fix for Mantis 2151 (No error checking for incorrect engine wash entries).
2010-05-02 05:53:02 +00:00
Sushi
34c61a7caa
Reverted commit 5656, due to side effect of changing AI behavior (see mantis 1982)
2010-05-01 20:39:41 +00:00
Goober5000
39d5580651
prevent HUD formatting from destroying subsystem names - Mantis #2195
...
also made hud_targetbox_truncate_subsys_name return void to lessen the chance of people making the mistake in the future
2010-04-30 06:33:38 +00:00
Goober5000
0d75839a9d
fix rounding formula (Mantis #2194 )
2010-04-30 04:03:24 +00:00
karajorma
35ac7d6afa
Fix Mantis 2194 (FRED incorrectly calculates the wrong number used in wings).
2010-04-30 03:24:30 +00:00
Sushi
b48b7f76ac
Fix for bug causing AI to not fire secondaries, as well as a fix for other minor AI bugs
2010-04-29 18:56:11 +00:00
karajorma
a2afa2b67a
Switch to using the Macros for Multiplayer modes whenever possible.
2010-04-27 13:42:59 +00:00
Sushi
0889d77f9f
Fix for Dynamic Glide Cap so that the cap ramps max speed in the same way as normal flight when turning afterburners on/off or changing the overclock (what it should have done in the first place). Also removed some old, unused glide code.
2010-04-26 13:38:36 +00:00
Sushi
b72514fbaa
Fix for 6057 (game sometimes crashes if $Turret Max Aim Update Delay not set)
2010-04-26 13:36:08 +00:00
The_E
475853afa3
Fix for Mantis 2189 (camera FOV may get corrupted by malformed commandline argument)
2010-04-21 21:14:08 +00:00
karajorma
047ae70637
FUBAR's Fix to allow Explosion-Effect to use any explosion in fireball.tbl
2010-04-20 13:05:29 +00:00
Goober5000
2e58278eba
make sure Fred knows its base directory before loading the command line... this will allow it to load cmdline_fso.cfg which will allow Fred to recognize mods (Mantis #2185 )
2010-04-20 05:37:34 +00:00
Goober5000
26f33cba24
fix parsing of miss factors (Mantis #2185 )
2010-04-20 04:37:44 +00:00
chief1983
7846af6c24
No 2-arg asserts on Linux.
2010-04-19 23:32:52 +00:00
Goober5000
aa0c39cb7d
add beam miss factor by team, requested by Blue Planet
2010-04-19 05:17:57 +00:00
Goober5000
63909095f5
merge Iss_Mneur's fix for Mantis #2173 (better error message in cmdline.cpp)
2010-04-19 03:51:05 +00:00
Goober5000
e537b1e133
merge Iss_Mneur's fix for Mantis #2178 (Assertion in missiontraining.cpp)
2010-04-19 03:49:09 +00:00
Goober5000
09602a9ffa
merge The E's fix for Mantis #2182 (NaN propagation leading to rendering wonkiness)
2010-04-19 03:40:13 +00:00
Sushi
f7ebd3c636
Added $Turret Max Aim Update Delay (same as $Max Aim Update Delay, but affecting turrets instead).
2010-04-15 20:03:01 +00:00
chief1983
52fb26169c
Add a VS2010 project file, made from VS2010 Ultimate RC1. Added tweaks after conversion from 2008 to make the output file names and target names more dynamic. This should be the basis for getting FRED release builds to compile. The three other executables per config work fine.
2010-04-14 20:07:08 +00:00
karajorma
ff7f028e0e
Fix the end-mission SEXP to make it possible to test if the player is alive or not.
2010-04-13 11:15:18 +00:00
karajorma
1362e16c4c
Remove a hack which wouldn't allow players to skip the penultimate FS2 mission if they failed it 5 times.
2010-04-13 11:14:20 +00:00
karajorma
4178c4b65c
Iss Mneur's mission-set-subspace and hud-display-gauge SEXPs
2010-04-13 11:12:28 +00:00
Goober5000
f59fd543c9
fix Mantis #1953 (departure locations and anchors destroyed by ship editor dialog)
2010-04-13 06:51:06 +00:00
Goober5000
0dddfbca74
consolidate and fix the resetting of time compression (Mantis #2180 )
2010-04-13 03:54:30 +00:00
Sushi
0c025d96f6
Fixes a bug where paths generated by exit paths aren't garbage collected. This can cause the game to crash in missions where a lot of ships launch from fighterbays.
2010-04-11 18:36:30 +00:00
Goober5000
4b662a3649
prevent an endless loop if someone tries to assign a variable to itself
2010-03-31 20:31:02 +00:00
Goober5000
d6d69d9ac7
IssMneur's patch for Mantis 2161
2010-03-31 05:33:55 +00:00
Goober5000
59c7c56dd4
The E's patch to apply capital+ to secondary weapons
2010-03-31 05:31:23 +00:00
Goober5000
c2a2f0727f
patch some holes in the handling of string variables
2010-03-29 09:39:26 +00:00
karajorma
a5078ce0aa
Fix Mantis 2000 (Skip Mission Dialog appears even when mission is successfully completed).
2010-03-24 10:49:28 +00:00
Echelon9
36f2e4fd73
Fix Mantis 2158: Increase Intelligence limit from species.tbl
2010-03-21 06:22:35 +00:00
Goober5000
0458d83f94
a couple of small but important fixes to the subtitle code, including (finally) the complete fix for Mantis #2152
2010-03-20 06:37:26 +00:00
Echelon9
c66a0b8e05
Fix Mantis 2156: Crash within outwnd_printf2(char*, ...) on non-Windows platforms
2010-03-20 00:20:47 +00:00
Goober5000
725b48d2b9
handle variables in show-subtitle
2010-03-19 07:39:51 +00:00
Goober5000
b7f4d00358
Genghis's fix for too many cargo names (Mantis 2132)
2010-03-19 06:45:05 +00:00
Goober5000
5a3fa6f576
allow specification of fonts via show-subtitle
2010-03-19 06:31:15 +00:00
Goober5000
28d23c56c0
sexp help now scrolls
2010-03-19 05:47:56 +00:00
Goober5000
7181e3d602
a few things here...
...
--add space for font argument which will be in post-3.6.12 builds
--fix round-off error in coordinate conversion, discovered by genghis
--use is_sexp_true() instead of WMC's comparison
--fix images not appearing in show-subtitle (Mantis #2152 )
--fix invalid character in change-soundtrack sexp help
2010-03-19 04:03:49 +00:00
Goober5000
774f34dea4
approximate the beam whack from retail FS2
2010-03-16 06:43:05 +00:00
Goober5000
7fa0a70c9e
this is a long-overdue rewrite of WMC's show-subtitle sexps
2010-03-15 01:55:40 +00:00
Goober5000
27f70fe135
move the -post_process flag to the experimental section
2010-03-14 22:38:37 +00:00
Echelon9
1530e3556b
Fix Diaspora Mantis 537: Successfully killing a ship hidden from sensors should count towards your kill count
2010-03-12 23:19:42 +00:00
karajorma
b6914428ad
Fix Mantis 2140 (Set-primary-ammo/weapon result in the ammo being set to 0 in some mods)
2010-03-10 14:49:50 +00:00
taylor
d36f675f50
no comment. (nothing nice to say)
2010-03-10 10:05:42 +00:00
karajorma
ca90928e08
Refactoring the Special Explosion and Special Hitpoints/Shield code and saving methods.
2010-03-10 08:50:28 +00:00
Wanderer
f19a74b5c2
mantis 2122, fix for hud_gauge string comparison problems.
2010-03-09 07:09:40 +00:00
Wanderer
e8d72f5a50
mantis 2138, fix game crashing if using ships with secondaries but without primaries, allow ai ships armed only with secondaries to attack & shoot
2010-03-08 14:53:48 +00:00
Wanderer
be06149719
mantis 2113, make autoaim independent from lead indicator status
2010-03-08 14:52:24 +00:00
Wanderer
d0b3d8fe30
feature commit - alternate lead indicator based on komet's code changes.
2010-03-06 14:23:13 +00:00
Goober5000
46ea3669d5
allow multiple interface patterns (FS2 plus WCS) to be used in fiction viewer
2010-03-06 11:39:11 +00:00
Wanderer
96c365ca86
Fix for mantis 2131:
...
prevent for time compression caused vector scaling errors
changed time compression related beam assert into nprintf.
2010-03-05 11:48:19 +00:00
Wanderer
f93e369d73
Fubars fix for mantis 2141
2010-03-05 05:47:23 +00:00
Wanderer
5983a47bc4
fix for mantis 2125
2010-03-04 20:34:52 +00:00
Wanderer
c4df09934c
fix for mantis 2105
2010-03-04 19:39:48 +00:00
Wanderer
3b1597f2d9
fix to attach muzzleflashes on ship to weapon firing points - mantis 2135.
...
also related fixes - fix attached particle rendering, allow all particles to exists at least 1 frame
2010-03-04 10:10:57 +00:00
taylor
56102ad328
use system versions of JPEG, PNG and LUA (per Mantis #1663 discussion)
2010-03-04 05:58:54 +00:00
taylor
8d2b02efb7
add detection of OpenAL and OpenGL (Mantis #1663 )
2010-03-04 05:58:53 +00:00
taylor
de60dfe106
fix memory issues with arg parsing
2010-03-04 05:58:52 +00:00
taylor
7b293cd972
reduce minimum sound volume value for OpenAL compatibility (Mantis #1854 )
2010-03-04 05:58:50 +00:00
taylor
1ad8db2238
cycle back to normal music is hostile ships leave without battle (Mantis #1632 )
2010-03-04 05:58:49 +00:00
taylor
bce97dae91
updated Ogg/Vorbis/Theora libs
2010-03-04 05:58:45 +00:00
taylor
721e71f860
handle cmdline_fso.cfg files of any size
2010-03-04 05:58:18 +00:00
taylor
a8510f8a51
clean up launcher flags
...
- update easy flag settings (Mantis #2074 )
- remove -res, it requires an option
2010-03-04 05:58:17 +00:00
taylor
f818572382
properly close out mission when end-mission sexp is used (Mantis #2144 )
2010-03-04 05:58:16 +00:00
karajorma
64d3a85dfa
Fix an issue with the multi_sexp system if you ever had to send two full packets in a single frame.
2010-03-03 14:11:59 +00:00
Swifty
b9baca78ed
Fix frame buffer objects from rendering upside down after calling gr_opengl_set_clip and gr_opengl_set_projection_matrix.
2010-03-03 12:47:08 +00:00
karajorma
e12b4c3840
Remove "disarm or disable cause global ai goal effects:" from AI_Profiles as promised and replace it with a new object types table setting.
2010-03-01 15:59:47 +00:00
karajorma
b464f2a558
Fix Mantis 2137 (Play-Sound-From-File doesn't loop correctly).
2010-03-01 13:44:25 +00:00
karajorma
abd020529d
Ironically OF_REFERENCED isn't referenced anywhere in the code.
2010-02-28 14:07:49 +00:00
karajorma
d4b6ae7b8d
FRED should base the list on the selected object and not simply the first marked one.
2010-02-24 09:13:47 +00:00
Goober5000
5a92218ce6
fix bugs in VC2005 project files, probably caused by VC6 import
2010-02-24 05:11:22 +00:00
karajorma
38a42dd2e4
Change an assertion into a warning and auto-fix the data in release builds.
2010-02-23 01:53:55 +00:00
Zacam
e7b0c695ea
For 3.6.12 RC: resolves the text "Monitoring" not showing on the HUD Escort monitor box. [Mantis 2133]
2010-02-20 22:24:28 +00:00
chief1983
a77a92b8f0
Get rid of one place we have to update the version.
2010-02-19 20:41:19 +00:00
Zacam
bfdf0c5b48
Increase Trunk tagging and version to 3.6.13.
2010-02-19 19:57:22 +00:00
chief1983
5fc6743d4c
SVN will ignore .git and .gitignore files now.
2010-02-18 03:55:41 +00:00
Goober5000
b124ff648b
reconvert MSVC_2005 project from MSVC_6
2010-02-17 10:27:23 +00:00
Goober5000
5c032efc72
remove MSVC_6_Release which is now redundant, and MSVC_2003 and MSVC_2005 which are old and need fixing
2010-02-17 10:16:33 +00:00
Goober5000
01a242f269
sync with MSVC6_Release
2010-02-17 10:13:54 +00:00
chief1983
e96e973a54
Fix VS 2008 compiling of FRED.
2010-02-16 05:22:14 +00:00
Zacam
cebcd67cfc
Some *nix compilers (and potentially Mac in the near future) are dying on the build process regarding this comma.
2010-02-15 22:04:45 +00:00
taylor
41adc2f68b
fix coop kill limit check when set to none (Mantis #2014 )
...
cleanup coop validation checks a little, particularly if future checks are added
2010-02-15 19:53:33 +00:00
taylor
f7126d9c9c
Merge branch 'misc'
2010-02-15 19:01:14 +00:00
Goober5000
4efaaf4523
clarify difference between knossos warpin and warpout in the code -- this should fix Mantis #2128
...
"mabye" -> "maybe"
2010-02-15 11:01:29 +00:00
Goober5000
ba9c45714a
add Fiction Viewer dialog
...
FRED will now save fiction viewer information properly
FRED will now also save "hidden" debriefing information properly
2010-02-15 10:22:20 +00:00
Goober5000
99aa1e74a0
sync png and zlib changes with MSVC6
2010-02-15 10:08:20 +00:00
Zacam
3761e36f4c
Well, this is embarrassing. Forgot to apply "is_a_word_separator" in the briefing text coloring fix for Mantis 1992. As a result, it wasn't stopping coloring unless and until a whitespace was being hit, instead of stopping on valid word separators like it should have been.
2010-02-14 00:46:13 +00:00
Echelon9
271044cb70
Mantis 2108 Fix (Mac Inferno build configurations do not correctly set INF_BUILD in Xcode)
2010-02-13 12:07:00 +00:00
karajorma
7d4f9f0fb5
FUBAR's Mantis 2053 fix (Fix a few holes where invalid names could leak through.)
2010-02-13 09:10:40 +00:00
Wanderer
8651bb3a0b
fix for potential (and real) null vec issue caused by sexped explosions
2010-02-13 09:01:07 +00:00
chief1983
1a4917ca2b
Fixes for Mantis #2071 : Color inheritance and child gauge IDs, per KK.
2010-02-12 17:42:31 +00:00
karajorma
9d705df121
Better fix for Mantis 2106 (set-object-position crashing multiplayer)
2010-02-12 11:23:23 +00:00
karajorma
ceebf42868
Bump the server version (should have done this when I broke the packet earlier this week).
2010-02-12 11:19:56 +00:00
karajorma
a1f100d0a3
Whoever designed a comparison function that reports false when the arguments are the same should be shot!
2010-02-12 07:42:23 +00:00
karajorma
8555140cf6
Deprecate <any support ship class> in favour of something that does exactly what it says on the tin.
2010-02-12 07:14:34 +00:00
karajorma
77dacf4307
Fix Mantis 2094 (Set-Support-ship results in support ships that can't rearm even though present in the mission). Thanks to FUBAR for the spading on this.
2010-02-12 06:42:19 +00:00
Zacam
6dffec5d23
Patch for Mantis #2001 : Primary weapon loadouts with text names no longer show # or anything to the right. Works with $Alt Name: as well.
2010-02-11 16:47:19 +00:00
chief1983
14e0a7f257
Patch for Mantis #2071 : color inheritance and pan or static option for custom gauges
2010-02-11 16:32:45 +00:00
chief1983
9473a345fc
Fix Mantis #2120 : is-primary-selected now returns true for any bank when primaries are linked.
2010-02-11 16:31:25 +00:00
Zacam
20d6d6116f
Potential Fix for Mantis 2114 as suggested by The_E and tested by myself. Not only set "static int bm_next_handle" to 0, but also conditioned the Asserts (hopefully) a bit better and cleared out commented code blocks.
...
(Note: It seems I got Notepad++ to convert ushort and uint into "unsigned" short and int. Doesn't break anything and frankly, I hate unnecessary typedefs anyway).
2010-02-11 02:12:15 +00:00
Zacam
e226c8e7f4
Resolves "conditional within an assignment" warnings that could cause problems.
2010-02-11 01:42:36 +00:00
Wanderer
c2a1ff57c9
Commit of lua debug patch.
2010-02-10 21:50:15 +00:00
Wanderer
3b84da5af0
commit of beam piercing patch (allow beam tooling to occur simultaneously to the effects)
2010-02-10 21:38:01 +00:00
Zacam
ab17ff4d40
From The_E: "This adds the optional string "$End Campaign Cutscene:" to the list of possible cutscenes; once end-campaign is called, all of those scenes will be played if their requisite trigger conditions are met, in the order in which they are defined in the mission file".
2010-02-09 20:03:57 +00:00
Zacam
6a6a3ac822
From The_E: Capital+ flag "AI will not use this weapon on fighters or bombers" for use against Capital class Targets ( SIF_BIG_SHIP | SIF_HUGE_SHIP ).
2010-02-09 20:01:54 +00:00
karajorma
47faa1c364
Fix for Mantis 2106 (Set-object-position crashes in multiplayer).
2010-02-06 11:20:32 +00:00
karajorma
b2a443a225
Packet breaking fix for Mantis 2011 (Send-Message-List sends all messages at once for clients).
2010-02-06 11:19:31 +00:00
Echelon9
6d4fb01f67
Updated Xcode project file to reflect the non-inclusion of some redundant png source code files that weren't actually needed in Antipodes 5
2010-02-06 06:52:12 +00:00
Zacam
7096cd3d11
From Antipodes #5 : PNG File Format support.
...
Adds PNG to Maps (should only be used for Nameplates), Interface, Effects, HUD (still needs HUD Rewrite to implement), Player/Squad Images, Multi Players, Multi Cache, CB Anims and Intel Anims.
LIBPNG: Version 1.2.42, current and highest usable version (MAX_VERSION), Linux can use any 1.2.2x-1.2.42, but should NOT use 1.4.0 under any platform for ANY reason (will require rewriting pngutils)
ZLIB: Version 1.2.3.
2010-02-06 02:35:41 +00:00
taylor
05f95e05ee
fix damage lightning (from Xt tree)
2010-02-06 01:02:24 +00:00
Wanderer
1cc80c2841
fix couple of model handle related bugs in lua.cpp
2010-02-05 23:14:34 +00:00
Wanderer
17decc5654
allow armor entries exists even without any calculations.
2010-02-05 19:04:12 +00:00
Wanderer
e3e7bbfd05
fix for mantis 2110
2010-02-04 21:18:19 +00:00
Zacam
e8e37e8620
Multi-platform resolution for "signed/unsigned mismatch" warning on aiturret.cpp via ship.h
2010-02-04 05:36:04 +00:00
Zacam
10d94a24e8
Not multi-platform, but it doesn't break other platforms and removes 11 warnings from nebula.cpp.
2010-02-04 05:02:07 +00:00
Zacam
6d273e9495
Multi-platform resolution for "unused variable" warning on shiphit.cpp
2010-02-04 04:44:42 +00:00
Zacam
650c8010bc
Multi-platform resolution for "signed/unsigned mismatch" warning on ship.cpp
2010-02-04 04:42:04 +00:00
Zacam
1f9d15d20e
Multi-platform resolution for "signed/unsigned mismatch" warning on gropenglstate.cpp
2010-02-04 04:27:43 +00:00
Zacam
b40359cd30
Fix for cutscene.cpp "signed/unsigned mismatch" multi-platform warning.
2010-02-04 04:12:45 +00:00
Zacam
40f0b0b279
Proper fix for Mantis 2039. Nebula poof debris ANI usage now based on using any ANI/EFF on nebdeb01-nebdeb04. Doesn't exist on retail but also doesn't conflict or break Retail as these (nor the original "Neb01-64") actually exist, but allows for the same flexible range for the effect as non-nebula has for motion debris.
2010-02-04 04:04:17 +00:00
taylor
4b40d32f3d
particle updates from the Xt code base
2010-02-03 02:18:22 +00:00
karajorma
a4f587110d
FUBAR's special hits fix.
2010-02-01 04:49:09 +00:00
karajorma
32f4c944e6
FUBAR's bump for the number of docks a ship can have in FRED.
2010-02-01 04:35:29 +00:00
karajorma
8f8a8486a1
FUBAR's Corkscrew Limit bump
2010-02-01 04:15:23 +00:00
Zacam
99c4490bb0
Crap. Fixes SparK's Reverse AB. Now with a ship defined with Reverse AB, forward AB still responds as normal.
2010-02-01 03:37:14 +00:00
Zacam
76d4ba4479
From Antipodes #5 : Corrections for errors and warnings to SPHelper.h for speech compiling for WSVC (specifically 2008), especially when done on Vista/Win 7.
2010-01-31 01:22:56 +00:00
Zacam
6cc6bd9119
From Antipodes #5 : new TBM option '$Alt name:'
...
For ships and weapon tbms - renaming existing tbl entries in mods
2010-01-31 01:19:58 +00:00
Wanderer
05b47ecfec
bah, bah, bah, bah - fix my own stupid bug in lua raycollision function
2010-01-30 11:45:22 +00:00
Zacam
5ddd75b11e
SparK's Reverse Afterburner code, for FringeSpace (Tachyon) project Feature Request.
2010-01-30 03:38:53 +00:00
Goober5000
96d93caf1b
Zacam's project fixes
2010-01-30 00:50:08 +00:00
Goober5000
7630b1669c
change the other DSPs too
2010-01-30 00:12:45 +00:00
Goober5000
0e7bdf926d
fix the MSVC6 project files
2010-01-30 00:04:54 +00:00
chief1983
274aa3cf93
Fix a VC6 compiling issue with multiple declarations of i
2010-01-29 22:21:33 +00:00
Wanderer
38c1682975
The_E's fix for preventing lua On HUD Draw hook from being run when HUD is not visible
2010-01-28 20:28:29 +00:00
Wanderer
170266436b
adding 'retail' type piercing (no piercing effect, but normal beam tooling effect)
2010-01-28 20:24:39 +00:00
Wanderer
13a3308e23
added improved controls for piercing effects. fixed shield armor type bug.
2010-01-28 16:05:15 +00:00
Wanderer
a3ca4f4ef7
lua function for checking the state of a ship when the ship is dying
2010-01-28 08:05:43 +00:00
Wanderer
b0e8ce130e
Lua additions/bugfixes, fixed drawmodeloor function for drawing models in game, new model loading helper functions (slow).
2010-01-28 07:37:31 +00:00
Sushi
d89a92c6e7
Added $Damage Lightning Type and +Lightning Arc Percent (under $Debris) to ships.tbl. Allows damage lightning effect to be changed (current options are default and none) on a per-ship basis. The percentage of debris pieces with lightning arcs can also be controlled via +Lightning Arc Percent.
2010-01-27 18:55:37 +00:00
Goober5000
51ef10452c
remove redundant definitions from modelinterp.cpp
2010-01-26 01:47:35 +00:00
Goober5000
4d643bfe6b
thanks to Zacam for noticing the edge case; max flags should actually be 31
2010-01-26 01:47:29 +00:00
Wanderer
ffaca21fdd
fix for certain lua control problems, data was read and copied at 'wrong' time.
2010-01-25 12:01:01 +00:00
Goober5000
ec0a7e930e
Mantis #1992 - enhanced briefing token support; credit to Pedro with modifications by Zacam
2010-01-25 03:25:41 +00:00
Goober5000
fba4e77284
bump MAX_SHIP_BAY_PATHS per Mantis #1917
2010-01-24 21:50:57 +00:00
Goober5000
b53a2b9cd3
trackIR change for MSVC6 project file
2010-01-24 21:50:29 +00:00
chief1983
266737ff84
Fix for Mantis #1936 : Third time's a a charm. Let's see if this doesn't help things a bit. Per KK.
2010-01-24 18:45:16 +00:00
chief1983
d5829ad173
Fix for Mantis #1936 part 2: Some stuff that was fixed exposed more broken stuff. Now should be fixed too. Per KK.
2010-01-23 21:58:57 +00:00
Wanderer
8279944008
separate beam flash from dinky explosion (was not a good idea). Enable beam width setting to affect all beams.
2010-01-23 19:34:59 +00:00
Wanderer
8549f3c71a
fix to lua escort ship indexer
2010-01-23 09:02:32 +00:00
Wanderer
1375bab654
fix for the new effects with shield impacts and with missiles exploding without impacting
2010-01-23 07:58:31 +00:00
Wanderer
f514d2b25a
some changes to beam pierce effect, blob pierce effect, new settings for them both
2010-01-22 15:50:54 +00:00
Wanderer
27ac3b0c05
fury's request, option for huge beams not to draw impact effects when hitting specified type of ship.
2010-01-19 14:28:50 +00:00
Wanderer
afbb428349
more chase view mode fixes
2010-01-19 07:28:17 +00:00
chief1983
ed5cd1d06b
Fix for Mantis #1936 : Per ship gauges should now work properly. From KK.
2010-01-18 16:06:35 +00:00
Wanderer
1de215abd5
potential fix for mantis 2041
2010-01-18 14:58:45 +00:00
Wanderer
f7d04a9311
weapon info flags: targetable weapon, show weapon on radar, show friendly weapon on radar
2010-01-17 13:52:34 +00:00
Echelon9
d30cc69e36
Provide a simpler way to set the CFBundleName key in the Xcode project file.
2010-01-16 18:26:05 +00:00
Echelon9
47869f4f32
Add to Xcode project file LSMinimumSystemVersion key for future work
2010-01-16 17:55:10 +00:00
Echelon9
03c24467ea
Simplify the Xcode project file's CFBundleExecutable key to be truly extensible
2010-01-16 16:51:43 +00:00
Wanderer
74225ecac9
enable another bitfield for ai profile flags, add ai profiles fix for turrets targeting too distant enemies in certain cases.
2010-01-16 16:14:21 +00:00
Wanderer
8546cac0c0
fix for issue when ai is selecting big attack points
2010-01-16 16:06:32 +00:00
Wanderer
dbf5d60ab2
Lua control for getting the full button control data
2010-01-16 13:10:55 +00:00
Wanderer
834e4321a7
fixes for various lua wings and wing ship indexer bugs.
2010-01-14 18:05:48 +00:00
Echelon9
2db4d1c9c2
Cleanup Xcode project file
2010-01-13 09:12:41 +00:00
portej05
8694bb1a29
trackir static library no longer needed
2010-01-13 06:53:31 +00:00
Sushi
9e9b6ada2d
Added "$Expl Visual Rad" to ships.tbl. This controls the visual size of the main fireball for ship explosions.
2010-01-12 18:51:36 +00:00
Wanderer
c18119c729
make sure the debug data is only used in debug builds (not initialized in release builds)
2010-01-11 21:15:27 +00:00
Wanderer
d41514c78e
Enable missing controls lua control info. Force fireprimary lua function to work regardless of stream status of the weapons.
2010-01-11 10:39:40 +00:00
Wanderer
9a8202cfd0
Fix for subsystem existing without table entries. Rewrote old disabled warnings related to this issue.
2010-01-11 10:38:00 +00:00
Wanderer
e2cfb8017a
lua access & related functions to enable player button controls to be operated via scripting
2010-01-10 20:59:31 +00:00
Echelon9
e12839e11e
With the removal of final Direct3D references, there are no remaining uses of the NO_DIRECT3D definition in the code base
2010-01-10 08:08:26 +00:00
Wanderer
f168b7aab7
fix for a case when player dies before his weapons hit the target (target hit by ghost)
2010-01-09 20:12:03 +00:00
Echelon9
cfec9106be
Complete reversion
2010-01-07 17:30:44 +00:00
Echelon9
9824b21218
Revert r5760 training_message_queue changes
2010-01-07 17:21:44 +00:00
Wanderer
0eca97a967
model:checkRayCollision lua function to allowed certain collision checks be done with lua
2010-01-07 15:23:25 +00:00
chief1983
abfb3b7298
Fix Xcode compiling for reals, tested to currently work.
2010-01-07 04:48:25 +00:00
chief1983
9f4b691a98
Fix for Mantis #1934 : Secondaries now work when changing from a ship that had none, and FRED won't complain when you can't equip secondaries to a ship.
2010-01-07 04:16:44 +00:00
taylor
951ec34a36
fix broken trackir compiling on non-Windows
...
eol fixage
2010-01-07 02:48:31 +00:00
portej05
680edc2da3
Remove trackir directory from VS2008 solutions
2010-01-06 17:03:13 +00:00
Echelon9
3085dd4b1c
Complete update to Xcode project file
2010-01-06 12:10:24 +00:00
Goober5000
d5ab81c947
add external_dll files to VC6 project
...
alphabetize the project modules at the same time
2010-01-06 01:21:35 +00:00
Goober5000
9ead43eccd
change ExternalDLL to external_dll for cross-platform friendliness
...
(yes there aren't any errors currently, but this has been a convention since the beginning of cross-platform compatibility)
vcproj and xcode projects are updated accordingly
2010-01-06 01:18:31 +00:00
Wanderer
cd15f39847
lua handled collision groups and lua bitwise ops library
2010-01-05 18:00:01 +00:00
Hery
c0b2e1b1ec
Fix for bloom using outdated mipmaps
2010-01-05 17:51:57 +00:00
Hery
1f40c55c1a
Fix for mantis 2078, two pass bilinear downscaling in order to reduce artifacts
2010-01-05 12:56:33 +00:00
Wanderer
3572226340
Fix for mantis 2063 from warfull
2010-01-05 09:41:35 +00:00
Wanderer
93524920bd
fix for mantis 2077
2010-01-04 11:21:56 +00:00
Goober5000
cdb6ceb1f1
location oops
2010-01-03 20:20:49 +00:00
portej05
99be9d044d
Fix TrackIR compile errors
2010-01-03 14:27:39 +00:00
Echelon9
65fc924f92
Update Xcode project file for portej05's code
2010-01-03 09:46:14 +00:00
Echelon9
8116b15105
Update Xcode project file to reflect removed .cpp/.h source code files
2010-01-03 08:52:46 +00:00
Goober5000
169e4e8518
hooray for function prototypes
2010-01-03 05:55:17 +00:00
portej05
2cc225ba3f
TrackIR DLL loading implementation. You need scptrackir.dll in order to run (on internal beta at present).
2010-01-02 14:12:22 +00:00
Echelon9
c2b601bd5c
Rename function to correctly reflect what it does
2010-01-02 13:32:43 +00:00
Echelon9
67b86f7377
Make Training_Message_Queue dynamic with SCP_vector
2010-01-02 13:28:56 +00:00
Echelon9
3c6f77811a
2010
2010-01-02 06:33:49 +00:00
Echelon9
dce9388543
Some how the removal of the OpenAL.Framework to address GCC 4.2 issues got reverted
2010-01-01 20:02:47 +00:00
Goober5000
5f7684a795
Zacam's extra colors for briefings (Mantis #2059 )
2010-01-01 08:30:53 +00:00
Goober5000
05b509d813
Zacam's fix for Int3 in mission briefing (Mantis #2059 )
2010-01-01 08:27:25 +00:00
Goober5000
ba9353ee54
adjust number of lines according to font, per KeldorKatarn
2010-01-01 07:52:22 +00:00
Goober5000
21c28412e3
fix ui window using the same font as fiction_viewer
2009-12-30 21:04:58 +00:00
Goober5000
407c670e74
fix mission load error message
...
remove deleted files from project
2009-12-30 21:04:00 +00:00
Echelon9
155907b7d0
Update SDL from 1.2.13 to 1.2.14. The changelog can be found at http://www.libsdl.org/release/changes-1.2.html
2009-12-30 19:14:05 +00:00
portej05
442ea06112
safe_strings requires you to specify the size of the destination buffer in some way. (fix build for all non-VC6 builds)
2009-12-30 18:09:39 +00:00
Goober5000
770095c84c
allow up to two additional fonts using fonts.tbl
...
allow specification of fiction viewer font
2009-12-30 08:02:37 +00:00
Sushi
4edb31de72
Fixed a problem in the glide code where thrust was not proportional to framerate. Also made glide ramping more consistent in behavior with normal speed ramping.
2009-12-29 23:10:26 +00:00
portej05
345f7b4bc3
ifdef trackir pending new trackir interface code
2009-12-28 18:06:36 +00:00
Wanderer
44b04ddb93
table defined support ship shield, hull and subsystem repair rates
2009-12-28 16:10:11 +00:00
Hery
bce99b342e
shader manager and post-procesing files need svn:eol-style set to LF
2009-12-27 16:35:39 +00:00
portej05
2449c9abb4
Locking for PDB_DEBUGGING (multithreadedness will need it)
2009-12-27 15:14:55 +00:00
Hery
bc369d5566
fix problems with nebula background
2009-12-27 13:20:51 +00:00
Hery
6939a6c05b
fix problems with lua scripts and post-processing
2009-12-27 13:01:42 +00:00
Hery
41156280df
fix for mantis 2081
2009-12-27 12:42:11 +00:00
portej05
7b730af602
Remove NEW_MALLOC code
...
Add strcpy_s where needed in vm_strdup
2009-12-26 07:59:01 +00:00
Echelon9
22869bd825
Complete the removal of the now redundant Info-debug.plist
2009-12-24 08:06:38 +00:00
Echelon9
b8af21a85b
Fix Mantis 2079. This change utilised Xcode's Info.plist Preprocessor Definitions to consolidate the .plist files into one; which is dynamically generated for the chosen Build Configuration (Release, Debug, Inferno_Release, Inferno_Debug)
2009-12-24 08:02:27 +00:00
Goober5000
1b7863f1d3
clean out some old font stuff
2009-12-24 04:52:56 +00:00
chief1983
a386e6ae74
Fix the makefile to work with the new executable filenames
2009-12-23 06:45:43 +00:00
chief1983
45b6069d74
Update Linux makefile with recently added/deleted files from post processing and the vampire list
2009-12-22 21:50:06 +00:00
Echelon9
b3bc073a73
Reduced size of Frameworks.tgz by removing the unused OpenAL.Framework (it is linked from the system version, this one was redundant). Mac developers will have to reextract the Frameworks folder to take effect. Preparation for the pending update of out of date SDL, Ogg, Theora and Vorbis frameworks for OS X.
2009-12-22 15:18:41 +00:00
Echelon9
9d342e4133
Remove the Xcode project's references to Makefiles
2009-12-22 14:31:46 +00:00
Echelon9
86b9f2f1f8
Hopefully last step to resolve OS X issues from Hery
2009-12-21 20:03:54 +00:00
portej05
de4d3ea105
Updated to VC6 release files for code commit removing empty sound code files
2009-12-21 11:42:07 +00:00
portej05
b8c080bb8e
Mantis 1900 patch from Hery
2009-12-21 11:28:16 +00:00
Echelon9
0dbed68b2a
Cleanup Xcode project file for *.cpp/*.h that have been previously removed
2009-12-21 09:23:45 +00:00
portej05
5b633a3342
Removal of empty files/unused files (sine OpenAL is now used in all builds)
2009-12-21 09:12:56 +00:00
Goober5000
0c1a0951d7
rewrite code to bypass bizarre internal compiler error
2009-12-21 03:19:13 +00:00
Goober5000
dfd4f33c1f
VC6 project file updates
2009-12-21 03:18:45 +00:00
Echelon9
8822a79e42
Commit of Hery's update to the new shader code to address GCC/Xcode compilation issues
2009-12-19 18:39:32 +00:00
Sushi
fc26bd16da
Fix for mantis 2031
2009-12-18 17:22:01 +00:00
Wanderer
f69d5881ed
Patch from FUBAR - set armor type sexp
2009-12-18 10:11:48 +00:00
Wanderer
80545a8a96
Patch from FUBAR - turret direction preference, turret optimum range & turret target priorities sexps
2009-12-18 09:34:23 +00:00
Wanderer
c2a526db7d
fix to portej's fix to particle code
2009-12-18 07:43:43 +00:00
portej05
e67a50beca
Make particles go a lot faster! (until a better system is implemented)
2009-12-18 04:28:13 +00:00
Wanderer
c0d76ee6c9
weapon based targeting priorities for turrets
2009-12-17 11:45:08 +00:00
Wanderer
02414bc9d6
making countermeasures function like retail countermeasures.
2009-12-16 07:29:56 +00:00
Echelon9
94a1b2d275
MIN() is defined as capitalised at pstypes.h:274
2009-12-15 06:16:04 +00:00
portej05
5f636a00f1
Potential fix for mac issues caused by inclusion of postprocessing in trunk
2009-12-15 02:56:15 +00:00
portej05
8ccf735e27
Resolve macro definition warning for MAX_MONITORS (renamed MAX_VARIABLE_MONITORS in FSO)
2009-12-15 02:23:23 +00:00
portej05
016d01c345
Woops - missed the two important files!
2009-12-14 17:17:29 +00:00
portej05
cf3a4975da
Antipodes #4 - Post Processing from Hery
2009-12-14 13:57:33 +00:00
Goober5000
6993a136c0
the reason for the return statement no longer exists
2009-12-14 05:28:06 +00:00
Goober5000
cc4fb68ea6
fix warnings Zacam noticed
2009-12-13 07:24:59 +00:00
Wanderer
54ebd3ad25
hery's patch for mantis 1945
2009-12-11 08:38:39 +00:00
Wanderer
11c87b9934
make the +override option use the flags set during the current parse tbm event
2009-12-10 14:54:13 +00:00
Wanderer
22586a2fb4
commit of aardwolf's clearOrders sexp function
2009-12-08 18:32:40 +00:00
Wanderer
6120956cd6
Fix for mantis 1998
2009-12-08 18:25:50 +00:00
Wanderer
d9808e04f6
Added proper functions and warnings as requested for mantis 2018.
2009-12-08 09:59:05 +00:00
Wanderer
97c7fb934d
added a warning to prevent issues like mantis 1946
2009-12-06 10:32:11 +00:00
Goober5000
a679a8f597
remove ai_get_subsystem_type as it's redundant
...
clean up all sorts of subsystem stuff in sexp.cpp (in particular, use ship_get_subsys when possible)
weapon / sensor subsystem types should work for "weapon" and "sensor", not "weapons" and "sensors" to be consistent
2009-12-06 10:06:51 +00:00
Goober5000
62575f7e23
add hits-left-subsystem-generic and hits-left-subsystem-specific
...
deprecate hits-left-subsystem
2009-12-06 08:48:03 +00:00
karajorma
66e3333392
Fix an issue with the client side section of sexp_deal_with_ship_flag.
2009-12-06 07:15:36 +00:00
Goober5000
434059b5a2
commit the revision patch originally inspired by Zacam
2009-12-05 22:53:04 +00:00
Wanderer
cbdca14ea4
fix for mantis 1976.
2009-12-05 19:15:31 +00:00
Wanderer
0db2ca515f
fix for mantis 2016
2009-12-05 12:01:03 +00:00
Goober5000
0b2c715162
project file fixes
2009-12-05 07:17:18 +00:00
portej05
17391ffc18
Turns out enableWindowsKey/disableWindowsKey isn't defined for all platforms
2009-12-05 00:50:09 +00:00
portej05
2560ae1109
MSPDB fix for VC6 users.
2009-12-04 06:58:22 +00:00
Goober5000
4c16a66ba9
fix for Mantis #2044
2009-12-04 06:19:02 +00:00
portej05
031f448be2
Fix "SymRefreshModuleList" symbol not found error on platforms without dbghelp.dll v6.5+ (we really should distribute that monster)
2009-12-03 10:23:59 +00:00
portej05
54f63a1357
Running as standalone no longer disables windows key (Mantis #2047 )
2009-12-03 07:01:48 +00:00
portej05
7445380789
Commit to update PDB_DEBUGGING in preparation for new allocator system
2009-12-02 17:16:33 +00:00
Wanderer
b9fc819ce2
fix to make sure turret matrices (and turret normals) are properly setup from the start
2009-12-01 08:58:40 +00:00
Goober5000
c092173f36
fix a bunch of problems where sexps with multiple arguments might not work on all of them
...
fix problem with beam-free-all and beam-lock-all only working on the first ship in a list
2009-11-28 19:15:53 +00:00
Wanderer
b98c4e8b75
fix to prevent formation of badly setup turret rotation matrices.
2009-11-27 10:09:20 +00:00
chief1983
34179e931a
Change the filename for Linux Inferno builds.
2009-11-25 06:20:19 +00:00
chief1983
cc3e1fd071
Set the Inferno configs to output a different filename than the regular counterparts.
2009-11-24 20:05:06 +00:00
chief1983
0bf1baac94
The_E's 720p hi-res interface art patch. Use hi-res interface stuff at vertical res of 600 and higher instead of 768 and higher.
2009-11-24 03:19:19 +00:00
portej05
02b5fd1496
Remove bitarray.h and substitute with simpler functions (tested via Zacam, Flaming_Sword and portej05)
2009-11-23 12:12:09 +00:00
portej05
583e03890f
Strip missed CVS comment
2009-11-23 06:11:24 +00:00
karajorma
af7ba40eb4
Add the ability to specify ships or wings to the num-ships-in-battle SEXP (In collaboration with FUBAR).
2009-11-23 04:57:42 +00:00
portej05
67e79b3177
Fix for Mantis 2042
2009-11-23 04:45:51 +00:00
Goober5000
554de8e375
warning fixage
2009-11-23 03:41:40 +00:00
Goober5000
5c88548cab
more warning fixage
2009-11-23 03:24:10 +00:00
Goober5000
aac68877ec
spacing
...
fix build warning
2009-11-23 03:23:11 +00:00
portej05
b9a95040f7
Remove name concatenation issue from cfilesystem (hopefully mantis 2042 solved, but that callstack changes depending on whether dbg_filter.cfg is there)
2009-11-22 15:05:33 +00:00
Goober5000
9a98a31b1b
fix Mantis #2043 - variable-array-set needed extra sexp_tree management
...
also, improve type safety for checking for sexp operators (compare the constants rather than using stricmp on the names)
2009-11-22 11:55:40 +00:00
chief1983
c90151f94a
Fix for fix for #1945 and #1768 : Previous fixes didn't play nicely together. Per Hery.
2009-11-19 17:31:48 +00:00
chief1983
65a31a1676
Fix for #1768 : cutscene bars should now be fully functional again. Something about cubemaps, ask Hery :)
2009-11-19 06:06:52 +00:00
chief1983
1435ef0752
Fix for #1914 : Add a Skybox CLAMP flag to FRED that forces clamped textures instead of tiling.
2009-11-19 05:51:26 +00:00
chief1983
2cc02d72e3
Fix for #1945 : Finish adding the proper rectangle drawing code. Cutscenes now combine FOV change + rectangles. From Hery.
2009-11-19 05:49:23 +00:00
Goober5000
6008752531
bump MAX_ASTEROIDS (I can't believe nobody else has yet)
2009-11-18 09:33:31 +00:00
Goober5000
aeb5fd2789
add two awesome sexps that allow treating sexp variables as arrays
2009-11-18 09:17:01 +00:00
Goober5000
33203d244a
add useful parselo function
2009-11-18 08:59:35 +00:00
Goober5000
6f3a91c53f
remove unused variable
2009-11-18 08:17:26 +00:00
Goober5000
769d3a4d89
sexp subcategorization
2009-11-18 06:34:09 +00:00
chief1983
2da096f845
Add back in:
...
_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;
until we can fix the code that is visibly broken by removing those. Per Zacam.
2009-11-18 05:58:11 +00:00
Goober5000
f33a638c61
Zacam's "oops" patch
2009-11-17 04:41:35 +00:00
Goober5000
12033c664b
fix knossos animations rendering backwards for ships warping out in certain orientations
...
(taylor's hack isn't actually needed; the parent_obj can - and probably should, for consistency - be the warping ship, not the knossos)
2009-11-16 07:04:06 +00:00
Goober5000
9ee90c41b7
remove this extra friendly-stealth-invisible check; it's redundant and incorrect
2009-11-16 07:01:49 +00:00
karajorma
e900e56e1a
Trim out some warning messages.
2009-11-14 11:57:35 +00:00
karajorma
39550294bd
Pedro's Mantis 1982 Fix (Afterburners are used from several places in the code for ships with no afterburners).
2009-11-14 09:51:24 +00:00
karajorma
b323aa89b9
FUBAR's percent-ships-arrived SEXP.
2009-11-14 09:13:45 +00:00
portej05
35aaf68496
FRED Learns to write in its own log file!
2009-11-14 04:11:16 +00:00
chief1983
c178b00fc1
VS2008 remembers how to build
...
Zacam fixed the broken merge from Antipodes of the project file updates.
2009-11-13 23:35:08 +00:00
portej05
7e65e47acc
Fix for issues caused by memset and _HAS_ITERATOR_DEBUGGING.
...
Some ugliness involved (placement new - yuck!), however given that a lot of our structures are allocated with vm_malloc, I haven't got a better way around this at present.
2009-11-13 18:06:27 +00:00
portej05
cbaf0e5cc3
Fix more incorrect uses of memset causing crashes
2009-11-13 13:22:59 +00:00
portej05
5fd345352e
Fix mistake with globally defined symbols (_SECURE_SCL=0 and _HAS_ITERATOR_DEBUGGING=0)
...
Add PDB_DEBUGGING to default 'code' builds
2009-11-13 10:09:10 +00:00
Goober5000
9c85ac2835
fix Mantis #1967 (spurious warning about custom wing names)
2009-11-13 08:26:12 +00:00
Goober5000
28120ca20c
allow changing of case for ship, wing, waypoint, and reinforcement names per Mantis #2017
2009-11-13 08:07:48 +00:00
portej05
6011414dcc
Remove _HAS_ITERATOR_DEBUGGING=0;
...
Remove _SECURE_SCL=0;
Remove _CRT_SECURE_NO_DEPRECATE;
Add Zacams icons patch
2009-11-12 16:40:27 +00:00
Goober5000
52a939531a
load hi-res cbanis, if we have them (Mantis #2029 )
2009-11-11 06:33:26 +00:00
karajorma
18933d071a
Change the Galactica warp effect name to a more neutral term.
2009-11-09 02:18:34 +00:00
portej05
03c0f38796
Added SCP_string, SCP_stringstream, SCP_map, SCP_multimap and allocator equality operators to vmallocator.h (Hery)
2009-11-08 10:28:35 +00:00
Sushi
771571be7e
AI Profiles entries in AI.tbl are now overrides instead of multipliers.
2009-11-05 22:46:54 +00:00
karajorma
74d1c139ed
Doh x2
2009-11-05 06:16:15 +00:00
portej05
3aaf81208b
Fix for memory debugging functions.
...
Totals are now more accurate!
2009-11-04 13:03:02 +00:00
portej05
b37058615f
Fix Assert in WMCGUI.cpp (Vector subscript out of range)
2009-11-03 07:28:25 +00:00
portej05
25e3fe0f80
Fix stupid VC6 variable scoping for for loop in memory debugging routines
2009-11-02 08:00:58 +00:00
karajorma
133a331fc8
Switch to a more neutral name (which fits better with the others too) for the BSG warpout effect.
...
Add FUBAR's fix for a radius issue affecting BSG style jumps.
2009-11-02 06:28:28 +00:00
karajorma
6d4a7ec889
FUBAR's bump for MULTI_PXO_MAX_PAGES (it was causing issues for Diaspora).
2009-11-02 06:25:23 +00:00
karajorma
2e8a49a05b
Minor unused variable clean up.
2009-11-02 03:44:57 +00:00
karajorma
9f44258319
Bump MAX_OBJECTS, WEAPONS, SPLIT_PLANES, and SWARM_MISSILES. This stuff has been tested by Diaspora for months now so it should be fine.
2009-11-02 03:37:36 +00:00
Goober5000
32450e2984
remove constructors as the init functions will always be called
...
make sure init functions init all struct fields
fix keyframes for weird FS1 anims
remove "dodgy frame skipping code" since frames should be skipped in certain circumstances
2009-11-02 03:10:19 +00:00
karajorma
5e968aac93
Might as well improve this message while fixing Respawn Delay.
2009-11-02 02:24:08 +00:00
karajorma
3d98b9aeae
Error message is back to front.
2009-11-02 02:23:16 +00:00
karajorma
38682babc3
Fix Max Respawn Delay properly.
2009-11-02 02:21:42 +00:00
Goober5000
b43417882f
Zacam's & Flaming_Sword's patch for ANI streaming, audited by Goober5000
2009-11-02 01:45:26 +00:00
Goober5000
47e03f4a32
removed an unused variable
...
fixed saving of mission fiction
2009-11-01 09:52:04 +00:00
Goober5000
fbcb83b9db
fix FRED choking on respawn delay by making it default to 0 instead of -1; this does not appear to break anything
2009-11-01 09:51:36 +00:00
taylor
de43cc3488
spew table/mission crcs to CSV
2009-10-21 11:12:36 +00:00
Wanderer
e1df65d0e4
2009-10-12 14:46:54 +00:00
Sushi
56ff4f45c6
Fixed bomb-firing delay scale bug (actually applied to all secondaries)
2009-10-10 19:25:04 +00:00
portej05
983d9cb94a
Fixup debug_int3 (until a better solution can be found)
2009-10-06 10:53:08 +00:00
karajorma
f0b8f077d5
Fix for Mantis 1996 (Missing support ship builtin messages)
2009-10-01 06:45:02 +00:00
Sushi
f4bd24d720
Moving the ships.tbl +Use Newtonian Dampening flag out of the $Glide flag's tree.
2009-09-28 23:00:04 +00:00
Sushi
b12b60d577
Fixed a bug that caused the AI to use afterburner too much (in the past 50 revisions or so)
2009-09-28 22:18:35 +00:00
Goober5000
94038d3822
pretty sure the parent objects here have to be -1, not 0
2009-09-28 01:55:14 +00:00
Goober5000
076cbcf818
don't create duplicate waypoints
2009-09-28 01:54:06 +00:00
Goober5000
f3fa70b18b
major goof from me a while ago; ship_info data isn't supposed to be modified
2009-09-27 20:53:23 +00:00
portej05
7a3b09e132
Fix for error introduced in Antipodes 3 which caused animations not to repeat
2009-09-26 11:22:26 +00:00
portej05
0383415a3b
Antipodes 3 from Flaming_Sword
2009-09-26 05:52:17 +00:00
Sushi
6542269c77
Fix decade-old AI class bug... including AI_Profiles.tbl flag ($fix AI class bug) to avoid breaking retail compatibility.
2009-09-24 20:40:56 +00:00
Goober5000
e516f97d49
improved some retarded setup code in aicode.cpp
...
moved create_waypoints() into waypoints.cpp and called it at mission post-process
2009-09-20 08:30:50 +00:00
Goober5000
d4f1e1132c
remove python files from MSVC6 project
2009-09-20 08:28:44 +00:00
Goober5000
664df3af89
remove an entirely redundant check that WMC added that has the unfortunate side-effect of screwing up any disabled ship that warps in
2009-09-20 08:03:01 +00:00
Goober5000
2a1b807bdb
fix compilation problems
2009-09-20 00:39:42 +00:00
Wanderer
27e87c6a0f
fotg request - lua support for reading turret fovs and turret matrix
2009-09-19 08:03:07 +00:00
Wanderer
06f0b169e4
wanderer's ai control system setup (both sexps and lua)
2009-09-17 21:27:45 +00:00
Sushi
2e833278ea
Fix for Linux build bug reported by Shadow95
2009-09-17 17:43:14 +00:00
karajorma
f2158a72fa
Add the remove-weapons SEXP. Fix add-waypoint-nav to work properly in multiplayer missions.
2009-09-15 13:47:38 +00:00
karajorma
c81d8fdeec
Add the option to set a maximum delay before a player is automatically respawned in multiplayer games.
2009-09-15 13:43:13 +00:00
portej05
5e92431d02
Removal of ASSUME macro behaviour
2009-09-13 15:46:34 +00:00
portej05
057ef78c09
Fix to make the stubs error function have a const parameter
2009-09-12 14:43:11 +00:00
Wanderer
2ee628829a
fixes to various things listed in the prefast log
2009-09-11 15:52:18 +00:00
portej05
1a8acd364b
ifdefing out of global exception handler pending removal.
2009-09-10 15:53:07 +00:00
portej05
be79cb4991
_asm int 3; replaced with DebugBreak for MSVC users
2009-09-10 15:49:56 +00:00
portej05
6cf641cb96
If -fps is specified, the framerate should always be shown.
2009-09-10 15:49:13 +00:00
portej05
884de6da24
ASSUME macro for preFAST noise suppression and optimisation hints (through Assert macros) for VS2005+
2009-09-10 15:44:25 +00:00
portej05
44f8eab341
Change to make safe_strings show asserts in release.
...
safe_strings is now used regardless of whether the CRT supports it (except if you're using VC6).
2009-09-10 07:44:08 +00:00
Wanderer
976b86d607
fixing a logic error from the previous fix
2009-09-09 15:41:07 +00:00
Wanderer
f53e3a9143
commit for glowpoint issue reported by darius
2009-09-09 15:26:28 +00:00
portej05
585981e24b
post-frame-shaded subtitles! Pass an argument 13 which is either (true) or (false) in order to make use of this.
...
Fix for multimonitor focus loss issue associated with the mouse at the initialisation of the mainhall
2009-09-09 11:52:42 +00:00
Wanderer
b91c8cd616
add lua functions to get and set individual HUD gauge color
2009-09-09 09:19:33 +00:00
Sushi
01c5a62b1a
Fixed an oversight in my last commit
2009-09-09 04:44:23 +00:00
Sushi
890b1bee36
Added $Max Aim Update Delay to AI_Profiles.tbl (and AI.tbl). $Max Aim Update Delay allows AI aim to "lag" somewhat, making it more possible to evade high-velocity weapons.
2009-09-08 23:32:03 +00:00
Wanderer
780f5e9d09
re-enable both interface and game sound playing from audio lib.
2009-09-08 15:33:34 +00:00
Wanderer
f675bde3db
fix for detonation_radius issue reported by FUBAR_BDHR
2009-09-08 06:57:05 +00:00
Wanderer
5b1ceed359
from prefast log.. add missing casts
2009-09-07 16:15:35 +00:00
portej05
2e08994ede
preFAST noise reduction - these will get optimised out in a release build.
2009-09-07 11:40:02 +00:00
portej05
49ce1e23a5
Fullscreen window request from QuantumDelta
2009-09-07 11:39:32 +00:00
portej05
07b1ea4a3a
Logic bugs - ((state != blah) || (state != blah2) ) is always true, so that || should be a &&, and !blah.state & flag != !(blah.state & flag)
2009-09-07 11:13:52 +00:00
Wanderer
db1a9508b6
reverting code change - seems only to make things worse
2009-09-06 15:16:23 +00:00
Wanderer
c9adb19837
fix for mantis 1944
2009-09-06 13:40:01 +00:00
Wanderer
84c2ad3461
FUBAR-BDHR's fix for 'knossos device' string appearing twice as 'knossos device device' in default objecttypes table
2009-09-06 08:25:37 +00:00
Wanderer
0b742d2301
fix to allow missiles not fired directly at the enemy to home on random spots on the target ships hull.
2009-09-06 08:21:57 +00:00
portej05
0de4a7d9ae
Fix for WiH crashes - I reckon this might be the cause of a few peoples problems (using bitwise & instead of logical &&)
2009-09-06 07:41:14 +00:00
Wanderer
cf2ef994e9
option to prevent missiles from losing lifetime if they miss their targets
2009-09-04 17:08:24 +00:00
Wanderer
d21f8d106f
fix for occasional turret locking issue
2009-09-04 17:07:47 +00:00
Echelon9
087f141218
Correct grammar
2009-09-04 08:36:46 +00:00
Wanderer
f6fbd4aa1d
commit of 'turret direction preference' (int - percentage) - meant to allow turrets to prefer targeting the targets close to the previous target.
2009-09-02 18:17:21 +00:00
Wanderer
7678d0b0c8
weapon flag to allow weapons (including player weapons) not to home on subsystems
2009-09-02 18:14:46 +00:00
Wanderer
5e9bf597c5
debris hitpoints (min/max), debris ship collision damage multiplier.
2009-09-02 08:32:43 +00:00
Wanderer
0715c8d504
Change to collision prediction when using additive weapon velocity. Change to allow 'arm_radius' to sue homing position instead of homing object pos as distance measuring point. Allow weapons with arm_radius to count as armed if they collide with intended target.
2009-09-02 08:13:39 +00:00
Wanderer
468fd91442
Optimum range setting for turrets to help with turrets re-targeting objects inside their minimum range
2009-09-02 08:09:18 +00:00
Wanderer
9eb42469a9
fix for debugging CTD in clean_filename function
2009-09-02 05:17:30 +00:00
Echelon9
822828f412
Force GCC 4.0 as the compiler (for those who've updated to Snow Leopard and Xcode 3.2) while we sort out GCC 4.2 deprecation
2009-09-01 08:16:44 +00:00
Wanderer
a92e6bfb1d
fix for shockwave and 'carry no damage' flag - addition of 'carry shockwave' flag for subsystems
2009-08-31 17:13:58 +00:00
Wanderer
4ce4880c70
improvements to how subsystems and armor interact
2009-08-30 21:16:48 +00:00
portej05
fb3c9dd696
Fix for interface weirdness in the multi ui (Props to Flaming_Sword and The_E)
2009-08-30 12:09:46 +00:00
Wanderer
f1e808aa62
fix for a null vec issue which fubar hit.
2009-08-30 07:51:55 +00:00
karajorma
78deb06ea2
Fix Mantis 1987 (Too many calls to good-secondary-time causes an Int3() )
2009-08-30 04:24:09 +00:00
karajorma
cf949cc6ad
Fix a typo, remove some unreachable code, add some missing casts.
2009-08-29 09:32:36 +00:00
Sushi
8b8f325e71
Updates to ai.tbl to allow AI behavior to NOT use the index of the AI class in its logic. In other words, added stuff so that you can create AI classes where their order in the file doesn't affect how they perform.
...
AI now uses the (previously unused) "Patience" attribute to determine how quickly to break out of a "stalemate" situation (higher patience means willing to endure stalemate for longer). Only matters if the stalemate detection stuff is used as well.
2009-08-29 01:20:11 +00:00
Wanderer
24c94fc72c
option to always allow hull armor type to be used (fix for mantis 1973)
2009-08-28 13:48:24 +00:00
portej05
5294e3e1ee
Hery's shader unification patch (from Antipodes #2 )
2009-08-28 13:16:53 +00:00
karajorma
72af11bb6d
Allow bombs to use their actual radius when working out collisions rather than doubling it.
2009-08-28 07:59:31 +00:00
Wanderer
ccda696429
runsexp debug console functions - runsexp lua scripting functions
2009-08-28 07:53:45 +00:00
karajorma
8a10fb3181
Don't bother with any other AI checks for afterburner use when the ship doesn't even have an afterburner. Might fix Mantis 1982.
2009-08-28 00:04:25 +00:00
Wanderer
9a1bfaf9c1
Fix for mantis 1986
2009-08-27 15:34:51 +00:00
karajorma
1fb668de99
FUBAR's Fix to make debugging message errors a little easier.
2009-08-26 08:39:41 +00:00
karajorma
5180dc1146
Fix Mantis 1984 (Using sexp_deal_with_ship_flag() on anything ship-vanished causes an Int3() )
2009-08-26 06:03:11 +00:00
karajorma
cb5bcc3369
Fix an issue with the location of the Number Used In Wings label.
2009-08-25 14:49:40 +00:00
karajorma
8edf0d43ed
Fix Mantis 1974 (Muzzleflashes don't show up in 3.6.11 builds).
2009-08-25 14:48:18 +00:00
taylor
1529b99932
ensure init_scoring_element() initializes properly (Mantis #1827 )
2009-08-25 01:09:32 +00:00
taylor
85920f2151
fix resetting of mission stats when reconnect of FS2NetD happens
2009-08-25 01:09:30 +00:00
taylor
a1259d02a8
remove libreadline dependency since we don't need it and can't use it anyway (redo of r.4603)
2009-08-25 01:09:28 +00:00
chief1983
867a8a643f
portej's safe strings fix for OS X problem
2009-08-24 16:58:46 +00:00
Sushi
9990637240
Fix so that checking subsystems that are allowed cargo is case-insensitive
2009-08-24 16:05:32 +00:00
Sushi
95a8b8c730
Fix for bug reported by Spoon ( http://www.hard-light.net/forums/index.php?topic=65285.0 )
2009-08-24 14:16:55 +00:00
Wanderer
75a514b5f9
split 'is_vec_null' macro into normal and 'safe to square' macros.
2009-08-23 11:36:44 +00:00
Wanderer
b559c0959b
fix for code trying assign 'light laser' and 'rockeye missile' to the weaponbanks if ship class didn't have enough weapons defined for it
2009-08-23 09:33:48 +00:00
Wanderer
48cc61733c
option to force beam turrets to use same FOV limits as the rest of the turrets
2009-08-22 09:25:34 +00:00
Wanderer
b77b9adf39
turret fov check improvements
2009-08-22 09:00:33 +00:00
Wanderer
8124f3d81d
commit of set of vm_vec_normalize_safe functions to modelread.cpp
2009-08-22 08:41:53 +00:00
Wanderer
23521c1e3b
nuke's scripting and submodel animation changes
2009-08-22 06:32:11 +00:00
Wanderer
064ab52578
lots of fixes to the earlier burst fire mode
2009-08-21 18:20:28 +00:00
Wanderer
09db476623
fix for shield armor issue reported by Qent
2009-08-19 17:19:37 +00:00
karajorma
3d02219bd7
Bump the number of manoeuvring thrusters again. This probably should be made dynamic at some point.
2009-08-19 06:58:46 +00:00
Sushi
eb4b7c03e9
Major expansion of AI.tbl. AI.tbl now allows per-AI-class changes to AI settings in AI Profiles. Numerical values (such as $Glide Attack Percent or $Predict Position Delay) are handled as multipliers. YES/NO flags are overridden if set for a specific AI class. All of these multipliers and overrides are optional, and only active if explicitly specified for an AI class.
2009-08-18 04:32:40 +00:00
Wanderer
02718dd5eb
fix for low res medals screen (by flaming sword)
2009-08-17 11:41:59 +00:00
portej05
6d7343b17d
Another offsets fix from Flaming_Sword (optionsmenumulti.cpp Line 471 20->31)
...
What appears to be an indexing error (cheers wanderer!)
2009-08-15 16:40:29 +00:00
portej05
6a1d3d3862
Flaming_Swords Interface Fixes "fixed popup dialog button errors"
2009-08-14 15:42:19 +00:00
portej05
06ef9910c4
Windoze->Windows
...
(Another) Fix (Attempt) for Mantis 1090. Make the IS_VEC_NULL now check small ranges, not just == 0.f
2009-08-14 12:18:58 +00:00
Wanderer
ed0821391e
lua virtvar to check and control hud draw status
2009-08-14 11:39:30 +00:00
Wanderer
8826c47460
fix for the support ship issue
2009-08-13 17:23:23 +00:00
Echelon9
3810491748
Modified version of blowfish's FSAA implementation for OS X. Enabled in ~/Library/FS2_Open/fs2_open.ini with OGL_AntiAliasSamples
2009-08-13 12:41:47 +00:00
portej05
6c2aea0db5
Quick update to mspdb_callstack.cpp to handle 64bit windows more correctly (I think - nobody has actually managed to compile FSO on 64bit windows successfully yet.)
...
Offset fix from Flaming_Sword for the music slider in optionsmenu.cpp (281->279 on line 189)
2009-08-13 04:25:50 +00:00
karajorma
560ab1a5b0
That really needs to be more than just an assertion.
2009-08-09 11:49:21 +00:00
Echelon9
35a8b8bb08
Proposed change for a OpenGL GLint fix in Snow Leopard
2009-08-08 06:02:00 +00:00
Sushi
66db559d2c
Some fixes/improvements to AI glide stuff, cleaned up some comments and notes
2009-08-05 05:36:45 +00:00
portej05
1a70dbca7a
Get rid of confusing magic numbers and boolean logic that is confusing on non-0 or not numbers.
2009-08-03 15:31:36 +00:00
Wanderer
8fc13dc9d7
Fix for the 'carry-no-damage' subsystem flag, feature commit of shield armor types and shield armor type based piercing percentage setting.
2009-08-02 12:56:26 +00:00
Wanderer
cc624e61cd
fix to allow live debris from static subsystems
2009-08-02 12:20:36 +00:00
portej05
aa25b5a591
Fix for pdb debugging not showing the symbols on subsequent warnings.
2009-08-02 09:22:40 +00:00
portej05
be186cd01d
Fix crash when no cutscenes are defined (NULL pointer dereference through vector [] overload)
2009-08-02 06:32:38 +00:00
Wanderer
c19d78f82f
variable lead prediction missiles & untargeted heat seekers (aka 'primitive sensor' heat seekers)
2009-07-31 17:26:55 +00:00
Wanderer
0dc516368a
commit of target highlighting options mostly for radar icons
2009-07-31 17:25:29 +00:00
portej05
0b1bfe8003
ifdef logic correction for safe_strings (VS2008 release build)
...
Full logic description is included in comments - please check!
2009-07-31 15:02:56 +00:00
Echelon9
2706a10aca
Well yes, but the issue is that strcpy_s was out of scope though
2009-07-31 11:07:10 +00:00
portej05
dcafaa6780
Update to asserts that come from safe_strings - now they print out what they're trying to concatenate - still some ways to go on how pretty they are though (strcat_s will not show the current contents of the buffer, so a short filename might appear to cause the assert, but it's being concatenated with a very long directory structure - the buffer size shown is the full buffer size, not the remaining size)
2009-07-31 09:45:50 +00:00
portej05
dac9c92928
safe_strings is actually safe here (copying stack buffer to stack buffer)
2009-07-31 09:30:03 +00:00
Wanderer
e7ff18e13d
fix for BP assert due arm_radius
2009-07-30 12:40:52 +00:00
portej05
9bafc782f9
Change taylors change for readability in version.cpp (char buffer initialisation)
...
safe_strings now spits more, but can be turned off using NO_SAFE_STRINGS (spits during build)
2009-07-29 16:03:15 +00:00
taylor
8cd76d8d41
fix strcpy_s() changes where they didn't need to be or just can't be used
2009-07-29 15:13:34 +00:00
portej05
98f337f701
safe_strings - from Antipodes build #1
2009-07-27 16:06:24 +00:00
portej05
fe7ff55ea2
Restrict semantics for VC2005+ and GCC (not actually used anywhere yet)
2009-07-26 10:13:39 +00:00
karajorma
8a811104b5
Add support for ammo low builtin messages when there is no support ship in the mission.
2009-07-25 16:31:51 +00:00
karajorma
f848621a1b
Ugly hack for the player ordered disarm/disable issue WCS have been experiencing.
2009-07-25 14:58:25 +00:00
Echelon9
414ce88c58
Clarify a code comment re:GCC
2009-07-24 17:26:43 +00:00
portej05
25e3cd89c4
Fix mistake in extended safe_strings for VS2008 macro expansion
2009-07-24 07:54:35 +00:00
Echelon9
11034e3376
Cleanup Xcode project file post DirectX purge
2009-07-22 14:46:35 +00:00
Echelon9
aadd6ca7c1
Fix use of uninitialised variable reported by valgrind
2009-07-22 09:48:01 +00:00
Echelon9
3bf44ae5b1
Reflect the change to 3.6.11 in Xcode
2009-07-22 09:13:25 +00:00
portej05
673ac40dba
Fix for Rodos long, single-word hud message issues. Seems that hudmessage.cpp didn't correctly handle all the possible return values from split_str_once
2009-07-22 05:08:49 +00:00
taylor
737496d65c
bump buffer to allow for more tables (99 minimum) during validation
2009-07-22 02:21:24 +00:00
chief1983
95ab9dffa9
Add Zacam's changes (slightly modified) to the VC2008 config - adds Inferno configs and cleans out some kruft
2009-07-21 22:52:19 +00:00
Sushi
7c0008c211
Changed ranges for "$Glide Attack Percent," "$Circle Strafe Percent," "$Glide Strafe Percent", and "$Vaporize Percent Chance" to be between 0-100 instead of 0-1.
2009-07-20 19:52:41 +00:00
chief1983
2f1ca39df8
VC6 updates - add safe_strings, remove Python, remove other vestigial non-existent D3D files
2009-07-20 17:56:01 +00:00
chief1983
060cfbc7ae
Fix odd VC6 complaint about a string that was too long. Guess that's what all those double quotes are for.
2009-07-20 17:55:06 +00:00
chief1983
c1a599ac0f
Likely unnecessary removal of non-existent files from makefile.
2009-07-20 15:56:41 +00:00
chief1983
90d350816c
Add safe_strings to linux makefile.
2009-07-20 15:53:07 +00:00
Wanderer
014b7e4300
Commit of thruster effects for ship and weapon flame and for weapon glow effects
2009-07-19 16:07:23 +00:00
portej05
4c350109dd
More safe_strings fixes.
2009-07-19 15:54:59 +00:00
portej05
90943b80c2
Update to safe_strings to give information while in debug mode under VS2005+ (uses scp_str*_s instead of str*_s in debug mode)
2009-07-19 11:15:33 +00:00
portej05
013997a0dd
Missed another one.
2009-07-19 08:07:48 +00:00
portej05
9fce479b91
Missed a buffer.
2009-07-19 07:57:39 +00:00
portej05
c5ee5f5e33
Bump buffers causing safe_strings asserts
2009-07-19 07:56:04 +00:00
chief1983
a1699f9edd
Port from 3.6.10 branch of fix for dropping issues in the mod warning system, r5458.
2009-07-18 21:34:31 +00:00
Echelon9
89f4e8985b
Small fix
2009-07-18 18:13:52 +00:00
portej05
7db0e1c4f1
Debug versions of safe_strings now show where the error occurred
2009-07-18 18:02:58 +00:00
portej05
41bf8dd1d4
Added some new strcpy_s calls
2009-07-18 17:15:17 +00:00
karajorma
ee761c8dfc
GUI and mission saving stuff for Chief's Force-Shields-On Parse flag.
2009-07-17 21:18:22 +00:00
portej05
86fd3cc17d
Some VC6 builds apparently borked by SCP_vm_allocator. VC6 now uses std::vector without a custom allocator.
2009-07-17 12:10:36 +00:00
Echelon9
cfb53105be
Apply some of portej05's recent changes to the Xcode project file
2009-07-17 08:15:40 +00:00
chief1983
c9ca0cab25
Add the phrases.xml and its file configuration so that grammar.h and phrases.cfg get generated for VC2008 builds.
...
This is a necessary step for FS2_VOICER builds to be built, even by 2008 Pro.
2009-07-16 19:58:51 +00:00
portej05
3ac9167ac7
Some safe_strings in use!
...
Note that I couldn't figure out the buffer size for some of them, so they haven't been changed. The buffer size should be passed as a function argument in future.
2009-07-16 15:18:11 +00:00
portej05
23fcd2968e
Fix for embarrassing bug in safe_strings.
2009-07-16 12:48:11 +00:00
portej05
51968f1a77
Fix possible compile error on VC6 platform
2009-07-16 10:14:58 +00:00
portej05
e7db3e6bef
Fix the broken comment in safe_strings.h
...
Add safe_strings.h to pstypes.h
2009-07-16 10:00:50 +00:00
portej05
76ddbc8c2a
Checkin of files related to safe_strings, and adding to the project tree (VS2008)
2009-07-16 09:50:34 +00:00
karajorma
0bde3e5d8f
Fix a couple of typos other people made. One minor, one not so minor.
2009-07-15 21:49:15 +00:00
Sushi
f20e481ba2
Added $Vaporize Percent Chance flag to objecttypes.tbl and ships.tbl. This flag (which takes a value between 0 and 1) allows ships to sometimes explode instantly instead of going through a death roll.
2009-07-15 21:23:46 +00:00
Sushi
d4cc6c215e
Added burst-fire for ballistic primaries (controlled with the $Primary Ammo Burst Multiplier flag in AI_Profiles).
2009-07-15 19:29:49 +00:00
karajorma
2ffc8487c4
Really need to remove the mission stuff from those too.
2009-07-15 15:19:31 +00:00
Echelon9
4e5c2a89d8
Ensure Sushi's latest AI changes work with gcc, as well as Visual Studio
2009-07-13 20:33:43 +00:00
Sushi
9246a2f74d
Additional AI code, including stuff taking advantage of glide and sidethrust. Includes: Flag for allowing fighters to dodge vertically as well as horizontally, "stalemate detection" to help AI break out of circle fights and other stalemate situations, "glide attack" where AI fighters will use glide to fly away while shooting back at you, "circle strafe" where AI fighters will use sidethrusters to jink around while shooting, and an (incomplete) version of "glide strafe" that allows fighters/bombers to use glide to attack capital ships. All new stuff is off by default, and can be turned on with AI_Profiles flags.
2009-07-13 20:08:32 +00:00
portej05
915a9270c9
NEW_HUD Removal commit
2009-07-13 15:48:38 +00:00
portej05
29abf1f51c
Python Stripping. Can't promise to have gotten the whole lot though.
2009-07-13 14:11:24 +00:00
chief1983
b0b03a7f7d
Fix 1959, the shockwave flag. Again. Hopefully this one doesn't have any other repurcussions.
2009-07-13 01:20:36 +00:00
Echelon9
7af7b91b56
Another instance of std::vector, converted to SCP_vector
2009-07-12 09:36:31 +00:00
karajorma
c77a70bfda
A couple more vectors that slipped the net.
2009-07-11 17:52:33 +00:00
karajorma
1e80a663af
Make messages dynamic.
2009-07-11 17:40:46 +00:00
karajorma
fcd9f2b8fb
Looks like one SCP_Vector was missed.
2009-07-11 14:18:29 +00:00
portej05
6a8d45c93d
Replace most instances of std::vector with SCP_vector. Memory is now all run through vm_malloc and vm_free.
...
Watch it go up AND down in mission.
2009-07-11 07:07:57 +00:00
karajorma
a9179e2db4
Add the Get-throttle-speed SEXP.
2009-07-10 17:07:07 +00:00
Echelon9
c91bf775bb
Reflect 3.6.11 version string in Xcode
2009-07-09 12:43:36 +00:00
portej05
5d6b9be53c
Removal of DirectX from the codebase.
...
VC6 and VC2008 solutions have been updated.
2009-07-09 11:35:43 +00:00
portej05
ba4d5c7132
Fix VC6 string too long compile error (props to Flaming_Sword)
2009-07-09 11:16:49 +00:00
karajorma
48d8822bd9
Fix Mantis 1957 (Too many subsystems crash FRED).
2009-07-09 10:55:13 +00:00
Wanderer
657eed8106
Non-swarm type burst fire firing mode commit
2009-07-07 17:08:50 +00:00
Wanderer
a5f5e912c3
ai profiles flag to allow turrets to ignore hardcoded fov limits
2009-07-06 20:49:51 +00:00
karajorma
81c1002211
Fix the Primary/secondary-fired-since SEXPs
2009-07-06 17:36:44 +00:00
Wanderer
94ddf755da
moved ai's missiles fired at player limit to ai_profiles.tbl
2009-07-06 15:40:21 +00:00
karajorma
31d6469fde
Can't say for certain this will cause a speed up but it definitely places the faster check first.
2009-07-06 13:28:33 +00:00
karajorma
5efb4abb9f
Looks like the previous SEXP code optimisation didn't take into account the fact that the game tramped values as well as operators through that function so it could call eval_num(). Fixing that gets rid of another few million needless calls to stricmp.
2009-07-06 11:27:31 +00:00
karajorma
bc633ce96e
Allow clients to pass variable changes to the server (when using lua).
2009-07-06 10:04:19 +00:00
karajorma
d121b449d3
Change the way the game figures out the current SEXP Operator in-game as the old method was a massive slowdown.
2009-07-06 10:03:03 +00:00
Goober5000
772865c027
documentation per KeldorKatarn's request
2009-07-06 05:57:17 +00:00
portej05
963fcf87b4
Fix bug in vmallocator.
2009-07-05 15:03:05 +00:00
portej05
720391f8f4
Fix potential undefined behaviour bug.
2009-07-05 06:53:29 +00:00
portej05
d14ace67b0
Customised STL allocator (uses vm_malloc and vm_free) - not actually used anywhere in this commit.
2009-07-05 04:21:55 +00:00
portej05
85eab173d2
Removed more memset(this ... ) statements.
2009-07-04 14:48:16 +00:00
portej05
bdd1f5ff9f
Missed a few! (CVS Comment blocks)
2009-07-04 13:39:58 +00:00
portej05
e704b86f72
Browse information turned off for VS2008.
...
Doesn't affect intellisense, only affects View->Object Browser (not commonly used)
2009-07-03 17:49:01 +00:00
chief1983
d973756d7f
KeldorKatarn's fix for Fire Down Normals flag.
2009-07-03 17:08:33 +00:00
portej05
ee5e08868d
Fix for Mantis 1949 - Aardwolf has tested this patch.
2009-07-03 15:37:31 +00:00
portej05
3e9707bd0b
Got rid of the memset(this,0,sizeof(species_info)) in species_info - defined constructors for a bunch of structs that species_info depends on
2009-07-03 14:29:58 +00:00
chief1983
8b7917d084
No primary linking ship flag. Good thing Kara did 5395 or this would be one more that caused problems.
2009-07-02 23:23:55 +00:00
karajorma
f24633cba2
New bug uncovers old bug. Neither particularly serious but both were annoying Diaspora debug builds.
2009-07-02 17:32:32 +00:00
portej05
aebae0185a
Warning now makes sense when it is displayed.
2009-07-01 14:31:32 +00:00
Echelon9
4808e4557a
Addition of get-fov SEXP
2009-07-01 11:09:06 +00:00
Goober5000
b6e4ccfd05
remove the three additional options from possible squad msgs for support ships; but thanks to WMC's feature they can be added for mods
...
synchronize comments on the comm menu and flags
2009-07-01 03:47:54 +00:00
karajorma
9df31c7d79
Colour in the ship names in FRED since no one uses wireframe mode to see what is marked these days.
2009-06-30 22:01:39 +00:00
karajorma
5992a55a77
Well that shouldn't have always been saved!
2009-06-30 22:00:24 +00:00
portej05
6281b057ee
Fix the FRED crashing on startup problem
2009-06-30 20:18:21 +00:00
Echelon9
948ccf959e
Cleanup sexp_set_fov()
2009-06-30 10:39:54 +00:00
Goober5000
f1cc46a562
fix for Mantis #1942 (support ship message using wrong persona)
...
made the message selection more robust and cleaner while I was at it
this also fixes Kara's multiple-builtin-message feature, as I don't think it would have worked properly in the previous revision :D
(it would have bailed after finding the first message match)
2009-06-30 04:24:15 +00:00
Goober5000
f67596bc5e
better checking of wingmen persona headz
...
fix Mantis #1874 (Command messages check for existence of ship)
2009-06-30 03:34:26 +00:00
Sushi
fe87aed445
Added "$nocollide_this_only" and "$collide_invisible" submodel flags. The first one is like $no_collisions, but not recursive on submodels. The second one allows weapon impacts on the special "invisible" texture (normally only ship collisions are allowed). These two flags can be combined to implement invisible collision meshes, which can save a lot of FPS for complex models.
2009-06-29 18:55:20 +00:00
karajorma
c9631721c5
This should only have caused problems with corrupt missions but given that it does that with the final FS2 mission it should be fixed.
2009-06-27 08:15:40 +00:00
chief1983
7015ffa0b2
Complete the gutting of safe_strings.
2009-06-24 17:27:09 +00:00
portej05
be743859c0
Removal of safe_strings code - not VC6 compatible :P
2009-06-24 16:56:11 +00:00
portej05
0ebf630314
KeldorKatarns Shield Checking Code.
2009-06-24 16:17:46 +00:00
chief1983
7a37841292
Fix a Lua function so the scripted mainhall works with multiplayer
2009-06-22 23:23:07 +00:00
portej05
0c93ba4501
This simple change means that speech works under VC2008.
...
I suggest getting the PSDK (rather than relying on the files in /speech/), and defining FS2_SPEECH in both code and Freespace2.
Then you're good to go!
2009-06-22 16:09:27 +00:00
portej05
b91be33343
Just->Error in windebug
2009-06-22 06:37:32 +00:00
Echelon9
0cc4ebc9ef
Adopt Assertion in safe_strings.h
2009-06-21 19:09:02 +00:00
Echelon9
7f79f08d32
Update Xcode project file for safe_strings.*
2009-06-21 18:52:21 +00:00
Echelon9
4c55c88b22
Cleanup includes
2009-06-21 18:36:34 +00:00
Echelon9
0666011353
Small change to safe_strings.cpp
2009-06-21 18:22:40 +00:00
Echelon9
015f4a5ef6
Updating portej05 str*_s implementation
2009-06-21 18:01:11 +00:00
portej05
5ad2dcf4b5
Add safe_strings to pstypes.h - forgot to do it in the last checkin
2009-06-21 17:27:24 +00:00
portej05
5b4c5f388c
Fixed up some indentation in pstypes.h - the assert section is now readable
...
Added a space after the ! in the stack tracing using DbgHelp
Added the str*_s basic functions. Note the licence in the top. (also, this only updates the VC2008 project)
2009-06-21 17:08:18 +00:00
portej05
cb51bf1eb5
Callstacks now work under VC2008 - define PDB_DEBUGGING to use. (you need the PSDK to make this work)
...
See the post in SCP for what/why.
2009-06-21 15:39:13 +00:00
chief1983
9103c5f217
Zacam's enhancement for briefing text colors.
2009-06-20 18:28:13 +00:00
karajorma
18f82eab12
KeldorKatarn's Capship screams fix.
2009-06-20 16:50:18 +00:00
karajorma
7d08f2fecb
Add the Trigger Count setting to allow events to repeat a certain number of times rather than simply be tested as with Repeat Count.
2009-06-20 11:27:50 +00:00
Echelon9
98f27b88dd
Fix for required_string_4() and readability in ship.cpp
2009-06-20 09:59:04 +00:00
portej05
719825f80d
The big CVS comment removal. This chops approx. 3.5mb off a full checkout.
...
I've tested this through compiling and through hand checking.
Normalises line endings in ALL files to \n.
2009-06-20 08:08:20 +00:00
portej05
af37fc1b1b
Fix for mantis 1933. Despite the huge ugly looking changes, there's only really 2 lines of code changed and indentation has been added.
2009-06-20 07:40:04 +00:00
portej05
8b43ed823c
Fix for Mantis 1938. Has been tested against plain mediavps and blueplanet by Sushi
2009-06-20 07:38:02 +00:00
portej05
2f307a06fe
Fix one of the static analysis errors Wanderer reported (leaking handle in cfilearchiver.cpp write_index)
2009-06-20 07:36:40 +00:00
portej05
da4d3ce2af
remove-goals sexp commit. This has received testing, however it hasn't been pushed to the limit.
...
http://www.hard-light.net/forums/index.php/topic,63249.0.html
2009-06-20 07:24:46 +00:00
portej05
f7a8bf844b
Fix the CTD in aicode.cpp when autopilot is engaged, but not in AP_CINEMATIC and wing_leader == NULL. Probably does not fix all the autopilot woes.
2009-06-20 07:21:41 +00:00
karajorma
9abc540362
Plug a memory leak.
2009-06-19 18:43:20 +00:00
Goober5000
dfb8d4cadf
clean-up the end-campaign sexp logic and fix the end-of-campaign movie playing
...
this leaves room for possible future specification of end-of-campaign movies
2009-06-16 04:14:27 +00:00
karajorma
286a7fca3e
Commit Sushi's improved glide changes.
2009-06-14 15:57:45 +00:00
Wanderer
77a8ab89e8
move the bomb delay timer to its proper place in internal ai_profiles.tbl
2009-06-14 09:38:49 +00:00
karajorma
5e3ca2f514
A few minor fixes.
2009-06-13 18:08:54 +00:00
Wanderer
c817826d45
commit of Nuke's and Aardwolf's lua functions
2009-06-12 11:38:18 +00:00
chief1983
87fa567516
Whoops.
2009-06-11 04:30:13 +00:00
chief1983
5bd74f4ab3
intrinsic no shields flag for ships.
...
force-shields-on p_obj flag for mission ship object (overrides intrinsic no shields, don't use with no shields).
No FRED checkbox yet for force-shields-on yet.
2009-06-10 20:19:01 +00:00
Wanderer
79adc6dde8
Echelon9's update to bring lua to version 5.1.4
2009-06-10 09:46:20 +00:00
Wanderer
16db9601ac
change mouse_force_pos call to mouse_set_pos call in forceMousePosition lua function
2009-06-10 07:54:52 +00:00
karajorma
15fe7f2ffe
Commit Echelon9's flag to prevent the addition of noise to thrusters.
2009-06-06 10:46:10 +00:00
Goober5000
7121dd75d5
clarify op_submenu comment (it had been moved from sexp_tree.cpp to sexp.cpp)
...
reorder weapon, shield, and engine sexps for consistency
2009-06-03 04:11:42 +00:00
Goober5000
1e4447111a
fix bug found by RedDwarf which would overflow the array if (e.g.) Alpha wing ever had six ships
2009-06-03 03:59:50 +00:00
Wanderer
dbd42fca7c
joystick sensitivity change to improve the accuracy of the controls
2009-06-01 20:33:32 +00:00
chief1983
6d999b5b9d
Add the new FRED files to the VC6 projects too.
2009-05-30 21:54:52 +00:00
karajorma
cd5faf4e8c
Fix yet another VC6 only issue.
2009-05-30 21:22:05 +00:00
chief1983
0c8b78505f
Add multi_sexp files to Xcode project
2009-05-29 15:47:55 +00:00
chief1983
a482a9a4a5
Add multi_sexp files to the VC6 projects.
2009-05-29 15:28:04 +00:00
chief1983
f0feac6f70
Committing for Karajorma since he's occupied - fixes Assertion code from breaking Linux now
2009-05-28 21:32:46 +00:00
karajorma
96852832cc
Fix compilation of Assertion on MSVC 6 and compilation of multi_sexp stuff on Mac OS X
2009-05-28 13:00:26 +00:00
Wanderer
84423fbcf3
fixing vector rotation issue in subsystem targeting
2009-05-25 21:16:00 +00:00
karajorma
8bdc2c1a9f
Portej05's second set of preFAST fixes.
2009-05-24 21:38:22 +00:00
Wanderer
875b735417
fix for the release build crash reported by HT
2009-05-24 07:09:16 +00:00
Wanderer
de5f86bd79
fixing the number of lua enumerations
2009-05-23 19:22:05 +00:00
Wanderer
eb1bd98ee8
merge from wanderer branch - additional options for lua mouse control
2009-05-23 07:29:56 +00:00
Wanderer
2a69aaa23b
merge from wanderer branch - lua flight control option
2009-05-23 07:06:11 +00:00
karajorma
24de2cb225
Bobboau's Skybox flags code (via Wanderer then me)
2009-05-21 14:57:33 +00:00
karajorma
77d60f603c
A piece of WMC's warp code that somehow missed being committed.
2009-05-21 14:15:41 +00:00
Wanderer
1302964fbf
merge from wanderer branch - trail & contrail leading edge fade out option
2009-05-21 08:50:31 +00:00
Wanderer
7f36e6dc8f
merge from wanderer branch - emp protection option for weapon, emp resistant option for ships
2009-05-21 08:37:48 +00:00
Goober5000
8fcee4ebe2
add Taylor's fix for Mantis 1768 (cutscene bars)
2009-05-21 08:33:02 +00:00
Goober5000
e79c4fd923
fix ship-to-ship collisions; they should be disabled iff the ship has a no_collide flag, not iff the ship is a navbuoy
...
(fortunately, in retail, all navbuoys also have no_collide flags)
2009-05-21 08:31:31 +00:00
Wanderer
943969aac1
merge from wanderer branch - fix inconsistencies with subobj_name and name
2009-05-21 08:19:51 +00:00
Wanderer
7cc7000f88
merge from wanderer branch - additions to alt subsys name from r5125
2009-05-21 08:05:46 +00:00
Wanderer
629b7558f7
merge from wanderer branch - alt subsys name for damage popup
2009-05-21 07:31:43 +00:00
Wanderer
2036fb95cc
merge from wanderer branch - turret target priorities setup
2009-05-20 20:43:01 +00:00
Wanderer
e05276ea1e
merge from wanderer branch.
...
option to allow all hitpointed weapons to be hit.
allow 'safe from weapons' time of bombs be set.
2009-05-20 20:11:15 +00:00
Wanderer
fdb2de32e7
fix swarm issue - again
2009-05-20 19:44:18 +00:00
Wanderer
b4eb17bd7f
merge from wanderer branch - limited rotation turrets, reset idle turrets option
2009-05-20 18:03:14 +00:00
Wanderer
0920dc10ed
addition to the rotate sound to toggle it on if rotation is re-enabled via sexps
2009-05-20 14:23:19 +00:00
Wanderer
fa24bc0b39
merge from wanderer branch - autoaim/convergence improvements and variants
2009-05-20 14:13:58 +00:00
Wanderer
4cd2a011db
merge from wanderer branch - fixed firingpoint and 'fire on target' subsystem flags
2009-05-20 13:24:57 +00:00
Wanderer
cb3085e58c
merge from wanderer branch - subsys/turret sounds
2009-05-20 12:24:45 +00:00
Wanderer
d320ebf724
merge from wanderer branch - no subsystem targeting flag for turrets
2009-05-20 09:46:45 +00:00
chief1983
01cb760ae5
Bump linux version to 3.6.11
2009-05-19 22:13:12 +00:00
chief1983
3c64b07134
Convert these to UNIX again, hope they compile this time...
2009-05-19 22:02:48 +00:00
Wanderer
9c7b1a1292
merge from wanderer branch - alt iff colors
2009-05-19 21:17:48 +00:00
Wanderer
d7f721f3b1
merge from wanderer branch - phreak's inherit parent target weapon flag
2009-05-19 19:40:06 +00:00
Wanderer
b399e066f7
merge from wanderer branch - smart spawn weapon flag
2009-05-19 19:29:41 +00:00
chief1983
4def2aebce
Add SEXP stuff to Linux Makefile.am
2009-05-19 18:17:31 +00:00
Wanderer
fc2f05c747
merge from wanderer branch '$Turrets prioritize ship target:' objecttypes flag
2009-05-19 17:20:18 +00:00
Wanderer
ea1cc6ca27
quick jury rigging to prevent stream of null vec warnings caused by r5261
2009-05-19 16:53:05 +00:00
Wanderer
cabc75bfe5
merge from wanderer branch. 2d and 3d radar images support
2009-05-18 22:08:13 +00:00
karajorma
3b912c0ca3
Fix Mantis 1926 (Piranha submunitions home in on the ship that fired them in dogfight mode)
2009-05-18 22:00:01 +00:00
Wanderer
ab316e895f
initial merge from wanderer branch - fixes to corkscrew missile effects
2009-05-18 20:36:11 +00:00
karajorma
5c1a6ef841
Fix Mantis 1925 (Loadout lists may contain ships and weapons which are not been flagged as player allowed).
2009-05-17 12:35:52 +00:00
karajorma
a4e623db23
Portej05's preFAST warning fixes.
2009-05-17 11:50:48 +00:00
karajorma
d599cc1d6b
Commit Wanderer's Salvo Fire mode changes.
2009-05-16 19:41:05 +00:00
chief1983
67406e5952
Update Xcode's Info.plist to 3.6.11
2009-05-16 19:09:55 +00:00
karajorma
3ac6b9aa80
WMC's shipFX changes. Some other minor fixes.
2009-05-16 18:01:08 +00:00
karajorma
2f33c72ba7
AddAdd support for multiple builtins of the same type and new builtin message types Praise Self, High Praise and Primaries Low
2009-05-16 17:32:53 +00:00
karajorma
1a1f81f86d
Switch network variables over to the SEXP packet except for when called from lua
2009-05-16 16:58:22 +00:00
karajorma
9f9f4dae6c
Add the set-ambient-light SEXP
2009-05-16 16:38:49 +00:00
karajorma
5d9af246c5
Allow multi-docking in multiplayer.
2009-05-16 16:29:41 +00:00
karajorma
7c70f212ba
More minor fixes.
2009-05-16 16:20:45 +00:00
karajorma
f95777ebe3
Add a ship and parse flag to lock all turrets initially. Fix the Lock Primary/Secondary checkboxes to work for multi-selection. Add a checkbox for lock afterburner. Add the weapon fired since SEXPs
2009-05-16 14:06:23 +00:00
karajorma
fc12d0a5b7
Break up the status SEXPs into sub-categories.
2009-05-16 13:03:59 +00:00
karajorma
0a4ca2f858
Fix a bug where the order of SEXP arguments was reversed.
2009-05-16 12:56:26 +00:00
karajorma
fbf44b51e0
Add SEXPs to set weapon, shield and afterburner energy.
2009-05-16 12:55:11 +00:00
karajorma
321c1cd30e
Echelon 9's fix for a potential buffer overrun.
2009-05-16 12:32:46 +00:00
karajorma
e63ea3738b
Auto-expand branches after pasting, add-pasting or replacing SEXPs. I really don't know why someone didn't get rid of that petty annoyance years ago.
2009-05-15 18:38:24 +00:00
karajorma
0adb576247
Fix an assertion that crops up when you have no selected message but click on delete message. Has the side effect of making the message editor much less annoying too.
2009-05-15 18:36:47 +00:00
karajorma
b67289e52a
Commit the SEXP packet code.
...
Add the set-respawns SEXP.
2009-05-15 18:32:46 +00:00
karajorma
1ea70f7122
Move the repair penalty to an AI profile setting.
2009-05-15 17:53:38 +00:00
karajorma
0512409e18
Looks like that icon was needed after all.
2009-05-15 17:34:46 +00:00
karajorma
39adc73583
Add the validate-argument SEXP.
...
Fix a minor initialisation error with the ship-tag SEXP.
Fix Mantis 1907 (Error in the get-damage-caused description)
2009-05-14 17:12:23 +00:00
karajorma
4bd18224fe
Fix Mantis 1859 (FRED crashes if an unknown ship type is detected in the loadout).
2009-05-14 16:52:56 +00:00
karajorma
961c88132b
Due to a merge, delete a file which was never in trunk anyway.
2009-05-14 16:38:02 +00:00
karajorma
ba4e5132ef
Add new sexps to determine the amount of afterburner and weapon energy remaining.
2009-05-14 16:37:11 +00:00
karajorma
251285cacc
Add support for cutscenes before the various briefing and debriefing sections (FRED support for this feature will come later, but it will load and save correctly for now).
2009-05-14 16:27:36 +00:00
karajorma
a9219ca129
Fix a bug where the log displays incorrect percentages for kills.
2009-05-14 16:26:37 +00:00
karajorma
616b19772e
Changes to allow more data to be used from exited_ship. Make ship_exited dynamic too.
...
Get-Damage-Caused SEXP and a couple of functions for counting the number of variables of a certain type.
Commit the new team loadout code and FRED changes to support it.
2009-05-14 15:06:52 +00:00
karajorma
4485f12c24
A couple of new parsing functions for dealing with variables in fields that previously only accepted integers or strings.
2009-05-14 14:08:07 +00:00
Wanderer
fe352da2a2
tweak to keep all 3d radar dots inside the retail radar bitmap area - Mantis 1908
2009-05-13 22:03:30 +00:00
karajorma
1d8f54cf29
Allow wireframe for the targetbox to be set from hud_gauges.tbl.
2009-05-12 22:05:43 +00:00
karajorma
5ec562973b
Allow the boilerplate traitor debrief to be turned off even if the player did turn traitor.
2009-05-12 22:03:39 +00:00
karajorma
dc934368ab
Fix Mantis 1538 (special hitpoints not updated properly on deletion)
2009-05-12 21:55:49 +00:00
karajorma
b33f468e38
Fix Mantis 1913 (Characters after # are visible in the wings and reinforcements comms menu)
2009-05-12 21:53:12 +00:00
karajorma
428e5d67c9
Fix the FictionViewer truncating anything with more than 70 lines.
2009-05-12 21:49:41 +00:00
karajorma
6a5bf64aeb
Allow players to filter who they send messages to when using the chatbox
2009-05-12 21:30:17 +00:00
karajorma
5a919c3e49
Fix Mantis 1911 (Add Data doesn't show the <argument> option)
...
Fix Mantis 1813 (Negative number constants could be added in FRED for SEXPs which expected OPF_POSITIVE, often resulting in crashes).
Fix (part of) Mantis 1677 (cap-subsys-cargo-known-delay doesn't list the correct ships)
Fix Mantis 1909 (Can't paste variables in FRED)
2009-05-11 09:00:40 +00:00
karajorma
2c8d1795e6
Fix a typo in disable-builtin-messages
2009-05-11 08:54:52 +00:00
karajorma
be03d7e3f1
Fix Mantis 1884 (Entering the name of an invalid operator in any dialog other than events editor would crash FRED)
2009-05-11 08:54:28 +00:00
karajorma
ad31fc80be
Fix Mantis 1910 (Assist Percentage resets itself when ships are multi selected)
2009-05-11 08:48:05 +00:00
karajorma
63f00de6e0
Fix an issue with homing capship missiles not tracking correctly in multiplayer.
2009-05-11 08:45:58 +00:00
karajorma
c35da651ea
Fix Mantis 1753 (Using " or ; in briefings and messages causes them to either vanish or truncate the message)
...
Fix a bug that prevented lcl_replace_stuff() working properly when a message had two or more replacements of the same type.
2009-05-11 08:41:51 +00:00
karajorma
6ba239d6a0
Allow beams on any player ship to count for kills. Not just fighters and bombers.
2009-05-11 08:41:09 +00:00
Wanderer
edd046798a
fix for mantis 1902
2009-05-10 19:09:21 +00:00
karajorma
09adeaea8a
Fix compile issue with GCC.
2009-05-10 13:03:41 +00:00
karajorma
62b5d676cd
Bump version to 3.6.11. Bump debug warning level to 4
2009-05-10 09:52:05 +00:00
karajorma
61d9326eb8
Fix Mantis 1371 (Can target target's target even if it is stealthed or hidden from sensors).
2009-05-10 09:06:00 +00:00
karajorma
5e54017f15
Fix Mantis 1916 (Can't change the dockpoint a ship is initially docked to without undocking it)
2009-05-10 08:58:16 +00:00
karajorma
0cb0206db2
Add the Assertion Macro as an alternative to Assert.
...
Switch a couple of Asserts to Assertions.
2009-05-10 08:53:57 +00:00
karajorma
d4f6ec98b9
Fix Mantis 1883 (spaces at the end of ship and wing names can cause errors)
2009-05-10 08:32:08 +00:00
karajorma
35dbaac407
Fix Mantis 1620 (Replace Number/String don't work in FRED)
2009-05-10 08:26:17 +00:00
Wanderer
c695230883
Fix for mantis 1915 and related collision detection issues
2009-05-09 10:45:04 +00:00
karajorma
e2f1229d79
Nope. That won't fix the error. Reverting.
2009-05-04 13:43:48 +00:00
karajorma
bdb1569898
Maybe fix a crash in the voice recognition code. Maybe fix a lock when going into the option menu while respawning.
2009-05-01 17:48:15 +00:00
chief1983
4f18bbd624
Nobody here but us chickens (really I don't think anyone uses this but FotG)
2009-05-01 16:14:32 +00:00
Goober5000
b78f77f0a0
fix bug in voice messaging
2009-04-30 23:55:42 +00:00
Goober5000
3427549f9b
activate voice recognition
2009-04-30 23:45:14 +00:00
chief1983
f711df0fd1
This is why we can't have nice things.
2009-04-18 19:37:20 +00:00
chief1983
5119664e14
Pretty FRED icon (and new 256x256 FS2 icon to boot) courtesy of Axem
2009-04-13 20:50:59 +00:00
Goober5000
6e4021888d
add apostrophes to contractions, lol
2009-04-10 07:49:12 +00:00
chief1983
03123b1437
Add Inferno configs to Xcode project
2009-04-08 17:48:46 +00:00
Goober5000
47060c5c9b
add warning system for mods with bad data files
2009-04-08 04:58:12 +00:00
chief1983
0c628834c5
Manual inspection to make sure my new VC6 project was essentially the same as the old one, and wouldn't you know, I found a bug in the wxFred project too :)
2009-04-02 21:57:12 +00:00
chief1983
b4a20998e1
Amazing what you can learn from reading SVN logs. Really. Old. SVN logs.
2009-04-02 21:32:15 +00:00
chief1983
b4d35f6afe
This MSVC6 project has additional defines to build Inferno builds, and also utilizes the speech SDK by default which was previously committed. I'm committing this so that anyone with VC6 can make a release build with little to no hassle.
2009-04-01 21:05:12 +00:00
chief1983
144a30b20f
We include every other SDK just about...why not speech
2009-04-01 20:29:09 +00:00
chief1983
fe5c1f3bad
Missing comma revealed with FS2_VOICER
2009-04-01 20:25:49 +00:00
chief1983
763f714864
Grammar fix
2009-03-31 18:32:09 +00:00
Wanderer
26217893fd
fix for mantis 1899
2009-03-31 06:11:09 +00:00
Wanderer
ce24e12816
fix for mantis 1900
2009-03-26 08:18:46 +00:00
Goober5000
570755309c
final tweak to callsign feature
2009-03-26 01:43:26 +00:00
Goober5000
4f22d45411
change warning
2009-03-26 01:42:47 +00:00
karajorma
26db4ff799
Bit of a hack but it should stop the function from going over MAX_PACKET_SET_SIZE
2009-03-25 00:49:21 +00:00
karajorma
aa49d10143
Made this change in my branch but it never made it over here.
2009-03-21 23:06:37 +00:00
karajorma
d5168e3592
Fix Mantis 1661 (Ships leaving via the fighter bay don't disappear on multiplayer clients).
2009-03-17 20:28:41 +00:00
karajorma
d8a1a68c16
Fix multiplayer for Inferno builds.
2009-03-17 20:25:36 +00:00
karajorma
70ecaa5d86
Various fixes needed to allow multiplayer to use over 255 weapons.
2009-03-17 20:20:48 +00:00
karajorma
bdf9f7008b
Fix Mantis 1486 (Pressing F4 crashes multiplayer)
2009-03-17 20:14:31 +00:00
karajorma
1637424c35
Fix a series of bugs with generic subsystem types and non-standard names in the ship model.
2009-03-17 17:44:28 +00:00
karajorma
26b7f17c41
Fix Mantis 1729 (Pressing glide keys while warping out locks up the game)
2009-03-16 22:22:48 +00:00
karajorma
fff260ae8e
Fix Mantis 1838 (Latency information obscures the messaging menu)
2009-03-15 17:19:45 +00:00
karajorma
5dcf9f7880
Fix Mantis 1898 (Names with a # are not truncated correctly in the message menu).
2009-03-12 20:25:09 +00:00
karajorma
bf6391e4c2
Fix Mantis 1896 (Two support ships crash the game)
2009-03-10 21:24:07 +00:00
karajorma
87774d9ce8
Doh! x2
2009-03-09 11:50:38 +00:00
karajorma
b4abe9f24d
Doh!
2009-03-09 11:46:44 +00:00
karajorma
3f1880d22c
Fix Mantis 1872 (Fiction Viewer crashes/locks up.)
...
Allow FRED to save fiction if the mission file already has some.
2009-03-07 22:53:07 +00:00
karajorma
9e61bb1df9
On reflection Mantis 1861 is also going to affect creating a new mission as well. Might as well fix that too.
2009-03-06 20:53:26 +00:00
karajorma
26dfa5f47f
Fix Mantis 1861 (Texture Replacements don't initialise properly in FRED).
2009-03-06 19:03:51 +00:00
Wanderer
e302a90a1e
add 'missing' casts
2009-03-06 15:08:16 +00:00
karajorma
bec2409fba
Fix a warning where ai_do_objects_docked_stuff was being called twice on clients during multiplayer mission load.
2009-03-05 20:43:34 +00:00
karajorma
812e480bb3
That should only be called once per mission.
2009-03-02 20:41:31 +00:00
karajorma
d704a450cb
Some minor fixes including getting rid of the vestigial Determination setting from everything except the mission file itself.
2009-02-25 15:41:23 +00:00
Wanderer
4ea1424e64
possible fix for the missing thruster glow names.
...
changed phrasing of unrecognized type subsystem issue to less severe.
forced game to warn only once if exceeding max ship classes.
2009-02-25 14:50:59 +00:00
chief1983
0272c785dd
Taylor's fix for the OpenGL error in the debug log
...
http://www.hard-light.net/forums/index.php/topic,61170.msg1207696/topicseen.html#msg1207696
2009-02-23 17:10:14 +00:00
Wanderer
8e83b3f502
fix for mantis 1862
2009-02-03 13:42:30 +00:00
karajorma
2d495a3c15
Serves me right for saying it was working.
2009-02-03 00:12:18 +00:00
karajorma
e57d4ff5f2
Argument SEXPs shouldn't be included when searching the tree for arguments.
2009-02-02 17:17:31 +00:00
Wanderer
6e0200d27e
fix for mantis 1875
2009-02-01 13:13:18 +00:00
karajorma
38eff95a7f
Fix a bug with in-sequence and invalidate-argument.
2009-01-28 22:41:57 +00:00
karajorma
d6f28ceb97
Fix Mantis 1867 (String-equals didn't work with nested arguments)
2009-01-24 22:36:45 +00:00
Goober5000
b8375fa785
being meticulous
2009-01-20 05:49:27 +00:00
phreak
d5f2b68044
Cutscene bars fix, try #2
2009-01-20 05:19:35 +00:00
Goober5000
afd60862ab
fix for Mantis #1851
2009-01-20 04:18:14 +00:00
Goober5000
deaad91241
possible fix for Mantis #1853
2009-01-20 03:46:49 +00:00
Goober5000
6842f9d910
don't CTD on sexps that are too long (Mantis #1852 )
2009-01-20 03:38:09 +00:00
Goober5000
eb862504f4
preserve texture replacement upon name change (Mantis #1695 )
2009-01-20 00:35:58 +00:00
Goober5000
ec427000eb
hopefully final revision of the callsign code
2009-01-19 20:56:36 +00:00
phreak
87dd770d93
Cutscene bars fix using gr_set_clip instead of gr_rect.
2009-01-19 03:48:45 +00:00
Goober5000
39efcaf386
just for sanity's sake, default to 0% limit for support ships repairing hull
2009-01-18 04:01:09 +00:00
Goober5000
a58ae3d02e
revert changes to close out issue #1870
2009-01-18 04:00:15 +00:00
karajorma
2f0c86dd01
Get rid of the ping message when the HUD is turned off
2009-01-15 21:33:32 +00:00
phreak
98e1d6b56f
Fix for Mantis #1870
2009-01-15 01:07:35 +00:00
karajorma
6d8ca2c14b
Make the player orders error message a little clearer.
2009-01-05 17:51:02 +00:00
karajorma
d448ff3632
Mantis 1633 (No orders for player ships) appears to have been due to two different bugs. This should fix the one I missed earlier.
2009-01-04 17:10:51 +00:00
karajorma
978f5f363f
Add a 3rd save format to FRED thereby making the current forward compatibility of save game optional.
2009-01-03 14:54:15 +00:00
chief1983
51a6901dae
OpenGL tweaks from Taylor's 3610 patch and a big fix for OS X graphics - Thanks Echelon9!
2009-01-03 02:39:11 +00:00
chief1983
da0dbe84b3
Standalone GUI minimize from Taylor's 3610 patch
2009-01-03 02:37:45 +00:00
chief1983
6fc6267fca
Fix for movie playback from Taylor's 3610 patch
2009-01-03 02:36:59 +00:00
chief1983
f5f0713345
Fix for fighter beams from Taylor's 3610 patch
2009-01-03 02:36:22 +00:00
karajorma
054d745ece
Fix a bug whereby initial orders were being ignored on the standalone. Maybe fix Mantis 1815 (Starting wings play dead on standalone).
2008-12-30 21:33:35 +00:00
phreak
53492408c9
Change FRED version and title bar from 3.6.9 to 3.6.10
2008-12-25 04:13:43 +00:00
Goober5000
506ee1f517
choose the last persona found as the Command persona, not the first, since that's how retail does it
2008-12-22 05:30:21 +00:00
Goober5000
58b171ce76
bah
2008-12-21 21:36:42 +00:00
Goober5000
673f10485b
this ought to fix bomber+ according to the way $smart secondary weapon selection was set up
2008-12-21 21:34:37 +00:00
Goober5000
1323b85c9d
roll back Wanderer's fix
2008-12-21 21:18:00 +00:00
Wanderer
f80572c172
fix mantis 1802
...
fix possible issue with subsystem fixup
fix - via ai_profiles - AI with bomber+ flag
2008-12-21 19:46:38 +00:00
karajorma
25c6d6340c
Use fout_version for +Use Table Score and +Assist Score Percentage
2008-12-21 13:08:12 +00:00
Goober5000
33034e581b
we probably only want to use fout_version when we have actually pushed a FSO version
...
(hopefully this should fix the sprawling version-specific commenting)
2008-12-21 07:45:38 +00:00
karajorma
88f71ef237
Fix a multiplayer bug where names like Alphabet were assumed to be in Alpha wing
2008-12-20 22:10:29 +00:00
Goober5000
69b0a7a250
skybox model should be 3.6, not 3.6.10
2008-12-20 19:53:55 +00:00
phreak
cd7ce4e88b
Fix crash due to revision 5006
2008-12-20 16:54:24 +00:00
Wanderer
c37055ea42
possible fix for Mantis 1802
2008-12-19 22:23:31 +00:00
chief1983
b7a51a86b5
Commit WMC's fix for icon briefing lines that don't get deleted (Mantis 1763).
2008-12-17 07:54:55 +00:00
chief1983
af9eea721c
Revert changes done to fix bug 1645 (it'll have to wait)
2008-12-17 07:38:38 +00:00
phreak
6ba6544036
Made the cutscene list dynamic
2008-12-16 22:07:21 +00:00
karajorma
2835c6950b
Restore Assist Score Percentage saving.
2008-12-15 22:11:57 +00:00
Wanderer
0562982e02
warn the user of 'div by 0' issue
2008-12-15 20:25:49 +00:00
karajorma
3dd6ce5bb7
That's probably had a rather large knock on effect with the version saving code.
2008-12-15 18:47:43 +00:00
phreak
04f77b4e7c
Add code project as a depedency of the Freespace2 project
2008-12-14 21:44:27 +00:00
phreak
be97108d6c
Fix a bad memset
2008-12-14 21:33:53 +00:00
Goober5000
adbb60d8bc
fix algorithms for any-of, every-of, and number-of to align with or and and, respectively
2008-12-14 08:47:27 +00:00
phreak
28a408deee
Possible fix for mantis #1843
2008-12-14 08:11:14 +00:00
Goober5000
6208959b49
whoever made this change forgot about operator precedence
2008-12-14 07:20:56 +00:00
phreak
ee75c69ab9
Edit workspace file to use relative paths
2008-12-13 17:25:16 +00:00
karajorma
548faf84bc
Fix the <argument> option not appearing when there were no other options on the list
2008-12-13 10:09:59 +00:00
karajorma
90ea4099fb
Fix a bug where you could supply add-background-bitmap or add-sun-bitmap with a string variable which then couldn't be used.
2008-12-12 17:38:23 +00:00
phreak
e1416453a8
This stops the crashing as demonstrated by Mantis #1844 , but I don't know why or if it is correct. Could someone please look at this?
2008-12-12 14:38:28 +00:00
chief1983
d18a78ef05
Must have fatfingered some keys when I wasn't paying attention.
2008-12-10 17:48:29 +00:00
chief1983
8406bfada6
Hopefully this will actually let it load the 2d without breaking WCS again
2008-12-09 23:51:13 +00:00
phreak
23742e8261
Turning an Int3() into a Warning()
2008-12-09 13:02:30 +00:00
chief1983
f75be11102
Only PCX and DDS work for Squad Logos.
...
Slight tweak of the open file dialogs.
2008-12-08 16:45:07 +00:00
phreak
1d453b80f2
Add code::blocks support. To compile you will need to install the following library packages SDL, openal, ogg, vorbis, vorbisfile, theora, lua5.1, jpeg, GL, GLU. Currently, it has two types of outputs: Debug (standard debug build), and Release, which optimizes using -O3 and -march=core2 (because my laptop is a core2). Probably could experiment with additional compiler options to improve speed.
2008-12-06 21:24:14 +00:00
chief1983
b290f5281a
Add Ship Choice 3d for TBP flag as well since lack of will crash debug builds, and fixed whitespace on that particular section of code.
2008-12-06 20:23:24 +00:00
chief1983
89a7c1e0f4
Force 3d Shockwave and 3d Weapon Selection command line option when The Babylon Project command line option is on, since their default launcher.ini does not have those and not having these options breaks things in TBP.
2008-12-06 00:44:44 +00:00
karajorma
6f32344d45
Fix the FRED undo function.
2008-12-05 23:06:17 +00:00
chief1983
fb37f654f0
Allow DDS, TGA and JPEG files for squad logos (TGA and JPEG need testing)
2008-12-04 23:15:18 +00:00
chief1983
9c0dbb7acb
Add 3d Shockwave to All Features On and Default Off lists
2008-12-04 20:47:45 +00:00
chief1983
5c12c0ef48
Redo that fix again - tolower wins, but don't chdrive on non-Windows platforms
...
Made a variable more semantically correct
2008-12-04 20:17:51 +00:00
karajorma
e55577111e
Fix Mantis 1835
2008-12-04 19:32:21 +00:00
chief1983
61891ed5ec
Fix the cause of the problem in Mantis #1748 in both chdir functions in case it becomes a problem elsewhere down the line
2008-12-04 17:56:53 +00:00
chief1983
84e6b6eabe
Rest of the different fix for 1278 (only my second commit and I already goofed)
2008-12-04 17:40:28 +00:00
chief1983
1f5444b850
Different fix for 1278 - It's a bit more flexible. Use ai_profiles to allow/disallow entering multi with no primaries or secondaries
2008-12-04 17:38:11 +00:00
chief1983
d12f0c7ae9
Fix for disabled 3d shockwave flag when 2d shockwave doesn't exist - fallback to 3d anyway
2008-12-04 17:27:26 +00:00
phreak
3736999bdc
Possible fix for mantis #1748 (FRED2 Crashes when squad logo button is pressed).
2008-12-03 05:40:35 +00:00
karajorma
93bb980ff3
Fix gibberish entries in file dialogs. Maybe fix Mantis 1748
2008-12-02 21:42:04 +00:00
karajorma
4862747454
Since the player ship is the default for most of these SEXPs they should not be greyed out just cause it is a player start rather than a ship
2008-12-02 21:14:23 +00:00
karajorma
42b5befef0
Fix Mantis 1733 (String variables required a valid default value when used in SEXPs even if that value would never be used)
2008-12-01 22:34:38 +00:00
karajorma
78cda09d2c
Fix Mantis 1822 (Cannot use variables in add-background-bitmap or add-sun-bitmap)
2008-12-01 17:29:24 +00:00
karajorma
b06a4a5349
Widen the primary and secondary combos in the weapons editor.
2008-11-30 20:00:02 +00:00
karajorma
21d258925d
Typo
2008-11-30 14:56:45 +00:00
karajorma
d6399427ff
Print an error to the log when too many messages are in the queue rather than breakpointing.
2008-11-30 14:55:58 +00:00
phreak
4bf6b83e93
whoops
2008-11-30 14:13:28 +00:00
karajorma
07d6f2bff9
Fix add-background-bitmap and add-sun-bitmap to display a list of bitmaps from the tables properly.
2008-11-30 13:01:30 +00:00
phreak
1bc83969ac
fix the message variable parsing the right way (mantis #1831 )
2008-11-27 01:38:28 +00:00
karajorma
aa7fc2d713
Fix Mantis 1825 (Int3() when trying to change a ship flag on a ship which self destructed)
2008-11-26 23:19:31 +00:00
phreak
4a4268e77d
Fix Mantis #1831
2008-11-25 22:05:39 +00:00
Goober5000
66019a11ca
add ai_profiles flag for Mantis #1422
2008-11-24 02:35:20 +00:00
Goober5000
219c7541f8
if a ship or weapon is allowed, allow all its # equivalents (further insurance against the Interceptor#Weak problem)
2008-11-24 02:13:13 +00:00
Goober5000
09d116f667
prevent form-on-wing goals from overriding everything else
...
this should fix the AI bug that revision 2170 applied to all wings (not just starting wings)
this should also fix the bug where Alpha wing couldn't be issued orders via sexp, even in retail
2008-11-24 00:01:00 +00:00
phreak
8c521c771b
Add some preprocessor macros to aid in debugging. Nothing is on by default, but when enabled, the macros will force windowed mode at various resolutions.
2008-11-22 20:56:30 +00:00
karajorma
cfa7e2d7c8
Fix Mantis 1823 (Rand SEXP only has 16-bit precision)
2008-11-20 20:03:14 +00:00
phreak
6d13cce780
Apply the time limit check when starting a co-op game to the kill limit as well.
2008-11-19 23:45:43 +00:00
phreak
d1f6caaaaa
Fixed Mantis #1675
2008-11-19 16:12:05 +00:00
phreak
871b316add
Fix Mantis #1278
2008-11-19 15:31:30 +00:00
karajorma
9eb55188d5
Fix Mantis 1824 (Cargo containers disappear when using change-ship-class SEXPs)
2008-11-19 08:00:05 +00:00
phreak
9b7fff7e99
more fixes that deal with mantis 1564
2008-11-18 03:30:13 +00:00
karajorma
53143dee9c
Allow AI-goals to be assigned to a ship represented by an <argument>
2008-11-17 17:57:45 +00:00
karajorma
a6bae2c557
Fix the Decline error message that crops up in multiplayer sometimes and get rid of the PAIN! entry in the log.
2008-11-14 09:15:19 +00:00
karajorma
55aea5cf13
Fix Mantis 1633 (Initial orders for multiplayer Player Starts that end up AI controlled are ignored).
2008-11-13 21:21:00 +00:00
taylor
643a1aa230
standalone changes:
...
- add score/kill values to Player Info tab
- add multi.log out to the Debug tab
- add minimize-to-tray functionality
- fix messaging problem with property sheet handled messages
2008-11-11 01:09:01 +00:00
taylor
fe03b667cd
remove bad checks for loadout info (we are screwed if the info is bad regardless, so making it Assert() is cleaner)
...
fix bug that screwed up TVT if more than 4 ships on team
2008-11-11 01:03:38 +00:00
taylor
570e4cb1e6
make sure that a positive hull precentage doesn't hit 0 due to rounding error (Mantis #1720 )
2008-11-11 00:59:19 +00:00
taylor
2c45dbbb5f
give multi clients a short delay on briefing music to reevaluate goals if needed (should fix/reduce Mantis #1465 )
2008-11-11 00:58:19 +00:00
phreak
307106f983
Got rid of goto statements
2008-11-11 00:09:30 +00:00
karajorma
68c51f242a
Fix Mantis 1812 (Ship-Deaths reported incorrectly for player starts controlled by AI ships)
2008-11-10 19:31:07 +00:00
taylor
ad1c5055d4
address some rounding issues with integer based percent values (Mantis #1807 )
2008-11-09 05:09:51 +00:00
taylor
3abccfa76c
sync up to current FS2NetD code (fixes so many little problems/issues that it's not even funny)
2008-11-09 05:08:19 +00:00
karajorma
42683318f7
Fix Mantis 1044 (Campaign Editor crashes in release builds but not in debug)
2008-11-06 20:42:23 +00:00
phreak
f4ba5d0bb2
Apply Spicious' patch from http://www.hard-light.net/forums/index.php/topic,57573.0.html
2008-11-04 05:21:00 +00:00
phreak
8d70f8c15f
Mantis #1800 , take 2
2008-11-03 00:04:26 +00:00
karajorma
73f924163c
Surprised this wasn't committed before.
2008-10-30 20:39:47 +00:00
phreak
83a57be996
Possible fix for mantis #1800 . Don't ask me how I came up with the numbers I used, I'm not too sure myself.
2008-10-30 04:04:54 +00:00
taylor
50cc1331ae
put a 1/2 sec delay on the next secondary so we don't fire immediately after respawn (Mantis #1118 )
2008-10-28 18:18:12 +00:00
taylor
1b5f722967
make disband wing work properly (Mantis #1680 )
2008-10-28 18:16:08 +00:00
taylor
33ab6d34ef
fix weapons carry check to work properly for multi (Mantis #1624 )
2008-10-26 14:42:03 +00:00
phreak
d7fd6b4454
Possible fix for mantis #1564
2008-10-26 02:57:36 +00:00
Goober5000
028bfecc70
fix another spawning weapon bug
2008-10-24 22:57:40 +00:00
Goober5000
e6b801595b
fix bugs caused by missing parent when weapon-create creates missiles
2008-10-24 22:17:02 +00:00
Goober5000
d3f38e26bc
fix a bug in weapon-create argument validation
2008-10-24 21:14:24 +00:00
karajorma
d4305fbd85
Set the type correctly for modify-variable (it used to assume all variables were numbers). Fix setting string variable to the value of another string variable (again). Solve a couple of other minor assertions and crashes.
2008-10-24 16:54:59 +00:00
taylor
70059a94d6
make sure that we update our subsystem in-use count when removing subsystems
...
(fixes bug where it just keeps wanting more memory but doesn't really need it)
2008-10-24 09:05:54 +00:00
taylor
262c3178e9
more if-statement fixing
...
fix the fix so that it's actually fixed (re: Mantis #1676 )
2008-10-24 09:03:46 +00:00
Wanderer
91dd16167b
patch to improve turret subsystem targeting
2008-10-23 15:38:57 +00:00
taylor
862d6f43db
mode if statement fixage
2008-10-23 13:27:21 +00:00
taylor
966ec358e9
fix bogus ml_printf strings
...
use ml_string over ml_printf where possible
remove newlines from ml_* calls, since it gets added already
2008-10-23 13:26:35 +00:00
taylor
6ed6ecbfb8
be sure that we sort the mission list properly for a host that isn't the master (for consistency with host-master behavior)
2008-10-23 13:25:19 +00:00
taylor
1062040fbf
output warnings, errors and asserts to debug log for Linux/OSX
...
allow -no_warn to skip asserts like it does on Windows builds (for consistent behavior)
2008-10-23 13:23:45 +00:00
taylor
0f01a1bd4c
this assert will happen during normal multi play, nothing ingame related
2008-10-23 13:22:11 +00:00
taylor
0b1ea9a58d
restart sounds/music on game browser screen (Mantis #1279 )
2008-10-23 13:21:02 +00:00
taylor
19c1520dba
final part of the fighter beam fix; freaky as it is, it actually managed to not break anything :D (Mantis #1795 )
2008-10-23 13:00:21 +00:00
Wanderer
3032a0f5d9
added 2 missing newlines to debug spew
2008-10-23 10:09:12 +00:00
Wanderer
fbe14f5a5e
improved readability per taylor's suggestion
2008-10-23 06:47:12 +00:00
taylor
c4b763680c
fix stupid bug that messed up last flight date (Mantis #1274 )
2008-10-23 04:51:02 +00:00
taylor
60fca98974
set player speed after respawn to be initial velocity specified in mission (Mantis #1198 )
2008-10-23 04:49:24 +00:00
taylor
15dbb9e8b4
basic fixing for cmeasure handling over the network, not 100% without packet breaking though (Mantis #1098 )
2008-10-23 04:47:41 +00:00
taylor
9bce69ef79
ingame join related crash fix (the correct value is put in after mission sync)
2008-10-23 04:44:25 +00:00
taylor
fdcaebfad3
pass correct object to primary cycling (fix for multiplayer)
2008-10-23 04:43:19 +00:00
taylor
ef0c0e994b
fix V's "hack" so that it actually works and doesn't leave unused objects hanging around
2008-10-23 04:41:19 +00:00
taylor
249b8496e3
fix some NaN that gave invalid values in the standalone UI
2008-10-23 04:39:54 +00:00
taylor
7c944ed2a3
fix some weird signature checks from retail code
2008-10-23 04:38:17 +00:00
Wanderer
aab688222c
allow option to prevent turrets from targeting too distant bombs
2008-10-23 04:30:09 +00:00
Wanderer
acc7fa2b16
fix for surface shields selecting wrong hit quadrant
2008-10-22 13:56:19 +00:00
Goober5000
1ccfa433d6
one last fix
2008-10-21 21:37:37 +00:00
Goober5000
a832c11585
hopefully this should be the last on Mantis #1785 (the callsigns)
2008-10-21 06:17:44 +00:00
Goober5000
10340678cb
Keldor's fix for callsigns not getting translated
2008-10-21 06:05:30 +00:00
Goober5000
a82b7862d8
fix a warning
2008-10-21 02:20:18 +00:00
Wanderer
2ccbedd071
added +noreplace to ships flags to allow adding flags
...
added +override to muzzleflash.tbl
added +override to weapon flags
2008-10-20 18:51:51 +00:00
Goober5000
280b979d09
try to keep up with Nature producing bigger idiots :(
2008-10-19 20:25:30 +00:00
Backslash
8a2af2b13b
My bad. No need to cap the ammo here. I had used the wrong variable anyway. Fixed.
2008-10-17 10:12:48 +00:00
phreak
400e950190
Fix Mantis #1799 : Crash on "Mystery of the Trinity"
2008-10-16 04:09:38 +00:00
taylor
36ac0cb908
make sure that we don't re-save a deleted pilot in the barracks (Mantis #1794 )
...
fix pilot deletion proceedure to not provide useless failure handling (if it fails to delete once, it will fail every time)
2008-10-16 00:41:35 +00:00
taylor
ae062bcc0b
make debris render properly in wireframe mode in hud targetbox and in ships lab (Mantis #1797 )
2008-10-15 22:15:24 +00:00
Backslash
4d0f978e1c
Fix 'cycle' behavior when $Shots is more than 1.
2008-10-15 06:31:18 +00:00
taylor
4f7744cf36
fix bug where changing turret_targeting_order[] to have asteroids earlier in the order would skip further checks
2008-10-14 17:09:09 +00:00
taylor
acf1aa60ac
get rid of some useless/annoying debug messages
2008-10-14 16:58:26 +00:00
taylor
e44de24957
fix for fighter beams in multi (Mantis #1795 )
2008-10-14 16:57:23 +00:00
taylor
6e42152761
better version of the earlier ab_count fix
2008-10-14 16:42:33 +00:00
taylor
251f52796c
when sorting the mission/campaign list be sure that we keep our current selection
...
when loading the mission/campaign list for the first time make sure that we always select the first element in the list
2008-10-14 16:40:42 +00:00
taylor
c5f9ba424c
add exports to map file
...
generate program database for release builds (doesn't make build bigger, .PDB allows finding of source/line given error address)
2008-10-14 16:38:39 +00:00
taylor
d23e80bdef
fix some bad if statements
2008-10-14 16:35:49 +00:00
taylor
ddd6ce2cf6
update to build with current code (Mantis #1796 )
2008-10-14 08:30:54 +00:00
taylor
f2e2297e9f
disable const string warning (that thing was just plain annoying)
2008-10-13 06:38:03 +00:00
taylor
0253d298e9
only load tbls from tables/ (Mantis #1725 )
2008-10-13 06:34:48 +00:00
taylor
f6d26f915a
bunch of out-of-bounds fixage
2008-10-13 05:57:57 +00:00
Goober5000
941faf9ab9
fixed a number of bugs with Electronics missiles that were present ever since 2003 :(
2008-10-12 21:57:40 +00:00
Goober5000
d0af5c2169
move the Electronics tag to its proper place
2008-10-12 19:44:27 +00:00
Goober5000
05769b3ffe
fixed "bastion" debug console command to work for all main halls
...
added "medals" debug console command for testing
2008-10-12 19:44:06 +00:00
phreak
6a3cf80be0
Add additional filename extension filters to fix Mantis #1484
2008-10-11 12:08:09 +00:00
karajorma
55c8720e90
Fix Mantis 1791 (invalidate-argument did not work with multiple matching arguments)
2008-10-09 21:13:26 +00:00
Turey
e461625622
Mantis 1584: Enabled F(n) keys during popups.
2008-10-08 03:02:15 +00:00
taylor
f598aafeb0
more class_type fixage from r4638
2008-10-07 20:47:03 +00:00
taylor
71e948278b
don't call gr_activate() in Assert macro
...
log asserts properly when using the -no_warn flag
(though asserts aren't really warnings and should not be turned off, it could be argued that many of our asserts don't belong)
2008-10-07 20:31:04 +00:00
taylor
ee57fa59ca
make sure that we reset the state properly after an ident failure (Mantis #1735 )
2008-10-07 16:28:22 +00:00
Wanderer
dbe8e071bb
fix for ab_count crash issue on mission reload
2008-10-06 18:05:37 +00:00
taylor
27f2f168dc
fix fs2netd shutdown/cleanup code to work better (gets rid of various little issues)
2008-10-06 05:52:25 +00:00
taylor
beafe688bb
don't really need to bother with MAX_SERVERS any longer since it's ultimately dynamic
2008-10-06 05:51:20 +00:00
Goober5000
01c783e27d
if ship names are hidden but a callsign is supplied, use the callsign
2008-10-05 21:58:16 +00:00
Goober5000
c7b8cd7021
alt names should now work in FRED (including the voice acting manager)
2008-10-05 21:29:45 +00:00
Wanderer
6ca5bdcffa
Added warning to help preventing invalid ship types.
2008-10-05 13:50:44 +00:00
taylor
18b2922455
a fix/workaround for Mantis #1692
...
bunch of standalone fixage for error reporting and various little signon issues
fix heartbeats for standalone servers
make proper use of +pxo in multi.cfg for standalone so that games can show up in the lobby
client-side fix for getting pilot stats in lobby (Mantis #1652 )
2008-10-05 13:31:35 +00:00
taylor
de28613166
add separate standalone options for setting FS2NetD login/password (gets around FS2NetD server game listing issue)
2008-10-05 13:24:06 +00:00
taylor
9a3a1b051e
no magic numbers
2008-10-05 13:19:13 +00:00
taylor
8650ee98bd
start up mainhall music/ambient when in the lobby (Mantis #1761 )
2008-10-05 13:16:42 +00:00
taylor
a4889e49e9
fix standalone crash when server name/password is too long in multi.cfg
2008-10-05 13:15:10 +00:00
taylor
fcb28b51f1
better error handling for when TCP socket is already in use (Mantis #1626 )
...
fix missing protocol XSTR that used the wrong tstring for display
2008-10-05 01:17:45 +00:00
taylor
7938c36df2
you are never guaranteed a valid class_type (fixes Mantis #1742 )
2008-10-04 20:48:07 +00:00
Swifty
ceea88037c
Fix the rest of the Visual Studio project files such that FRED can compile.
2008-10-03 00:04:52 +00:00
phreak
d17ea1d102
Update fred to include trackir libs
2008-10-02 17:32:54 +00:00
Swifty
db5767b18a
Added missing semi-colons.
2008-10-02 06:50:15 +00:00
Swifty
04fc426d90
Statically link TrackIR support; FS2_TrackIR.dll no longer required at run-time.
2008-10-02 05:58:01 +00:00
phreak
4524583f06
Disable the mouse when lost focus in windowed mode.
2008-10-02 00:57:10 +00:00
phreak
f445aedaf1
Get rid of some repeated code.
2008-10-01 22:50:13 +00:00
phreak
666cbd4bc5
Get rid of windows system ding sound when pressing ALT and another key while windowed mode is active.
2008-10-01 05:36:40 +00:00
phreak
99446022fc
It may be a hack, but this seems to fix that one pixel line seen on the bottom and right side of the screen when faded to a solid color.
2008-10-01 04:04:39 +00:00
Goober5000
d37828e00a
fix linked primary behavior to be based on percentage, not absolute value, as expected (Mantis #1778 )
2008-10-01 00:44:11 +00:00
Goober5000
818b6a40ac
re-bump alt names
...
fix hidden ship names for voice acting manager
2008-09-30 23:50:14 +00:00
karajorma
3bc9a692af
Fix Mantis 1774 (when-argument within when does nothing)
2008-09-30 17:36:12 +00:00
karajorma
9ef6d889d3
Fix compiling on OSX...apparently.
2008-09-30 15:52:53 +00:00
Goober5000
a0344aefae
uninitialized pointer bugfix and cleanup to hud_stuff_ship_name / hud_stuff_ship_class
...
send messages with ship class rather than ship name if ship name is hidden
2008-09-29 04:47:23 +00:00
Goober5000
f0e53971f6
redo the callsign feature to be independent of the alt name
...
(fixes Mantis #1785 )
2008-09-28 23:05:03 +00:00
Goober5000
8340ed5943
add Keldor's fix for Mantis #1779
2008-09-28 20:58:28 +00:00
Goober5000
89d3b62524
make CAR and CDR fail-safe
2008-09-28 19:28:22 +00:00
Goober5000
fdd2daebad
don't hide information when displaying ship callsign
...
clean up hud_render_target_ship_info a bit
2008-09-28 01:53:54 +00:00
Goober5000
d3509e1aba
fix for Mantis #1783 (voice acting manager message senders)
2008-09-28 01:16:07 +00:00
Goober5000
52c04fdf18
add KeldorKatarn's fix for AI afterburning too long
2008-09-28 00:26:56 +00:00
phreak
42b5c942f5
Allow .jpg files to be loaded out of VPs when in the "interface" subdirectory.
2008-09-26 04:59:12 +00:00
phreak
b2f21047da
Add KeldorKatarn's patch for mantis #1776
2008-09-25 03:55:24 +00:00
phreak
c3e32613d7
Fix for Mantis #1767 : Fix invisible ships upon knossos warpin
2008-09-25 03:45:57 +00:00
phreak
146d3cdd8f
Fix for mantis #1773 . Check null pointers
2008-09-25 01:58:40 +00:00
phreak
16a3ed9f4b
Seperate 3d ship and weapons selection into their own command line options.
2008-09-25 01:15:30 +00:00
phreak
b5cc4e46fb
Render the lens flare even if the parent sun is off screen as some lens flares are much larger than their parent star and they magically disappear as soon as the center of the star leaves the FOV.
2008-09-18 00:33:59 +00:00
phreak
485a98ac3e
Fix radar orb rendering (It was using the incorrect rotation matrix). Also enable alpha blending on the orb axes.
2008-09-18 00:30:54 +00:00
WMCoolmon
4e872096b1
Fixed secondaries using the laser renderer
2008-09-17 00:10:05 +00:00
phreak
0248c6988a
Ensure the larger keyframe is chosen when looping the weapon loadout animations.
2008-09-16 04:51:36 +00:00
phreak
3189278d43
Do the same thing for ships that the previous commit did
2008-09-15 23:21:41 +00:00
phreak
9278f421ad
Honor the keyframe value in the weapon loadout animations. If less than 2 keyframes are defined (first frame and return frame), then the animation will treat "52" as the keyframe value (retail default).
...
All 1024x768 weapon loadout animations have 0 and 52 set as the keyframes so they render properly.
2008-09-15 23:05:05 +00:00
phreak
0f13bcee06
Fix for Mantis #1562 : Lens flares visible if sun behind asteroids.
2008-09-15 01:51:20 +00:00
phreak
f78749be88
Ensure target_engines pointer is initialized.
2008-09-14 21:55:34 +00:00
Goober5000
b784bb6cff
revert changes from 4801 (Phreak's fix for >4GB memory reporting)
...
c.f. http://www.hard-light.net/forums/index.php/topic,56409.0.html
2008-09-14 20:29:03 +00:00
Goober5000
0ae4939981
re-fix WMC's bug to be compatible with expected behavior
2008-09-14 19:29:07 +00:00
phreak
2c34c391d2
Fixed nebula render bug for Mantis #1765
2008-09-14 19:05:30 +00:00
phreak
14c478376b
cleanup find_homing_object()
2008-09-14 18:51:38 +00:00
phreak
8bf826793a
Change output executables to 3_6_10
2008-09-14 17:05:59 +00:00
karajorma
58fc12fc57
KeldorKatarn's afterburner lock SEXPs
2008-09-13 22:21:38 +00:00
taylor
61ef271683
update with current official SDL framework (should fix Mantis #1727 )
2008-09-13 14:41:57 +00:00
taylor
81811ff842
if max shield strength is 0 then disable shields (rest of Mantis #1645 )
2008-09-13 14:40:06 +00:00
karajorma
455180fa4a
Fix Mantis 1088 (Extra call to ai_do_objects_docked_stuff() )
...
Remove the banks_fired Assert. WMC is correct. We don't need it anyway.
2008-09-10 11:24:00 +00:00
phreak
25b56bfac6
Add updated freespace2 icons
2008-09-08 23:01:22 +00:00
Swifty
7e047b5c98
WMC's fix for RTT indexing and fix unnecessary slewing for 3D HUD elements.
2008-09-06 07:51:50 +00:00
Wanderer
ac4fb52604
Fix for mantis 1736
2008-09-05 21:59:55 +00:00
Swifty
57fbb21c62
Fix for Mantis 1743: Targets don't shudder with the rest of the HUD.
2008-09-05 07:57:40 +00:00
phreak
21aa72ae2f
Fix memory detection for systems with > 4GB of RAM.
2008-09-04 20:40:57 +00:00
karajorma
04e4095b36
Arguments within arguments (again). It should work this time round.
2008-09-04 20:38:14 +00:00
phreak
38abe31509
Possible fix for Mantis #1669
2008-09-01 03:09:00 +00:00
karajorma
3b6e62805f
Fix Mantis 1545 & 1754 (Order SEXP doesn't work with wings or destroy subsystems properly)
...
Add the Query-Orders SEXP
Deprecate the Order SEXP
2008-08-31 21:04:44 +00:00
WMCoolmon
4bff232cad
Change set-fov back to a global override
2008-08-30 19:48:20 +00:00
WMCoolmon
ddf75fc7e0
Final scripting, camera code updates.
2008-08-30 11:05:48 +00:00
WMCoolmon
b4b2f7d54f
Fix for mantis 0001211
2008-08-30 11:04:12 +00:00
WMCoolmon
e71d060984
Core all-RTT code.
2008-08-30 11:03:03 +00:00
WMCoolmon
c9e3d746d4
Added object_get_model; moved object_h to object.h
2008-08-30 11:02:36 +00:00
WMCoolmon
9d4bad1c7f
Input updates for scripting
2008-08-30 11:00:11 +00:00
WMCoolmon
74a6636bc6
Attempted HUD shake fixes
2008-08-30 10:59:10 +00:00
WMCoolmon
19ed659d6b
Minor idiotproofs
2008-08-30 10:58:44 +00:00
WMCoolmon
48d8f030b3
Better compatibility with avoiding the main hall
2008-08-30 10:57:27 +00:00
WMCoolmon
7ef7959d77
all-texture replacement code
2008-08-30 10:56:28 +00:00
WMCoolmon
6c7ccad82f
Attempted HUD shake fixes
2008-08-30 10:56:04 +00:00
WMCoolmon
36e44e7f2b
hud_get_draw, custom subsystem names in HUD subsystem damage list
2008-08-30 10:54:44 +00:00
WMCoolmon
6cfab94ef0
New camera code
2008-08-30 10:52:32 +00:00
WMCoolmon
9764ce9ea8
Replace Assert with smooth failure.
2008-08-30 10:52:08 +00:00
WMCoolmon
d0808e2bf0
New camera code, cutscene bar fixes
2008-08-30 10:51:21 +00:00
WMCoolmon
d2e4d0d6ee
Support for all-texture-type texture replacement.
2008-08-30 10:50:49 +00:00
WMCoolmon
699ac0f2bd
FRED support for new camera code and texture replacement of all texture types
2008-08-30 10:49:22 +00:00
WMCoolmon
39d623c7c2
ship_wing_point_or_none SEXP type
2008-08-30 10:48:46 +00:00
WMCoolmon
5404b776aa
Support for custom warp sounds
2008-08-30 10:47:50 +00:00
WMCoolmon
5a72f40f62
Fix unneeded use of doubles
2008-08-30 10:47:16 +00:00
WMCoolmon
525e45db77
Updated objsnd API
2008-08-30 10:46:23 +00:00
WMCoolmon
3f02f79b3d
New camera code, warp code updates, debris attributes, fix large numbers of ships being created at the same time, delta bank.
2008-08-30 10:45:41 +00:00
WMCoolmon
9360d3b580
Prevent "Alt-Alt" from textify_scancode
2008-08-30 10:43:37 +00:00
WMCoolmon
f51a8cf3c0
New camera code core commit, delta bank code.
2008-08-30 10:42:27 +00:00
WMCoolmon
743c9eb82d
Update to use new camera code.
2008-08-30 10:41:31 +00:00
WMCoolmon
752bff94cc
Updated to use new texture map class.
2008-08-30 10:41:01 +00:00
WMCoolmon
fd7cbf5750
- Fixed bug involving too many goals being assigned to a ship from wing orders
2008-08-30 10:37:51 +00:00
WMCoolmon
13eb0e77e4
Fix for mantis 0001737
2008-08-30 01:21:54 +00:00
WMCoolmon
896b61f2fe
Fix glowpoint option in lab not working (thanks blowfish)
2008-08-30 00:24:10 +00:00
Goober5000
1859ae688e
Mantis #1755 : stars should not be drawn when there's a skybox
2008-08-26 01:28:30 +00:00
phreak
943ee9b8a2
Add Fred to the list of executables automatically built in debug mode.
2008-08-22 15:05:12 +00:00
karajorma
81a851e33a
Revert argument changes till I can figure out why they crashing VC6 builds but not 2005 ones.
2008-08-20 20:45:45 +00:00
phreak
97951efa9d
Fix alt-tab and FS2 trying to regain focus.
2008-08-20 04:22:39 +00:00
karajorma
672e34c166
Fix the -argument SEXPs to allow them to cope with conditionals being used within them.
...
Clean up some code from in-sequence that never worked anyway.
2008-08-19 19:00:54 +00:00
phreak
4ea2ca2b64
Applied blowfish's patch for Mantis #1714 .
2008-08-18 23:33:34 +00:00
taylor
61dbdc24b3
fix broken commit from partial Xt merge
2008-08-18 05:56:46 +00:00
phreak
2d79e4eee4
Don't flash the screen red when damaged while invulnerable (either through cheat or sexp).
2008-08-17 22:26:59 +00:00
phreak
1a3e5f28af
Fix beam damage when time compression is active.
2008-08-17 21:55:03 +00:00
karajorma
69b61ceaa4
Hmmmmmm. Using a VC2005 keyword as a variable name is just asking for trouble.
2008-08-16 08:13:43 +00:00
Goober5000
ca0df1f2b0
fix a few bugs by rolling back the non-ship-template code from revision 4636
...
this also fixes the ship spinny thing (which both argv[-1] and Backslash had noticed and fixed previously)
2008-08-16 05:06:38 +00:00
phreak
3f48553935
Add a check to see if the complete escort list is full before adding an additional ship.
2008-08-15 01:37:38 +00:00
karajorma
cb6dbe5214
Fix Mantis 1745 (TvT scoring for players kills scales with difficulty)
2008-08-12 20:29:36 +00:00
phreak
52829ea14e
Remove check for no-collide-invisible ships when checking to see if a weapon passed it's target. Changed FOV check to allow for missiles with FOV half-angles greater than 90 degrees.
2008-08-11 04:11:46 +00:00
phreak
4e1fdc6c8b
Fix for mantis #1744
2008-08-10 21:17:00 +00:00
phreak
f419106805
Possible fix for mantis #1728
2008-08-10 21:16:22 +00:00
karajorma
bfe417ff2f
Add builtin messages for support ships back into TvT missions.
2008-08-10 10:37:20 +00:00
WMCoolmon
3a54776c6b
ATTN: Swifty - Mantis #0001707 . Update to fix what looks like basic math error on my part.
2008-08-07 01:35:17 +00:00
karajorma
6de7ba0deb
Fix Mantis 1605 (Support ships are forever marked as abort on clients after initially called in).
...
Fix a bug where support messages were sent from the client and the server so they played twice.
2008-08-05 21:25:55 +00:00
WMCoolmon
da6fa5a429
Update MSVC2003 project files
2008-08-04 22:54:03 +00:00
karajorma
a70c5ffb1d
Fix the Run Freespace option in FRED. Still not 100% but it should get a valid name more often than not.
2008-08-04 09:56:40 +00:00
karajorma
bcdc1c1589
Fix Mantis 1731 (CTEXT reporting the variable value if a block variable of the same name existed)
2008-08-03 11:39:05 +00:00
karajorma
9a28c24f70
Fix Mantis 1232 (Can't use Zeta in Coop or Beta/Gamma in TvT)
2008-08-02 19:20:58 +00:00
karajorma
4374fcd1ce
Fix Mantis 1734 (Block variables appearing in modify_variable menu and SEXP)
2008-08-02 16:53:09 +00:00
karajorma
90e30ee37e
Fix a problem with the assertion logging fix I added earlier if the stack trace was too long. Will now log errors too.
2008-07-29 19:25:34 +00:00
WMCoolmon
bf23eb17c8
add isPXOEnabled scripting function to Testing library
2008-07-29 04:21:58 +00:00
phreak
e10379ad18
Disable UAC for the other project types (debug, and non-sse2 release builds).
2008-07-28 22:14:18 +00:00
phreak
d094476101
Remove UAC when building the executables.
2008-07-28 02:51:36 +00:00
karajorma
0a9903f48d
Print the stacktrace to the debug log on hitting an assertion.
2008-07-24 20:25:42 +00:00
karajorma
a05b1ef11f
Allow the player to score from assists and kills in a variety of new ways.
2008-07-24 20:23:52 +00:00
karajorma
b3d7dba2a4
Let TvT games use all the skill levels
2008-07-24 20:10:29 +00:00
karajorma
a360a8e606
Allow multi_find_player_by_ship_name() to deal with respawning players too
2008-07-24 20:09:21 +00:00
karajorma
e44f2c1911
Fix Mantis 1732 (Ship-Guardianing ships destroyed before mission start)
...
Add change-player/team-score SEXPs
2008-07-24 20:01:30 +00:00
karajorma
5b05ce6028
Update 2005 solution with the shader stuff.
2008-07-24 19:56:27 +00:00
taylor
952c057ff9
add ARB_shader_texture_lod to the stupid SM3.0 test (for OS X mainly)
2008-07-22 15:50:01 +00:00
taylor
e1044c578d
2d poofs are supposed to be default (forgot that since I didn't commit the new neb2 code :))
2008-07-22 12:59:58 +00:00
phreak
bba43b5a79
Updated to add new files to the VS2008 project.
2008-07-18 20:26:27 +00:00
taylor
f2f6bef1fa
damn, forgot these
2008-07-16 07:50:58 +00:00
taylor
9231692e48
basic commit of a few Xt tree changes
...
- updated OpenGL code (basic shader support, etc.)
- new ships lab code
- scripting RTT fixes
- don't let FRED hog CPU time
2008-07-16 02:49:19 +00:00
karajorma
6e3aa4a33a
A bandaid on the gaping wound that is the current score code for ships. Should stop the missions corrupting themselves with ;;FSO 3.6.10;; messages but missions won't open in 3.6.9 now.
2008-07-14 18:25:41 +00:00
taylor
663ff9d0b1
add part of the Xt texture replacement code which fixed texture page-in issues for late arrivals
...
(rest of the missing thruster fix)
2008-07-14 03:11:11 +00:00
phreak
a9c8558507
Updated to a newer version of glext.h from SGI
2008-07-10 11:34:50 +00:00
taylor
d5e1312e19
total_time fixage (it should never be allowed to be zero)
2008-07-10 06:15:56 +00:00
taylor
2494bd0291
various thruster fixage from the Xt tree (should fix Mantis #1450 )
2008-07-10 05:58:51 +00:00
taylor
6c255cf1c9
fix HB being sent after server disconnect (made games show up for up to 10 minutes after they had ended)
...
make the chat channel count update more than once, since that didn't appear to work very well
fix compile error with GCC 4.3
2008-07-10 05:10:31 +00:00
Goober5000
16f8087433
the second half of the Mantis #1271 fix
2008-07-10 03:44:45 +00:00
Swifty
14c7b2c4c8
Mantis 1707: fix for FTL warp effect going out of bounds.
2008-07-08 16:17:49 +00:00
Goober5000
9d5d21c39d
d'oh -- fix Mantis #1271
2008-07-08 08:03:31 +00:00
karajorma
466d3a2811
Couple of small changes to make the Standalone work again.
2008-07-07 08:46:17 +00:00
Goober5000
b57c41c6f7
fix incompatibility in sexps between retail and SCP
2008-06-26 21:18:46 +00:00
phreak
ebc331324d
Properly autocenter the missile models in the techroom.
2008-06-26 02:52:51 +00:00
Wanderer
ccbdf0ead1
added startMission lua function
2008-06-24 12:27:49 +00:00
phreak
0fff5c7da0
Fix mantis #1710
2008-06-23 22:09:04 +00:00
karajorma
78d512002e
Allow capship beams to take full credit for their kills if a flag is set.
2008-06-23 20:47:26 +00:00
karajorma
7ce2d59bce
Doh!
2008-06-23 19:01:08 +00:00
karajorma
a10ea210b3
Fix a bug that meant players sometimes didn't get an assist is someone had already earned one.
...
Make it possible to decide what percentage of the damage a ship receives earns you a kill.
2008-06-23 16:27:14 +00:00
WMCoolmon
89f5949071
The new scripting hooks for mouse/keyboard.
2008-06-23 07:50:47 +00:00
Swifty
1746c4ce94
Even more accurate HUD reticle offset calculations.
2008-06-23 07:39:01 +00:00
phreak
4a2b028463
Get rid of my mixed case old username.
2008-06-23 01:58:02 +00:00
phreak
468bcc6441
Fixed filename cases in the code, fred2, and freespace2 project files. The files were originally mixed-case (from fs2-public) and the mixed-case names would be restored when saving the files. This didn't sit too well with SVN.
2008-06-23 01:54:33 +00:00
karajorma
73aaa87bd3
Change No Debrief to Toggle Debrief. It will now turn on debriefings for dogfight missions (Which otherwise get the kills matrix).
2008-06-22 16:57:35 +00:00
karajorma
ea02c08748
Add the Hide-ship-name ship flag
2008-06-22 16:55:29 +00:00
Swifty
87b4f5ef8d
Fixed inaccurate slewing HUD reticle as pointed out by Goober.
2008-06-22 08:24:57 +00:00
Goober5000
1dcb42aa5d
added missing TrackIR offsets in FS1 HUD code
...
disabled the entire HUD nose offset system until Swifty can fix the centering algorithm
2008-06-22 04:02:07 +00:00
taylor
0c1d218fb4
fix compiling on F9 (per the standard, limits.h isn't implicitly included)
2008-06-19 04:36:26 +00:00
karajorma
d9432e7e82
I'm fairly sure FRED shouldn't be calling that function. Certainly not for BtRL at least as it was causing a crash.
2008-06-18 22:24:56 +00:00