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

..

gl

Trunk sync r8575

2012-03-05 11:53:22 +00:00

2d.cpp

Merge branch 'master' into antipodes_/sync

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

2d.h

Merge branch 'master' into antipodes_/sync

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

font.cpp

some const-correctness

2015-09-22 19:02:10 -04:00

font.h

some const-correctness

2015-09-22 19:02:10 -04:00

generic.cpp

Fix memory leaks in generic_anim_stream

2015-10-24 15:04:13 +10:00

generic.h

Merge pull request #195 from Echelon9/fix/sort-uniq-includes

2015-08-19 00:05:02 -04:00

grbatch.cpp

Fix another braces warning

2015-08-19 11:26:30 +02:00

grbatch.h

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

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

grinternal.h

Merge branch 'master' into antipodes_/sync

2015-08-24 12:10:16 +02:00

gropengl.cpp

Add support for specifying the used display

2015-09-06 22:34:09 +02:00

gropengl.h

Workaround for freezing when exiting abnormally

2015-09-03 13:09:37 +02:00

gropenglbmpman.cpp

Merge pull request #195 from Echelon9/fix/sort-uniq-includes

2015-08-19 00:05:02 -04:00

gropenglbmpman.h

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

gropengldraw.cpp

Merge pull request #195 from Echelon9/fix/sort-uniq-includes

2015-08-19 00:05:02 -04:00

gropengldraw.h

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

gropenglextension.cpp

Merge branch 'master' into antipodes_/sync

2015-10-01 22:45:10 +02:00

gropenglextension.h

Merge branch 'master' into antipodes

2015-05-12 20:34:35 +02:00

gropengllight.cpp

more linux compatibility

2015-10-25 20:23:26 -04:00

gropengllight.h

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

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

gropenglpostprocessing.cpp

Merge pull request #195 from Echelon9/fix/sort-uniq-includes

2015-08-19 00:05:02 -04:00

gropenglpostprocessing.h

Fix: graphics/gropenglpostprocessing.cpp:682:79: warning: declaration of ‘shader’ shadows a global declaration [-Wshadow]

2015-07-06 22:49:38 +10:00

gropenglshader.cpp

Merge pull request #195 from Echelon9/fix/sort-uniq-includes

2015-08-19 00:05:02 -04:00

gropenglshader.h

Merge pull request #195 from Echelon9/fix/sort-uniq-includes

2015-08-19 00:05:02 -04:00

gropenglstate.cpp

Simplify duplicative graphics/ includes.

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

gropenglstate.h

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

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

gropengltexture.cpp

Merge pull request #195 from Echelon9/fix/sort-uniq-includes

2015-08-19 00:05:02 -04:00

gropengltexture.h

Fix: graphics/gropenglbmpman.cpp:561:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

2015-07-06 21:41:31 +10:00

gropengltnl.cpp

Fix set but unused variable warning in gropengltnl.cpp

2015-08-19 11:26:27 +02:00

gropengltnl.h

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

grstub.cpp

Fix set but unused variable warning in grstub.cpp

2015-08-19 11:26:27 +02:00

grstub.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

line.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

shadows.cpp

Simplify duplicative graphics/ includes.

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

shadows.h

Simplify duplicative graphics/ includes.

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

tmapper.h

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

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