lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11110 commits 1 branch 29 tags 122 MiB
Commit graph

9781 commits

Author SHA1 Message Date
James R df98601b12 Merge branch 'bubbleshieldoverhaul' into 'next' 
Bubble Shield overhaul

See merge request STJr/SRB2!1046
 2020-07-11 01:56:53 -04:00
James R f336b1e979 Merge branch 'i-added-the-branch-name-into-the-version-command-when-outside-of-develop-mode' into 'master' 
Adds the branch name into the version command printout when outside of DEVELOP mode.

See merge request STJr/SRB2!981
 2020-07-11 01:48:38 -04:00
James R 5cebf5c7bf Merge branch 'makefile-detect-version' into 'master' 
Detect GCC version in Makefile

See merge request STJr/SRB2!1002
 2020-07-11 01:47:50 -04:00
James R 99e0c48f7b Fix a lot of stuff related to the version automation 2020-07-10 22:39:46 -07:00
James R 1757002ddb Automate VERSION/SUBVERSION; move version related definitions to version.h 
CMake support. Srb2win.rc still needs touchy, whatever.
 2020-07-10 22:20:33 -07:00
Steel Titanium e22964ee0a I screwed up 2020-07-10 23:16:18 -04:00
Steel Titanium db6fc75b4f Update player.dta hash 2020-07-10 20:53:42 -04:00
Steel Titanium 778089458c Merge branch 'next' into 226-prep 2020-07-10 20:06:16 -04:00
Louis-Antoine f8aefc2fd3 Revert "Fix computation of very high pings" 
This reverts commit 82dbe95e22.
 2020-07-11 01:55:40 +02:00
Steel Titanium d9483dabfd Merge branch 'next' into 226-prep 2020-07-10 19:11:28 -04:00
Steel Titanium 759f9171a2 Update patch.pk3 hash again 2020-07-10 19:09:49 -04:00
Jaime Passos d87c874559 Fix GL y-shearing ignoring a Y-flipped transform 2020-07-10 19:19:51 -03:00
Steel Titanium dcd56a7fe3 Update patch.pk3 hash and Srb2win.rc 2020-07-10 18:13:01 -04:00
toaster 958d397cdb Merge branch 'marathoninfo' into 'next' 
Marathon Run adjustments

See merge request STJr/SRB2!1048
 2020-07-10 17:54:51 -04:00
Steel Titanium 307125e84e Update version number 2020-07-10 17:29:03 -04:00
Nev3r 6c6f16e158 Merge branch 'ogl-model-spr-uv-fix' into 'next' 
Fix models that use sprite textures

See merge request STJr/SRB2!1049
 2020-07-10 17:17:52 -04:00
toaster 217ac14ac5 Introduce a live event backup penalty for non MA_INGAME runs, since the change to saving time causes problems for this. 2020-07-10 21:36:37 +01:00
toaster 4c9cdcca0d Hopefully fix the issue, which I can't recreate, of live event backups being created even if they shouldn't. 2020-07-10 21:27:34 +01:00
toaster 1956e9e670 Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback. 2020-07-10 21:24:25 +01:00
toaster 8a5069156f Add a small amount of extra info to the Evaluation screen for Marathon Mode, on request from multiple runners. 2020-07-10 21:16:28 +01:00
Hannu Hanhi ad57426713 Adjust model uvs to power of two texture if sprite texture is used 2020-07-10 23:05:21 +03:00
toaster 205d4c8d20 Fix the issue where custom exits with skipped intermission screens (notably, Black Core Zone 2 and 3) would cause the game to softlock when playing on a save file, or with a live event backup. 2020-07-10 20:30:16 +01:00
Hannu Hanhi 5fdc4578db Merge remote-tracking branch 'upstream/next' into ogl-linkdraw 2020-07-10 21:14:57 +03:00
Snu be8f0853ef Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul 
Updated to 2.2.5
 2020-07-10 17:08:53 +01:00
Nev3r 710097a0ca Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
Snu d392c59935 Changed Bubble Shield functionality 2020-07-10 05:59:10 +01:00
Lachlan Wright 12ea5398c8 Merge branch 'restore-supergold' into 'next' 
Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3

See merge request STJr/SRB2!1042
 2020-07-09 12:37:31 -04:00
Lachlan Wright 867728ca16 Merge branch 'custom-color-fixes' into 'next' 
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades

Closes #179 and #182

See merge request STJr/SRB2!1043
 2020-07-09 12:37:16 -04:00
GoldenTails 59bd6d45a3 Whose idea was it to make the aPNG speed 1/2x by default?! 2020-07-08 18:14:11 -05:00
lachwright 3226a5d699 Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades 2020-07-09 05:56:11 +08:00
lachwright c28ed25628 Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3 2020-07-09 00:00:21 +08:00
SteelT 31364d2120 Merge branch '225-prep' into 'next' 
2.2.5 preparation

See merge request STJr/SRB2!1039
 2020-07-07 14:55:06 -04:00
Lachlan Wright 337ec7bf6c Merge branch 'remove-tricks' into 'next' 
Remove Software tricks

See merge request STJr/SRB2!1036
 2020-07-07 13:47:33 -04:00
Lachlan Wright b9a088b16f Merge branch 'fix-autoexec-netvars' into 'next' 
Fix autoexec file trying to set netvars when joining from command-line

See merge request STJr/SRB2!1040
 2020-07-07 13:47:13 -04:00
lachwright 994bf78fe2 Update Srb2win.rc 2020-07-08 00:48:01 +08:00
lachwright 129fd2e27b Update patch.pk3 hash 2020-07-08 00:42:31 +08:00
toaster 274f649a02 M_RATHON header text. 2020-07-07 17:30:20 +01:00
Louis-Antoine 0858c2f6ed Fix autoexec file trying to set netvars when joining from command-line 2020-07-07 16:19:25 +02:00
lachwright 706b3c509d Make A_FlickyCenter usable in SOC/Lua 2020-07-07 20:42:00 +08:00
James R d31c6ac5b5 Contact the master server admims 2020-07-06 19:15:40 -07:00
Steel Titanium 7d75c72263 Update the version number 2020-07-06 21:29:02 -04:00
Steel Titanium ded902678c Update md5 hash for player.dta and patch.pk3 2020-07-06 21:22:57 -04:00
Louis-Antoine 78f8a44c25 Fix timeout 2020-07-07 02:06:26 +02:00
Jaime Passos 3a4ce6aea3 Merge remote-tracking branch 'origin/next' into opengl-blending-fix 2020-07-06 19:48:13 -03:00
Jaime Passos 7911deebf8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Steel Titanium 7d00255dc4 Merge branch 'master' into next 2020-07-06 12:13:00 -04:00
Nev3r 42d92eab2c Fix erroneous merge conflict resolution. 2020-07-06 11:54:55 +02:00
Nev3r fd5b05cafc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
Jaime Passos 4f6420274f Remove Software tricks 2020-07-06 01:26:56 -03:00
Jaime Passos 5c5d907251 gr_ -> gl_ 2020-07-06 01:15:08 -03:00
Jaime Passos a739cb0da9 Remove unused texture formats 2020-07-06 00:58:09 -03:00
Jaime Passos 3d50bef0e5 Rename structs, turn GrTextureFormat_t into an enum 2020-07-06 00:52:10 -03:00
Jaime Passos ac04853f8c Remove GrTexInfo 2020-07-06 00:35:48 -03:00
Jaime Passos abeedc4b65 Delete hw_glide.h 2020-07-06 00:27:34 -03:00
Hannu Hanhi b4aa5cecc1 Merge remote-tracking branch 'upstream/next' into ogl-linkdraw 2020-07-05 13:27:51 +03:00
James R de8019f163 Merge branch 'hahaha-credits' into 'next' 
The credit

