Commit graph

1631 commits

Author SHA1 Message Date
Sally Coolatta
8071ec92e8 InputDown -> PlayerInputDown, JoyAxis -> PlayerJoyAxis 2020-08-10 17:00:45 -04:00
Sally Coolatta
a771bb0047 Merge g_game.c/h 2020-08-10 13:09:26 -04: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
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
20dcd07fa4 Merge g_game.c/h
Also includes required changes to g_demo.c/h
2020-08-09 14:43:13 -04:00
James R
3332c22801 Fault again if you spectate then respawn during a fault 2020-08-05 05:07:42 -07:00
Sal
21dfe49bf8 Merge branch 'antigrav-respawn' into 'master'
Antigravity fixes, round 2

See merge request KartKrew/Kart!305
2020-07-31 21:55:38 -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
Sally Coolatta
c45a67c3f9 Pre start bulbs 2020-07-29 01:19:53 -04:00
Sally Coolatta
69b6ba2f18 I tore apart the entire code to try and fix braking friction and gave up, so now it's back to v1
My rewrites clean up a LOT of weird/misleading behavior anyway, so I'm gonna push this regardless. Someone else will have to figure out another way to reimplement braking friction though -- we can't use it as is because it prevents being able to bump people.
2020-07-28 03:34:39 -04:00
Sally Coolatta
b08459cbee Buffer time before countdown depends on player count, no intro spin in 1v1 2020-07-27 23:31:46 -04:00
Latapostrophe
b62ef5a51d Kill flipcam again but nothing else associated with it. 2020-07-26 21:15:32 +02:00
Latapostrophe
90cde7379c Revert "Push flipcam down the nearest staircase"
This reverts commit 06d70c1f8e.
2020-07-26 20:27:22 +02:00
Sally Coolatta
f0044e05c1 Crossing the finish line first before anyone else gives you a free rainbow boost 2020-07-24 21:41:41 -04:00
Latapostrophe
06d70c1f8e Push flipcam down the nearest staircase 2020-07-24 16:17:07 +02: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
Sally Coolatta
5c1a33f95c Increase buffer time so that high speed characters have time to get in position, change ra_timeskip to introtime 2020-07-24 03:13:17 -04:00
Sally Coolatta
fc89f2cc47 Remove start boosts, let you roam, kill you for crossing the line before the start 2020-07-24 02:59:47 -04:00
Sally Coolatta
25e9c72bab Merge branch 'master' into spindash 2020-07-23 19:12:00 -04:00
Sally Coolatta
ef2579f2b3 Merge branch 'master' into draw-flags 2020-07-20 13:38:48 -04: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
Latapostrophe
01ecc8573a Actually use the proper player for followercolor, for real this time 2020-06-14 17:06:46 +02:00
Latapostrophe
6d07126283 Use the proper player to save followercolor in replays this time around 2020-06-14 16:59:46 +02:00
Latapostrophe
4eac7f8366 Merge branch 'v2-master' into followme-internal 2020-06-10 23:38:19 +02:00
Latapostrophe
478e9cee7c Use P_SetTarget 2020-06-09 19:59:46 +02:00
Latapostrophe
396bd69e84 Don't save follower skin in replays if there's no follower... 2020-06-09 18:10:09 +02:00
lachwright
b4057d10e7 Merge branch 'master' into spindash 2020-06-09 03:55:55 +08:00
Sal
7555177cb1 Merge branch 'viewpoint-reset' into 'master'
Reset some viewpoints properly (closes #69)

Closes #69

See merge request KartKrew/Kart!282
2020-06-08 15:01:25 -04:00
Latapostrophe
ef45949202 Fix followercolor not being saved in replays 2020-06-08 20:36:48 +02: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
Sally Coolatta
3e36e15628 Merge master 2020-06-08 00:52:37 -04:00
Latapostrophe
cab9c2a139 Merge branch 'v2-master' into followme-internal 2020-06-07 23:56:32 +02:00
James R
2918c1a9a7 Merge branch 'nametags' into 'master'
Online name tags

See merge request KartKrew/Kart!279
2020-06-07 04:38:20 -04:00
Sally Coolatta
559b879a28 move bot ticcmd to SV_Maketic 2020-06-07 03:41:56 -04:00
Sally Coolatta
72e82ade04 Merge branch 'master' into nametags 2020-06-07 01:30:47 -04:00
Sal
58dbdc2378 Merge branch 'grand-pricks' into 'master'
Grand pricks

See merge request KartKrew/Kart!258
2020-06-07 01:28:35 -04:00