fickleheart
|
4a2492e8e1
|
Fix camera reset button
|
2019-12-30 15:34:43 -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 |
|
fickleheart
|
0f62ada954
|
Disable lock-on in Ringslinger
|
2019-12-30 12:13:41 -06:00 |
|
fickleheart
|
774412bbfd
|
Somehow miss committing the ACTUAL stickyhold part
|
2019-12-30 11:36:59 -06:00 |
|
fickleheart
|
aadc91e4e8
|
Change defaults to match my personal settings
|
2019-12-30 11:36:40 -06:00 |
|
fickleheart
|
0577c151ce
|
Fix tailsbot flying weird with P1=standard P2=simple controls
|
2019-12-30 11:07:29 -06:00 |
|
fickleheart
|
205b1cc4cd
|
Fix compilation errors
|
2019-12-30 11:01:56 -06:00 |
|
fickleheart
|
be9384ddd9
|
Merge branch 'master' into newcontrols
# Conflicts:
# src/d_netcmd.c
# src/g_game.c
# src/g_game.h
# src/m_menu.c
|
2019-12-30 10:47:09 -06:00 |
|
Jaime Passos
|
12068930b2
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-30 12:09:45 -03:00 |
|
MascaraSnake
|
6b53b883c5
|
Merge branch 'mapload-refactor' into 'next'
Refactor map loading functions
See merge request STJr/SRB2!594
|
2019-12-29 10:04:27 -05:00 |
|
MascaraSnake
|
8d561a20c1
|
Merge branch 'kill-zshift' into 'next'
Eliminate all unnecessary uses of ZSHIFT
See merge request STJr/SRB2!580
|
2019-12-29 08:35:52 -05:00 |
|
James R
|
909a9dccc7
|
Don't let us warp to a map that doesn't exist (really!)
Okay so 66524a1e3f, I WAS mistaken! Except that's
not how you check for a map's existence, at least not how the old map command
did it.
|
2019-12-29 02:44:27 -08:00 |
|
James R
|
69535cf202
|
I'm still an idiot
|
2019-12-29 02:16:37 -08:00 |
|
James R
|
0004f47f94
|
Who cares?
|
2019-12-29 02:15:48 -08:00 |
|
James R
|
08016fbdca
|
Split map code checking from Command_Map_f
|
2019-12-29 02:14:02 -08:00 |
|
Steel Titanium
|
0ecbd0baec
|
Fix emerald hunt not working properly
|
2019-12-28 21:57:29 -05:00 |
|
Jaime Passos
|
bd28daea02
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-28 21:39:38 -03:00 |
|
Jaime Passos
|
37b1953a14
|
Disallow few more characters.
|
2019-12-28 21:05:42 -03:00 |
|
Jaime Passos
|
4dafc59133
|
Remove characters that will not be allowed in the constant string.
|
2019-12-28 20:54:22 -03:00 |
|
Jaime Passos
|
e5e4b4891a
|
Add GTR_CUTSCENES. And I ran out of rule slots. Cool.
|
2019-12-28 20:33:28 -03:00 |
|
Jaime Passos
|
d165634870
|
Add GTR_FRIENDLY.
|
2019-12-28 19:56:18 -03:00 |
|
Jaime Passos
|
63132da7e0
|
Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.
|
2019-12-28 19:49:34 -03:00 |
|
Jaime Passos
|
a7fa90d11d
|
Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.
|
2019-12-28 19:47:03 -03:00 |
|
MascaraSnake
|
af85de53d7
|
Rename P_LoadThingsOnly to P_RespawnThings to make it clearer that it doesn't actually reload the things from the file, it just respawns them.
|
2019-12-28 14:13:26 +01:00 |
|
MascaraSnake
|
f67ff6d97e
|
Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions
|
2019-12-28 11:30:39 +01: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
|
ca3941f5b8
|
use GTR_DEATHMATCHSTARTS
|
2019-12-27 12:14:33 -03:00 |
|
MascaraSnake
|
82d21224cf
|
Merge branch 'next' into kill-zshift
# Conflicts:
# src/p_mobj.c
|
2019-12-27 08:11:04 +01:00 |
|
Jaime Passos
|
be32397562
|
Respawn delay gametype rule
|
2019-12-27 01:44:27 -03:00 |
|
James R
|
0fd77ff5f4
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-26 15:35:53 -08:00 |
|
James R
|
bd472eb353
|
Merge branch 'turnmultiplier' into 'master'
Option to increase the turning speed
See merge request STJr/SRB2!553
|
2019-12-26 18:18:23 -05:00 |
|
MascaraSnake
|
b1a43c7c4a
|
Use mthing->z instead of mthing->options >> ZSHIFT in G_AddGhost
|
2019-12-26 20:54:06 +01:00 |
|
Jaime Passos
|
42c71d3f42
|
Merge remote-tracking branch 'origin/next' into gametype-clownery
|
2019-12-25 06:09:00 -03:00 |
|
Jaime Passos
|
31eeb90056
|
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
|
2019-12-24 17:55:46 -03:00 |
|
James R
|
27e251e7fc
|
Merge branch 'wipes2' into 'master'
Wipe styles cleanup
See merge request STJr/SRB2!525
|
2019-12-24 14:47:14 -05:00 |
|
Jaime Passos
|
debacf34bb
|
Turn the babysitting deterrent into its own rule.
|
2019-12-24 16:30:18 -03:00 |
|
Jaime Passos
|
c6dd9f016e
|
Title card fixes.
|
2019-12-24 16:22:25 -03:00 |
|
Jaime Passos
|
c76154d3a1
|
Don't warn about missing CTF starts if the gametype doesn't have team flags.
|
2019-12-24 16:12:05 -03:00 |
|
Jaime Passos
|
c832d26ee9
|
ViewpointSwitch improvements.
|
2019-12-23 20:22:57 -03:00 |
|
Jaime Passos
|
73bb0567cc
|
Turn GTR_CHASECAM into GTR_FIRSTPERSON.
|
2019-12-23 19:24:06 -03:00 |
|
Jaime Passos
|
100144d4db
|
Merge remote-tracking branch 'origin/master' into gametype-clownery
|
2019-12-23 18:21:13 -03:00 |
|
James R
|
9fd3088956
|
Whoops I forgot player 2
|
2019-12-22 21:29:41 -08:00 |
|
James R
|
2b2d4c139f
|
Merge remote-tracking branch 'origin/master' into turnmultiplier
|
2019-12-22 21:26:36 -08:00 |
|
Jaime Passos
|
f3a91afe90
|
Make G_PlatformGametype only check the gametype rules, to avoid unintended side effects
|
2019-12-19 16:31:38 -03:00 |
|
Jaime Passos
|
b8671edef4
|
Removing commented out code
|
2019-12-19 16:22:55 -03:00 |
|
Jaime Passos
|
a4ce7e908d
|
Remove GTR_NOGAMEEND
|
2019-12-19 16:13:27 -03:00 |
|