9339 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaime Passos	7b54846a02	Merge remote-tracking branch 'origin/master' into software-clownery	2019-12-30 23:21:42 -03:00
James R	5e94ca07bc	Use gametypecount in G_GetGametypeByName	2019-12-30 17:57:38 -08:00
James R	e3fcd860de	Merge remote-tracking branch 'origin/next' into local-lua-commands	2019-12-30 15:08:34 -08:00
Zachary McAlpin	ed5bf1ad9d	Merge branch 'next' into playerthink-hook	2019-12-30 16:35:50 -06:00
fickleheart	85e2e92ee0	Fix spying on simple mode players having dumb camera angles	2019-12-30 15:44:52 -06:00
Jaime Passos	181a366d4a	Merge remote-tracking branch 'origin/next' into respawndelaygametyperule	2019-12-30 18:39:31 -03:00
fickleheart	2c45ecbaa5	Fix camera reset button	2019-12-30 15:34:43 -06:00
James R	fc8c0f8a9a	Merge remote-tracking branch 'origin/master' into next	2019-12-30 13:16:53 -08:00
fickleheart	a51f2500e0	Update playstyle menu handling to use analog/directionchar combo	2019-12-30 15:15:37 -06:00
fickleheart	c3d14064e2	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	80bb6fe7a0	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	5e5f3c4fa7	Merge branch 'renderswitch' into 'master' ... Renderer switching See merge request STJr/SRB2!550	2019-12-30 15:36:17 -05:00
James R	d670139404	Revert revert revert ... This reverts commit 6546e3c3bc. This reverts commit 8a15e9abc4.	2019-12-30 12:31:53 -08:00
MascaraSnake	013f1f70d9	-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	e0f35d207f	Convert analog/directionchar cvars into 2-long arrays	2019-12-30 14:01:14 -06:00
fickleheart	631b5ff883	Disable lock-on in Ringslinger	2019-12-30 12:13:41 -06:00
fickleheart	085c39128f	Save separate camera settings for standard/simple modes	2019-12-30 12:10:38 -06:00
fickleheart	b46cbe76d6	Somehow miss committing the ACTUAL stickyhold part	2019-12-30 11:36:59 -06:00
fickleheart	d980d526c8	Change defaults to match my personal settings	2019-12-30 11:36:40 -06:00
fickleheart	7fa9eed573	Fix camera reset snap in simple controls	2019-12-30 11:22:54 -06:00
fickleheart	ebbe5938a8	Fix tailsbot flying weird with P1=standard P2=simple controls	2019-12-30 11:07:29 -06:00
fickleheart	f4e7227e11	Fix compilation errors	2019-12-30 11:01:56 -06:00
fickleheart	a9b80bf1f0	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	05a97530c1	Add support for flat offset and rotation fields in UDMF	2019-12-30 17:28:10 +01:00
MascaraSnake	72bb673209	Some minor refactoring of textmap loading code	2019-12-30 16:28:22 +01:00
Jaime Passos	7676f11112	Merge remote-tracking branch 'origin/next' into respawndelaygametyperule	2019-12-30 12:09:45 -03:00
Jaime Passos	a04834d1aa	Fix alignment in R_ThickStepping	2019-12-30 12:02:09 -03:00
Jaime Passos	590d6729e6	Merge remote-tracking branch 'origin/master' into software-clownery	2019-12-30 11:49:12 -03:00
Nev3r	99aace19f5	Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser	2019-12-30 14:48:10 +01:00
Nev3r	4a5498473c	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	f9d6e26558	Replace INT16_MAX with LUMPERROR in lump check.	2019-12-30 14:45:39 +01:00
Nev3r	7ae2143c91	Add a disclaimer when loading textmaps/UDMF.	2019-12-30 14:42:41 +01:00
MascaraSnake	ea87af0076	Refactor TextmapParse	2019-12-30 14:33:41 +01:00
Nev3r	c6c00aa7d5	Tweak TextmapCount()'s bracket detection to account for multiple levels, if that ever happens.	2019-12-30 13:46:37 +01:00
MascaraSnake	4aee4e3684	Refactor TextmapCount	2019-12-30 13:27:05 +01:00
Monster Iestyn	7c9b1ee2cb	Fix P_SetTarget crash by setting th->target to NULL first	2019-12-30 11:49:01 +00:00
Nev3r	e43df2993f	Move TextmapFixFlatOffsets() above P_LoadTextmap() so that it can compile.	2019-12-30 12:33:24 +01:00
Nev3r	f9aabe753e	Refactor TextmapFixFlatOffsets().	2019-12-30 12:31:55 +01:00
Nev3r	493c6c8ae2	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA	2019-12-30 12:23:31 +01:00
Nev3r	f49b8de5fd	Adapt P_MakeMapMD5() for textmaps.	2019-12-30 12:07:54 +01:00
Nev3r	ed114f655b	Fixed missing M_GetToken(NULL);	2019-12-30 12:07:02 +01:00
lachwright	0839287609	Add unused sounds and remove unused sound slots	2019-12-30 19:00:45 +08:00
Nev3r	aaef412823	Add basic textmap support; currently crashes when trying to free the virtres, at vres_free().	2019-12-30 11:33:22 +01:00
James R	c46bfa2be9	Merge branch 'saloondoor-fix' into 'next' ... Fix saloon doors not letting players through when marked with the Ambush flag See merge request STJr/SRB2!600	2019-12-30 00:25:37 -05:00
James R	65921c1702	Improve COM_AddCommand boolean deprecated warning	2019-12-29 21:09:07 -08:00
Jaime Passos	757480f219	Some cleanup in general.	2019-12-30 02:07:39 -03:00
James R	802ef0aba1	COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd	2019-12-29 21:07:28 -08:00
James R	6546e3c3bc	No.	2019-12-29 21:02:42 -08:00
James R	dc757f3086	Fuck magic numbers; COM_ flags for Lua commands!	2019-12-29 21:00:38 -08:00
James R	8a15e9abc4	Bro player 2 can't use the console	2019-12-29 21:00:38 -08:00