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
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
James R
a1502046cf
Merge remote-tracking branch 'origin/master' into resume
2020-04-30 09:32:40 -07:00
James R
8490919257
Bye death fades
2020-04-19 22:06:22 -07:00
James R
7e0aa16e70
Reset Invincibility (and Grow) music to the start if stacked
...
Toggleable via the resetspecialmusic cvar.
2020-03-21 22:28:55 -07:00
James R
7023ccc239
Death fades music
...
Cvars are respawnfademusicout and respawnfademusicback. Both measure
milliseconds.
2020-03-21 22:28:55 -07:00
James R
911dd57334
Restore level music to where it left off
...
Toggleable via the resume cvar.
2020-03-21 22:28:55 -07:00
James R
8524c3749d
Fade level music back in after Invincibility and Grow
...
Cvars are invincibilitymusicfade and growmusicfade. Both measure milliseconds.
2020-03-21 22:28:54 -07:00
James R
52fa738ef8
Replace even more ints with INT32
2020-03-21 13:18:17 -07: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
James R
0c814ce42d
Sync look back
...
Also fixes look back applying to the first
player in parties instead of locally.
2020-02-23 23:21:20 -08:00
James R
02757eac82
Fix and fully implement leaving parties
2020-02-23 23:20:20 -08:00
James R
46ac563eaf
Implement big bad parties (splitscreen with network players)
...
Use the 'invite' command to invite another player to your party.
If that player accepts, via the 'acceptinvite' command, they and any
splitscreen players on their machine will be added after the players
in your party. They may also use the 'rejectinvite' command.
Use the 'leaveparty' command to leave a party. You and any splitscreen players
on your machine will be removed from the party. Players after you will be
shifted to take your place on the splitscreen.
2020-02-23 23:20:20 -08: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
