asarium 5f23381c07 Merge branch 'master' into antipodes_/sync ...

Conflicts:
	code/cmdline/cmdline.cpp
	code/globalincs/pstypes.h
	code/globalincs/windebug.cpp
	code/graphics/2d.cpp
	code/windows_stub/stubs.cpp

2015-10-31 17:18:29 +01:00

..

afterburner.cpp

Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info

2015-08-19 11:53:25 -07:00

afterburner.h

change object from a struct to a class, since it contains the objsnd_num field :-/

2013-11-10 18:28:55 +10:00

awacs.cpp

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

awacs.h

change object from a struct to a class, since it contains the objsnd_num field :-/

2013-11-10 18:28:55 +10:00

shield.cpp

Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info

2015-08-19 11:53:25 -07:00

ship.cpp

Undefine MessageBox if it is defined

2015-08-29 23:01:38 +02:00

ship.h

remove WF_NEVER_EXISTED

2015-10-22 23:27:43 -04:00

shipcontrails.cpp

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

shipcontrails.h

change the ship struct to a class, and remove use of memcpy and memset for setting/copying the entire ship class

2013-10-07 20:02:31 +10:00

shipfx.cpp

Simplify duplicative ship/ includes, which are in ship/shipfx.h

2015-06-22 20:24:31 +10:00

shipfx.h

Soft shadows, deferred lighting, and various major graphics optimizations.

2015-05-02 14:35:37 -07:00

shiphit.cpp

looks like we'll need them in these three other files too

2015-10-25 21:20:57 -04:00

shiphit.h

Adding customizable pain flash and shield pain flash settings

2015-05-24 09:00:30 -05:00

subsysdamage.h

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.)

2012-01-21 22:08:38 +00:00