Lachlan Wright
b37d6ba94d
Merge branch 'name-change-spam' into 'next'
...
Don't let players change their name more than five times per minute
See merge request STJr/SRB2!1155
2020-09-25 09:36:39 -04:00
James R
c0abb2ca09
Don't let players change their name more than five times per minute
...
(ported 29488856604e9d006c37
2020-09-22 12:04:28 -07:00
lachwright
c4a4608236
Let analog control schemes control objectplace like standard control schemes
2020-09-06 19:03:17 +09:30
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
Louis-Antoine
d886e35576
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Monster Iestyn
ffb2674a6e
Merge branch 'next' into demos-refactor
...
# Conflicts:
# src/g_game.c
(also update g_demo.c)
2020-03-20 17:48:31 +00:00
Monster Iestyn
ac7a71f85b
Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c
2020-03-19 20:09:55 +00:00
Jaime Passos
84f977ff7a
Fix G_TOLFlag returning the wrong type
2020-03-02 00:20:53 -03:00
Jaime Passos
9d0e3465f9
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Louis-Antoine
a997683d1c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2020-01-22 03:57:22 +01:00
Louis-Antoine
7d615ed94b
Refactor player spawning code a little
2020-01-22 03:19:15 +01:00
fickleheart
067b132eb1
Merge remote-tracking branch 'origin/next' into next-newcontrols
2020-01-04 09:57:09 -06:00
fickleheart
ce0c42a767
Merge branch 'newcontrols' into next-newcontrols
2020-01-04 09:56:24 -06:00
fickleheart
992ead1c85
Merge remote-tracking branch 'origin/master' into newcontrols
2020-01-04 09:35:12 -06:00
James R
b342301373
Merge remote-tracking branch 'origin/master' into next
2020-01-01 15:39:05 -08:00
fickleheart
77ba835f4f
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
fickleheart
0ffb1e11f9
Fix tailsbot behavior that broke with Simple mode
2019-12-30 23:58:58 -06:00
fickleheart
758bb8f3ae
Update playstyle menu handling to use analog/directionchar combo
2019-12-30 15:15:37 -06:00
fickleheart
e0d09a457e
Convert simple movement to directionchar+analog
...
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
2019-12-30 15:05:24 -06:00
fickleheart
61a8f715ac
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 14:01:14 -06:00
James R
08016fbdca
Split map code checking from Command_Map_f
2019-12-29 02:14:02 -08:00
Jaime Passos
62d79eef2a
Same deal, but for starposts.
2019-12-27 17:14:56 -03:00
Jaime Passos
ff80c4ef4d
Preparing for the inevitable gametype rule that will handle cooplives...
2019-12-27 17:08:20 -03:00
Jaime Passos
203f4c50a0
add G_CompetitionGametype(void)
2019-12-27 12:28:00 -03:00
Jaime Passos
c6dd9f016e
Title card fixes.
2019-12-24 16:22:25 -03:00
Jaime Passos
100144d4db
Merge remote-tracking branch 'origin/master' into gametype-clownery
2019-12-23 18:21:13 -03:00
Jaime Passos
920d99976c
Lua! Lua! Lua!
...
Expecting the buildbot to complain
2019-12-19 02:13:09 -03:00
Jaime Passos
156d5fd37f
Custom gametype rankings
2019-12-18 22:02:37 -03:00
Jaime Passos
968d1bb875
Fix warnings
2019-12-18 15:41:03 -03:00
Jaime Passos
78f4997164
GTR_EMERALDHUNT and GTR_SPAWNENEMIES
2019-12-18 14:57:42 -03:00
Jaime Passos
a82a5e664c
SOC stuff
2019-12-18 14:37:48 -03:00
Jaime Passos
9b900e6fc7
TOL/Level platter stuff
2019-12-18 13:24:10 -03:00
Jaime Passos
c11865e7e9
G_NewGametype
2019-12-18 12:23:42 -03:00
Jaime Passos
d7cb14d38e
Gametype rules draft, mind the debug command
2019-12-18 01:25:57 -03:00
Sryder
b4e8f71acb
Port the deadzone cvar stuff from kart.
...
Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
fickleheart
17c3ef073e
Add analog deadzone option separate from digital deadzones
2019-12-14 19:41:54 -06:00
fickleheart
603d52a723
Allow setting center view to a toggle
2019-12-14 19:17:41 -06:00
fickleheart
4e8bf7a226
Expand options for aim assist
...
This will need a lot of testing to ensure each type
works properly.
2019-12-12 23:03:51 -06:00
fickleheart
4cc0bb4746
Add boss target assist and finally organize camera options
2019-12-12 00:48:15 -06:00
fickleheart
0ab83319a5
Move Z-targeting behavior to Center View
2019-12-11 21:09:23 -06:00
fickleheart
f886eb3a3c
Add option to always turn with input while locked
...
Uhhh also camera options scrolls now.
2019-12-10 22:01:17 -06:00
fickleheart
8ce189dcba
Give spindash turn a separate slider
2019-12-10 08:07:41 -06:00
fickleheart
26ab979bdb
Port deadzone configuration from Kart
...
I don't feel like getting out my gamepad, so I'll trust
that this works.
2019-12-09 20:39:05 -06:00
fickleheart
8d66e90810
Lock camera behind player when holding cam reset
...
This also disables abilitydirection movement temporarily.
2019-12-09 20:21:32 -06:00
fickleheart
eaef39c974
Shift camera sideways toward player angle
2019-12-08 15:54:16 -06:00
fickleheart
98b6fc3adf
Automatically rotate camera to reflect player actions
2019-12-08 14:35:50 -06:00
