Monster Iestyn
|
7c36a2a99e
|
Merge branch 'master' into next
|
2019-03-25 18:08:36 +00:00 |
|
Nev3r
|
64353bf373
|
Merge branch 'allow-localhost' into 'master'
Allow connecting to localhost / 127.0.0.1
See merge request STJr/SRB2!474
|
2019-03-23 05:16:44 -04:00 |
|
James R
|
6939dca52a
|
Actually allow connecting to "localhost"
Because IPv6 doesn't seem to work anyway.
|
2019-03-20 20:37:00 -07:00 |
|
James R
|
25bd4a0876
|
Let localhost connections
|
2019-03-20 20:37:00 -07:00 |
|
Monster Iestyn
|
ce37e4c9c8
|
Merge branch 'sdl-noxinput-nohidapi' into 'master'
-noxinput and -nohidapi command line parameters.
See merge request STJr/SRB2!468
|
2019-03-20 17:33:04 -04:00 |
|
Monster Iestyn
|
fa6f9062fe
|
Merge branch 'errorifpng' into 'master'
Error if the lump is a PNG lump
See merge request STJr/SRB2!466
|
2019-03-20 16:26:28 -04:00 |
|
Alam Ed Arias
|
94e29d1bb4
|
CMake: have funny check for empty CMAKE_SIZEOF_VOID_P
|
2019-03-19 09:10:25 -04:00 |
|
Alam Ed Arias
|
727d9cae23
|
CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac?
|
2019-03-19 00:04:14 -04:00 |
|
Alam Ed Arias
|
4cb71746a7
|
Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check"
This reverts commit 7d14342a8f.
|
2019-03-18 23:58:31 -04:00 |
|
Alam Ed Arias
|
7d14342a8f
|
Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check
|
2019-03-18 16:50:17 -04:00 |
|
Steel Titanium
|
4757031929
|
Remove the define.
|
2019-03-15 18:46:25 -04:00 |
|
Steel Titanium
|
4837c1742b
|
Merge branch 'master' into errorifpng
|
2019-03-15 16:40:47 -04:00 |
|
Digiku
|
fa581b7518
|
Merge branch 'public-musicplus-feature-interfadeout' into 'next'
Fade out level music during intermission via level header
See merge request STJr/SRB2!470
|
2019-03-15 01:40:23 -04:00 |
|
mazmazz
|
a40c6f0125
|
Intermission: Don't fade out level music when using win32 midi volume hack
|
2019-03-15 01:26:13 -04:00 |
|
mazmazz
|
1381343a2e
|
Implement MUSICINTERFADEOUT level header
|
2019-03-15 01:05:52 -04:00 |
|
Digiku
|
58c6d839d3
|
Merge branch 'public-musicplus-inter' into 'next'
Custom intermission music by level header [by SteelTitanium]
See merge request STJr/SRB2!469
|
2019-03-15 00:23:45 -04:00 |
|
mazmazz
|
a9b6bad96a
|
Merge branch 'public-gl-next' into public-musicplus-inter
|
2019-03-14 23:42:16 -04:00 |
|
mazmazz
|
bdb9e8cfda
|
When resetting volume on same music, make it fade instead of a hard change
|
2019-03-13 23:55:30 -04:00 |
|
mazmazz
|
2c823703f9
|
When changing to same music, reset the internal volume
|
2019-03-13 23:41:35 -04:00 |
|
mazmazz
|
aa22941d2c
|
Restore MUSIC_RELOADRESET if block in g_game
|
2019-03-13 21:18:23 -04:00 |
|
mazmazz
|
06f4f355ff
|
Fix custom fade source bug for Change Music linedef
|
2019-03-13 19:53:16 -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 |
|
Alam Ed Arias
|
a037977f09
|
Merge branch 'master' into next
|
2019-03-09 20:37:17 -05:00 |
|
Alam Ed Arias
|
a2c1b63864
|
partly Revert "TravisCI: remove WFLAGS"
This reverts commit a22c9a999e.
|
2019-03-09 20:36:44 -05:00 |
|
Alam Ed Arias
|
a22c9a999e
|
TravisCI: remove WFLAGS
|
2019-03-09 20:17:14 -05:00 |
|
Alam Ed Arias
|
d386febf56
|
TravisCI: add option for GCC 8.1
|
2019-03-09 19:41:56 -05:00 |
|
Alam Ed Arias
|
fc13137880
|
Merge branch 'master' into next
|
2019-03-04 17:15:04 -05:00 |
|
Alam Ed Arias
|
ca407e2be7
|
CircleCi: we need SSH for buildbot
|
2019-03-04 16:51:39 -05:00 |
|
Alam Ed Arias
|
9dbdc6a3a5
|
No more errors for VC6 support
|
2019-03-04 16:46:14 -05:00 |
|
Alam Ed Arias
|
4b0e8db4c1
|
no more floating constants warnings, and disable bad array bounds warnings
|
2019-03-04 16:46:14 -05:00 |
|
Steel Titanium
|
3c1f0b5e3f
|
New -noxinput and -nohidapi command line parameters.
|
2019-03-03 22:57:09 -05:00 |
|
Steel Titanium
|
c6900b6c89
|
Check using memcmp()
|
2019-03-03 22:43:21 -05:00 |
|
Steel Titanium
|
0b11424e3d
|
Error if the lump is a PNG lump
|
2019-03-03 19:58:01 -05:00 |
|
Alam Ed Arias
|
86264a545e
|
Merge branch 'master' into next
|
2019-03-01 17:32:17 -05:00 |
|
Alam Ed Arias
|
2eb26bc68e
|
Fix building without BLUA support
|
2019-03-01 17:31:32 -05:00 |
|
Monster Iestyn
|
4dd9c41b7b
|
Merge branch 'master' into next
|
2019-03-01 18:59:32 +00:00 |
|
Monster Iestyn
|
0bfcbca0a2
|
Merge branch 'circleci' into 'master'
CircleCI: test build SRB2 without network support
See merge request STJr/SRB2!462
|
2019-03-01 12:56:52 -05:00 |
|
Monster Iestyn
|
e4062e1dc0
|
Merge branch 'master' into next
|
2019-03-01 16:23:51 +00: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 |
|
Monster Iestyn
|
659e8e8162
|
Merge branch 'master' into next
|
2019-03-01 16:05:49 +00:00 |
|
Monster Iestyn
|
351a5e28be
|
Merge branch 'apng-backport' into 'master'
aPNG backport from Kart
See merge request STJr/SRB2!464
|
2019-03-01 11:04:08 -05:00 |
|
Monster Iestyn
|
33c18d831f
|
Merge branch 'higher-maxnodes' into 'next'
Upped MAXNETNODES
See merge request STJr/SRB2!463
|
2019-03-01 09:15:47 -05:00 |
|
wolfy852
|
cc7112eaf5
|
Stop Linux servers from hanging every 34 hours
|
2019-03-01 00:07:58 -06:00 |
|
Alam Ed Arias
|
3cbb1204ad
|
Merge branch 'apng-oh-shit-fixes' into 'master'
Compiling errors for apng fixed
See merge request KartKrew/Kart-Public!69
|
2019-02-28 12:00:58 -08: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 |
|
Steel Titanium
|
c748882d04
|
Remove double define
|
2019-02-27 16:05:43 -05:00 |
|
Steel Titanium
|
7fc180604b
|
Upped MAXNETNODES
|
2019-02-27 15:59:50 -05:00 |
|
Monster Iestyn
|
538605117e
|
Merge branch 'master' into next
|
2019-02-27 20:35:07 +00:00 |
|
Alam Arias
|
0ea2177a4e
|
CircleCI: test build SRB2 without network support
|
2019-02-27 14:37:31 -05:00 |
|