Commit graph

10013 commits

Author SHA1 Message Date
fickleheart b66be478d9 Increase COM_BUF_SIZE
The config file is starting to get close to the old max,
so this should be enough headroom for a while...
2020-02-24 11:45:22 -06:00
fickleheart f8408f3c99 Fix ExecCfg not working on files added via command line 2020-02-24 11:44:45 -06:00
fickleheart 1f8dbd1b8c Allow using lump names in ExecCfg 2020-02-24 11:44:27 -06:00
sphere 0df094021e Allow emblem hints (and radar) in record attack. 2020-02-24 17:31:30 +01:00
fickleheart 1848ce4b97 Skip empty gametypes in level select menu 2020-02-24 10:02:48 -06:00
Jaime Passos ebafd4b2c6 Merge branch 'spectator-is-it' into 'next'
Don't get chosen as the tagger if you're a spectator

See merge request STJr/SRB2!815
2020-02-23 20:37:27 -05:00
fickleheart d1dcdf88c7 Fix MD2 rollangle in reverse gravity 2020-02-23 18:44:22 -06:00
fickleheart 352029fd76 Add music position functions to Lua 2020-02-23 17:58:32 -06:00
fickleheart f2c968dea8 Add JingleStatus hook for carrying custom jingle tunes
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
2020-02-23 17:20:44 -06:00
fickleheart c5f3868819 Expose P_PlayJingle/Music() to Lua 2020-02-23 17:19:18 -06:00
James R 711c8ed6b4 Merge branch 'console-in-menus-mk-ii' into 'master'
Console in menus again!

See merge request STJr/SRB2!797
2020-02-23 18:15:43 -05:00
James R 95b8f950b4 Merge branch 'nomd5-crash' into 'master'
Fix crash under NOMD5

See merge request STJr/SRB2!807
2020-02-23 18:15:04 -05:00
James R 3394102927 Merge branch 'exitmove-hideflags' into 'master'
Don't spawn the exitmove flags in Single Player

See merge request STJr/SRB2!813
2020-02-23 18:13:38 -05:00
Jaime Passos 94738bfd2d Don't get chosen as the tagger if you're a spectator 2020-02-23 19:28:16 -03:00
fickleheart 40488096c0 Make P_PlayLivesJingle player optional in Lua 2020-02-23 15:40:59 -06:00
fickleheart 283bb52e7d Disable NOHUD/INLEVEL checks on Lua sound functions
None of these are implicitly sync-safe anyway, and most have
no need to be walled off from HUD code or intermission thinkers.
2020-02-23 12:50:45 -06:00
Snu 2dc72219e7 Merge branch 'master' into supergoldedit 2020-02-23 17:57:39 +00:00
Jaime Passos 0362f53e9b Fix incorrect newdisplayplayer in forced ViewpointSwitch 2020-02-23 12:14:52 -03:00
Tatsuru ff8a62819b Oopsie 2 2020-02-22 22:36:44 -03:00
Tatsuru 4c00e33096 Oopsie 2020-02-22 21:14:05 -03:00
James R 4244480d63 Add patch_music.pk3 2020-02-22 14:43:41 -08:00
SteelT 0770f77371 Merge branch '2.2.2-prep' into 'next'
2.2.2 preparation

See merge request STJr/SRB2!811
2020-02-22 17:27:19 -05:00
Steel Titanium 03e38e9486 Enable use of the patch file 2020-02-22 16:42:24 -05:00
Steel Titanium 1c1163bd0f Update version number to 2.2.2 2020-02-22 16:37:13 -05:00
Louis-Antoine d19fe295e0 Fix buffer overrun with nodeless players 2020-02-22 15:08:17 +01:00
James R af12f26f37 Merge remote-tracking branch 'origin/master' into next 2020-02-21 21:06:27 -08:00
James R f6df71ba54 Fix NOMD5 compiling 2020-02-21 21:06:04 -08:00
James R 0f2b8b8b2c Register servername etc. under NOMD5
This fixes crashes in the menus.
2020-02-21 20:04:28 -08:00
Steel Titanium 76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
SteelT cfd190c453 Merge branch 'warp-gamedata-corruption-fix' into 'next'
Warp gamedata corruption fix

See merge request STJr/SRB2!802
2020-02-21 21:00:29 -05:00
SteelT a1cf58cf7f Merge branch 'update-copyright-year' into 'master'
Update copyright year

See merge request STJr/SRB2!801
2020-02-21 20:59:56 -05:00
Louis-Antoine 778715f611 Cleanup code a little 2020-02-22 02:21:27 +01:00
Louis-Antoine af9164f336 Improve join refusal handling 2020-02-22 02:17:21 +01:00
Louis-Antoine 472befd183 Replace MAX_WADPATH with plain numbers
This is not ideal either, but I would rather
not use a constant for something unrelated.
2020-02-21 17:31:32 +01:00
Louis-Antoine ec5b88e79f Fix weird comment style 2020-02-21 17:17:39 +01:00
James R 93046c5e59 Merge remote-tracking branch 'origin/master' into next 2020-02-20 17:30:50 -08:00
James R 08627752b2 Fix NOPNG compiling 2020-02-20 17:30:32 -08:00
James R 2df4717f18 Fix NO_LUA compiling 2020-02-20 17:20:50 -08:00
James R cce5308108 Fix compiler warnings 2020-02-20 17:18:26 -08:00
James R fb0bedf02c Merge branch 'ogl-colorbug' into 'master'
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
2020-02-20 19:32:34 -05:00
James R 62d943b609 Merge branch 'thin-fixed' into 'next'
Add more strings (and respective functions) for v.drawString().

See merge request STJr/SRB2!770
2020-02-20 19:27:01 -05:00
Snu 2a93ddc2dd Change SKINCOLOR_SUPERGOLD1-5 2020-02-20 21:53:21 +00:00
Sally Cochenour 400366802c Make hook_FollowMobj a mobj hook instead of a player hook
Makes more logical sense, as if you have a custom follow item for a custom skin, you probably want your new thinker to only run for your new MT_ and not the vanilla ones.
2020-02-20 16:40:39 -05:00
Monster Iestyn 5c33ff0458 clarify the situation a bit more in the comments 2020-02-20 20:38:01 +00:00
Monster Iestyn 903cc311a7 move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified 2020-02-20 20:31:11 +00:00
Louis-Antoine 3502278f8a SpaceSpaceSpaceSpace 2020-02-20 01:15:54 +01:00
James R 54794f325d :) 2020-02-19 14:44:22 -08:00
James R 61470201f9 Regex bruh moment 2020-02-19 14:37:42 -08:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine 12959ff4a9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io 2020-02-19 22:40:54 +01:00