Alam Ed Arias
3472bf857c
TravisCI: build custom sdl2_mixer build
2019-03-25 15:51:13 -04:00
Alam Ed Arias
594c906376
use default osx image
2019-03-25 15:48:33 -04:00
Alam Ed Arias
3ab0f675ec
TravisCI: move homebrew packages for all mac builds
2019-03-25 15:44:33 -04:00
Alam Ed Arias
a8681a5b72
CircleCI: rebuild depend file with BLUA
2019-03-25 15:34:25 -04:00
Alam Ed Arias
fe22fdc5a3
P_SuperDamage() is too big for inlining
2019-03-25 15:30:25 -04:00
Alam Ed Arias
c4e8a60112
CircleCI: also test compiling without BLUA support
2019-03-25 15:21:52 -04:00
Alam Ed Arias
9a8d36b822
Travis-CI: use a new version of xcode and use homebrew add-on to install packages
2019-03-25 15:16:43 -04:00
Monster Iestyn
147221cf6e
R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.
2019-03-25 18:54:47 +00:00
Monster Iestyn
7441dd7d9b
Merge branch 'master' into next
2019-03-25 18:08:36 +00:00
Nev3r
b5a1030722
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
ed0f8fd967
Actually allow connecting to "localhost"
...
Because IPv6 doesn't seem to work anyway.
2019-03-20 20:37:00 -07:00
James R
f139ffd1dc
Let localhost connections
2019-03-20 20:37:00 -07:00
Monster Iestyn
ecb6322a52
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
828691a7ac
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
1c55daef2a
CMake: have funny check for empty CMAKE_SIZEOF_VOID_P
2019-03-19 09:10:25 -04:00
Alam Ed Arias
49dddf54ab
CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac?
2019-03-19 00:04:14 -04:00
Alam Ed Arias
6142becb4d
Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check"
...
This reverts commit d03c53930b
2019-03-18 23:58:31 -04:00
Monster Iestyn
2fb569857a
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
...
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names
# Conflicts:
# src/doomstat.h
# src/m_menu.c
2019-03-18 22:00:23 +00:00
Alam Ed Arias
d03c53930b
Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check
2019-03-18 16:50:17 -04:00
Nev3r
aa43f8b3bf
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into 144-scrolltweaks
2019-03-16 08:14:29 +01:00
Steel Titanium
6d751ff302
Remove the define.
2019-03-15 18:46:25 -04:00
Steel Titanium
5a170b9e4e
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
Steel Titanium
67a80ba311
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
2019-03-15 16:13:31 -04:00
Jimita
6e4b42fc97
Merge branch 'next' into flashpals-on-screenshots
2019-03-15 16:38:33 -03:00
mazmazz
f18103a473
Declare exitfadestarted properly
2019-03-15 11:01:41 -04:00
mazmazz
587a51a957
Fix end-of-level fading for cv_playersforexit
...
(Code in p_user.c was from 2.2, where cv_playersforexit has different values so that the player exit check works differently)
2019-03-15 03:47:30 -04:00
mazmazz
8afaaa80a1
lclear -> _clear typo
2019-03-15 03:15:20 -04:00
mazmazz
a1ccb8512d
Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel
2019-03-15 02:07:53 -04:00
mazmazz
f163633591
Merge branch 'public_next'
2019-03-15 01:43:03 -04:00
Digiku
c0782aa89e
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
6b93ca9221
Intermission: Don't fade out level music when using win32 midi volume hack
2019-03-15 01:26:13 -04:00
mazmazz
e098d6a8b8
Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
2019-03-15 01:09:12 -04:00
mazmazz
6cf05a4613
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
mazmazz
ba77dfd546
Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
2019-03-15 01:01:24 -04:00
mazmazz
b5fc27c545
Implement MUSICINTERFADEOUT level header
2019-03-15 01:00:50 -04:00
mazmazz
773f9dc2ba
Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel
2019-03-15 00:39:26 -04:00
mazmazz
9064a0b33a
Merge remote-tracking branch 'origin/master'
2019-03-15 00:33:12 -04:00
mazmazz
4377386153
Merge branch 'public_next'
2019-03-15 00:33:06 -04:00
Digiku
dcd8669ec2
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
bd9e42ce6e
Merge branch 'public-gl-next' into public-musicplus-inter
2019-03-14 23:42:16 -04:00
Digiku
be304eaf68
Merge branch 'musicplus-feature-nights-sfx-timeup' into 'master'
...
MusicPlus feature: NiGHTS: Toggle countdown SFX overlay vs. music switch, by level header, and fade out the music on SFX overlay
See merge request STJr/SRB2Internal!179
2019-03-14 23:22:54 -04:00
mazmazz
3b6be9b419
Remove redundant music reset block for MIXNIGHTSCOUNTDOWN
2019-03-14 23:21:52 -04:00
mazmazz
469ed9cbe3
Implement MIXNIGHTSCOUNTDOWN
...
An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
2019-03-14 23:10:14 -04:00
mazmazz
9ec98c588f
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
mazmazz
fdde5f13c5
When resetting volume on same music, make it fade instead of a hard change
2019-03-13 23:55:30 -04:00
mazmazz
67e2857303
When changing to same music, reset the internal volume
2019-03-13 23:41:35 -04:00
mazmazz
c021e29835
Restore MUSIC_RELOADRESET if block in g_game
2019-03-13 21:18:23 -04:00
mazmazz
2c75d4da69
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
mazmazz
aea18f36ba
Remove MP3 warning
2019-03-13 19:51:45 -04:00
mazmazz
93626c2293
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
