scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-11 04:31:35 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
Files
00f2ddc8da3cdcc7c4d7d0ded0ea7bbe3f40b6e4
fs2open.github.com/code
T
History
wookieejedi 00f2ddc8da Bug fix: adds missing conditional when using custom icons and 3D weapon selection 
Previously if the 3D_weapon flag was used it would always create a weapon icon and overrride any pre-existing icons the modder would specify. This PR fixes that by adding an extra set of conditionals, which specify if a weapon has an icon file name then it should be used, and if the weapon does not have an `$Anim:` but does have a model then that model should be used if the 3D_weapon flag is enabled.
2019-06-25 16:20:13 -04:00
..
ai
Don't link if ship has 'no primary linking' flag
2019-05-10 23:06:16 +10:00
anim
remove unused functions on anim
2018-12-22 20:10:56 +01:00
asteroid
Cleanup in object collide code.
2019-05-01 09:44:19 +02:00
autopilot
remove unused functions in autopilot
2018-12-22 20:10:56 +01:00
bmpman
remove unused or unread variables in bmpman.
2018-12-22 20:10:56 +01:00
camera
Add new options system
2019-03-02 14:02:21 +01:00
cfile
Unify Cfile blocks and CFILE handles
2019-03-08 18:34:00 +01:00
cfilearchiver
Changes the usage printout as per discussion
2017-02-16 10:24:51 +01:00
cfileextractor
Fixes Configuration error for the CFileArchiver/Extractor projects
2017-02-15 16:12:59 +01:00
cmdline
Add new options system
2019-03-02 14:02:21 +01:00
cmeasure
remove unused functions in cmeasures
2018-12-22 20:10:56 +01:00
controlconfig
Update code/controlconfig/controlsconfigcommon.cpp
2019-03-23 14:14:36 +01:00
cutscene
Add CircleCI config file
2019-02-26 19:53:11 +01:00
ddsutils
More 64-bit MSVC warning fixes
2016-08-10 13:33:12 +02:00
debris
Cleanup in object collide code.
2019-05-01 09:44:19 +02:00
debugconsole
remove dead code in debugconsole
2018-12-26 20:40:20 +01:00
decals
Add additional validity check for decals
2018-11-18 12:41:55 +01:00
def_files
add ai-play-dead-persistent
2018-09-27 00:48:57 -04:00
events
Add discord Rich Presence support
2018-07-15 19:37:24 +02:00
exceptionhandler
Trunk sync r9300 (last was actually synced with 9284, skipped 9296 since we don't have an Xcode4 project in Antipodes yet).
2012-11-02 20:28:04 +00:00
external_dll
Add improved head tracking code
2016-08-13 21:43:23 +02:00
fireball
Add new options system
2019-03-02 14:02:21 +01:00
fs2netd
strings.tbl translation adjustments
2018-07-14 14:26:48 +02:00
gamehelp
remove unused function in gameplayhelp: gameplay_help_close
2018-12-26 20:40:20 +01:00
gamesequence
remove two unused functions in gamesequence
2018-12-26 20:40:20 +01:00
gamesnd
Add CircleCI config file
2019-02-26 19:53:11 +01:00
globalincs
Add new options system
2019-03-02 14:02:21 +01:00
graphics
Clean up map::iterator usage
2019-05-24 13:43:04 -07:00
headtracking
Fix various issues detected by MinGW
2018-04-21 15:13:25 +02:00
hud
fix bug #1827: targeting brackets stuck in top left corner
2019-05-01 18:32:26 +02:00
iff_defs
More string const correctness fixes
2017-01-04 00:12:41 +01:00
inetfile
Enable misc-unused-parameters
2018-04-25 11:57:55 +02:00
io
Add new options system
2019-03-02 14:02:21 +01:00
jpgutils
Enable misc-unused-parameters
2018-04-25 11:57:55 +02:00
jumpnode
Enable remaining misc- checks and fix detected issues
2018-04-25 11:57:55 +02:00
lab
Add new options system
2019-03-02 14:02:21 +01:00
libs
Add new options system
2019-03-02 14:02:21 +01:00
lighting
remove unused functions in lighting code.
2018-12-28 10:29:21 +01:00
localization
New translateable strings for the strings.tbl
2019-03-22 22:44:35 +01:00
math
address clang-tidy complaint
2018-11-22 16:07:00 -05:00
menuui
Merge pull request #1892 from asarium/feature/optionsUI
2019-04-29 17:16:21 -04:00
mission
Allow qtFred to open missions again
2019-05-04 14:02:50 +10:00
missionui
Bug fix: adds missing conditional when using custom icons and 3D weapon selection
2019-06-25 16:20:13 -04:00
mod_table
Fix error message vars
2019-06-22 20:50:29 -04:00
model
Update to using tuples and error checks
2019-06-22 16:07:55 -04:00
nebula
remove unused function in nebula code
2018-12-29 16:45:47 +01:00
network
fix function references
2018-11-24 14:11:26 -05:00
object
Merge pull request #2024 from CasparKielwein/collision_cleanup_ck
2019-05-13 19:41:38 +10:00
observer
Bitset flags -- take 2 (#775)
2016-08-12 16:13:50 -07:00
options
Add new options system
2019-03-02 14:02:21 +01:00
osapi
Add new options system
2019-03-02 14:02:21 +01:00
parse
repair parent submodel if it needs repairing
2019-05-17 14:31:16 -04:00
particle
Add support for "Effects per second" feature
2019-01-19 13:56:45 +01:00
pcxutils
remove unused and commented out functions in pcxutils.
2018-12-29 16:45:47 +01:00
physics
remove unused functions in physics
2018-12-29 16:45:47 +01:00
pilotfile
Add CircleCI config file
2019-02-26 19:53:11 +01:00
playerman
stage 1: replace individual parameters with an index into Warp_params
2019-01-08 23:03:36 -05:00
pngutils
Enable misc-unused-parameters
2018-04-25 11:57:55 +02:00
popup
Enable remaining misc- checks and fix detected issues
2018-04-25 11:57:55 +02:00
radar
address feedback
2019-03-10 09:26:12 +10:00
render
Clean up map::iterator usage
2019-05-24 13:43:04 -07:00
scpui
Only play UI sounds if the event is triggered on the element where the property is set.
2018-10-31 06:46:27 +01:00
scripting
add $On Subsystem Destroyed scripting hook
2019-05-08 19:55:03 -04:00
ship
Merge pull request #2042 from Goober5000/nested_subsys_destruction
2019-06-06 01:48:03 -04:00
sound
remove unused functions in sound
2018-12-29 16:41:23 +01:00
species_defs
Move build system to CMake
2016-07-22 12:07:19 +02:00
starfield
Add new options system
2019-03-02 14:02:21 +01:00
stats
Clean up map::iterator usage
2019-05-24 13:43:04 -07:00
tgautils
Enable misc-unused-parameters
2018-04-25 11:57:55 +02:00
tracing
Fix new warnings reported by GCC8
2018-06-26 11:51:08 +02:00
ui
Enable misc-unused-parameters
2018-04-25 11:57:55 +02:00
utils
Add support for "Effects per second" feature
2019-01-19 13:56:45 +01:00
weapon
Merge pull request #1892 from asarium/feature/optionsUI
2019-04-29 17:16:21 -04:00
windows_stub
Add new libRocket UI system
2018-09-16 13:55:29 +02:00
CMakeLists.txt
Add new libRocket UI system
2018-09-16 13:55:29 +02:00
default_files.cmake
Test Windows compilation with Travis CI
2018-10-20 23:44:10 +02:00
prefix_header.h
Unify Cfile blocks and CFILE handles
2019-03-08 18:34:00 +01:00
source_groups.cmake
Merge pull request #1892 from asarium/feature/optionsUI
2019-04-29 17:16:21 -04:00
voice_rec.cmake
Move build system to CMake
2016-07-22 12:07:19 +02:00