Commit graph

14661 commits

Author SHA1 Message Date
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
Sryder13
7e04e679a9 Player Spin Frame MD2 Interpolation
Player spin frames on MD2's interpolate correctly when moving slowly.
2014-04-07 12:37:15 +01:00
Ronald Kinard
ec559c84c1 sdl2: Fix mouse motion in fullscreen 2014-04-06 22:36:47 -05:00
Ronald Kinard
1882cf9233 sdl2: fix tabbing on last few commits 2014-04-06 21:50:56 -05:00
Ronald Kinard
080f8e4008 sdl2: restore joystick code
remarkably it still works even though the API has changed.
2014-04-06 21:43:40 -05:00
Ronald Kinard
6ea03a23b4 sdl2: Revert -win flag behavior, was glitchy 2014-04-06 21:23:59 -05:00
Alam Ed Arias
0ae6d5ae29 merge sdl interface changes into SDL2 interface 2014-04-06 19:01:04 -04:00
Alam Ed Arias
ea2e1a1144 Merge branch 'master' into sdl2 2014-04-06 18:38:04 -04:00
Alam Ed Arias
2d7441d360 Merge branch 'sdl2' of github.com:Furyhunter/SRB2 into sdl2 2014-04-06 18:37:56 -04:00
Sryder13
56fbdfdad3 OpenGL Translucent Midtexture Fix
Translucent Midtextures using holes with textures in them now work when
there is no FOF's above their sector.
2014-04-05 22:13:09 +01:00
Ronald Kinard
a413811ccd Merge branch 'master' into sdl2
Synchronizing back to upstream
2014-04-01 01:29:18 -05:00
Sryder13
fc12fc7cd4 OpenGL Screen Fading Fix
Screen Wipes now work as they did in 2.0.x.
2014-03-31 23:47:12 +01:00
Sryder13
d75d7cd09a OpenGL Splitscreen Fix
First screen in split-screen is now not completely black.
2014-03-31 00:07:55 +01:00
Sryder13
9f0aacb059 MD2 Texture load fix
Fixes MD2's using sprites on the first frame when they're loaded.
2014-03-30 17:45:58 +01:00
Sryder13
652f3395a9 Merge https://github.com/STJr/SRB2 2014-03-28 23:29:20 +00:00
Sryder13
fc978c79bb OpenGL wall Y offset
Fixed wall textures breaking when Y offset of the wall was too high.
2014-03-28 23:28:00 +00:00
Alam Ed Arias
a80d925daf Merge branch 'master' of github.com:STJr/SRB2 into sdl2 2014-03-28 11:59:57 -04:00
Alam Ed Arias
1b0b9fa537 Merge branch 'master' of https://github.com/ilag11111/SRB2
With whitespace fixup
2014-03-28 11:58:35 -04:00