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
424d6531c9
Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2
2014-07-25 20:00:46 -04:00
Alam Ed Arias
d438a8f8c2
doh, I forget one, and in SDL2's Makefile.cfg
2014-07-25 19:44:43 -04:00
Alam Ed Arias
f03e591f64
change SDL into HAVE_SDL
2014-07-25 19:10:24 -04:00
Ronald Kinard
b429cce3b6
sdl2: add -borderless option for windowed
2014-07-24 22:35:04 -05:00
Ronald Kinard
ce8d82aa52
sdl2: oops it should be 32 bpp in softblit
2014-07-24 21:46:35 -05:00
Ronald Kinard
93e00cc694
sdl2: -softblit, use smaller texture format
...
-softblit uses SDL2 software renderer backend for blitting
2014-07-24 21:32:47 -05:00
Ronald Kinard
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
Ronald Kinard
005b502756
sdl2: limit fullscreen resolution in OpenGL
2014-07-24 03:15:35 -05:00
Ronald Kinard
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
Ronald Kinard
39603487ec
sdl2: restore anisotropic filtering support in gl
2014-07-24 03:01:16 -05:00
Ronald Kinard
716aa1f33a
sdl2: fix mouse motion (remove -mousewarp)
2014-07-24 02:51:46 -05:00
Ronald Kinard
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
Ronald Kinard
4433be194f
sdl2: software: clear window on mode change
2014-07-23 23:21:19 -05:00
Ronald Kinard
73e99fa96c
sdl2: I_Error if we can't create gl context
2014-07-23 23:15:31 -05:00
Ronald Kinard
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
Ronald Kinard
345b59f6f5
sdl2: code cleanup
2014-07-23 21:45:36 -05:00
Alam Ed Arias
a103697dd0
isFullscreen is unused?
2014-07-23 22:05:03 -04:00
Alam Ed Arias
1a731fb463
there no fade for non mixer builds
2014-07-23 22:04:46 -04:00
Ronald Kinard
9a4b2bd360
sdl2: restore vsync option (use sdl swap interval)
2014-07-23 19:46:12 -05:00
Ronald Kinard
20f871bd84
sdl2: opengl compiles fine, no TESTHW=1 needed
2014-07-23 19:43:15 -05:00
Ronald Kinard
d078e3e17f
sdl2: fix opengl (almost) entirely
2014-07-23 19:39:41 -05:00
Ronald Kinard
fea559398a
sdl2: we have colored rects in gl now I guess
2014-07-22 02:23:51 -05:00
Ronald Kinard
0a37bdf76d
sdl2: start getting opengl working again
2014-07-22 01:23:08 -05:00
Ronald Kinard
145618785c
sdl2: reuse window on mode change
2014-07-21 22:41:01 -05:00
Ronald Kinard
2618b1dd0b
sdl2: truncate resolution list, add 16:9 hdtv modes
2014-07-21 22:16:34 -05:00
Ronald Kinard
1ac1d04cca
sdl2: joystick fixes. don't pause in demo play/rec
2014-07-21 21:32:18 -05:00
wolfy852
9ab60d1295
Add LUA_EvalMath to Lua with function name EvalMath
2014-07-19 17:46:53 -05:00
wolfy852
d6b466b7dd
Add skin flag for running on water
2014-07-05 03:23:49 -05:00
wolfy852
39ce16a468
Add the Jump Thok ability for use by custom characters
2014-07-05 02:50:07 -05:00
Alam Ed Arias
c130be77b1
Merge remote-tracking branch 'RedEnchilada/next' into next
...
Also clean up whitespaces
2014-06-19 13:00:36 -04:00
RedEnchilada
37d3780458
Add hook for chat messages, including csays
2014-06-18 15:28:09 -05:00
Alam Ed Arias
b520d61ba2
Merge branch 'master' into sdl2
2014-05-27 15:19:18 -04:00
Alam Ed Arias
15f976a06c
Merge branch 'master' into next
2014-05-27 15:19:08 -04:00
Alam Ed Arias
b511294749
Merge remote-tracking branch 'Sryder13/master'
2014-05-27 15:14:55 -04:00
wolfy852
a8f5406233
Add P_Telekinesis and P_IsFlagAtBase to Lua.
2014-05-25 21:41:05 -05:00
Wolfy
9987d132fb
Add P_DoSpring to base library.
2014-05-24 12:51:59 -04:00
Wolfy
f509c56e3c
Unstatic P_DoSpring.
2014-05-24 12:49:15 -04:00
Wolfy
5316f8da96
Add P_SpawnSpinMobj to base library.
2014-05-24 12:46:46 -04:00
Wolfy
3f1038dcbe
Unstatic P_SpawnSpinMobj.
2014-05-24 12:46:10 -04:00
Wolfy
ec443af3d9
Add P_SpawnThokMobj to Lua base library.
...
I don't know too much about this but I THINK I did it right.
2014-05-24 12:35:01 -04:00
Wolfy
ed82755b6d
Unstatic P_SpawnThokMobj.
2014-05-24 12:30:33 -04:00
ilag
d8234f408b
Ensures the force shield's movecount is correctly set before comparing
2014-05-15 11:36:17 -07:00
ilag11111
aafc0bcb0d
Ensures that the force shield's sprite returns to the proper state after receiving an invincibility monitor.
...
Fixes http://mb.srb2.org/showthread.php?p=752815
2014-05-14 16:27:37 -07:00
Alam Ed Arias
d597856c8f
Merge branch 'master' into sdl2
2014-05-02 21:32:31 -04:00
ilag
1af18c7013
Redo all changes I ended up losing trying to undo the mess I made.
...
Also, fix the issue pointed out by Alam.
2014-05-02 14:24:20 -07:00
Alam Ed Arias
0f8269fe6f
merge sdl interface changes into SDL2 interface
2014-05-02 09:33:57 -04:00
Alam Ed Arias
f3bd8c6ef4
Merge branch 'master' into sdl2
2014-05-02 09:01:51 -04:00
Alam Ed Arias
ea7abe7c44
Merge branch 'master' of https://github.com/ilag11111/SRB2
2014-05-02 08:49:30 -04:00
ilag11111
b21d5c55c9
Uses fixed-point math to properly calculate the exact amount of space needed.
2014-04-25 13:17:05 -07:00
ilag11111
f7bbf8c6d0
Improved fix by changing the formula for how memory is allocated to arbitrary sample rate conversion.
2014-04-25 12:42:43 -07:00
ilag11111
60a115b0a7
Fix (Linux) 64-bit crash in CEZ3 (playback of sfx_litng3).
2014-04-25 00:37:13 -07:00
Dmitry Marakasov
7d52913add
Make endianess detection more flexible
...
And fix it on FreeBSD, where _BIG_ENDIAN is not a flag indicating
big endian machine, but a constant to compare _BYTE_ORDER to.
2014-04-25 02:40:19 +04:00
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
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
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
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
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
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
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
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
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
cec63aa4c0
restore ISO C90 support in r_opengl
2014-04-08 12:01:26 -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
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
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
ilag11111
544682f140
Proof of concept fix for Sonic not being MD2-able
2014-03-27 18:04:03 -07:00
Alam Ed Arias
bf51c09ea3
2.1.6 release
...
Merge branch 'master' of github.com:STJr/SRB2 into sdl2
2014-03-24 22:28:59 -04:00
Alam Ed Arias
32de698f5e
SRB2 2.1.6 release
2014-03-24 22:17:59 -04:00
Alam Ed Arias
d040190a66
Merge branch 'master' of github.com:STJr/SRB2 into sdl2
2014-03-24 19:47:14 -04:00
Alam Ed Arias
a9c2395e8d
SDL interface no longer use FMOD.dll
2014-03-24 19:40:54 -04:00
Alam Ed Arias
69d3f325f5
off_t for linux onl;y
2014-03-24 19:40:04 -04:00
Alam Ed Arias
f5b4187af6
disabled DEBUG section because of use of SDL_VideoDriverName()
2014-03-24 19:39:42 -04:00
Alam Ed Arias
21fc19f9d0
Win32 CPU cpuinfo was also using SDL_MMXExt() and SDL_Had3DNewExt()
2014-03-24 19:39:05 -04:00
Sryder13
3fbe3d38d3
OpenGL Patch Fill Fix
...
Patch Fill Drawing for intermission has been fixed to loop properly in
non aspect correct resolutions.
2014-03-24 20:06:13 +00:00
Sryder13
b075d1e3fa
Redwall sky gone
...
More redwall sky shenanigans gone.
2014-03-24 17:29:14 +00:00
Sryder13
9e10e3278b
Negative Light
...
Light no longer goes wrong when lightlevel of a sector is negative.
2014-03-24 17:11:45 +00:00
Sryder13
770c7eeade
LightLevelToLum gone
...
LightLevelToLum unused by everything now, it seemed to be giving wrong
values for lightlevels.
2014-03-24 16:11:25 +00:00
Sryder13
103258e364
OpenGL Flipped Patch Drawing
...
V_FLIP in OpenGL.
2014-03-23 23:37:44 +00:00
Alam Ed Arias
bb6688107b
bump Srb2mac project
2014-03-23 12:06:07 -04:00
Alam Ed Arias
15bd266cac
SRB2 2.1.5 release
2014-03-23 12:00:29 -04:00
Alam Ed Arias
3a5fcc58da
Let steal some OpenGL fixes
...
Merge branch 'master' of https://github.com/Sryder13/SRB2
2014-03-23 10:31:31 -04:00
Sryder13
734d6b56f0
OpenGL Flashpal Flashes
...
Fixed flashes for OpenGL Nukes/Teleports etc.
2014-03-23 00:04:35 +00:00
Alam Arias
5e24fe8937
Fixup Srb2Mac to exclude srb2.srb from Lite pack
2014-03-22 16:09:41 -04:00
Alam Ed Arias
2b781d82d5
Quartz is evil, we need to ask for a new modeList
2014-03-22 15:54:46 -04:00
Sryder13
9386b3900b
OpenGL remove HOMs
...
Removes HOMs from OpenGL.
This also seems to have made skyboxes not draw ontop of everything else
on Intel GPU's.
2014-03-22 17:17:40 +00:00
Sryder13
1f452953b6
Post processor skybox
...
Post processing no longer done in the skybox.
2014-03-22 14:52:32 +00:00
Sryder13
7b6aeefea0
Hopefully correct
...
Pulled
2014-03-21 21:40:37 +00:00
Sryder13
ec902fed52
OpenGL Intermission picture fix
...
Fixes intermission pictures being taken in OpenGL.
2014-03-21 20:28:41 +00:00
Alam Arias
dcaac56f9a
bump SRB2Mac version
2014-03-21 16:05:12 -04:00
Alam Ed Arias
ed72bd8fa1
SRB2 2.1.4 release
2014-03-21 19:21:06 +00:00
Alam Ed Arias
505ea76834
SRB2 2.1.4 release
2014-03-21 14:42:55 -04:00
Sryder13
c72fc0f10d
Warning gone.
...
Hopefully.
2014-03-21 18:03:40 +00:00
Ronald Kinard
be96974742
sdl2: Fix mouse button input
2014-03-20 23:37:57 -05:00
Ronald Kinard
d298aa8e0d
sdl2: Restore mouse motion support
2014-03-20 22:37:26 -05:00
Ronald Kinard
4c636123a4
sdl2: Bump up mixer support to SDL2_mixxer
2014-03-20 21:54:02 -05:00
Ronald Kinard
3839c2fd58
sdl2: Zero out buffer on sound callback
2014-03-20 20:07:50 -05:00
Ronald Kinard
40de8ea630
sdl2: Make -win toggle cvar instead of disabling fullscreen
2014-03-20 17:48:10 -05:00
Ronald Kinard
ad1b9f93c8
sdl2: Fix changing between fullscreen/windowed
2014-03-20 17:26:07 -05:00
Sryder13
24681013d1
Opaque translucent midtextures
...
Fixed translucent midtextures being opaque when there were multiple
lights in a sector.
2014-03-20 20:34:56 +00:00
Sryder13
dd16f58e38
OpenGL Skybox
...
OpenGL skyboxes.
Slight change to sky vertical offsetting.
2014-03-20 20:13:15 +00:00
Sryder13
7aa960d6d5
Software Cropped Patches
...
Fixed the stupid error I made that was causing software to not draw
cropped patches.
2014-03-20 10:29:53 +00:00
Ronald Kinard
beb2672f40
sdl2: fix mode changing
2014-03-20 02:26:02 -05:00