See merge request STJr/SRB2!1033
 2020-07-04 18:00:49 -04:00
LJ Sonic 9c1bee694b Merge branch 'knuxtweaks' into 'next' 
Knuckles tweaks

See merge request STJr/SRB2!1030
 2020-07-04 16:37:35 -04:00
LJ Sonic 9f69396054 Merge branch 'fix-gif-delay' into 'next' 
Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with

See merge request STJr/SRB2!1023
 2020-07-04 16:28:59 -04:00
LJ Sonic 6c61baa818 Merge branch 'fix-oldbrak-missiles2' into 'next' 
Take 2: Fix Old Brak missiles + add pw_ignorelatch

See merge request STJr/SRB2!1006
 2020-07-04 16:28:48 -04:00
James R 96bccd5f9f Credit Oni for CODE 2020-07-04 12:59:56 -07:00
James R d9005203c7 Fuck you macro 2020-07-04 12:52:01 -07:00
James R e741a7b3c7 Actually save the cvar name in demos 2020-07-04 12:51:07 -07:00
LJ Sonic 17616967d3 Merge branch 'levelflat_name' into 'next' 
Use levelflat->name instead of flatname

See merge request STJr/SRB2!1024
 2020-07-04 08:46:04 -04:00
LJ Sonic 77e39a0fd5 Merge branch 'make-linedef-422-smarter' into 'next' 
Make Linedef type 422 smarter

See merge request STJr/SRB2!1014
 2020-07-04 08:35:42 -04:00
lachwright 17daf2faa2 Reduce speed cut when gliding underwater 2020-07-04 19:17:38 +08:00
LJ Sonic cf4087a014 Merge branch 'jetjawsound' into 'next' 
Jet Jaw Sounds

See merge request STJr/SRB2!1018
 2020-07-04 07:09:43 -04:00
LJ Sonic 804ba6da9e Merge branch 'more-platform-fixes' into 'next' 
More platform fixes

See merge request STJr/SRB2!999
 2020-07-04 07:07:17 -04:00
LJ Sonic 8d511ed565 Merge branch 'cez3debris' into 'next' 
New Debris for CEZ3

See merge request STJr/SRB2!1012
 2020-07-04 07:00:20 -04:00
lachwright f03addc5a7 Merge remote-tracking branch 'origin/next' into knuxtweaks 2020-07-04 18:53:26 +08:00
LJ Sonic 98c657e703 Merge branch 'sf_nosupersprites' into 'next' 
Add SF_NOSUPERSPRITES

See merge request STJr/SRB2!1000
 2020-07-04 06:51:11 -04:00
LJ Sonic 5ee94c8ce7 Merge branch 'patch-1' into 'next' 
Rename "Legacy" control scheme

See merge request STJr/SRB2!1029
 2020-07-04 06:50:15 -04:00
lachwright 527e682931 Add sightcheck boolean to P_RadiusAttack 
Also now destroys Egg Guard shields, and circumstantially Minuses
 2020-07-04 18:27:06 +08:00
Lachlan e2bdb56f97 Merge remote-tracking branch 'origin/next' into more-platform-fixes 2020-07-04 05:25:38 +08:00
Lachlan cdb247d08f Fix compiler warning 2020-07-04 05:25:34 +08:00
LJ Sonic 3679df07aa Merge branch 'dragonbomber-height' into 'next' 
Fix Dragonbomber z positioning

See merge request STJr/SRB2!1004
 2020-07-03 17:05:10 -04:00
LJ Sonic 07bbebd9b0 Merge branch 'shift-when-hiding-in-1p-menu' into 'next' 
Tweak display of hidden items in "1 Player" menu

See merge request STJr/SRB2!1013
 2020-07-03 17:04:42 -04:00
LJ Sonic 6e7446dea3 Merge branch 'ff_horizontalflip' into 'next' 
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)

See merge request STJr/SRB2!987
 2020-07-03 16:56:32 -04:00
Lachlan e44d93f76b Fix skiddust positional scaling 2020-07-04 04:30:57 +08:00
Lachlan 84000a0add P_Earthquake: Use P_RadiusAttack in favor of thinker iteration 2020-07-04 04:00:28 +08:00
Lachlan 7e72009a87 Fix buildbot warning 2020-07-04 03:21:48 +08:00
SteelT 186335c2ac Merge branch 'na-char-replays' into 'next' 
Add support for saving/loading per-skin NiGHTS replays

See merge request STJr/SRB2!1025
 2020-07-03 14:51:05 -04:00
lachwright 8652bbc1a5 Knuckles changes: 
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
 2020-07-04 01:54:00 +08:00
colette 1cc2ab120d "Legacy controls" was a mistake of a name 2020-07-02 23:17:33 -04:00
Hannu Hanhi b29873ce1c Better MF2_LINKDRAW support for OpenGL 2020-07-03 00:28:52 +03:00
lachwright 3ebc17ac3a Merge branch 'next' into knuxtweaks 2020-07-02 13:08:04 +08:00
Zippy_Zolton 29dfa5f605 sound caption 2020-07-01 23:18:20 -05:00
James R 9eb58a8e42 Merge branch 'cheese' into 'next' 
Cheese

See merge request STJr/SRB2!1028
 2020-07-01 23:28:08 -04:00
James R 7a17c74893 Merge branch 'credits-225' into 'next' 
More credits changes

See merge request STJr/SRB2!1027
 2020-07-01 23:27:59 -04:00
