13f3fbac2e
Merge branch 'master' into next
2014-08-02 11:11:09 -04:00
cd97685e5a
fix build for sh sheel
2014-08-02 11:10:00 -04:00
abce10fd65
Merge branch 'master' into next
2014-07-29 15:53:53 -04:00
d8eceeb0ac
add build is done message into Makefile
2014-07-29 14:14:59 -04:00
03fe3bdad2
Replace sdl with sdl2
...
SDL1.2 is dead, long live SDL
2014-07-26 02:06:00 -05:00
87df25a58c
sdl2: Fallback resolution for gl fullscreen
...
to avoid a crash
2014-07-26 00:56:30 -05:00
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
1bfea632c9
sdl2: windows exe rename srb2sdl2.exe
2014-07-25 23:08:37 -05:00
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
c5c5d3918e
Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2
2014-07-25 20:01:21 -04:00
424d6531c9
Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2
2014-07-25 20:00:46 -04:00
7e650d30f6
sdl2: add -borderless option for windowed
2014-07-25 18:59:11 -05:00
8d2b813554
sdl2: oops it should be 32 bpp in softblit
2014-07-25 18:59:11 -05:00
d438a8f8c2
doh, I forget one, and in SDL2's Makefile.cfg
2014-07-25 19:44:43 -04:00
f03e591f64
change SDL into HAVE_SDL
2014-07-25 19:10:24 -04:00
b429cce3b6
sdl2: add -borderless option for windowed
2014-07-24 22:35:04 -05:00
086463bc61
Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2
2014-07-24 22:47:45 -04:00
ce8d82aa52
sdl2: oops it should be 32 bpp in softblit
2014-07-24 21:46:35 -05:00
93e00cc694
sdl2: -softblit, use smaller texture format
...
-softblit uses SDL2 software renderer backend for blitting
2014-07-24 21:32:47 -05:00
b19a9077bd
Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2
2014-07-24 20:27:14 -04:00
8b0f374bfe
sdl2: potential huge perf. boost to software
...
SDL_UpdateTexture is apparently not good for streaming textures.
So instead, I did SDL_LockTexture/Unlock.
2014-07-24 19:18:48 -05:00
005b502756
sdl2: limit fullscreen resolution in OpenGL
2014-07-24 03:15:35 -05:00
8890722223
sdl2: handle no AF support correctly (1, not 0)
...
GL_EXT_texture_filter_anisotropic is cool I guess
2014-07-24 03:03:41 -05:00
39603487ec
sdl2: restore anisotropic filtering support in gl
2014-07-24 03:01:16 -05:00
716aa1f33a
sdl2: fix mouse motion (remove -mousewarp)
2014-07-24 02:51:46 -05:00
750617939d
Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2
2014-07-24 01:23:26 -04:00
0d82e3b54b
sdl2: reorder graphics initialization
...
GL Initialization needs to happen before window creation,
otherwise the GL library will get reloaded while in use and
Windows will have a heart attack. This is bad, obviously.
2014-07-24 00:20:34 -05:00
0870d628ea
Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2
2014-07-24 00:39:17 -04:00
4433be194f
sdl2: software: clear window on mode change
2014-07-23 23:21:19 -05:00
73e99fa96c
sdl2: I_Error if we can't create gl context
2014-07-23 23:15:31 -05:00
fc075e4c81
sdl2: use ABGR8888 texture on little endian system
...
This is a massive performance boost on slow processors, because
before, the intermediary buffer had to be swizzled to ABGR8888
before being uploaded -- for large resolutions this was an
enormous performance penalty.
2014-07-23 23:02:21 -05:00
4c635c67a6
Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2
2014-07-23 22:47:12 -04:00
345b59f6f5
sdl2: code cleanup
2014-07-23 21:45:36 -05:00
a103697dd0
isFullscreen is unused?
2014-07-23 22:05:03 -04:00
1a731fb463
there no fade for non mixer builds
2014-07-23 22:04:46 -04:00
d5c22f9224
Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2
2014-07-23 20:59:34 -04:00
9a4b2bd360
sdl2: restore vsync option (use sdl swap interval)
2014-07-23 19:46:12 -05:00
20f871bd84
sdl2: opengl compiles fine, no TESTHW=1 needed
2014-07-23 19:43:15 -05:00
d078e3e17f
sdl2: fix opengl (almost) entirely
2014-07-23 19:39:41 -05:00
6b112a3bfd
Merge remote-tracking branch 'wolfy852/next' into next
2014-07-23 18:34:42 -04:00
331b120c31
Merge remote-tracking branch 'origin/next' into next
...
Conflicts:
libs/fmodex/lib/libfmodex64_vc.a
libs/fmodex/lib/libfmodexL64_vc.a
libs/fmodex/lib/libfmodexL_vc.a
libs/fmodex/lib/libfmodex_vc.a
2014-07-23 18:32:21 -04:00
4b446495ad
come back to life
2014-07-23 18:29:36 -04:00
1c4b1c1d7e
DIE, DIE, DIE
...
Conflicts:
libs/fmodex/lib/libfmodex64_vc.a
libs/fmodex/lib/libfmodexL64_vc.a
libs/fmodex/lib/libfmodexL_vc.a
libs/fmodex/lib/libfmodex_vc.a
2014-07-23 18:29:25 -04:00
fea559398a
sdl2: we have colored rects in gl now I guess
2014-07-22 02:23:51 -05:00
0a37bdf76d
sdl2: start getting opengl working again
2014-07-22 01:23:08 -05:00
145618785c
sdl2: reuse window on mode change
2014-07-21 22:41:01 -05:00
2618b1dd0b
sdl2: truncate resolution list, add 16:9 hdtv modes
2014-07-21 22:16:34 -05:00
1ac1d04cca
sdl2: joystick fixes. don't pause in demo play/rec
2014-07-21 21:32:18 -05:00
35545a0d67
Merge branch 'master' into sdl2
2014-07-21 21:03:34 -04:00
1c724a6d84
come back to life
2014-07-21 21:00:18 -04:00
Alam Ed Arias