LJ Sonic
5c61f059e8
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
79857ea9e8
Merge branch 'patch-1' into 'next'
...
Rename "Legacy" control scheme
See merge request STJr/SRB2!1029
2020-07-04 06:50:15 -04:00
LJ Sonic
85f5698c9b
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
e4b5d85f31
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
080a5acd0f
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
SteelT
2d6fff5165
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
colette
da537d8695
"Legacy controls" was a mistake of a name
2020-07-02 23:17:33 -04:00
James R
1071e72e62
Merge branch 'cheese' into 'next'
...
Cheese
See merge request STJr/SRB2!1028
2020-07-01 23:28:08 -04:00
James R
39e3a5f5bb
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
79bbd3606d
Merge branch 'fix-polyobject-rotation-crash' into 'next'
...
Fix crash when a polyobject rotates a non-player mobj
See merge request STJr/SRB2!1026
2020-07-01 19:40:36 -04:00
James R
a5a626f883
Cheese mode activate!
2020-07-01 16:37:36 -07:00
James R
1beea770e5
Add "Discord Community Testers" to the Testing section
2020-07-01 16:29:26 -07:00
James R
746235a4d6
Credits: add back fickle, add Chrispy and Hannu
2020-07-01 16:23:26 -07:00
James R
5e78af3818
Remove Producer role from the credits
2020-07-01 16:04:46 -07:00
Louis-Antoine
ec2f58c664
Fix crash when a polyobject rotates a non-player mobj
2020-06-30 18:37:21 +02:00
Steel Titanium
db559d73d0
Correct comment
2020-06-29 23:57:39 -04:00
Steel Titanium
e0b524d6a9
Address compat with old-style names
2020-06-29 23:54:45 -04:00
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
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
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
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
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
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