James R 2cbf7ac27d Cheese mode activate! 2020-07-01 16:37:36 -07:00
James R e1996a437d Add "Discord Community Testers" to the Testing section 2020-07-01 16:29:26 -07:00
James R 99a9c935f9 Credits: add back fickle, add Chrispy and Hannu 2020-07-01 16:23:26 -07:00
James R fae583915a Remove Producer role from the credits 2020-07-01 16:04:46 -07:00
Nev3r ff8759e507 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/hardware/hw_main.c
 2020-06-30 20:29:48 +02:00
Louis-Antoine 40e98e5712 Fix crash when a polyobject rotates a non-player mobj 2020-06-30 18:37:21 +02:00
Steel Titanium 612386aef0 Correct comment 2020-06-29 23:57:39 -04:00
Steel Titanium e641895268 Address compat with old-style names 2020-06-29 23:54:45 -04:00
James R 696f9707fc Merge branch 'special_save' into 'next' 
Special saves! (Resolves #162)

Closes #162

See merge request STJr/SRB2!1016
 2020-06-29 19:18:30 -04:00
James R 84391f558b Merge branch 'titlecard-double-clown-town' into 'next' 
ACTUALLY fix #172

Closes #172

See merge request STJr/SRB2!1020
 2020-06-28 18:41:22 -04:00
James R e56fc08757 Merge branch 'delete-connection-screen-and-midgame-joins' into 'next' 
Delete connection screen and midgame joins

See merge request STJr/SRB2!1021
 2020-06-28 18:41:07 -04:00
Steel Titanium 3f3ff0688b Add support for saving/loading per-skin NiGHTS replays 2020-06-28 16:59:36 -04:00
James R 335fc0b327 Use levelflat->name instead of flatname 2020-06-27 14:30:41 -07:00
SteelT 22459df1f1 Merge branch 'increase-input-buffer-more' into 'next' 
Increase the length of the player input buffer even more

See merge request STJr/SRB2!951
 2020-06-27 13:32:19 -04:00
GoldenTails fef15be0af Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with 2020-06-27 10:56:15 -05:00
Louis-Antoine 93cc48054a Expose "server" and "dedicated" to Lua scripts 
Careful! Both are local variables and are always false for clients,
and therefore should obviously not be used in anything gamelogic-related.
 2020-06-27 15:30:23 +02:00
Louis-Antoine c96e07b61c Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines 2020-06-27 02:01:16 +02:00
Louis-Antoine 82dbe95e22 Fix computation of very high pings 2020-06-26 15:34:26 +02:00
James R fbbfe3b3b1 Add back the int_none check 
It got removed by 864e703355 but he forget how it
was before the hook was there. :(
 2020-06-25 13:43:07 -07:00
James R 607a4dbee7 Remove caching of INTERSCW 2020-06-25 13:09:00 -07:00
James R 78e6bcc8ff Just stretch the fallback card to the screen resolution 2020-06-25 13:08:00 -07:00
James R 864e703355 Only fill the intermission with blapck if we can't draw patches 
This fixes an issue where patches cease to be drawn due to Y_UnloadData, but
the screen is still overwritten, causing the next wipe to start from void.
 2020-06-25 13:04:03 -07:00
Zachary McAlpin b973b43271 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-25 10:31:55 -05:00
toaster f258131e55 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into special_save 
# Conflicts:
#	src/g_game.c
 2020-06-25 10:48:36 +01:00
Zippy_Zolton dc2f689957 Jet Jaw Sounds 2020-06-25 00:38:07 -05:00
James R 7317bbb692 Merge branch 'ogl-sprite-qsort' into 'next' 
Faster OGL sprite sorting algorithm

See merge request STJr/SRB2!1008
 2020-06-24 23:22:06 -04:00
James R 067d9b9a63 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
Zachary McAlpin b14f18c1a9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-24 20:55:08 -05:00
James R 207d8aee4b Merge branch 'acz3-softlock-fix' into 'next' 
ACZ3 softlock fix

See merge request STJr/SRB2!1015
 2020-06-24 21:43:42 -04:00
James R 95cc10d735 Merge branch 'ogl-mdl-tex-repeat-search-fix' into 'next' 
Don't repeatedly look for model texture files

See merge request STJr/SRB2!1009
 2020-06-24 21:42:40 -04:00
James R 9eb8fd8ac8 Merge branch 'fixeggsign' into 'next' 
Fix the Eggman signpost's background color

See merge request STJr/SRB2!1007
 2020-06-24 21:42:12 -04:00
James R 2e827705b4 Merge branch 'ogl-drawnode-fix' into 'next' 
Faster and more correct OGL transparent surface sorting

See merge request STJr/SRB2!1005
 2020-06-24 21:42:01 -04:00
James R ac71bb76b6 Merge branch 'gme-cleanup-fixes' into 'next' 
GME cleanup and fixes

See merge request STJr/SRB2!1001
 2020-06-24 21:41:49 -04:00
Zachary McAlpin 5ef8c95cdb Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-24 19:47:52 -05:00
Monster Iestyn 7d2de8394f Merge branch 'lua-side-enum-bruh' into 'next' 
Fix missing bruh string in Lua side string options.

See merge request STJr/SRB2!1017
 2020-06-22 15:23:34 -04:00
Latapostrophe 80e0d35391 Fix missing bruh string in lua side options. This is stupid. 2020-06-22 21:11:33 +02:00
toaster 4502604007 Special saves! 
All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts.

Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear...

One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
 2020-06-22 19:00:47 +01:00
GoldenTails f0787077e3 More people ought to know what modulo is... 
Or modulous if your prefer.
 2020-06-22 04:14:42 -05:00
GoldenTails 6fe0874606 Stop resetting cusval cause that's annoying 2020-06-21 23:21:42 -05:00
GoldenTails d609cfc9e3 Make it so Linedef type 422 instead sets cusval when the titlemap is in action. 
I have no idea why it wasn't like this before, but oh well.
 2020-06-21 22:20:06 -05:00
Zwip-Zwap Zapony ae474b6945 Fix re-opening 1 Player menu re-lowering options 
If an add-on disabled an option, re-opening the 1 Player menu
multiple times would lower the above options multiple times

Also fix Marathon Run and Tutorial being "perma-(un)lock"-able
 2020-06-21 16:16:12 +02:00
sphere e9e9cd6133 Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking. 2020-06-21 16:01:24 +02:00
Zwip-Zwap Zapony 5655db11ab Tweak display of hidden items in "1 Player" menu 
If an option in the "1 Player" menu is unavailable in an add-on,
lower the above options to close the gap from the invisible option

Also make Marathon Run display as question marks if locked
And also change "sploadgame" to "spstartgame"
 2020-06-21 09:30:55 +02:00
Louis-Antoine 65054bd0aa Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into increase-input-buffer-more 2020-06-21 01:20:39 +02:00
Zippy_Zolton ca7fc22388 t_lspr 2020-06-20 14:16:22 -05:00
James R 7ec0b6c792 I meant consvar_number_of_netids to be exclusive :V 2020-06-20 00:53:51 -07:00
Zippy_Zolton fc68134938 Thanks for the feedback, I have fixed your issues. 2020-06-20 02:04:18 -05:00
Zippy_Zolton bfa1382736 New Debris for CEZ3 2020-06-20 02:02:13 -05:00
James R 3e52764935 Actually print a warning if the old demo id collides 2020-06-19 19:59:14 -07:00
James R db34d70faa Cvar compatibility with older demos 2020-06-19 18:04:20 -07:00
James R 32134a01fe Save cvar names in demos; refactor cvar loading 2020-06-19 17:58:42 -07:00
James R 32773b71e0 Use ordered ids instead of hashes for cvar netid 
Originally 6acd99c0a465ab1594edc12502f71a5e0a3af938
 2020-06-19 16:36:36 -07:00
kaysrishaq c74a607c54 Whoops, switched these for no reason 2020-06-19 11:11:19 -04:00
kaysrishaq cad1f57b1e FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements) 2020-06-19 11:11:18 -04:00
Hannu Hanhi f3212746d2 Don't repeatedly look for model texture files 2020-06-19 16:18:04 +03:00
Hannu Hanhi 6f9b9aacf4 Faster OGL sprite sorting algorithm 2020-06-19 14:32:34 +03:00
lachwright cab87b4632 lol should have tested before pushing 2020-06-19 15:59:09 +08:00
lachwright 47d9d87654 Fix the Eggman signpost's background color 2020-06-19 15:49:24 +08:00
kaysrishaq 682791a024 brak missile fix, pw_ignorelatch, small Recycler fix 2020-06-18 17:09:29 -04:00
Hannu Hanhi ffaffdf3e1 Faster and more correct OGL transparent surface sorting 2020-06-18 20:27:19 +03:00
lachwright 7b2e54b426 Fix Dragonbomber z positioning 2020-06-19 00:52:24 +08:00
Hannu Hanhi 9477d372b9 Backwards compatibility for shaderless hardware 2020-06-18 17:39:34 +03:00
James R 193c45aa2f Forgot a comma 2020-06-17 22:58:11 -07:00
James R 489bb81d00 Makefile: Move the PREFIX stuff up so version detection can take advantage of 2020-06-17 22:52:19 -07:00
James R bf90fbb91f Detect the compiler version and set the correct GCC flag 
If the version is not supported by the Makefile, the flag for the latest
version supported is set instead.
 2020-06-17 22:49:12 -07:00
SteelT bff6b19056 Merge branch 'marathonmode' into 'next' 
MARATHON RUN

See merge request STJr/SRB2!941
 2020-06-17 19:36:10 -04:00
Steel Titanium 8365d975d3 A even more better fix for this 2020-06-17 18:40:56 -04:00
Steel Titanium 1e655fb2c1 Better fix for may be used uninitialized, maybe fixes GCC 4.x 2020-06-17 18:23:54 -04:00
Steel Titanium 3946309ece Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
 2020-06-17 18:15:07 -04:00
Steel Titanium 5708325d2b Use SAMPLERATE for consistency with the rest of the code 2020-06-17 14:50:22 -04:00
Steel Titanium f626b9f4d9 Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong 2020-06-17 14:31:49 -04:00
Steel Titanium a34be0e370 Reduce code duplication by creating get_zlib_error function 
Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong
Return false if it fails to decompress VGZ data in some form.
 2020-06-17 14:19:19 -04:00
Steel Titanium d3d5496a78 Fix facecolor may be used uninitialized. 2020-06-17 14:09:49 -04:00
lachwright 7d92631d97 Whoops, forgot hu_stuff.c 2020-06-17 05:27:42 +08:00
lachwright edfd64877c Add SF_NOSUPERSPRITES 2020-06-17 04:53:42 +08:00
lachwright e403de7459 Merge branch 'next' into more-platform-fixes 2020-06-17 01:53:19 +08:00
lachwright 29738fcdd0 Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain 2020-06-17 01:46:36 +08:00
lachwright 38e2c999c5 Platform fixes 2020-06-14 12:17:30 +08:00
Zachary McAlpin 6eccc7030d I forgot to pop the error handler 2020-06-12 07:50:57 -05:00
Zachary McAlpin 965d42f974 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-12 07:32:44 -05:00
Nev3r 2322644488 Merge branch 'dofile' into 'next' 
Add dofile() to Lua

See merge request STJr/SRB2!969
 2020-06-12 02:32:16 -04:00
Steel Titanium b056bf1d6c Merge branch 'master' into next 2020-06-11 20:11:26 -04:00
SteelT c810ea3945 Merge branch 'next-lc-uint16' into 'next' 
Custom skincolor bugfixes

See merge request STJr/SRB2!971
 2020-06-11 20:08:50 -04:00
Zachary McAlpin 0d70e16b0b Updated LUAh_GameQuit to use new error handler 2020-06-11 15:11:01 -05:00
Zachary McAlpin 08e9efee76 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-11 15:02:31 -05:00
lachwright fad82265e0 Allow macOS builds to be launched through Steam 2020-06-12 01:19:06 +08:00
mazmazz 8fc414536f CMAKE: Move launch-c into more sensible location 2020-06-10 15:08:09 -04:00
LJ Sonic 7ffee074d8 Merge branch 'next' into 'better-download' 
# Conflicts:
#   src/d_clisrv.c
 2020-06-10 07:57:49 -04:00
LJ Sonic bc2edb2ae4 Merge branch 'snake' into 'next' 
Add a Snake minigame to the file transfer screen

See merge request STJr/SRB2!903
 2020-06-10 07:38:37 -04:00
Zachary McAlpin 291479e3e8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-09 19:54:47 -05:00
mazmazz 46b383acda CMAKE: Fix toggle fullscreen breakage due to missing define 
This is lazy. The correct solution is to eliminate the define in the program code
 2020-06-09 17:32:14 -04:00
MascaraSnake a76c8af60c Compiling fix 2020-06-09 22:10:02 +02:00
mazmazz 36e17006b7 CMAKE: Fix OS X ccache scripts 2020-06-09 11:12:52 -04:00
MascaraSnake d07c376f6d Adapt POF_SPLAT to UDMF setup 2020-06-09 09:44:49 +02:00
MascaraSnake 4a0206b38d Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02:00
Steel Titanium 2abdc86537 Fix these "may be used uninitialized in this function" errors with batching 2020-06-08 20:18:32 -04:00
Steel Titanium 3dd89f67fa Fix no previous prototype for TimeFunction 2020-06-08 19:56:24 -04:00
Steel Titanium 62d73968e2 Merge branch 'next' into sal-oglshaderport 2020-06-08 19:36:23 -04:00
mazmazz 01ff46326f Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments 2020-06-08 11:57:57 -04:00
Digiku 70eb5ba634 Merge branch 'buffer-offset-fix' into 'master' 
Strike null-pointer-arithmetic error in BUFFER_OFFSET

See merge request STJr/SRB2!989
 2020-06-08 11:56:48 -04:00
Lachlan Wright 191e2e094d Merge branch 'fix-spawn-desynch' into 'next' 
Fix desynch when a player spawns

See merge request STJr/SRB2!977
 2020-06-08 05:25:41 -04:00
Lachlan Wright 614a98bd9d Merge branch 'dashmode-fixes' into 'next' 
Dashmode fixes

See merge request STJr/SRB2!909
 2020-06-08 05:25:30 -04:00
Lachlan Wright 590dfca582 Merge branch 'fix-continuing-mouse' into 'next' 
Fix mouse being grabbed in continue screen

See merge request STJr/SRB2!983
 2020-06-08 05:25:24 -04:00
mazmazz f3c1db0650 CMAKE: Fix OSX CCache error 2020-06-08 03:08:58 -04:00
mazmazz efba50c83c CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package 2020-06-08 00:38:13 -04:00
mazmazz aef9a1b522 CMAKE: Add CCACHE support 2020-06-08 00:35:31 -04:00
mazmazz a5f7f9a534 Fix OPENMPT deprecation error, openmpt_module_ctl_set 2020-06-08 00:09:29 -04:00
mazmazz 2cefe82950 Fix OSX null-pointer-arithmetic error 2020-06-08 00:08:07 -04:00
mazmazz ded6285249 CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo 2020-06-08 00:01:15 -04:00
mazmazz a449fa4a1d Added SDL Mixer X to CMAKE (Windows only) 2020-06-08 00:01:15 -04:00
Zachary McAlpin 78014cfd4c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-07 22:42:43 -05:00
Hannu Hanhi 0e521922c6 Change some unsigned ints to UINT32 2020-06-07 21:32:52 +03:00
Hannu Hanhi abe13651d0 OpenGL draw call batching system 2020-06-07 21:20:52 +03:00
MascaraSnake de7a806ec3 Merge branch 'nospinmovecut' into 'next' 
Don't cut momentum if landing in a roll

See merge request STJr/SRB2!972
 2020-06-07 13:24:19 -04:00
Hannu Hanhi da98ea242e Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
SteelT db32b01222 Merge branch 'renderstats' into 'sal-oglshaderport' 
Render stats

See merge request STJr/SRB2!914
 2020-06-07 12:29:58 -04:00
sphere 82200d80a9 Fix mouse being grabbed in the continue screen. 2020-06-07 00:40:33 +02:00
Monster Iestyn 28550b221a Merge branch 'master' into next 2020-06-06 20:50:12 +01:00
Monster Iestyn d2fefb6b9a use void rather than VOID, because the logging init code isn't exclusively Win32, whoops 2020-06-06 20:49:12 +01:00
Monster Iestyn 7e562a3ca5 Merge branch 'master' into next 2020-06-06 20:35:48 +01:00
Monster Iestyn 982d1db5d8 Merge branch 'cppcheck-fixes' into 'master' 
Cppcheck fixes

See merge request STJr/SRB2!967
 2020-06-06 15:28:48 -04:00
lachwright f68a95016e Merge branch 'next' into nospinmovecut 2020-06-07 02:45:26 +08:00
Monster Iestyn a4d7ff3c6d Merge branch 'master' into next 2020-06-06 17:39:43 +01:00
Monster Iestyn 56b8ea3587 added liolib.c to the VC10 project files, since it was missing from them 2020-06-06 17:38:35 +01:00
GoldenTails 9aa68f524e Adds the branch name into the version command printout when outside of DEVELOP mode. 
Really just so I don't accidentally join netgames or record replays for vanilla SRB2 in the `next` branch...
 2020-06-06 04:12:27 -05:00
MascaraSnake 50b47a1b25 Merge branch 'translucent-splat-planes' into 'next' 
Allow transparent parts in translucent FOF and PolyObject planes

See merge request STJr/SRB2!978
 2020-06-06 04:35:06 -04:00
Zachary McAlpin ca66c5e7ee Updated LUAh_GameQuit 2020-06-05 13:18:22 -05:00
Zachary McAlpin 7b779fa89b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-05 12:59:41 -05:00
Monster Iestyn 9e4ed738b7 Sync turnobjs for polyrotate_t thinkers in netgames 2020-06-04 21:31:26 +01:00
Monster Iestyn cb7423b97e sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean 2020-06-03 20:47:49 +01:00
Monster Iestyn b11d58aef5 clean up BUGTRAP code in win32/win_main.c to avoid unmatched } 
(though that said we don't officially care about the win32 folder files anymore)
 2020-06-03 20:47:49 +01:00
Monster Iestyn 5349a0bf62 V_Init: count to NUMSCREENS, not NUMSCREENS+1 (though I can't help thinking this one might have been deliberate somehow?) 2020-06-03 20:47:49 +01:00
Monster Iestyn bb1a2dbba7 sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code 2020-06-03 20:47:49 +01:00
Monster Iestyn 8092d30376 Polyobj_rotate and related: change "origin" to vector2_t since all it needs is x/y and not any of the new stuff for vertex_t 2020-06-03 20:47:49 +01:00
Monster Iestyn 7340442839 P_XYMovement: initialise slopemom to all zeros 2020-06-03 20:47:49 +01:00
Monster Iestyn adb11eec1b dehacked.c: use actual size of descriptions buffers rather than MAXLINELEN, which is way too large 2020-06-03 20:47:49 +01:00
Monster Iestyn d11ba67288 G_ReadMetalTic: Make sure all three values for GZT_XYZ are read in the right order 2020-06-03 20:47:49 +01:00
Monster Iestyn 879a2bd20a G_GhostTicker/G_ReadMetalTic: type should default to MT_NULL, not -1 
This way, if for some reason the ghost has no skin, nothing should spawn at all
 2020-06-03 20:47:49 +01:00
MascaraSnake 33ed36cf4b Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent) 2020-06-03 19:41:47 +02:00
Louis-Antoine 9be188ff02 Minor edit 2020-06-02 10:31:56 +02:00
Louis-Antoine 286b316cf9 Fix dofile() return incorrect values 2020-06-01 15:43:14 +02:00
LJ Sonic 6895d7df92 Merge branch 'next' into 'dofile' 
# Conflicts:
#   src/lua_script.c
#   src/lua_script.h
 2020-06-01 09:28:56 -04:00
Louis-Antoine e6ffedbce8 Fix food occasionally spawning inside the snake 2020-06-01 15:21:16 +02:00
LJ Sonic 04c7eeb6ae Merge branch 'deprecate-fixedrem' into 'next' 
Deprecate FixedRem.

See merge request STJr/SRB2!952
 2020-06-01 08:30:44 -04:00
LJ Sonic 715cb857f5 Merge branch 'next' into 'better-download' 
# Conflicts:
#   src/sdl/i_system.c
#   src/win32/win_sys.c
 2020-06-01 08:16:53 -04:00
LJ Sonic e2b860dc28 Merge branch 'next' into 'fix-spawn-desynch' 
# Conflicts:
#   src/p_map.c
 2020-06-01 08:15:02 -04:00
MascaraSnake 11493e61d2 Merge branch 'executordelay' into 'udmf-next' 
UDMF linedef executor delay

See merge request STJr/SRB2!918
 2020-06-01 07:57:23 -04:00
MascaraSnake b13f29852f Merge branch 'gravflip-shadows' into 'next' 
Move drop shadows to the ceiling for objects in reverse gravity

See merge request STJr/SRB2!973
 2020-06-01 07:23:29 -04:00
MascaraSnake 8d7f4e3265 Merge branch 'movement-refactor' into 'next' 
Clean up some movement code

See merge request STJr/SRB2!912
 2020-06-01 07:21:41 -04:00
Louis-Antoine 3c3a60d189 Fix "downloads" command reporting incorrect progress 2020-06-01 10:37:05 +02:00
LJ Sonic dd18915570 Merge branch 'traceback' into 'next' 
Traceback

See merge request STJr/SRB2!974
 2020-06-01 04:17:30 -04:00
MascaraSnake 508160ed42 Use 0 instead of 0xffff as dummy mobjnum 2020-05-31 22:58:14 +02:00
MascaraSnake 3a4502fa87 Netsync waypoint sequences 2020-05-31 22:44:25 +02:00
SwitchKaze 5a18bdf20b Fix SOC color name reading 2020-05-30 16:52:44 -05:00
Louis-Antoine d31346822d Refactor hook library a little 2020-05-30 20:28:45 +02:00
Louis-Antoine 1bacaedde2 Show the traceback when a Lua script error happens 2020-05-30 20:24:33 +02:00
lachwright f32d29f700 Oops, forgot to #undef 2020-05-31 01:26:23 +08:00
lachwright a7f73bfa85 Move drop shadows to the ceiling for objects in reverse gravity 2020-05-31 01:21:26 +08:00
lachwright 5136a4d41d Don't cut momentum if landing in a roll 2020-05-30 19:07:16 +08:00
lachwright b874da5229 Ensure followmobj ghost exists before applying fuse 2020-05-30 18:26:11 +08:00
lachwright 51b640ad5a Feedback so far indicates the old booster effect is preferred 2020-05-30 18:21:39 +08:00
lachwright ae5d5b9546 Merge branch 'next' into dashmode-fixes 2020-05-30 18:13:21 +08:00
SwitchKaze d589e6bc95 Fix signpost shade. 2020-05-29 21:41:20 -05:00
Zachary McAlpin 7bdea21435 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-29 15:32:59 -05:00
Louis-Antoine 1dbb755743 Add dofile() to Lua 2020-05-29 17:35:07 +02:00
LJ Sonic b7c5163419 Merge branch 'luacolors-gcc10-fix' into 'next' 
Fix the "Custom skincolors" branch not compiling with GCC 10.

See merge request STJr/SRB2!966
 2020-05-29 11:23:54 -04:00
sphere 71cf31fcaf Fix the "Custom skincolors" branch not compiling with GCC 10. 2020-05-28 18:43:04 +02:00
Louis-Antoine c6e13d0e30 Fix crash when setting a mobj's angle from a Lua script 2020-05-28 18:34:56 +02:00
Monster Iestyn 755e9d659d Merge branch 'master' into next 2020-05-28 16:34:06 +01:00
SteelT 07da7f7d29 Merge branch 'scroller-tweaks' into 'next' 
Add back side wall scrollers & allow using offsets for tagged wall scrollers.

See merge request STJr/SRB2!955
 2020-05-28 11:29:39 -04:00
LJ Sonic aab6339e66 Merge branch 'possibly-fix-dedi-crash' into 'next' 
Possible fix for dedicated server crashes (aka the msvcrt.dll!_mbscat crash)

See merge request STJr/SRB2!963
 2020-05-28 11:29:00 -04:00
SteelT 1c42102ddb Merge branch 'fix-input-buffer' into 'next' 
Allow input buffer to hold more than 64 tics

See merge request STJr/SRB2!950
 2020-05-28 11:27:39 -04:00
SteelT f0b64971a0 Merge branch 'next-lc-uint16' into 'next' 
Custom skincolors

See merge request STJr/SRB2!960
 2020-05-28 11:23:05 -04:00
Louis-Antoine 67eef5a37f Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
Louis-Antoine bb1e3fdf13 Add a few missing calls to GameQuit hook 2020-05-27 14:58:10 +02:00
Monster Iestyn 40566e6926 Got_AddPlayer: check that I_GetNodeAddress(node) is non-NULL before using strcpy to copy it to the playeraddress array 2020-05-25 21:27:48 +01:00
mazmazz 272362a86f Fix NOWIPE bugs with colormap fade and title card 2020-05-25 00:20:23 -04:00
mazmazz 8fee9a51ce Add NOWIPE behavaior for colormap fades 2020-05-25 00:19:41 -04:00
Monster Iestyn ed25fefcae T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5 due to P_FloorzAtPos messing up as a result) 2020-05-24 21:15:31 +01:00
SwitchKaze f508f5b881 Fix typo SKINCOLOT 2020-05-24 12:36:20 -05:00
SwitchKaze b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
Zachary McAlpin 566a5a0ab7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-23 15:23:43 -05:00
MascaraSnake 747d784c77 Merge branch 'splitshot-notarget-fix' into 'next' 
A_SplitShot no target fix

