James R
06c3116afa
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
7ef7649c75
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
71dedde5eb
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
f891c6cde4
Add support for saving/loading per-skin NiGHTS replays
2020-06-28 16:59:36 -04:00
James R
dc746f4dfe
Use levelflat->name instead of flatname
2020-06-27 14:30:41 -07:00
SteelT
07c84dc854
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
0fbcd7a5d2
Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with
2020-06-27 10:56:15 -05:00
LJ Sonic
71f5b7fd0d
Merge branch 'lua-server-variables' into 'next'
...
Expose "server" and "dedicated" to Lua scripts
See merge request STJr/SRB2!1022
2020-06-27 09:50:30 -04:00
Louis-Antoine
9e770ceec4
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
36ad16452c
Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines
2020-06-27 02:01:16 +02:00
Louis-Antoine
8b78811651
Fix computation of very high pings
2020-06-26 15:34:26 +02:00
James R
b301f56358
Add back the int_none check
...
It got removed by 864e7033552cbb966f378cfbaf56aa116c1f97e8 but he forget how it
was before the hook was there. :(
2020-06-25 13:43:07 -07:00
James R
45c6018094
Merge branch 'gamequit-hook' into 'next'
...
GameQuit Hook
See merge request STJr/SRB2!847
2020-06-25 12:45:20 -04:00
Zachary McAlpin
fbe3c1a122
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-25 10:31:55 -05:00
toaster
94dbb0ebe1
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
74ece42ee2
Jet Jaw Sounds
2020-06-25 00:38:07 -05:00
James R
f2f68ca732
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
22de612d65
Merge branch 'gtr-fixes' into 'next'
...
Gametype fixes
See merge request STJr/SRB2!816
2020-06-24 23:01:11 -04:00
James R
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
Zachary McAlpin
bad02950e8
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-24 20:55:08 -05:00
James R
d5569c0924
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
1a9b74a57c
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
2a27e3839c
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
a3f9b9c302
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
0dcba91c4f
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
feb56fc3b6
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-24 19:47:52 -05:00
Monster Iestyn
00f8c2ceff
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
5d81856427
Fix missing bruh string in lua side options. This is stupid.
2020-06-22 21:11:33 +02:00
toaster
3b3256be8f
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
40520302cd
More people ought to know what modulo is...
...
Or modulous if your prefer.
2020-06-22 04:14:42 -05:00
GoldenTails
5942c4f7b8
Stop resetting cusval cause that's annoying
2020-06-21 23:21:42 -05:00
GoldenTails
2d937925f8
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
fa9a140a45
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
97ebb50e12
Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking.
2020-06-21 16:01:24 +02:00
Zwip-Zwap Zapony
940689d3ae
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
86022608d2
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
f3a9ba447b
t_lspr
2020-06-20 14:16:22 -05:00
James R
785ff5b8eb
I meant consvar_number_of_netids to be exclusive :V
2020-06-20 00:53:51 -07:00
Zippy_Zolton
9c194f4186
Thanks for the feedback, I have fixed your issues.
2020-06-20 02:04:18 -05:00
Zippy_Zolton
50f51715a7
New Debris for CEZ3
2020-06-20 02:02:13 -05:00
James R
f7503adbde
Actually print a warning if the old demo id collides
2020-06-19 19:59:14 -07:00
James R
b89be9f179
Cvar compatibility with older demos
2020-06-19 18:04:20 -07:00
James R
31cf034d63
Save cvar names in demos; refactor cvar loading
2020-06-19 17:58:42 -07:00
James R
df19ededb8
Use ordered ids instead of hashes for cvar netid
...
Originally 6acd99c0a465ab1594edc12502f71a5e0a3af938
2020-06-19 16:36:36 -07:00
kaysrishaq
18281fd511
Whoops, switched these for no reason
2020-06-19 11:11:19 -04:00
kaysrishaq
6f859fd44d
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-19 11:11:18 -04:00
Hannu Hanhi
20447c68a5
Don't repeatedly look for model texture files
2020-06-19 16:18:04 +03:00
Hannu Hanhi
75da8067dc
Faster OGL sprite sorting algorithm
2020-06-19 14:32:34 +03:00
lachwright
c54cb042ba
lol should have tested before pushing
2020-06-19 15:59:09 +08:00
lachwright
e1a8ea7663
Fix the Eggman signpost's background color
2020-06-19 15:49:24 +08:00