Commit graph

8166 commits

Author SHA1 Message Date
James R
0fdf838c86 Merge branch 'dashmode-ctf-monitors' into 'next'
Don't let Metal pop the enemy team's monitors (closes #94)

See merge request STJr/SRB2!584
2019-12-31 01:31:55 -05:00
James R
3bcfe5ae99 Merge branch 'dashspeed-fix' into 'next'
Cap dashspeed between mindash and maxdash before revving.

See merge request STJr/SRB2!565
2019-12-31 01:31:43 -05:00
James R
93d5a9a174 Truncate gametype name in server list if it's too long 2019-12-30 22:23:19 -08:00
James R
6d042c4d3f Replace gametype with gametypename in SERVERINFO
PACKETVERSION 1
2019-12-30 22:18:55 -08:00
fickleheart
0ffb1e11f9 Fix tailsbot behavior that broke with Simple mode 2019-12-30 23:58:58 -06:00
James R
ec72c69614 Make the menu option for renderer switching transparent under NOHW 2019-12-30 21:45:19 -08:00
James R
7616bf5734 IT_PAIR for when you want to define both sides of a menu item 2019-12-30 21:40:13 -08:00
Tatsuru
50ffcba552 Small 2019-12-31 01:48:50 -03:00
James R
3b30fcc5fa Don't let the user switch to OpenGL if NOHW 2019-12-30 20:29:41 -08:00
Tatsuru
15d4829e19 Appease the C90 entity 2019-12-31 01:20:11 -03:00
James R
73643dafaf Fix NOHW compiling 2019-12-30 20:18:08 -08:00
James R
4f8775d560 Fix NOMIXER compiling 2019-12-30 20:08:29 -08:00
Tatsuru
5cf362dd87 Disable Minecart Spawners for players already riding a minecart 2019-12-31 00:38:09 -03:00
Nami
ee0e68d8dc I removed a hook I left behind and forgot to save the change before committing :upside_down: 2019-12-30 19:22:12 -08:00
James R
cdadd86780 Fix NOOPENMPT compiling 2019-12-30 19:19:17 -08:00
Nami
20494c4c42 Move PreThinkFrame hook back a bit, now runs before PlayerThink 2019-12-30 19:11:49 -08:00
Nami
4456ff50ab Revert changes to searchBlockmap because on reflection, the benefits didn't outweigh breaking every current usage of it
Readd ThinkFrame in its original position
PostThinkFrame now runs at the end of P_Ticker, only MapEnd runs after it
2019-12-30 19:04:27 -08:00
James R
7d6d8b3b6e Fix command not running if it was split by COM_BufAddText
(Looks at d57083264e93f1020c2730e072c7a7b5417e08b3...)
2019-12-30 18:47:21 -08:00
James R
46c0d62a06 Fix unclosed quotes leaving the escape character in 2019-12-30 18:44:13 -08:00
Jaime Passos
2bdd411736 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 23:21:42 -03:00
James R
2e8f83b79c Use gametypecount in G_GetGametypeByName 2019-12-30 17:57:38 -08:00
James R
81bdd2d473 Merge remote-tracking branch 'origin/next' into local-lua-commands 2019-12-30 15:08:34 -08:00
Zachary McAlpin
850299fb32 Merge branch 'next' into playerthink-hook 2019-12-30 16:35:50 -06:00
fickleheart
5f50f7e8ae Fix spying on simple mode players having dumb camera angles 2019-12-30 15:44:52 -06:00
Jaime Passos
585db9fe2d Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 18:39:31 -03:00
fickleheart
4a2492e8e1 Fix camera reset button 2019-12-30 15:34:43 -06:00
James R
67ca512120 Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08: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
James R
0408572380 Merge branch 'modid' into 'next'
Put a mod name in SERVERINFO

See merge request STJr/SRB2!577
2019-12-30 15:41:08 -05:00
James R
14fb5dccc8 Merge branch 'renderswitch' into 'master'
Renderer switching

See merge request STJr/SRB2!550
2019-12-30 15:36:17 -05:00
James R
4a4fd1051b Revert revert revert
This reverts commit 41a8bed879.
This reverts commit e37e9b0f99.
2019-12-30 12:31:53 -08:00
MascaraSnake
1654119ae9 -Set defaults for vertex and mapthing fields in textmap
-Fix P_InitializeSector being called too early (band-aid fix for now, will reorganize this properly later)
2019-12-30 21:23:00 +01: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
f8599ffcb9 Save separate camera settings for standard/simple modes 2019-12-30 12:10:38 -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
b4924fdfed Fix camera reset snap in simple controls 2019-12-30 11:22:54 -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
MascaraSnake
dff1e92ba8 Add support for flat offset and rotation fields in UDMF 2019-12-30 17:28:10 +01:00
MascaraSnake
b22460bd32 Some minor refactoring of textmap loading code 2019-12-30 16:28:22 +01:00
Jaime Passos
12068930b2 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03:00
Jaime Passos
8d1ad4dc2e Fix alignment in R_ThickStepping 2019-12-30 12:02:09 -03:00
Jaime Passos
2c247d8210 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 11:49:12 -03:00
Nev3r
e0b4921855 Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser 2019-12-30 14:48:10 +01:00
Nev3r
839718499d Make P_LoadMapData() a return a boolean as well as P_LoadMapFromFile(); if they fail to load, they return false, and thus P_SetupLevel() will also return false.
TextmapCount() also now returns false if brackets are left open inside a textmap.
2019-12-30 14:47:48 +01:00
Nev3r
73698c70aa Replace INT16_MAX with LUMPERROR in lump check. 2019-12-30 14:45:39 +01:00