See merge request STJr/SRB2!956
 2020-05-23 07:52:36 -04:00
SwitchKaze 46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Monster Iestyn 4b7f0f49f1 added the ability to get the # of a mapthing_t in Lua 2020-05-22 18:32:34 +01:00
Monster Iestyn c9c7327011 A_SplitShot fix: don't even attempt to A_FaceTarget (or anything beyond) if there is no target to face to begin with 2020-05-21 19:42:48 +01:00
Monster Iestyn 7722d41be6 Merge branch 'sprite-projection-fixes' into 'next' 
Sprite projection fixes

See merge request STJr/SRB2!954
 2020-05-20 15:33:30 -04:00
Monster Iestyn 702a7041d4 also do the fovtan multiplication thing with precip sprites 2020-05-20 19:34:18 +01:00
Louis-Antoine bf00955786 Wait for acks before resending file fragments 2020-05-20 16:21:18 +02:00
James R 4eeae51cbb Merge branch 'more-lua-map-names' into 'next' 
G_BuildMapTitle for Lua, G_BuildMapName outside of levels

See merge request STJr/SRB2!694
 2020-05-19 23:13:35 -04:00
Louis-Antoine 06060c02d3 Add a command to list current file transfers 2020-05-20 00:24:53 +02:00
Louis-Antoine c8948909d3 Fix I_Error when queuing multiple Lua files 2020-05-19 23:50:37 +02:00
sphere 934b28989f Add linedef actions 507 & 508, allow using offsets for actions 502-504. 2020-05-19 23:39:35 +02:00
Monster Iestyn c3d576058a on second thought maybe we don't need extra tx clamping, it turns out to be more effort than it's worth (at least for now) 
meanwhile, let's move x/yscale calculations down since we don't actually need them until later on
 2020-05-19 22:00:34 +01:00
