Commit graph

293 commits

Author SHA1 Message Date
Alam Ed Arias
2b2b23efab Merge branch 'next' 2015-01-01 14:51:38 -05:00
Alam Ed Arias
73b3287b19 SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
Alam Ed Arias
d959d0e462 Merge remote-tracking branch 'wolfy852/patch-2' into next 2014-11-29 13:08:32 -05:00
Alam Ed Arias
35547282ca Merge branch 'master' into next 2014-11-29 13:08:12 -05:00
Alam Ed Arias
b153073585 Merge remote-tracking branch 'Sryder13/master' 2014-11-29 13:07:59 -05:00
Sryder13
3f1bb6359f Merge remote-tracking branch 'upstream/master' 2014-11-14 22:21:07 +00:00
Sryder13
e90286ae52 Fix the polyobject crash 2014-11-14 22:19:44 +00:00
Alam Ed Arias
c9753836d2 Merge remote-tracking branch 'Furyhunter/master' 2014-11-14 01:05:47 -05:00
Ronald Kinard
3fd2a705ee Maybe this is the last warning related commit? 2014-11-14 00:04:54 -06:00
Ronald Kinard
98c3c3a3ae More warning squashing 2014-11-13 23:09:57 -06:00
Ronald Kinard
3eafca0dc1 Fix compile errors on win32, warnings elsewhere 2014-11-13 22:58:08 -06:00
Ronald Kinard
2feda0b560 Fix second joystick in sdl 2014-11-13 22:34:47 -06:00
Ronald Kinard
be1565fce3 Add support for new HWR functions in win32 and sdl12 2014-11-13 22:34:09 -06:00
Ronald Kinard
869c4241eb Restrict mouse to window when in focus 2014-11-13 19:18:24 -06:00
Ronald Kinard
d056e82b3b Parse GL version correctly. 2014-11-13 18:20:32 -06:00
Ronald Kinard
d8484a86e0 Virtual resolutions in OpenGL
Also made fades use core functions if they are available.
2014-11-13 18:06:38 -06:00
Ronald Kinard
5d0eafb26a Fix MOUSE4/MOUSE5
MOUSE6-8 will not be supported on SDL2 as there is no interface for them.
2014-11-13 15:31:32 -06:00
Ronald Kinard
80891e916d Use scancodes instead of keycodes for locale independence.
ONLY US KEYBOARDS SUPPORTED! THAT'S HOW WE DO IT IN AMURRICA
2014-11-13 15:19:39 -06:00
Ronald Kinard
0913bd44af Fix mouse warping
In some cases, the warp back to center was being detected as a mouse motion, causing all sorts of silliness with the mouse. The workaround is by only using the first motion event and ignoring every event after that, until the next call to I_GetEvent.
2014-11-13 03:51:33 -06:00
Ronald Kinard
b82f64dea5 Display error window on crash 2014-11-13 01:51:29 -06:00
Ronald Kinard
4c55b5db20 Center only on display 1. No more multimonitor span. 2014-11-13 01:36:06 -06:00
Ronald Kinard
b7e8d7d044 Fix -nomouse 2014-11-13 01:04:17 -06:00
Sryder13
9796260709 Merge remote-tracking branch 'upstream/master' 2014-11-12 17:02:40 +00:00
Alam Ed Arias
a721528c50 DunceEnchilada had been glared at 2014-11-12 09:28:14 -05:00
Alam Ed Arias
404b5f666c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
Alam Ed Arias
3fe4921a24 Merge remote-tracking branch 'origin/master' into next 2014-11-02 01:12:23 -05:00
Alam Ed Arias
6d773c54a5 Use OpenGL 1.3 in static builds and on SDL interfaces 2014-11-02 01:11:59 -05:00
Alam Ed Arias
be73e84245 Merge remote-tracking branch 'origin/master' into next 2014-11-02 01:32:33 -04:00
JTE
9d1da548aa Fix hardware / r_opengl warnings. 2014-11-02 01:31:38 -04:00
Alam Ed Arias
aa612bcf91 whiteline checkup 2014-11-02 01:31:36 -04:00
Alam Ed Arias
21edc49ea4 Merge remote-tracking branch 'Sryder13/master' 2014-11-02 01:30:46 -04:00
Sryder13
0c0ede6f18 OpenGL: Polyobject Planes 2014-10-27 20:57:45 +00:00
Wolfy
197e5fce55 Change super transformation to freeze momentum instead of bitshifting
Fixes https://mb.srb2.org/showthread.php?t=39921 where the issue before was that when you transformed your momentum would still have you moving slowly, which could cancel out the animation.
2014-10-01 21:19:32 -05:00
Sryder13
1ab29ba96a Merge remote-tracking branch 'upstream/master' 2014-09-12 20:53:55 +01:00
Sryder13
781dd16fa6 Fix THOK MD2's not rotating with camera
Will also fix any other case that an mobj has a skin and a single frame.
2014-09-10 00:22:39 +01:00
Sryder13
987f9f5c26 Quick sky fix 2
walls not extending down when a thok barrier has top textures and both
ceilings have sky.
2014-09-09 23:57:12 +01:00
Sryder13
cee8fff7b3 Quick sky fix
Avoid Z-Fighting on the depth wall with the regular walls to stop the
possibility of regular walls being made partially invisible.
2014-09-09 01:59:19 +01:00
Sryder13
b2852ec0f4 OpenGL: Sky culling
Gets rid of stuff being drawn where the sky should be being drawn.
2014-09-08 23:29:05 +01:00
Sryder13
bc0b5505a8 OpenGL: Fix sky drawing
sky positioning and scaling more correct compared to software.
2014-09-08 00:55:32 +01:00
Alam Ed Arias
dc6f798a43 Merge remote-tracking branch 'origin/master' into next 2014-09-05 20:26:07 -04:00
Ronald Kinard
5b07cf8ff0 SDL2: Add 1600x1200 mode 2014-09-05 20:25:06 -04:00
Ronald Kinard
399eddefe6 SDL2: Do not use xinput, force directinput
Fixes axes issue with xinput controllers.
2014-09-05 20:24:57 -04:00
Ronald Kinard
31abd19f75 SDL2: Reimplement some stubbed commands
Also remove some unnecessary functions.
2014-09-05 20:24:39 -04:00
Ronald Kinard
eece38609e SDL2: Fix 320x200 mode 2014-09-05 20:24:25 -04:00
Ronald Kinard
c97eef238e Use gcc_struct on ATTRPACK too 2014-09-05 20:23:38 -04:00
Wolfy
8a4ec56ef5 Merge the dedicatedserver and server global variables
Previously in Lua, dedicatedserver would only return true if the player running the script was the one hosting the dedicated server. In all other cases, it would return nil. This fixes it to point to the server host no matter what.
2014-09-05 20:23:32 -04:00
Alam Ed Arias
cd1ab74bcd Merge branch 'master' into next 2014-09-05 20:23:23 -04:00
Sryder13
ca0f0bf2fd OpenGL Fade masks
I think I've done this all right, someone correct me if I haven't.
2014-09-04 01:35:29 +01:00
Sryder13
da2b6f2c01 Fix certain textures with holes in
see: CEZ1 skybox in linear filtermodes.
2014-09-03 02:10:47 +01:00
Sryder13
d96eaa768c else added
less redundancy.
2014-08-30 14:36:18 +01:00