Commit graph

9288 commits

Author SHA1 Message Date
Alam Ed Arias
f3bd8c6ef4 Merge branch 'master' into sdl2 2014-05-02 09:01:51 -04:00
Alam Ed Arias
ea7abe7c44 Merge branch 'master' of https://github.com/ilag11111/SRB2 2014-05-02 08:49:30 -04:00
Alam Ed Arias
2055e268e8 Merge branch 'cmake' of github.com:AMDmi3/SRB2 2014-05-02 08:49:18 -04:00
Alam Ed Arias
00fc6b9dcd Merge branch 'endianess' of github.com:AMDmi3/SRB2 2014-05-02 08:49:00 -04:00
ilag11111
b21d5c55c9 Uses fixed-point math to properly calculate the exact amount of space needed. 2014-04-25 13:17:05 -07:00
ilag11111
f7bbf8c6d0 Improved fix by changing the formula for how memory is allocated to arbitrary sample rate conversion. 2014-04-25 12:42:43 -07:00
Dmitry Marakasov
dad0ad59c1 Add Linux support to CMake 2014-04-25 13:02:50 +04:00
Dmitry Marakasov
3f170769da Add simple CMakeLists.txt 2014-04-25 13:02:50 +04:00
ilag11111
60a115b0a7 Fix (Linux) 64-bit crash in CEZ3 (playback of sfx_litng3). 2014-04-25 00:37:13 -07:00
Dmitry Marakasov
7d52913add Make endianess detection more flexible
And fix it on FreeBSD, where _BIG_ENDIAN is not a flag indicating
big endian machine, but a constant to compare _BYTE_ORDER to.
2014-04-25 02:40:19 +04:00
Sryder13
c5aa433167 Merge remote-tracking branch 'upstream/master' 2014-04-24 15:37:07 +01:00
Alam Ed Arias
5b5fbe9aad fix suport for libpng 1.6 2014-04-21 23:07:02 -04:00
Sryder13
46e84465e8 OpenGL: FOF Cutting Fix 2
Fixes Translucent FOF's cutting Solid FOF's.
2014-04-20 10:35:50 +01:00
Sryder13
a230368c3d Merge remote-tracking branch 'upstream/master' 2014-04-20 10:33:47 +01:00
Alam Ed Arias
26d2d37d31 Merge branch 'master' into sdl2 2014-04-19 13:42:23 -04:00
Alam Ed Arias
8a9759a3e4 SRB2 2.1.8 release 2014-04-19 13:41:29 -04:00
Sryder13
bae7b5b2ac OpenGL: FOF cutting fix
Fixes any FOF's with FF_SOLID not cutting each other.
2014-04-19 17:21:30 +01:00
Sryder13
8271b7feab Merge remote-tracking branch 'upstream/master' 2014-04-19 17:18:14 +01:00
Alam Ed Arias
f3e8c01565 Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
Alam Ed Arias
a4919454e8 Merge branch 'master' into sdl2 2014-04-17 20:46:35 -04:00
Alam Arias
7fb530fd18 grr, shadows 2014-04-17 17:52:33 -04:00
Alam Ed Arias
d6e48e2168 whitespace cleanup 2014-04-17 17:47:51 -04:00
Alam Ed Arias
f4b9b11451 Merge remote-tracking branch 'RedEnchilada/master' 2014-04-17 17:46:02 -04:00
RedEnchilada
fa79c1856c Make player seethru code account for cut-away view 2014-04-17 13:46:40 -05:00
Alam Ed Arias
cb9f07fae8 Merge branch 'master' into sdl2 2014-04-17 14:04:02 -04:00
Alam Ed Arias
d7101607a8 Merge remote-tracking branch 'Sryder13/master' 2014-04-17 14:03:44 -04:00
Alam Ed Arias
65c75f413c SDL2: disable hardware support by default for now 2014-04-17 14:02:51 -04:00
Sryder13
098eb28036 OpenGL Multi-Property FOF's
Multi-Property FOF's have their multiple side properties display in
OpenGL.
2014-04-17 13:02:34 +01:00
Sryder13
5b324924ff Undo MD2 Spin Frame Interpolation
Because apparently people don't like them like that.
2014-04-17 11:57:10 +01:00
Sryder13
9db0262a90 Merge remote-tracking branch 'upstream/master' 2014-04-17 11:49:03 +01:00
Alam Ed Arias
537ad47d00 Will the real 2.1.7 release please stand up? 2014-04-15 22:20:13 -04:00
Alam Ed Arias
6b3a982434 Merge branch 'master' into sdl2 2014-04-15 13:57:39 -04:00
Alam Ed Arias
51d8c213f0 Merge remote-tracking branch 'RedEnchilada/master' 2014-04-15 13:57:08 -04:00
RedEnchilada
766f4c4acb Render skybox from proper place for cutaway view
(Disclaimer: I don't know C at all)
2014-04-15 12:39:23 -05:00
Alam Ed Arias
9a5e74c4a2 Merge branch 'master' into sdl2 2014-04-14 09:09:05 -04:00
Alam Ed Arias
8e2378b15d Merge remote-tracking branch 'Sryder13/master' 2014-04-14 09:08:02 -04:00
Sryder13
804684b911 Merge remote-tracking branch 'upstream/master' 2014-04-14 07:34:15 +01:00
Alam Ed Arias
8b90b0c39e Merge branch 'master' into sdl2 2014-04-14 01:16:06 -04:00
Alam Ed Arias
02a3b0776c SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
Sryder13
d3dc1e1d60 Merge remote-tracking branch 'upstream/master' 2014-04-10 19:56:01 +01:00
Alam Ed Arias
b1dc3452c9 grsoftwarefog is still hardware only 2014-04-10 17:28:07 +01:00
Alam Ed Arias
5afc1d145b use git describe to get the tag+version 2014-04-10 17:28:07 +01:00
Alam Ed Arias
8fea599bf8 disable x11 check 2014-04-09 19:55:05 -04:00
Alam Ed Arias
2005421a7e Merge remote-tracking branch 'ilag11111/sdl2' into sdl2
Conflicts:
	src/sdl2/i_video.c
2014-04-09 19:47:11 -04:00
ilag11111
c206d55568 Adds command line parameter -mousewarp to control the use of warping in place of grabbing. Works around bugs in certain versions of X. 2014-04-09 14:40:54 -07:00
Alam Ed Arias
a3f387200e XINPUT2 support check
reable check for x11 and check if XINPUT2 support before enable mouse grab mode
TODO: need to restore non-mousegrab code?
2014-04-09 14:57:47 -04:00
Alam Ed Arias
57c1fd602c clean up SDL2 video interface code 2014-04-09 14:54:15 -04:00
Alam Ed Arias
0aaaf067e3 update SDL2 interface to use SDL_JoystickNameForIndex 2014-04-09 14:54:15 -04:00
Alam Ed Arias
c59df51d19 Merge branch 'master' into sdl2
Conflicts:
	comptime.sh
2014-04-09 14:54:06 -04:00
Alam Ed Arias
2bd6573f5f grsoftwarefog is still hardware only 2014-04-09 14:52:38 -04:00