Louis-Antoine f620b52672 Fix sending Lua files in text mode 2020-05-19 21:36:21 +02:00
Louis-Antoine 34c5da39e2 Create FIL_ConvertTextFileToBinary 2020-05-19 20:00:58 +02:00
Monster Iestyn 65d6b04fd2 change limits for tx based on fov, by multiplying by fovtan 
this makes it so that higher fov values can actually let you see all the sprites that should be in the view
 2020-05-19 18:54:39 +01:00
Monster Iestyn 35e5d673e0 do tx checking after tz clamping, not before 2020-05-19 18:43:33 +01:00
Monster Iestyn 12e1094143 We don't actually need x1 or x2 until these points in the function, at least for papersprites 2020-05-19 17:23:22 +01:00
Monster Iestyn 1a790235c6 added basic culling of papersprites if tx for either is too large, proper clamping to be added later 
also removed some commented out old code
 2020-05-19 17:19:44 +01:00
Monster Iestyn c8320b6c9d split "rot" into two variables: frame and rot, for frame number and rotation angle 
it always bothered me that "rot" was used for both of the above, since it confused me as to what it was for every time I look at this function
 2020-05-19 16:58:53 +01:00
Monster Iestyn dd42682791 remove gxt and gyt, as they are unnecessary 
also add a few comments to explain what tx/tz are
 2020-05-19 16:48:50 +01:00
