asarium 84279530d7 Merge branch 'master' into antipodes ...

Conflicts:
	code/globalincs/pstypes.h
	code/globalincs/windebug.cpp
	code/windows_stub/stubs.cpp
	projects/MSVC_2015/Freespace2.vcxproj
	projects/MSVC_2015/code.vcxproj

2015-08-15 16:41:34 +02:00

..

ai

Turret bank fix and ammo removal

2015-08-09 19:29:16 -05:00

anim

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

asteroid

Fix: warning: format not a string literal and no format arguments [-Wformat-security]

2015-08-05 21:07:05 +10:00

autopilot

Replace longjmp with exceptions

2015-04-24 15:03:59 +02:00

bmpman

Fix incorrect Doxygen comment for bm_lock().

2015-08-15 13:56:54 +10:00

camera

[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

cfile

Fix cf_file_exists().

2015-04-29 23:21:49 -07:00

cfilearchiver

Trunk Sync - r6875

2010-12-21 06:51:15 +00:00

cfileextractor

Trunk Sync r7946

2011-11-05 09:36:17 +00:00

cmdline

Proposed fix for #248

2015-07-26 14:23:13 +02:00

cmeasure

sync to trunk 10046

2013-11-25 18:40:16 +10:00

controlconfig

Merge remote-tracking branch 'origin/master' into antipodes

2015-07-13 16:36:40 -05:00

cutscene

Merge branch 'master' into antipodes

2015-07-03 19:15:43 +02:00

ddsutils

sync to trunk 10046

2013-11-25 18:40:16 +10:00

debris

Added $Collision LOD ship table property, for using a LOD for collision detection

2015-08-03 13:20:14 +03:00

debugconsole

Fix incorrect Doxygen comment, there is no type @ret.

2015-08-15 13:55:05 +10:00

directx

This is more like it. These files diff'd as different than Trunk versions, so I over-rode them with Trunk versions so that Antipodes and Trunk can finally have some 1:1 parity.

2010-09-23 02:14:26 +00: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

Update externalcode to use SDL to do DLL loading

2015-05-27 15:01:40 +02:00

fireball

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

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

fred2

Merge branch 'master' into antipodes

2015-08-15 16:41:34 +02:00

freespace2

Merge branch 'master' into antipodes

2015-07-03 19:15:43 +02:00

fs2netd

Replace Sleep with os_sleep

2015-06-03 16:20:39 +02:00

gamehelp

Fix: gamehelp/contexthelp.cpp:391:9: warning: declaration of ‘font’ shadows a global declaration [-Wshadow]

2015-07-05 17:01:37 +10:00

gamesequence

Trunk sync r10257

2014-03-06 19:24:14 +10:00

gamesnd

Merge branch 'master' into antipodes

2015-07-03 19:15:43 +02:00

globalincs

Merge branch 'master' into antipodes

2015-08-15 16:41:34 +02:00

graphics

Merge branch 'master' into antipodes

2015-08-15 16:41:34 +02:00

hud

Merge branch 'master' into antipodes

2015-08-15 16:41:34 +02:00

iff_defs

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

inetfile

Replace Sleep with os_sleep

2015-06-03 16:20:39 +02:00

io

Add some debug code to sdl haptic initialization

2015-05-28 15:43:00 +02:00

jpgutils

sync to trunk 10046

2013-11-25 18:40:16 +10:00

jumpnode

Merge pull request #149 from SamuelCho/mantis3163

2015-05-30 19:24:15 -07:00

lab

Change s/Error code/Error message/ in GUISystem::ParseClassInfo()

2015-08-06 17:56:53 +10:00

lighting

Fixed gradient brackets in ship select screen. Fixed lighting for transparent meshes when using deferred lighting.

2015-05-13 20:38:17 -07:00

localization

From Yarn: fix mantis 3157

2015-04-28 19:36:30 +10:00

math

fvi: Refactor solution to quadratic formula

2015-07-15 09:18:47 -04:00

menuui

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

mission

Do a couple more MAX_SHIP_*_BANKS to num_*_banks replacements.

2015-08-13 15:03:31 -07:00

missionui

Merge remote-tracking branch 'origin/master' into antipodes

2015-07-13 16:36:40 -05:00

mm

remove PreProcDefine #includes in FS2

2005-07-13 03:26:00 +00:00

mod_table

Adding customizable pain flash and shield pain flash settings

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

model

Change s/Error code/Error message/ in parse_glowpoint_table()

2015-08-06 17:54:41 +10:00

nebula

Fix: nebula/neb.cpp:1422:37: warning: declaration of ‘eye’ shadows a global declaration [-Wshadow]

2015-07-06 23:01:21 +10:00

network

Merge branch 'master' into antipodes

2015-08-15 16:41:34 +02:00

object

Fix incorrect Doxygen comment for free_object_slots().

2015-08-15 13:45:20 +10:00

observer

sync to trunk 10223

2014-03-06 19:24:13 +10:00

osapi

Merge branch 'master' into antipodes

2015-08-15 16:41:34 +02:00

palman

Resolve CID 1093395 - Unnecessary sanity check

2015-06-15 16:12:22 -04:00

parse

Merge branch 'master' into antipodes

2015-08-15 16:41:34 +02:00

particle

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

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

pcxutils

sync to trunk 10046

2013-11-25 18:40:16 +10:00

physics

Fixed a FRED crash when using $Flight controls follow eyepoint orientation (patch by MageKing17).

2014-10-29 18:47:04 +10:00

pilotfile

Ensure sufficient format string specifiers are present.

2015-08-05 19:55:03 +10:00

playerman

Fixes Mantis #2436: Mouse controls ignore the axis binds.

2015-06-28 14:42:17 +03:00

pngutils

sync to trunk 10046

2013-11-25 18:40:16 +10:00

popup

Merge branch 'master' into antipodes

2015-04-25 16:48:43 +02:00

radar

Patch to add MSVC2015 support. Also fixes a few warnings its compiler threw.

2015-03-29 11:05:02 +10:00

render

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

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

ship

Actually fix the cargo_size check for turrets.

2015-08-12 21:18:37 -07:00

sound

Merge branch 'master' into antipodes

2015-08-15 16:41:34 +02:00

species_defs

Replace longjmp with exceptions

2015-04-24 15:03:59 +02:00

starfield

Correct Warning() in parse_startbl

2015-08-05 16:48:49 +10:00

stats

Resolve CID 1093428 & 1093429

2015-06-13 13:16:56 -04:00

tgautils

sync to trunk 10046

2013-11-25 18:40:16 +10:00

ui

Merge branch 'master' into antipodes

2015-08-15 16:41:34 +02:00

weapon

Turret bank fix and ammo removal

2015-08-09 19:29:16 -05:00

windows_stub

Add format specifying macros

2015-07-26 14:08:31 +02:00

wxfred2

Merge branch 'master' into antipodes

2015-04-25 16:48:43 +02:00

Makefile.am

Merge branch 'master' into antipodes

2015-07-03 19:15:43 +02:00