LJ Sonic
85cd429d1d
Revert "Replace all instances of P_AproxDistance with FixedHypot"
...
This reverts commit 498ff708bb .
2021-02-13 17:45:20 +01:00
LJ Sonic
70c0f8a644
Only call PlayerCmd hooks if added to game
2021-02-11 00:24:42 +01:00
LJ Sonic
05a75758ab
Merge branch 'redundant-hypot' into 'next'
...
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's
See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
SteelT
e242a87f01
Merge branch 'fix-ticcmd-received' into 'next'
...
Fix TICCMD_RECEIVED being overridden by gamelogic
See merge request STJr/SRB2!1337
2021-01-07 16:31:45 -05:00
LJ Sonic
5884f803bb
Fix TICCMD_RECEIVED being overridden by gamelogic
2020-12-16 17:35:39 +01:00
James R
498ff708bb
Replace all instances of P_AproxDistance with FixedHypot
2020-12-12 14:53:54 -08:00
James R
956fd338f0
Merge branch 'oldguards' into 'next'
...
Kill remaining HAVE_BLUA and SEENAMES
See merge request STJr/SRB2!1319
2020-12-12 17:34:04 -05:00
James R
41f1b3b97c
Kill SEENAMES
2020-12-12 02:11:23 -08:00
James R
34f09b2845
Merge branch 'marathon-mode-tokens' into 'next'
...
Fix emeralds, tokens, etc not resetting when restarting marathon mode in first level
See merge request STJr/SRB2!1252
2020-12-10 14:57:23 -05:00
LJ Sonic
2e71d1be63
Fix PlayerCmd not handling angle and aiming correctly
2020-11-23 01:23:34 +01:00
Riku Salminen
a336bcf60c
No need to reset tokens twice
2020-11-22 23:23:32 +02:00
Riku Salminen
9bb2014a79
Now the fix actually does what the MR says... +lua banks
2020-11-22 23:19:24 +02:00
Riku Salminen
571d6f2124
Reset a couple of other variables while we're at it
2020-11-14 20:17:35 +02:00
Riku Salminen
33e99a0276
Emeralds and tokens now reset when restarting marathon mode in first level
2020-11-14 19:18:36 +02:00
Louis-Antoine
ddec491b0b
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate
2020-10-24 16:21:44 +02:00
James R
da41c5b79d
Merge branch 'skip-credits-gone-wrong' into 'next'
...
Fix clients being able to skip credits AGAIN (closes #339 )
Closes #339
See merge request STJr/SRB2!1182
2020-10-12 18:09:48 -04:00
James R
c9532c32e2
Merge branch 'specialstagecheck' into 'next'
...
A special stage is a special stage, even outside of coop.
Closes #211
See merge request STJr/SRB2!1180
2020-10-12 18:08:02 -04:00
James R
1d6fbed871
Oops, go straight to evaluation if not in a netgame
...
serverrunning means that you are actually the server.
2020-10-09 13:16:56 -07:00
sphere
734a94439c
how did this even happen
2020-10-09 05:55:10 -04:00
James R
6363162826
Merge branch 'sanity-meter-empty' into 'next'
...
Replace cvar initializers with a macro
See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
sphere
77f64b0a81
A special stage is a special stage, even outside of coop.
2020-10-08 18:45:20 +02:00
James R
b7c4a82a0f
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
Zachary McAlpin
ae238236c8
Update comment
2020-10-06 16:43:14 -05:00
Zachary McAlpin
36d7ddeb09
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into playercmd-kart-port
2020-10-06 02:07:05 -05:00
Lachlan Wright
05f4fb13fe
Merge branch 'special-stage-respects-nextmapoverride' into 'next'
...
Make Special Stage map transitions respect nextmapoverride.
See merge request STJr/SRB2!1129
2020-09-27 22:42:07 -04:00
James R
c0abb2ca09
Don't let players change their name more than five times per minute
...
(ported 2948885660 and 4e9d006c37 )
2020-09-22 12:04:28 -07:00
GoldenTails
ba4310939a
Make Special Stage map transitions respect nextmapoverride.
...
In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars.
It's otherwise impossible to do so via Lua.
2020-08-26 23:22:53 -05:00
Louis-Antoine
8471f9e71f
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
...
# Conflicts:
# src/d_clisrv.c
# src/d_clisrv.h
# src/d_net.c
# src/p_saveg.c
# src/p_saveg.h
2020-08-13 13:53:10 +02:00
James R
0a85046b22
Merge branch 'bt_spin' into 'next'
...
Replace all occurances of BT_USE with BT_SPIN (2.2!)
See merge request STJr/SRB2!982
2020-08-09 21:03:17 -04:00
Zachary McAlpin
70fc6854b1
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port
2020-07-30 15:37:41 -05:00
lachwright
12c622902f
Make old analog functional again
2020-07-30 18:22:15 +08:00
James R
329bd3e36a
Fix Credits sequence from Extras being unskippable
...
This is because a server is not started before going to the credits. I'm way
too stupid/lazy to try starting a server, so have a special case!
2020-07-24 03:58:38 -07:00
Zachary McAlpin
6877df94bc
Ported Lat's PlayerCmd hook to vanilla SRB2
2020-07-17 00:08:38 -05:00
toaster
de1257d524
Two minor fixes for Marathon Mode.
...
* Apply the RTA penalty to the live event backup rather than the current timer. (Resolves #184 )
* Snap the character name and timer mode text to the bottom of the screen, just above the bar.
2020-07-12 13:00:08 +01:00
GoldenTails
b3198ed063
Replace PF_USEDOWN with PF_SPINDOWN
2020-07-11 21:59:54 -05:00
GoldenTails
50fd9de9d8
Oops! Missed a couple...
2020-07-11 21:59:54 -05:00
GoldenTails
36e1c30e19
Replace all occurances of BT_USE with BT_SPIN (2.3?)
...
I'd use `next-major` but it doesn't exist lol
2020-07-11 21:59:54 -05:00
toaster
25564e5cf5
Merge branch 'marathoninfo' into 'next'
...
Marathon Run adjustments
See merge request STJr/SRB2!1048
2020-07-10 17:54:51 -04:00
toaster
7a8f44613c
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
1d0453c5d4
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
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
Steel Titanium
f891c6cde4
Add support for saving/loading per-skin NiGHTS replays
2020-06-28 16:59:36 -04: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
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07: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
SteelT
dbd5198ac2
Merge branch 'marathonmode' into 'next'
...
MARATHON RUN
See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
Lachlan Wright
5263b8cf63
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
LJ Sonic
aeeb6e1b02
Merge branch 'next' into 'fix-spawn-desynch'
...
# Conflicts:
# src/p_map.c
2020-06-01 08:15:02 -04:00
lachwright
48f167d75c
Merge branch 'next' into dashmode-fixes
2020-05-30 18:13:21 +08:00
Monster Iestyn
239b758cd1
Merge branch 'master' into next
2020-05-28 16:34:06 +01:00