Louis-Antoine 06d3af6716 Refactor Lua file transfer code 2020-05-19 15:16:51 +02:00
Louis-Antoine db85c62c6f Allow resuming the most recent file transfer 2020-05-19 11:28:24 +02:00
MascaraSnake ff37975892 Merge branch 'next' into movement-refactor 
# Conflicts:
#	src/p_map.c
 2020-05-19 09:50:23 +02:00
MascaraSnake 6f854f2de3 Merge branch 'more-polyobject-cleanup' into 'next' 
Smooth polyobject movement and other cleanup

See merge request STJr/SRB2!947
 2020-05-18 16:00:55 -04:00
MascaraSnake 33a22331f8 Merge branch 'waypoints' into 'next' 
Store waypoints at map load instead of iterating through the thinker list to find them

See merge request STJr/SRB2!938
 2020-05-18 16:00:46 -04:00
Zachary McAlpin 530d0e3421 Remove redundant M_QuitResponse call 2020-05-18 14:56:10 -05:00
Zachary McAlpin ed78d17ed3 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-18 14:50:58 -05:00
Louis-Antoine d40a8efce2 I forgot to test OpenGL :slight_smile: 2020-05-18 20:35:30 +02:00
GoldenTails 8b801921a4 Deprecate FixedRem. 
It's about time!
 2020-05-18 11:29:56 -05:00
