Commit Graph

178 Commits

Author SHA1 Message Date
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
Alam Ed Arias c390173e22 Merge remote-tracking branch 'Sryder13/master' 2014-04-09 12:28:06 -04:00
Alam Ed Arias cb9494effa use git describe to get the tag+version 2014-04-09 12:27:29 -04:00
ilag11111 025523f3e3 Fix the previous commit to work on Linux32. Add more comments. 2014-04-08 19:19:23 -07:00
ilag11111 0306c1834a Disables input grabbing in Linux; allows alt-tabbing and other actions. 2014-04-08 19:02:45 -07:00
Alam Ed Arias 79b32a46e5 restore ISO C90 support in r_opengl 2014-04-08 17:34:42 +01:00
Alam Ed Arias cec63aa4c0 restore ISO C90 support in r_opengl 2014-04-08 12:01:26 -04:00
Alam Ed Arias 40d1898806 Merge branch 'master' of https://github.com/Sryder13/SRB2 2014-04-08 11:47:43 -04:00
Sryder13 b63e99efd8 OpenGL Screen Flip
Screen flipping in OpenGL is no longer done by inverting the screen
polygons.
2014-04-07 17:08:04 +01:00
Sryder13 81627a847f Merge https://github.com/STJr/SRB2 2014-04-07 17:01:56 +01:00
Alam Ed Arias 25448dec36 Compile Win32 EXE with -gdwarf-2 2014-04-07 10:03:14 -04:00