Alam Ed Arias
7d14342a8f
Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check
2019-03-18 16:50:17 -04:00
Nev3r
e4870030d2
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into 144-scrolltweaks
2019-03-16 08:14:29 +01: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
Steel Titanium
adcc8fe0d8
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
2019-03-15 16:13:31 -04:00
Jimita
bced3656f2
Merge branch 'next' into flashpals-on-screenshots
2019-03-15 16:38:33 -03:00
mazmazz
a181f12af3
Declare exitfadestarted properly
2019-03-15 11:01:41 -04:00
mazmazz
fbdd7b0174
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
e5ca2cfb77
lclear -> _clear typo
2019-03-15 03:15:20 -04:00
mazmazz
9094d29607
Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel
2019-03-15 02:07:53 -04:00
mazmazz
822b4d12bf
Merge branch 'public_next'
2019-03-15 01:43:03 -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
9d32ea8b5a
Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
2019-03-15 01:09:12 -04:00
mazmazz
1381343a2e
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
mazmazz
690c48a823
Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
2019-03-15 01:01:24 -04:00
mazmazz
91ea462e50
Implement MUSICINTERFADEOUT level header
2019-03-15 01:00:50 -04:00
mazmazz
c427ccbec5
Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel
2019-03-15 00:39:26 -04:00
mazmazz
a34daa4a0c
Merge remote-tracking branch 'origin/master'
2019-03-15 00:33:12 -04:00
mazmazz
83e89ba62c
Merge branch 'public_next'
2019-03-15 00:33:06 -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
Digiku
f9db342c18
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
607d647435
Remove redundant music reset block for MIXNIGHTSCOUNTDOWN
2019-03-14 23:21:52 -04:00
mazmazz
5e06530829
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
2eb04ab17d
Merge branch 'public_next'
2019-03-14 22:15:34 -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
Nev3r
971565940f
Merge branch 'fof-horizon-lines' into 'master'
...
Make FOFs extend to infinity when in contact with a horizon line.
See merge request STJr/SRB2Internal!212
2019-03-13 07:26:19 -04:00
Nev3r
281c7fa6b8
Override vectorial magnitude with front X offset, if provided; takes the line's lengths into account otherwise, as usual.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-03-13 12:24:47 +01:00
Nev3r
5b02ac70ff
Dealt with no-tag business:
...
* Wind/current pushers affect front sector if left untagged.
* Plane scrollers affect front sector if left untagged.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-03-13 11:13:54 +01: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
Nev3r
582aeee5e4
Make FOFs extend to infinity when in contact with a horizon line.
...
Make FOFs extend to infinity when in contact with a horizon line.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-03-07 19:01:02 +01:00
Jimita the Cat
f8ed0857c0
a
2019-03-06 21:40:38 -03: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
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 Ed Arias
86264a545e
Merge branch 'master' into next
2019-03-01 17:32:17 -05:00
