50e8f13c03
Fix FOF slopes briefly glitching on level load in software mode, by ensuring the FOFs' target sectors have hasslope set on creation
2019-06-17 18:46:51 +01:00
c591633733
Update m_misc.c
2019-06-14 14:13:41 -03:00
f5d883bd12
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
ea08ba3fba
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
83b8a98df4
Merge branch 'gme-msvc' into 'master'
...
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
2019-06-07 18:06:51 -04:00
c0c1e5416f
Merge branch 'next' into 2.1.24-prep
2019-06-07 18:02:09 -04:00
3c08ee1313
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
eb99ad0437
Merge branch 'more-limits' into 2.1.24-prep
2019-06-07 11:28:43 -04:00
6f6d912fa6
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
d4dac52766
Upped freeslots limit
2019-06-03 15:23:48 -04:00
34ce368895
Merge branch 'next' into jimita-unfuck-awayview
2019-05-25 19:47:45 -04:00
dc273d3f23
Merge branch 'next' into jimita-flashpals-on-screenshots
2019-05-25 19:37:17 -04:00
600a373739
Merge branch 'master' into next
2019-05-13 16:07:30 +01:00
2a9019c15e
Merge branch 'archiveworld-sigsegv-fix' into 'next'
...
Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.
See merge request STJr/SRB2!490
2019-05-13 07:02:48 -04:00
addf2bb3c4
Fix NONET build
2019-05-13 01:51:36 -04:00
8a14427420
Merge branch 'perpetual-modifier-updates' into 'master'
...
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
06961a8f5e
Merge branch 'no-frameskip' into 'next'
...
Don't skip frames when connecting or paused
See merge request STJr/SRB2!489
2019-05-13 00:35:11 -04:00
cad65ad5e9
Properly fix crash due to duplicated lines.
2019-05-13 00:23:43 -04:00
4e0cc2505a
Revert "Check that lumps are okay"
...
This reverts commit 7ac0a8b4d2
2019-05-13 00:20:39 -04:00
7ac0a8b4d2
Check that lumps are okay
2019-05-08 20:30:19 -04:00
f0e16cad32
Merge branch 'master' into next
2019-05-08 16:31:05 +01:00
8ea9d0e95c
Merge branch 'alias_recursion_hotfix_2' into 'master'
...
Alias recursion hotfix 2
See merge request STJr/SRB2!482
2019-05-08 11:25:15 -04:00
8f05d75926
Don't skip frames when connecting or paused
2019-05-08 09:39:45 -05:00
e394f41c52
Merge branch 'public-musicplus-tagfix' into 'next'
...
Fix music load lag by reverting tag changes
See merge request STJr/SRB2!486
2019-05-07 22:42:13 -04:00
406c3619d7
Merge branch 'master' into next
2019-05-06 19:38:53 +01:00
aab2f55aec
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
ae25e8ea07
Merge branch 'console-wait-fix' into 'master'
...
Don't count down wait timer when executing a command line
See merge request STJr/SRB2!483
2019-05-06 12:56:07 -04:00
8b8e165d19
Merge branch 'opengl-sprite-billboarding' into 'master'
...
OpenGL Sprite Billboarding
See merge request STJr/SRB2!485
2019-05-06 12:45:53 -04:00
8273534967
Add a cvar for sprite billboarding, off by default.
2019-05-06 16:57:32 +01:00
454306cf86
Merge branch 'master' into next
2019-05-03 16:40:13 +01:00
a5dfbe7eff
add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason
...
not making a merge request because this is so laughably stupidly simple
2019-05-03 16:38:59 +01:00
d4ab2837bb
Merge branch 'master' into next
2019-05-03 16:00:45 +01:00
904b00e921
Remove song_length tag search
...
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
3e5b0c4531
Remove MP3 widechar tag searching
...
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
4d77ed925e
OpenGL sprite billboarding
...
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
2019-05-01 20:15:00 +01:00
26fdee8217
Don't enable UPnP support if NONET is defined.
2019-04-16 15:05:09 -04:00
36e678b292
Don't count down wait timer when executing a command
2019-04-14 15:17:47 -07:00
797ca99f42
Detect infinite alias self-recursion mixed with other commands, such as in the case of `alias a "echo test; a"; a`.
...
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)
2019-04-14 16:39:14 +01:00
ab0fe6b164
Merge branch 'master' into next
2019-04-02 15:47:07 +01:00
42d25f67ca
Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes
2019-03-31 12:29:55 -07:00
917edf720d
Don't close console when starting title screen
2019-03-26 13:05:19 -07:00
9a350eb879
Don't close console when changing map
2019-03-26 13:04:11 -07:00
69d7e98f34
Remove redundant CON_ClearHUD calls
2019-03-26 12:59:13 -07:00
e8071e66e4
Resize console upon resolution change
...
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
2019-03-26 12:30:02 -07:00
b9b36a44a8
Keep color across wrapped lines
...
And this works by inserting the same color code on each wrapped line.
2019-03-26 12:07:11 -07:00
587586f4bb
Scroll console immediately upon pressing PageUp
2019-03-26 12:05:23 -07:00
a01a0a3dc3
Merge branch 'master' into next
2019-03-26 13:46:15 +00:00
9ef98471a4
Merge branch 'buildbot' into 'master'
...
Buildbot changes
See merge request STJr/SRB2!477
2019-03-26 09:44:56 -04:00
8e78369f83
Merge branch 'dedicated-server-credits-fix' into 'master'
...
Dedicated server credits fix
See merge request STJr/SRB2!476
2019-03-26 09:44:21 -04:00
67874180b2
Merge branch 'gametype-strings-backport' into 'next'
...
Gametype strings backport
See merge request STJr/SRB2!473
2019-03-26 09:42:52 -04:00
d00cc7cddb
Prevent just anyone from skipping credits but allow admins
...
exitlevel works too
2019-03-25 16:19:40 -07:00
8c1c0875a2
Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
2019-03-25 21:35:04 +00:00
fe22fdc5a3
P_SuperDamage() is too big for inlining
2019-03-25 15:30:25 -04:00
147221cf6e
R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.
2019-03-25 18:54:47 +00:00
7441dd7d9b
Merge branch 'master' into next
2019-03-25 18:08:36 +00:00
ed0f8fd967
Actually allow connecting to "localhost"
...
Because IPv6 doesn't seem to work anyway.
2019-03-20 20:37:00 -07:00
f139ffd1dc
Let localhost connections
2019-03-20 20:37:00 -07:00
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
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
6d751ff302
Remove the define.
2019-03-15 18:46:25 -04:00
5a170b9e4e
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
67a80ba311
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
2019-03-15 16:13:31 -04:00
6e4b42fc97
Merge branch 'next' into flashpals-on-screenshots
2019-03-15 16:38:33 -03:00
f18103a473
Declare exitfadestarted properly
2019-03-15 11:01:41 -04:00
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
a1ccb8512d
Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel
2019-03-15 02:07:53 -04:00
6b93ca9221
Intermission: Don't fade out level music when using win32 midi volume hack
2019-03-15 01:26:13 -04:00
e098d6a8b8
Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
2019-03-15 01:09:12 -04:00
6cf05a4613
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
ba77dfd546
Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
2019-03-15 01:01:24 -04:00
b5fc27c545
Implement MUSICINTERFADEOUT level header
2019-03-15 01:00:50 -04:00
773f9dc2ba
Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel
2019-03-15 00:39:26 -04:00
bd9e42ce6e
Merge branch 'public-gl-next' into public-musicplus-inter
2019-03-14 23:42:16 -04:00
fdde5f13c5
When resetting volume on same music, make it fade instead of a hard change
2019-03-13 23:55:30 -04:00
67e2857303
When changing to same music, reset the internal volume
2019-03-13 23:41:35 -04:00
c021e29835
Restore MUSIC_RELOADRESET if block in g_game
2019-03-13 21:18:23 -04:00
2c75d4da69
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
aea18f36ba
Remove MP3 warning
2019-03-13 19:51:45 -04:00
93626c2293
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
08784ce58d
Merge branch 'master' into next
2019-03-09 20:37:17 -05:00
60ca6ae06b
TravisCI: add option for GCC 8.1
2019-03-09 19:41:56 -05:00
0186f6784b
a
2019-03-06 21:40:38 -03:00
747995ae6a
Merge branch 'master' into next
2019-03-04 17:15:04 -05:00
67e246cd53
No more errors for VC6 support
2019-03-04 16:46:14 -05:00
145ccfd405
no more floating constants warnings, and disable bad array bounds warnings
2019-03-04 16:46:14 -05:00
9542a47f7f
New -noxinput and -nohidapi command line parameters.
2019-03-03 22:57:09 -05:00
15323328c5
Check using memcmp()
2019-03-03 22:43:21 -05:00
3d5d02fc15
Error if the lump is a PNG lump
2019-03-03 19:58:01 -05:00
c2618fd987
Merge branch 'master' into next
2019-03-01 17:32:17 -05:00
f823768699
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
008b0bf560
Merge branch 'master' into next
2019-03-01 16:23:51 +00:00
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
4459ecdd90
Merge branch 'master' into next
2019-03-01 16:05:49 +00:00
97de2ae4f6
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
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
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
fa990e8603
Remove double define
2019-02-27 16:05:43 -05:00
e71977fe6a
Merge branch 'next' into banip-command
2019-02-27 16:03:01 -05:00
15b27bb7d7
Upped MAXNETNODES
2019-02-27 15:59:50 -05:00
0340eb0b99
Merge branch 'master' into next
2019-02-27 20:35:07 +00:00
Monster Iestyn