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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Monster Iestyn
|
811c82ba47
|
Fix goofup with addonsp patch unlock for loop from 2.1.13 merge
|
2019-02-28 15:48:27 +00: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 |
|
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 |
|
Monster Iestyn
|
4933e1de51
|
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
|
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 |
|
Monster Iestyn
|
9ddad37455
|
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
|
e7952e4de7
|
Make sure that B_CheckRespawn can be called even if Tails is dead
|
2019-02-26 21:14:22 +00:00 |
|
Alam Ed Arias
|
482bfd0804
|
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
|
887a26f971
|
Merge branch 'master' into next
|
2019-02-21 22:42:26 -05:00 |
|
Alam Ed Arias
|
7a09161e69
|
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
|
45e9e3f7f9
|
Disable multi statement macros errors.
|
2019-02-21 18:48:42 -05:00 |
|
Monster Iestyn
|
2ef1d63b63
|
Fix compiler warnings
|
2019-02-13 18:06:56 +00:00 |
|
Steel Titanium
|
93bed5f40d
|
Show line number on error, also hide under devmode
|
2019-02-11 16:39:58 -05:00 |
|
Monster Iestyn
|
38546ba6d1
|
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
|
4b8b8f90f4
|
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 |
|
MascaraSnake
|
edea95c55b
|
Merge branch 'emblem_hardcoding' into 'master'
Emblem and unlockable softcoding
See merge request STJr/SRB2Internal!210
|
2019-02-06 02:24:56 -05:00 |
|
MascaraSnake
|
a0a3a8b4e0
|
Forgot the continue statements
|
2019-02-03 17:07:13 +01:00 |
|