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 |
|
Nev3r
|
170fa95557
|
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 |
|
Alam Ed Arias
|
08784ce58d
|
Merge branch 'master' into next
|
2019-03-09 20:37:17 -05:00 |
|
Alam Ed Arias
|
cd39b951bb
|
partly Revert "TravisCI: remove WFLAGS"
This reverts commit 8780800e8e.
|
2019-03-09 20:36:44 -05:00 |
|
Alam Ed Arias
|
8780800e8e
|
TravisCI: remove WFLAGS
|
2019-03-09 20:17:14 -05:00 |
|
Alam Ed Arias
|
60ca6ae06b
|
TravisCI: add option for GCC 8.1
|
2019-03-09 19:41:56 -05:00 |
|
Nev3r
|
83f953edb8
|
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 |
|
Alam Ed Arias
|
747995ae6a
|
Merge branch 'master' into next
|
2019-03-04 17:15:04 -05:00 |
|
Alam Ed Arias
|
3fa1751706
|
CircleCi: we need SSH for buildbot
|
2019-03-04 16:51:39 -05:00 |
|
Alam Ed Arias
|
67e246cd53
|
No more errors for VC6 support
|
2019-03-04 16:46:14 -05:00 |
|
Alam Ed Arias
|
145ccfd405
|
no more floating constants warnings, and disable bad array bounds warnings
|
2019-03-04 16:46:14 -05:00 |
|
Monster Iestyn
|
a93e96c75b
|
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
|
c2618fd987
|
Merge branch 'master' into next
|
2019-03-01 17:32:17 -05:00 |
|
Alam Ed Arias
|
f823768699
|
Fix building without BLUA support
|
2019-03-01 17:31:32 -05:00 |
|
Monster Iestyn
|
c9e8d34b9d
|
Merge branch 'master' into next
|
2019-03-01 18:59:32 +00:00 |
|
Monster Iestyn
|
0051eb7039
|
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
|
008b0bf560
|
Merge branch 'master' into next
|
2019-03-01 16:23:51 +00:00 |
|
Monster Iestyn
|
67e721e983
|
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
|
4459ecdd90
|
Merge branch 'master' into next
|
2019-03-01 16:05:49 +00:00 |
|
Monster Iestyn
|
27adf300b2
|
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
|
4247f47ad9
|
Merge branch 'higher-maxnodes' into 'next'
Upped MAXNETNODES
See merge request STJr/SRB2!463
|
2019-03-01 09:15:47 -05:00 |
|
wolfy852
|
97de2ae4f6
|
Stop Linux servers from hanging every 34 hours
|
2019-03-01 00:07:58 -06:00 |
|
Alam Ed Arias
|
7cd60a544a
|
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
|
5620d0188e
|
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
|
ae244d2af3
|
Fix goofup with addonsp patch unlock for loop from 2.1.13 merge
|
2019-02-28 15:48:27 +00:00 |
|
Monster Iestyn
|
7a0d8b408e
|
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 |
|
Steel Titanium
|
fa990e8603
|
Remove double define
|
2019-02-27 16:05:43 -05:00 |
|
Steel Titanium
|
15b27bb7d7
|
Upped MAXNETNODES
|
2019-02-27 15:59:50 -05:00 |
|
Monster Iestyn
|
0340eb0b99
|
Merge branch 'master' into next
|
2019-02-27 20:35:07 +00:00 |
|
Alam Arias
|
d865b5660a
|
CircleCI: test build SRB2 without network support
|
2019-02-27 14:37:31 -05:00 |
|
Monster Iestyn
|
e86d0836a3
|
Merge branch 'updatelibgme' into 'master'
Update game-emu-music lib to 0.6.2
See merge request STJr/SRB2!444
|
2019-02-27 13:49:44 -05:00 |
|
Monster Iestyn
|
d76e946b3e
|
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 |
|
Monster Iestyn
|
d44cb36d53
|
Merge branch 'tails-bot-dead-forever-fix' into 'next'
Tails bot dead forever fix
See merge request STJr/SRB2!461
|
2019-02-27 12:39:56 -05:00 |
|
Monster Iestyn
|
a25f4b8194
|
Make sure that B_CheckRespawn can be called even if Tails is dead
|
2019-02-26 21:14:22 +00:00 |
|
Alam Ed Arias
|
e36193e44e
|
Merge branch 'hide-error-devmode' into 'next'
Show line number on error, also hide under devmode
See merge request STJr/SRB2!458
|
2019-02-21 23:05:09 -05:00 |
|
Alam Ed Arias
|
2f8eadd211
|
Merge branch 'master' into next
|
2019-02-21 22:42:26 -05:00 |
|
Alam Ed Arias
|
7667122912
|
Merge branch 'gcc8-statement-warning' into 'master'
GCC8: Disable multi statement macros errors.
See merge request STJr/SRB2!459
|
2019-02-21 22:32:38 -05:00 |
|
Steel Titanium
|
c1deea0714
|
Disable multi statement macros errors.
|
2019-02-21 18:48:42 -05:00 |
|
Monster Iestyn
|
8f667906eb
|
Fix compiler warnings
|
2019-02-13 18:06:56 +00:00 |
|
Steel Titanium
|
76724c9c13
|
Show line number on error, also hide under devmode
|
2019-02-11 16:39:58 -05:00 |
|
Monster Iestyn
|
ca176b6225
|
Merge branch 'polyobj_fix_vanilia' into 'master'
Fix rendering gaps on polys with upper/lower textures
See merge request STJr/SRB2!453
|
2019-02-11 15:05:44 -05:00 |
|
Monster Iestyn
|
e6cb47e2f2
|
Merge branch 'fix_skins_overflow' into 'next'
Fix skin overflow error
See merge request STJr/SRB2!455
|
2019-02-11 15:05:00 -05:00 |
|