Louis-Antoine 435643b958 Fix P_GetZAt for Lua 2020-05-18 16:16:45 +02:00
Louis-Antoine d0abd6e86c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_spec.c
 2020-05-18 16:14:05 +02:00
Louis-Antoine a06c4a8c98 Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
Louis-Antoine 37d2796b91 Increase the length of the player input buffer even more 2020-05-18 12:35:55 +02:00
Louis-Antoine 56cc5190e5 Allow input buffer to hold more than 64 tics 2020-05-18 11:34:09 +02:00
Louis-Antoine e49d3d0bb9 Use per-node reference tics in ExpandTics 2020-05-17 20:23:07 +02:00
Louis-Antoine fc07db26c0 Store starttic as a raw value in PT_SERVERTICS packets 
This avoids some desynch issues and is simpler to handle.
Those packets are always big anyway, so the difference is irrelevant.
 2020-05-17 20:09:11 +02:00
MascaraSnake c05d1dd979 Merge branch 'software-missing-sprite-column' into 'next' 
Fix missing sprite column (resolves #135)

See merge request STJr/SRB2!944
 2020-05-17 02:30:32 -04:00
MascaraSnake a7c7f7afa9 Merge branch 'fof-cleanup' into 'next' 
FOF cleanup

See merge request STJr/SRB2!910
 2020-05-17 02:30:16 -04:00
Louis-Antoine bf11e3a361 Add missing packet name 2020-05-16 23:22:33 +02:00
Louis-Antoine 66ecfb741a Show total size when downloading gamestate 2020-05-16 22:49:20 +02:00
Louis-Antoine 3c7c758d17 Rewrite file transfer code 
This code uses a custom packet acknowledgement system,
which is more suited for file transfer and does not suffer from
the small sender window used by the default acknowledgement system
 2020-05-16 22:09:00 +02:00
Jaime Passos 423494381e Fix mistake 2020-05-16 14:01:42 -03:00
Jaime Passos c64e231b2b Attempt to properly match Software texture blending 
without messing with the original ASTBlendPixel function
 2020-05-16 13:51:10 -03:00
Monster Iestyn 20e4d5ab9e lib_sStopSoundByID: fixed mixed declaration and code compiler warning 2020-05-16 16:14:47 +01:00
MascaraSnake 969c48fac8 Merge branch 'udmf-next' into udmf-polyobjects 
# Conflicts:
#	src/p_polyobj.c
 2020-05-16 11:18:47 +02:00
MascaraSnake 9b25ab27ca Merge branch 'stop-sound-by-id' into 'next' 
S_StopSoundByID Lua support

See merge request STJr/SRB2!925
 2020-05-16 04:55:46 -04:00
MascaraSnake 5d7bea6400 Merge branch 'more-demo-cleanup' into 'next' 
More Demo code cleanup

See merge request STJr/SRB2!942
 2020-05-16 04:52:31 -04:00
MascaraSnake 371a1851e3 Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location 2020-05-16 10:24:06 +02:00
MascaraSnake 536e355cdf polywaypointdata_t: Turn reverse and continuous into flags 2020-05-16 09:49:30 +02:00
MascaraSnake 06dda9c69d EV_DoPolyObjWaypoint: Don't discard movement if you start at the last waypoint 2020-05-16 09:09:26 +02:00
MascaraSnake 3680b246c9 T_PolyObjWaypoint: We can find waypoints in constant time now, so no need to store the waypoint mobj in the thinker anymore 2020-05-16 09:03:02 +02:00
MascaraSnake 1057c0f7c1 T_PolyObjWaypoint: If the polyobject reaches its target exactly, find next waypoint in the same tic 2020-05-16 08:49:03 +02:00
MascaraSnake e422d1fa1d Rewrite T_PolyObjWaypoint to move more smoothly 2020-05-16 08:45:06 +02:00
Steel Titanium 69c86c63b3 Fix A_SpinSpin not being usable in Lua or SOC due to an error 2020-05-15 23:05:29 -04:00
MascaraSnake ed9b76e4b9 Merge branch 'opengl-character-select-mipmap-memory-leak-fix' into 'next' 
Fix colormap mipmap memory leak on the character select in OpenGL

See merge request STJr/SRB2!943
 2020-05-15 16:41:19 -04:00
MascaraSnake 8f4ed5af62 Merge branch 'nights-character-select' into 'next' 
Character select in Nights mode.

See merge request STJr/SRB2!862
 2020-05-15 16:39:38 -04:00
toaster a5150e07fd * Swap location of Tutorial and Marathon Run, per sphere's suggestion. 
* Lock Marathon Run if Record Attack isn't available, to avoid confusing new players.
 2020-05-15 21:32:54 +01:00
toaster a615de3504 Correctly reset map/timer for retries where the first map in Marathon Run is LF_NORELOAD (by forcing a reload when the retry option is used). 2020-05-15 21:17:57 +01:00
James R 1ccca987cb Jart? What's that? 2020-05-15 12:57:31 -07:00
Jaime Passos 288d7166bc Fix ASTBlendPixel outputting empty pixels if the background pixel was empty, BUT if the foreground pixel had no alpha at all 2020-05-15 16:41:39 -03:00
Jaime Passos 00ac9deb5b Fix missing sprite column 2020-05-15 16:17:31 -03:00
Jaime Passos dd3c7aa0af Fix colormap mipmap memory leak on the character select in OpenGL 2020-05-15 15:58:20 -03:00
Jaime Passos 5e28e358ad Fix memory leak 2020-05-15 15:45:00 -03:00
MascaraSnake 0508f99419 T_PolyObjWaypoint: Move duplicated movement code into its own function 2020-05-15 17:35:07 +02:00
toaster 9686ad2d70 * In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default. 
* Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
 2020-05-15 16:33:20 +01:00
toaster 1e3e9c81ac Remove emblem hints from Marathon Run (I think Options is good just for the sake of live events, though). 2020-05-15 15:23:31 +01:00
toaster 47419ce0df Introducing "antisplice" - a pair of small highlights on the Marathon bar that is based on the real time the executable has been open for and *isn't* restored with the Live Event Backup, making spliced runs basically intractable. 2020-05-15 15:08:45 +01:00
toaster f06206cd5f Fix "press any other key" sending you to HOM hell. 2020-05-15 14:24:29 +01:00
toaster 271c6d354b Re-order Marathon bar to be drawn before FPS and captions if applicable. 2020-05-15 13:39:27 +01:00
toaster 4348ebdfa8 Make live event backup files savedata specific (new format: live%s.bkp, where %s is the time attack folder name/savegame name - so vanilla's is livesrb2sav.bkp). 2020-05-15 13:37:06 +01:00
toaster 2aa542d2bf Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode 
# Conflicts:
#	src/doomdef.h
 2020-05-15 13:23:37 +01:00
toaster e99d38ffaf Make a falsy useBlackRoc prevent doing Black Rock sparkle calculations and Egg Rock pulse sounds. 2020-05-15 13:19:52 +01:00
MascaraSnake 9cd9d2e0d7 Merge branch 'carry-dust-devil' into 'next' 
Add carry types to Dust devils

See merge request STJr/SRB2!886
 2020-05-15 02:50:29 -04:00
Jaime Passos 1a79f6246d Merge remote-tracking branch 'origin/next' into pictureformats 2020-05-15 01:34:54 -03:00
James R 2ec97b87a0 This is SRB2 2020-05-14 17:29:36 -07:00
James R 57c7df74d9 Rename hms123311.c to http-mserv.c 
HMS lives on in our hearts!

(cherry picked from commit e8a2397deaacdd7dc6f80717755bc89161247cb5)
 2020-05-14 17:28:55 -07:00
James R fec8879797 Use Unlock_state here too 
(cherry picked from commit a6ce21b450644a79b08b9533166704c7ef093816)
 2020-05-14 17:28:55 -07:00
toaster d593e2e1bb Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) 
Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features.

Benefits include:
* An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending.
* Disable the console (pausing is still allowed, but the timer will still increment).
* Automatically skip intermissions as if you're holding down the spin button.
* Show centiseconds on HUD automatically, like record attack.
* "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout.
* "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port).
* Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them.
* Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext).
* Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for).
* Gorgeous new menu (no new assets required, unless you wanna give it a header later).

Changes which were required for the above but affect other areas of the game include:
* "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories).
* Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true).
* Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.)
* The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs).
* A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier.
* Minor m_menu.c touchups and refactorings here and there.

Built using feedback from the official server's #speedruns channel, among other places.
 2020-05-14 23:10:00 +01:00
Monster Iestyn ee520b4a0d split significant chunks of G_CheckDemoStatus into their own smaller functions, also give writing demo checksums its own little function 2020-05-14 20:57:21 +01:00
kaysrishaq 70896f9095 clean whitespace 2020-05-14 07:42:06 -04:00