Commit graph

12554 commits

Author SHA1 Message Date
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
Sryder13
ae27ace7fe Polyobject translucency quick fix.
I realise what I did before may cause FOF's in the same sector to not be
drawn, if they were before.
2014-08-30 14:20:07 +01:00
Sryder13
278f2e9b66 Polyobject top/bottom texture + translucency
polyobjects do have top/bottom textures, silly.
And translucency.
2014-08-30 14:10:55 +01:00
Sryder13
0ee18be33b Merge remote-tracking branch 'upstream/master' 2014-08-30 14:09:25 +01:00
Alam Ed Arias
b1e1163b91 evil changes 2014-08-27 22:43:10 -04:00
Sryder13
5bec33b659 Merge remote-tracking branch 'upstream/master' 2014-08-27 15:07:50 +01:00
Alam Ed Arias
5fe150cd20 Merge branch 'master' into next 2014-08-26 23:57:10 -04:00
Alam Ed Arias
6e7c783013 Merge branch 'next' 2014-08-26 23:56:50 -04:00
Alam Ed Arias
7cb77075d1 SRB2 2.1.11 release 2014-08-26 23:56:30 -04:00
Alam Arias
81cbdcccd5 Merge pull request #28 from wolfy852/master
Remove momentum reduction in CA_JUMPTHOK
2014-08-26 21:29:24 -04:00
Sryder13
e489ad2cd3 Merge remote-tracking branch 'upstream/master' 2014-08-06 15:49:59 +01:00
Alam Ed Arias
29bac09998 Merge branch 'master' into next 2014-08-05 20:01:53 -04:00
Alam Ed Arias
4f1f17b646 Merge branch 'next' 2014-08-05 20:01:25 -04:00
Alam Ed Arias
d6c29e19ab SRB2 2.1.10 release 2014-08-05 19:59:40 -04:00
Wolfy
53c791b29c Remove momentum reduction in CA_JUMPTHOK
Also add new multiability handling for it
2014-08-04 13:38:19 -05:00
Sryder13
8303367548 Merge remote-tracking branch 'upstream/master' 2014-08-04 17:19:20 +01:00
Alam Ed Arias
d066a7a6d1 Change mixer panning to make sense (for SDL12)
This makes positional audio in sdl work correctly (things to the left
    play sounds in the left speaker)
2014-08-04 11:57:29 -04:00
Alam Ed Arias
39c018ec1c Merge remote-tracking branch 'Furyhunter/sdl-fix-flippedchannels' 2014-08-04 11:50:12 -04:00
Sryder13
74499e8173 Merge remote-tracking branch 'upstream/master' 2014-08-04 15:05:56 +01:00
Ronald Kinard
8eef7239b2 Change mixer panning to make sense
This makes positional audio in sdl work correctly (things to the left
play sounds in the left speaker)
2014-08-04 02:48:18 -05:00
Ronald Kinard
25739b38e3 INTERFACE=sdl 2014-08-04 00:27:12 -05:00
Ronald Kinard
a0f959e597 Fix Makefile to target sdl correctly 2014-08-04 00:04:03 -05:00
Alam Ed Arias
c028c83235 SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
Alam Ed Arias
ab9934932e Merge branch 'master' into next 2014-08-03 23:41:57 -04:00
Alam Ed Arias
0386516946 Merge remote-tracking branch 'Furyhunter/sdl2' 2014-08-03 21:02:24 -04:00
Alam Ed Arias
e2d3ce1aed keep the old SDL interface 2014-08-03 21:02:04 -04:00
Alam Ed Arias
13f3fbac2e Merge branch 'master' into next 2014-08-02 11:11:09 -04:00
Alam Ed Arias
cd97685e5a fix build for sh sheel 2014-08-02 11:10:00 -04:00
Alam Ed Arias
abce10fd65 Merge branch 'master' into next 2014-07-29 15:53:53 -04:00
Alam Ed Arias
d8eceeb0ac add build is done message into Makefile 2014-07-29 14:14:59 -04:00
Ronald Kinard
03fe3bdad2 Replace sdl with sdl2
SDL1.2 is dead, long live SDL
2014-07-26 02:06:00 -05:00
Ronald Kinard
87df25a58c sdl2: Fallback resolution for gl fullscreen
to avoid a crash
2014-07-26 00:56:30 -05:00
Ronald Kinard
3a1a0c8871 sdl2: fix mouse grabbing in windowed
Should now ignore all motion events and not warp the mouse when the
window is out of focus.
2014-07-25 23:47:14 -05:00
Ronald Kinard
1bfea632c9 sdl2: windows exe rename srb2sdl2.exe 2014-07-25 23:08:37 -05:00
Ronald Kinard
e3c7bc0637 sdl2: Slow the mouse a bit
Fixes Furyhunter/SRB2#1 but probably makes mouse speed too slow on
Linux. Whatever.
2014-07-25 22:55:48 -05:00
Alam Ed Arias
c5c5d3918e Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2 2014-07-25 20:01:21 -04:00
Alam Ed Arias
424d6531c9 Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2 2014-07-25 20:00:46 -04:00
Ronald Kinard
7e650d30f6 sdl2: add -borderless option for windowed 2014-07-25 18:59:11 -05:00
Ronald Kinard
8d2b813554 sdl2: oops it should be 32 bpp in softblit 2014-07-25 18:59:11 -05:00
Alam Ed Arias
d438a8f8c2 doh, I forget one, and in SDL2's Makefile.cfg 2014-07-25 19:44:43 -04:00