Commit graph

1313 commits

Author SHA1 Message Date
TehRealSalt
f48a08cd53 Merge v1 2019-05-06 21:23:29 -04:00
wolfy852
4eb2a7d2eb Merge remote-tracking branch 'remotes/pub/master' into next 2019-05-06 14:17:02 -05:00
mazmazz
d2236a32c3 Remove song_length tag search
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
7301140b10 Remove MP3 widechar tag searching
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
mazmazz
f9354289ba Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-05-02 17:43:40 -04:00
Jaime Passos
2a3e885b9a 01052019 2019-05-01 19:37:42 -03:00
Jaime Passos
c8b19a9af5 fix includes 2019-04-13 18:14:55 -03:00
Jaime Passos
4548b4bb13 The player should be able to toggle shaders 2019-04-07 00:09:53 -03:00
Jaime Passos
fbc3e27592 stuff 2019-04-06 23:33:34 -03:00
James R
714b4068ca Grab mouse on window focus
Window focus does not necessarily imply mouse movement.
2019-03-29 22:00:47 -07:00
Monster Iestyn
257f31c1ba Merge branch 'public_next'
# Conflicts:
#	src/doomstat.h
#	src/g_game.c
2019-03-28 14:19:02 +00:00
Monster Iestyn
7c36a2a99e Merge branch 'master' into next 2019-03-25 18:08:36 +00:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
Jaime Passos
08efec4cf3 destroy hw_glide.h because no modern GPU supports such API 2019-03-21 18:23:40 -03:00
wolfy852
963cbf4671 Merge branch 'next' into md3-vanilla-kart
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05:00
Jaime Passos
843498ef4a Improve custom shader support 2019-03-19 17:37:04 -03:00
Jaime Passos
cfc5bd4ac7 custom shader support 2019-03-18 23:03:29 -03:00
Jaime Passos
6dd5037ef1 add vertex shaders 2019-03-18 19:17:47 -03:00
Jaime Passos
35459caea7 md3-vanilla 2019-03-18 18:34:20 -03:00
Jaime Passos
fd5fb73671 gl4 2019-03-17 22:27:50 -03:00
fickleheart
6555802dc0 Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep 2019-03-17 16:36:52 -05:00
James R
81669c9372 Resume sounds on unpausing after a window re-focus 2019-03-16 15:50:16 -07:00
mazmazz
7f0b923107 Merge branch 'public-gl-next' into public-musicplus-jingle 2019-03-15 18:42:19 -04:00
mazmazz
2eb04ab17d Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
mazmazz
832a6433c2 Remove MP3 warning 2019-03-13 19:51:45 -04:00
mazmazz
937a423664 Merge remote-tracking branch 'public-gl/next' into public-musicplus-core 2019-03-13 19:45:07 -04:00
fickleheart
5c4c0a5ff6 Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00
James R
b91701c948 Miscellaneous window de-focus options
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
Alam Arias
06cd65cc72 Merge branch 'master' into next 2019-03-11 10:01:57 -04:00
Alam Arias
18233eba23 Merge branch 'master' into ping-stuff-take2 2019-03-09 18:05:30 -05:00
Steel Titanium
32fbfc9159 Always return false instead. 2019-03-08 18:51:55 -05:00
Steel Titanium
db07eddb3a Properly comment out the function 2019-03-07 18:52:27 -05:00
Steel Titanium
4698130321 Fix unused function error 2019-03-07 18:20:57 -05:00
Steel Titanium
b4e7e8e62f Merge branch 'master' into dontskipframes 2019-03-05 22:11:00 -05:00
Steel Titanium
a0b06044b1 Don't skip frames in software mode 2019-03-05 22:07:53 -05:00
Steel Titanium
3c1f0b5e3f New -noxinput and -nohidapi command line parameters. 2019-03-03 22:57:09 -05:00
Monster Iestyn
70d1006800 Merge branch 'public_next'
# Conflicts:
#	src/sdl12/Srb2SDL-vc10.vcxproj
#	src/sdl12/Srb2SDL-vc9.vcproj
#	src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-03-02 20:51:15 +00:00
Alam Arias
c82fd8acd7 Exported SDL_icon.xpm as srb2icon.png 2019-03-02 13:26:17 -05:00
Monster Iestyn
8d124101f4 Merge branch 'need-more-time' into 'master'
Stop Linux servers from hanging every 34 hours

See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
Alam Arias
65cf8c5da2 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 11:10:57 -05:00
wolfy852
cc7112eaf5 Stop Linux servers from hanging every 34 hours 2019-03-01 00:07:58 -06:00
wolfy852
088bfd30d0 Stop Linux servers from hanging every 34 hours
This drastically increases the amount of time Linux servers can stay up for before hanging.
2019-02-28 18:51:57 -06:00
wolfs
8a6f4b6405 Merge branch 'apng' into 'master'
Support aPNG in new versions of libpng

See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Monster Iestyn
974e3aa4f2 Merge branch 'public_next'
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/m_menu.h
2019-02-27 22:36:01 +00:00
Monster Iestyn
ea0c251a92 Merge branch 'sdl-new-windowicon' into 'master'
SDL:Update XPM icon

See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
wolfy852
733c472e1f Reorganization + kill old interfaces 2019-02-19 18:52:57 -06:00
Latapostrophe
4129dae3af Move ping display in i_video for consistency with showfps display 2019-02-16 13:38:50 +01:00
Steel Titanium
264adb7c7e Update project files 2019-02-14 21:32:57 -05:00
james
cb1429b59f Support CMake for apng 2019-02-12 17:01:27 -08:00
Alam Arias
380bce88a0 remove whitespaces 2019-02-05 15:42:37 -05:00