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
fickleheart
4f71096ba5
Add cvar to use abilities in input direction
2019-12-08 14:17:48 -06:00
fickleheart
4c41bc1478
Consolidate G_BuildTiccmd
2019-12-08 13:27:11 -06:00
MascaraSnake
fffd385151
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Jaime Passos
0fa1525749
Remove unnecessary function parameters from title card code
2019-12-05 01:58:19 -03:00
Jaime Passos
4d18646881
fix RA fade
2019-11-23 18:15:09 -03:00
Jaime Passos
8ce00492c2
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-18 17:55:47 -03:00
Jaime Passos
8ad20c1108
Organize
2019-11-18 12:56:41 -03:00
Louis-Antoine
d3b113c84a
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
Louis-Antoine
28b0b7c404
Let players move after completing the level
...
This only takes effect in co-op,
and can be disabled with "exitmove off"
2019-11-15 15:35:28 +01:00
MascaraSnake
302e122d64
Merge branch 'map-by-name' into 'master'
...
New map command
See merge request STJr/SRB2Internal!424
2019-11-13 13:45:36 -05:00
toaster
f7c5774b7e
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
...
# Conflicts:
# src/p_user.c
2019-11-12 21:56:46 +00:00
toaster
2a16cf539a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
...
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
toaster
91d2beebfa
* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following...
...
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
James R
08ad257e17
Extend map name text matching code into a function
2019-10-27 14:23:03 -07:00