8665 commits

Author	SHA1	Message	Date
James R	e9843590da	Merge branch 'nohw-renderswitch' into 'master' ... NOHW V.S. Renderer Switching See merge request STJr/SRB2!609	2020-01-01 17:52:35 -05:00
MascaraSnake	2da9c3cf81	P_LoadTextmap: Bail out if certain mandatory fields are not set	2020-01-01 23:52:30 +01:00
James R	35fe2e7281	Merge branch 'quote-shenanigans' into 'master' ... Stuff I Broke: Commands See merge request STJr/SRB2!607	2020-01-01 17:52:21 -05:00
James R	01be810aee	Merge branch 'warp-by-name' into 'master' ... Properly fix the issue that !528 tried to; let the -warp parameter work with map name See merge request STJr/SRB2!596	2020-01-01 17:51:21 -05:00
James R	48c83be89e	Merge branch 'respawndelaygametyperule' into 'next' ... Gametype ruleset changes See merge request STJr/SRB2!585	2020-01-01 17:49:53 -05:00
Jaime Passos	874d4d01ee	Don't Y-billboard papersprite models (?!?!??!??!?!?)	2020-01-01 18:00:01 -03:00
Jaime Passos	03d4082f21	Rename functions	2020-01-01 17:46:26 -03:00
Jaime Passos	c7794d4ce0	Remove unused parameter	2020-01-01 17:36:55 -03:00
Jaime Passos	6d2f2e0865	Update copyrights	2020-01-01 17:30:07 -03:00
Jaime Passos	401c35b407	Fix transparent PNG conversion	2020-01-01 17:28:22 -03:00
Zachary McAlpin	7123abd493	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2020-01-01 13:31:07 -06:00
Alam Ed Arias	af57468e68	Merge branch 'master' into next	2020-01-01 14:29:30 -05:00
Jaime Passos	98b7d8aaca	Fix broken model light lists in ACZ3	2020-01-01 15:55:18 -03:00
Jaime Passos	35ff383a4a	Rename `seenplayer to seenfriend`	2020-01-01 15:17:29 -03:00
lachwright	dc7f10e17d	Allow 6-letter character names to be drawn with the thick font	2020-01-01 23:49:29 +08:00
MascaraSnake	4f26a8e73a	Move MAXFLATSIZE define to p_spec.h so p_spec.c doesn't have to redefine it	2020-01-01 16:01:07 +01:00
MascaraSnake	9cda82d896	Rework textmap parser to always read a parameter's value, even if it doesn't recognize the parameter	2020-01-01 15:52:59 +01:00
MascaraSnake	6724b11c36	Whoops	2020-01-01 15:11:39 +01:00
MascaraSnake	a41c640559	Move shared parts of sidedef initialization into P_InitializeSidedef	2020-01-01 15:10:41 +01:00
MascaraSnake	fe198b8a32	Check if certain mandatory linedef and sidedef fields are set, and use fallback values if not	2020-01-01 14:27:01 +01:00
MascaraSnake	b59532bcca	Setup repeatcnt in P_LoadSidedefs instead of P_ProcessLinedefsWithSidedefs, since UDMF can set it directly	2020-01-01 14:13:24 +01:00
MascaraSnake	24d68ba07e	P_LoadTextmap: Set defaults for all linedef and sidedef fields that UDMF is allowed to set	2020-01-01 13:40:17 +01:00
Louis-Antoine	caadf6aa61	Let the mouse move freely when a menu is open or game is paused ... That means you can now easily move your mouse out of SRB2's window and switch between several windows easily by just pressing escape! Any phase of the game that isn't actual gameplay counts as a menu, which means you can also move the mouse in cutscenes, at the title screen, server connection screen, and even when the chat or console are open.	2020-01-01 13:29:07 +01:00
Jaime Passos	b41cd59e51	Revert "Merge branch 'software-clownery' into 'master'" ... This reverts merge request !578	2019-12-31 23:40:17 +00:00
Tatsuru	caf47019ce	Or is it better like this?	2019-12-31 20:20:30 -03:00
Nami	ef4840555e	Add MobjLineCollide hook	2019-12-31 15:17:02 -08:00
Tatsuru	83467a7b3d	The dumbass forgot NiGHTS mode is also a carry power	2019-12-31 20:13:16 -03:00
Tatsuru	6e330348bc	Fix MP Special Stages crashing if a player is being carried when it ends	2019-12-31 19:38:11 -03:00
James R	2a9a3b9760	Merge branch 'fix-flight-indicator' into 'next' ... Remove flight indicator when AI Tails is taken over by second player See merge request STJr/SRB2!611	2019-12-31 17:17:21 -05:00
James R	f77188ef0f	Merge branch 'metal-fume-opacity' into 'next' ... Make Metal Sonic's jet fume opaque when re-emerging from water See merge request STJr/SRB2!612	2019-12-31 17:16:14 -05:00
James R	0cb76f63b7	Merge branch 'firefuck3' into 'next' ... Make elemental crop circle flames obey player gravity See merge request STJr/SRB2!613	2019-12-31 17:15:45 -05:00
James R	bd0deea11c	Merge branch 'minecartspawner-fix' into 'next' ... Disable minecart spawners for players already riding a minecart See merge request STJr/SRB2!608	2019-12-31 17:15:18 -05:00
Jaime Passos	c460775cd7	Merge branch 'fixcoronalist' into 'master' ... Fix broken corona list See merge request STJr/SRB2!605	2019-12-31 14:25:49 -05:00
fickleheart	b22de48c03	Merge branch 'next' into next-newcontrols ... # Conflicts: # src/g_game.c # src/p_setup.c	2019-12-31 12:58:36 -06:00
Nev3r	0979887600	Merge branch 'software-clownery' into 'master' ... Software clownery See merge request STJr/SRB2!578	2019-12-31 12:49:44 -05:00
Jaime Passos	1c048275da	**NEW!** hook_SeenPlayer	2019-12-31 14:37:45 -03:00
fickleheart	8bc58807aa	Software FOV ported from kart ... also fixes high software FOVs having buggy walls	2019-12-31 11:22:05 -06:00
Jaime Passos	cd1cc9a222	Fix desynch	2019-12-31 14:00:25 -03:00
Tatsuru	79f18a3c19	Got rid of the uhh	2019-12-31 11:19:54 -03:00
lachwright	e5e96cb271	Make elemental crop circle flames obey player gravity	2019-12-31 18:06:40 +08:00
lachwright	10b71d40b8	Make Metal Sonic's jet fume opaque when re-emerging from water	2019-12-31 17:26:35 +08:00
lachwright	342d80198c	Add missed semicolon, oops	2019-12-31 16:55:36 +08:00
lachwright	1a78b3548c	Remove flight indicator on death as well	2019-12-31 16:54:52 +08:00
lachwright	d3c56cd807	Remove flight indicator when AI Tails is taken over by second player	2019-12-31 16:48:29 +08:00
James R	939814d479	Merge remote-tracking branch 'origin/master' into next	2019-12-30 22:37:24 -08:00
James R	3112dff345	Merge branch 'oops' into 'next' ... Fix unknown gametype for map command crashing the game See merge request STJr/SRB2!606	2019-12-31 01:34:39 -05:00
James R	34687e85d7	Merge branch 'emeraldhunt-fix' into 'next' ... Fix emerald hunt not working properly See merge request STJr/SRB2!593	2019-12-31 01:34:17 -05:00
James R	b5df2d5c3f	Merge branch 'polyobj-waypoint-thinker-optimise' into 'next' ... Polyobj waypoint thinker optimise See merge request STJr/SRB2!586	2019-12-31 01:33:01 -05:00
James R	4b91e49bf4	Merge branch 'fix-lua-scorechains' into 'next' ... Fix scoreadd not doing anything in certain cases when modified by Lua See merge request STJr/SRB2!579	2019-12-31 01:32:22 -05:00
James R	077c453e33	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	8e61b1003a	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	b4ebb01e2d	Truncate gametype name in server list if it's too long	2019-12-30 22:23:19 -08:00
James R	281f30c4fd	Replace gametype with gametypename in SERVERINFO ... PACKETVERSION 1	2019-12-30 22:18:55 -08:00
fickleheart	0eb65d0fa7	Fix tailsbot behavior that broke with Simple mode	2019-12-30 23:58:58 -06:00
James R	7af2533d23	Make the menu option for renderer switching transparent under NOHW	2019-12-30 21:45:19 -08:00
James R	38492073fa	IT_PAIR for when you want to define both sides of a menu item	2019-12-30 21:40:13 -08:00
Tatsuru	b68a629a71	Small	2019-12-31 01:48:50 -03:00
James R	e8db39229c	Don't let the user switch to OpenGL if NOHW	2019-12-30 20:29:41 -08:00
Tatsuru	2d0cdbe34f	Appease the C90 entity	2019-12-31 01:20:11 -03:00
James R	36c5bb7b0d	Fix NOHW compiling	2019-12-30 20:18:08 -08:00
James R	782bf8d31e	Fix NOMIXER compiling	2019-12-30 20:08:29 -08:00
Tatsuru	47b096a357	Disable Minecart Spawners for players already riding a minecart	2019-12-31 00:38:09 -03:00
Nami	60928db0e0	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	4bf3597116	Fix NOOPENMPT compiling	2019-12-30 19:19:17 -08:00
Nami	41c902b819	Move PreThinkFrame hook back a bit, now runs before PlayerThink	2019-12-30 19:11:49 -08:00
Nami	a36920808b	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	ff47f911dc	Fix command not running if it was split by COM_BufAddText ... (Looks at 4865a190578b900b48571e74e0bd97bef88ea71b...)	2019-12-30 18:47:21 -08:00
James R	ab410652ae	Fix unclosed quotes leaving the escape character in	2019-12-30 18:44:13 -08:00
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
Jaime Passos	c303b1a435	Use strspn here.	2019-12-30 01:39:34 -03:00
Nami	58dd578b09	Let's try this again!	2019-12-29 20:36:24 -08:00
Tatsuru	3d724f302d	Fix saloon doors not letting players through when marked with the Ambush flag	2019-12-30 01:16:50 -03:00
Jaime Passos	773d564d6a	MUSICDEF parser changes.	2019-12-30 00:22:27 -03:00
James R	7886a4bbee	Don't warn if we start in OpenGL	2019-12-29 18:37:44 -08:00
James R	569453ee93	Warn when going to OpenGL from the menu	2019-12-29 18:37:22 -08:00
Zachary McAlpin	458f3cb14b	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-29 20:37:11 -06:00
GoldenTails	bc88def225	Slap in some Ctrl+Insert (copy) support too while I'm at it. ... Also added a comment but you didn't see that.	2019-12-29 20:22:58 -06:00
GoldenTails	9d701d722e	Reverted to better, less complex system, and added support for Shift+Insert and Shift+Delete. ... Major thanks to James for helping me. Turns out that strncpy thwarts the memory leaks for me. Silly, me!	2019-12-29 20:15:18 -06:00
James R	97c5e63dc3	Initialize 'supported' array	2019-12-29 16:52:39 -08:00
GoldenTails	ae9adce873	Replace magic numbers with less magic and more readable chars.	2019-12-29 18:26:56 -06:00
Jaime Passos	2f4c270a7b	Update r_segs.c	2019-12-29 19:43:38 -03:00
Zachary McAlpin	fdd1823ee2	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-29 16:19:53 -06:00
MascaraSnake	136c656cc0	Properly pass nodes data along to functions that need it without breaking the original data pointer	2019-12-29 22:11:15 +01:00
MascaraSnake	81422c4e6d	Revert "Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly" ... This reverts commit cfc6428569.	2019-12-29 21:57:47 +01:00
MascaraSnake	cfc6428569	Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly	2019-12-29 21:42:16 +01:00
MascaraSnake	e88556efe1	P_GetNodetype: The virtnodes pointer is supposed to be the output parameter, so we have to pass a pointer to that pointer	2019-12-29 21:00:20 +01:00
MascaraSnake	dd02fe0d78	P_GetNodetype: Set virtnodes for traditional Doom format	2019-12-29 20:43:41 +01:00
MascaraSnake	882e8ef7b8	Separate shared parts of seg initialization into P_InitializeSeg	2019-12-29 20:24:14 +01:00
MascaraSnake	36f86077da	Move loading of extended subsectors and segs into its own function	2019-12-29 19:54:04 +01:00
MascaraSnake	c287b86fab	Get rid of duplicated code in the extended seg parsing	2019-12-29 19:04:50 +01:00
MascaraSnake	3839e95d63	Move reading of extra vertices into separate function	2019-12-29 18:07:44 +01:00
MascaraSnake	45ca959f97	-Move reading of actual extended nodes into separate function, cutting down on code duplication in the process ... -Fix a typo in the segs reading	2019-12-29 17:52:49 +01:00
MascaraSnake	e5cb7a7833	Merge branch 'next' into newnodeformats	2019-12-29 16:05:55 +01:00
MascaraSnake	bf25128986	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	9d009edfc8	Move copying of the nodes signature out of the else case	2019-12-29 15:59:15 +01:00
MascaraSnake	0aed60f4de	Separate retrieval of nodetype and nodes lump into its own function (Function. Not file. Sorry.)	2019-12-29 15:50:53 +01:00
MascaraSnake	8032054a47	Separate loading of extended nodes into its own file	2019-12-29 15:15:32 +01:00
MascaraSnake	bb9093ff57	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
Nev3r	389b9e35c4	Add XNOD, XGLN and XGL3 BSP formats recognition and support.	2019-12-29 14:17:51 +01:00
MascaraSnake	c43a83dc04	Remove virtres_t pointer in P_SpawnSpecials that's no longer needed	2019-12-29 12:26:02 +01:00
MascaraSnake	abdfe60aa7	Store custom FOF flags directly in back toptexture field at map load instead of re-reading the sidedefs data later on	2019-12-29 12:01:41 +01:00
James R	566b4a1626	Don't let us warp to a map that doesn't exist (really!) ... Okay so 6464df9876, 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	404f3c13e4	If we move the -warp code down, map searching can be used	2019-12-29 02:31:48 -08:00
James R	0a014755b9	I'm still an idiot	2019-12-29 02:16:37 -08:00
James R	2ffff56b39	Who cares?	2019-12-29 02:15:48 -08:00
James R	19aafbfd0b	Split map code checking from Command_Map_f	2019-12-29 02:14:02 -08:00
James R	e04e1ac1b4	Merge branch 'mfe-lua' into 'next' ... Add missing MFE_ flags to Lua (resolves #103) See merge request STJr/SRB2!592	2019-12-29 04:44:29 -05:00
MascaraSnake	b333770a3b	Merge branch 'next' into mapload-refactor	2019-12-29 09:40:19 +01:00
MascaraSnake	cfadbb0f36	-Add linedef pointer to side_t, so sidedefs are able to tell if they're a front or back sidedef during setup ... -Fix a broken condition during setup of texture fields for the change music linedef	2019-12-29 09:39:50 +01:00
Zachary McAlpin	ef9a7b01f5	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-28 22:29:10 -06:00
Steel Titanium	0d15f27026	Fix emerald hunt not working properly	2019-12-28 21:57:29 -05:00
Alam Ed Arias	d588e3ca9c	Merge branch 'master' into next	2019-12-28 21:43:16 -05:00
Jaime Passos	f997866b4d	Fix broken dynlight list because of a SPR_NON2 that doesn't exist	2019-12-28 22:57:37 -03:00
James R	0237dc8ca2	Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC	2019-12-28 17:52:22 -08:00
Jaime Passos	244f0b228f	Fix M_PathParts instead	2019-12-28 22:18:41 -03:00
Jaime Passos	3bb7fd4cbf	Fix logfiles crashing Windoze	2019-12-28 22:14:23 -03:00
Jaime Passos	e63f77ea1a	Merge remote-tracking branch 'origin/next' into respawndelaygametyperule	2019-12-28 21:39:38 -03:00
James R	90e56bcdf9	Merge branch 'levelload-refactor' into 'next' ... Hack P_SetupLevel into little pie- actually just clean it up a bit See merge request STJr/SRB2!587	2019-12-28 19:37:06 -05:00
Jaime Passos	dede51fc4c	Disallow few more characters.	2019-12-28 21:05:42 -03:00
Jaime Passos	5b1b556946	Remove characters that will not be allowed in the constant string.	2019-12-28 20:54:22 -03:00
Zachary McAlpin	745cced08e	Execute LUAh_PlayerThink(player) at the end if the player has a valid mobj_t object	2019-12-28 17:40:47 -06:00
Jaime Passos	2166571920	Add GTR_CUTSCENES. And I ran out of rule slots. Cool.	2019-12-28 20:33:28 -03:00
Zachary McAlpin	5a9b80b5d5	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-28 17:32:27 -06:00
Jaime Passos	ae0acfba0f	Organise gametype ruleset again.	2019-12-28 20:18:21 -03:00
Jaime Passos	7a00b3a331	Add GTR_FRIENDLY.	2019-12-28 19:56:18 -03:00
Jaime Passos	093a1baf1d	Remove debugging stuff.	2019-12-28 19:50:14 -03:00
Jaime Passos	45af6d8899	Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.	2019-12-28 19:49:34 -03:00
Jaime Passos	4b604328d5	Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.	2019-12-28 19:47:03 -03:00
lachwright	5ed1dc5410	Remove MF_NOTHINK from join-breaking referenced objects	2019-12-29 03:01:09 +08:00
MascaraSnake	bd7765227e	Rename P_GroupLines to the more apt P_LinkMapData	2019-12-28 17:40:08 +01:00
MascaraSnake	7e5b87ce42	Fix debug prints	2019-12-28 17:37:32 +01:00
MascaraSnake	d38ee51d49	Separate setting of sector field defaults into P_InitializeSector	2019-12-28 17:29:58 +01:00
MascaraSnake	54fe91b1cc	Refactor P_SetupLines into P_InitializeLinedef	2019-12-28 17:21:31 +01:00
MascaraSnake	1ca25224c2	Fix P_SetupLines printing the wrong line number	2019-12-28 17:05:04 +01:00
MascaraSnake	85de3614cb	Standardize P_LoadVertices and P_LoadSidedefs	2019-12-28 16:58:48 +01:00
MascaraSnake	86d1fb73f4	Split P_LoadLineDefs2 into P_ProcessLinedefsWithSidedefs and P_CompressSidedefs	2019-12-28 16:49:56 +01:00
MascaraSnake	21b7507aee	Reorganize and partially rename map loading functions	2019-12-28 16:40:35 +01:00
MascaraSnake	b1854b5c96	Remove stray #endif	2019-12-28 14:50:00 +01:00
MascaraSnake	5590343043	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	3971067cf3	Remove some old #if 0'd code	2019-12-28 14:03:48 +01:00
MascaraSnake	303e6cee4a	Merge branch 'next' into mapload-refactor	2019-12-28 13:59:24 +01:00
MascaraSnake	ceca99e3c5	Fix accidental removal of sector_t's spawn_lightlevel initialization	2019-12-28 13:58:23 +01:00
MascaraSnake	e9376a8353	Cleaned up some more stuff in P_LoadLevel()	2019-12-28 12:48:32 +01:00
MascaraSnake	c059146937	Move more P_LoadLevel parts into subfunctions	2019-12-28 11:37:56 +01:00
MascaraSnake	319ed09c00	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
GoldenTails	f62579811b	Fixed messed up comparison.	2019-12-27 23:51:13 -06:00
James R	afc78fb56a	Only return if we damaged the monitor	2019-12-27 14:48:55 -08:00
Alam Ed Arias	94bb6655a5	Merge branch 'master' into next	2019-12-27 17:08:16 -05:00
James R	152a63b682	Merge branch 'rotsprite3' into 'next' ... More rollangle changes See merge request STJr/SRB2!582	2019-12-27 16:49:21 -05:00
James R	69ad41e58e	Merge branch 'skinusable-fix' into 'next' ... Fix edge case with R_SkinUsable See merge request STJr/SRB2!573	2019-12-27 16:49:06 -05:00
Jaime Passos	1fb244d87f	GTR_HIDETIME, not GTR_TAG	2019-12-27 18:24:08 -03:00
Jaime Passos	e03eaa554b	In P_KillPlayer, check for the gametype's rules, instead of the gametype itself, before bursting rings.	2019-12-27 17:22:55 -03:00
Jaime Passos	4b2c88fab8	Fix CoopLives_OnChange.	2019-12-27 17:15:23 -03:00
Jaime Passos	3b341245f1	Same deal, but for starposts.	2019-12-27 17:14:56 -03:00
Jaime Passos	1f96f70173	Preparing for the inevitable gametype rule that will handle cooplives...	2019-12-27 17:08:20 -03:00
Jaime Passos	ed29efd9eb	ST_drawLivesArea stuff.	2019-12-27 16:58:55 -03:00
Monster Iestyn	1d04001fdf	use P_SetTarget to assign a value to th->target	2019-12-27 19:24:00 +00:00
Monster Iestyn	282fe7667c	added a "target" pointer to polywaypoint_t, so the polyobj waypoint thinker doesn't have to re-find the next waypoint every tic	2019-12-27 19:10:14 +00:00
Alam Ed Arias	c394ad056c	use size_t to count the sprites	2019-12-27 13:20:58 -05:00
Alam Ed Arias	0caa08defd	fread and fwrite use size_t, not int	2019-12-27 13:08:26 -05:00
Alam Ed Arias	ff004c4cf6	we only need link on unix systems	2019-12-27 13:05:15 -05:00
Jaime Passos	6b8839d5aa	burst emeralds with GTR_MATCHEMERALDS	2019-12-27 12:34:35 -03:00
Jaime Passos	f0d58368f9	look for GTR_LIVES rule instead of coop/competition gametype	2019-12-27 12:29:21 -03:00
Jaime Passos	f8eed7171a	add G_CompetitionGametype(void)	2019-12-27 12:28:00 -03:00
Jaime Passos	5c023739e6	change this > to >=	2019-12-27 12:23:50 -03:00
Jaime Passos	1d0d404922	check if the gametype allows spectators to allow jump key respawn	2019-12-27 12:17:38 -03:00
Jaime Passos	9613bdeca6	use GTR_DEATHMATCHSTARTS	2019-12-27 12:14:33 -03:00
MascaraSnake	45c432462e	Merge branch 'why-inline' into 'master' ... I got a compiler warning from P_PlayerHitsPlayer being too big See merge request STJr/SRB2!581	2019-12-27 02:12:01 -05:00
MascaraSnake	e71d07fa8e	Merge branch 'next' into kill-zshift ... # Conflicts: # src/p_mobj.c	2019-12-27 08:11:04 +01:00
Jaime Passos	56e94182d5	P_SetupCamera funny	2019-12-27 02:07:13 -03:00
Jaime Passos	51404130af	Respawn delay gametype rule	2019-12-27 01:44:27 -03:00
Jaime Passos	5ea43aa023	Fix sprite rotation crashes.	2019-12-27 00:37:40 -03:00
James R	855e61f59e	Pop monitors properly so Metal doesn't destroy enemy team's monitors	2019-12-26 19:27:25 -08:00
Jaime Passos	96609e45ae	OpenGL funny	2019-12-27 00:02:30 -03:00
Jaime Passos	2d3f45de0d	Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch	2019-12-26 23:53:03 -03:00
Jaime Passos	eca5be52b2	And the sound test	2019-12-26 23:52:42 -03:00
Jaime Passos	956905c8f4	Same deal, but for the level platter and save select screen	2019-12-26 23:49:31 -03:00
James R	76a1a80d71	Save the renderer	2019-12-26 18:44:02 -08:00
James R	e19d0877e8	Merge branch 'time' into 'master' ... haha log files See merge request STJr/SRB2!567	2019-12-26 21:43:46 -05:00
Jaime Passos	644e41d90c	Handle character select screen correctly after a renderer switch	2019-12-26 23:39:40 -03:00
James R	7df6a3090a	Lua CV_FindVar function ... (cherry picked from commit b5746c231d17cd7b58c6b633e242d5ad26ad7017)	2019-12-26 18:30:34 -08:00
James R	e49d12b731	Expose CV_FindVar ... (cherry picked from commit 0e9d69d6a3759686ca8bb567817be650291ea0e1)	2019-12-26 18:30:34 -08:00
Jaime Passos	e617f35182	PU_PATCH funny	2019-12-26 23:26:43 -03:00
James R	4865a19057	One more optimization	2019-12-26 18:23:01 -08:00
James R	9673439628	e	2019-12-26 18:20:48 -08:00
James R	4959d52ae0	Make cv_renderer CV_NOLUA instead of hidden!!!	2019-12-26 18:15:52 -08:00
James R	cb29a9dd0a	CV_NOLUA for when a cvar should not be changed via Lua	2019-12-26 18:15:19 -08:00
James R	f26bdf00fe	A system to encode flags in the command buffer	2019-12-26 18:12:10 -08:00
Jaime Passos	da1718f93c	Avoid possible overflows in the rotsprite arrays.	2019-12-26 21:49:36 -03:00
Jaime Passos	4b653a0b12	Remove the min() and max() calls.	2019-12-26 21:36:35 -03:00
Jaime Passos	56fd29a42a	stuff	2019-12-26 21:27:30 -03:00
James R	1dac3d174e	Merge remote-tracking branch 'origin/master' into next	2019-12-26 15:35:53 -08:00
Zachary McAlpin	9fe20aa1a3	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-26 17:29:54 -06:00
Jaime Passos	c0390f5186	Merge remote-tracking branch 'origin/next' into rotsprite2	2019-12-26 20:27:29 -03:00
James R	414a066ec8	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
James R	aa9cc6e6f2	Merge branch 'char-damage-fix' into 'next' ... Fix Amy and Fang being able to attack other players in MP Special Stages See merge request STJr/SRB2!558	2019-12-26 18:18:10 -05:00
James R	e6532b9bad	Merge branch 'gametype-clownery' into 'next' ... Custom gametypes See merge request STJr/SRB2!566	2019-12-26 18:08:41 -05:00
Zachary McAlpin	e08b3b691f	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-26 16:59:47 -06:00
James R	dd1ca69f54	P_PlayerHitsPlayer is too big for inline, and these other functions are getting there	2019-12-26 14:59:31 -08:00
Monster Iestyn	ca5a4d90e0	Fix mixed declaration-and-code compiling error	2019-12-26 21:59:09 +00:00
Jaime Passos	69b4efb579	Rename R_WorldSegTextured	2019-12-26 18:13:03 -03:00
Jaime Passos	ad6cda7c53	Masked stuff	2019-12-26 17:39:18 -03:00
Jaime Passos	0ec800b266	I forgot a `static`	2019-12-26 17:20:17 -03:00
Jaime Passos	919864d0f3	Thick stuff. Hoping I didn't break anything.	2019-12-26 17:15:30 -03:00
MascaraSnake	2d90098b6a	Use startpos->z instead of startpos->options >> ZSHIFT in F_StartTitleScreen	2019-12-26 20:55:29 +01:00
MascaraSnake	7ccb695fa1	Use mthing->z instead of mthing->options >> ZSHIFT in G_AddGhost	2019-12-26 20:54:06 +01:00
MascaraSnake	24e15387b3	Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift	2019-12-26 20:50:48 +01:00
Alam Ed Arias	e823441e31	Merge branch 'next' into mobjthinker-refactoring	2019-12-26 14:50:35 -05:00
MascaraSnake	f86c5f13ce	Use mt->z instead of mt->options >> ZSHIFT in Command_Teleport_f	2019-12-26 20:48:52 +01:00
Alam Ed Arias	61a0197339	Merge branch 'next' into gametype-clownery	2019-12-26 14:48:04 -05:00
Alam Ed Arias	5a5d5a76d4	Merge branch 'next' into kill-zshift	2019-12-26 14:45:18 -05:00
Alam Ed Arias	c0d6cd8599	Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift	2019-12-26 14:43:03 -05:00
Jaime Passos	5f1e3bab71	struct time	2019-12-26 16:25:04 -03:00
MascaraSnake	855f5da6c9	Make P_RespawnSpecials call P_SpawnMapThing instead of trying to do everything itself	2019-12-26 20:13:56 +01:00
Sally Cochenour	a1d944fc4d	Fix scoreadd not doing anything when modified by Lua ... This does not change any vanilla behavior, as scoreadd is reset constantly on the ground anyway -- this simply makes the behavior modifiable for Lua scripts.	2019-12-26 14:02:02 -05:00
Jaime Passos	4e0a7030ca	Move all the thick/masked/splat stuff to the end of the file	2019-12-26 15:34:33 -03:00
Jaime Passos	e09838224e	ifdef this right so it works like before without the define	2019-12-26 15:27:16 -03:00
Alam Ed Arias	e8431e168a	Merge branch 'next' into kill-zshift	2019-12-26 12:49:04 -05:00
Alam Ed Arias	4906cd4331	ISO C90 fixup	2019-12-26 12:44:47 -05:00
Alam Ed Arias	0a873d857d	Merge branch 'next' into lua-damage-hooks-hotfix	2019-12-26 12:41:02 -05:00
Alam Ed Arias	50379dac85	cleanup buildbot error	2019-12-26 12:27:15 -05:00
Jaime Passos	649455c2d0	R_CalculateSegDistance stuff...	2019-12-26 01:58:38 -03:00
James R	6bd383621e	More fine tuned versioning ... You get a PACKETVERSION, for when some packets change format. You get SRB2APPLICATION, for when you have big fucking mod.	2019-12-25 20:52:02 -08:00
Jaime Passos	69e9784085	Something in R_RenderSegLoop I thought looked off...	2019-12-26 00:55:34 -03:00
Jaime Passos	6f5a259983	Tame R_StoreWallRange	2019-12-26 00:07:04 -03:00
James R	70f08007eb	Correct the check for rings on thing 604 - 607 ... The original code used a switch case, not AND 1. :V	2019-12-25 15:23:19 -08:00
Monster Iestyn	5241030012	Fix ShouldDamage, MobjDamage and MobjDeath hooks all messing up the pushing of variables to Lua as function args, by adding damagetype support where it was missing! ... The above issue occured only if you had both a generic hook and a type specific hook for a particular hook type. This way, the stack is never updated to include damagetype at the start, and all pushes of the variables get offsetted by 1 compared to what they should be, once the code *expects* damagetype to be included in it.	2019-12-25 21:48:59 +00:00
Nev3r	9b89ed92f5	Merge branch 'tokentweaks' into 'next' ... Slight touchups on the tokenizer See merge request STJr/SRB2!569	2019-12-25 06:22:11 -05:00
Nev3r	a932b54b26	Merge branch 'mapdataload_refactor' into 'next' ... Mapdataload refactor See merge request STJr/SRB2!568	2019-12-25 06:21:49 -05:00
Nev3r	c4a017ddf0	Move flat caching code to the map data load function.	2019-12-25 12:05:40 +01:00
MascaraSnake	de7575416a	P_FlagFuseThink: Use mt->z instead of mt->options >> ZSHIFT	2019-12-25 11:17:57 +01:00
MascaraSnake	f4c6068ab1	P_MovePlayerToSpawn: Use mthing->z instead of mthing->options >> ZSHIFT	2019-12-25 10:59:12 +01:00
Jaime Passos	7e5ec552ee	Merge remote-tracking branch 'origin/next' into gametype-clownery	2019-12-25 06:09:00 -03:00
MascaraSnake	12d30b7acc	Use mthing->z instead of mthing->options >> ZSHIFT in particle generator setup	2019-12-25 09:46:09 +01:00
Jaime Passos	03a3b02301	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-25 05:43:46 -03:00
MascaraSnake	32ef930c04	Get rid of a few mt->options >> ZSHIFT usages in objectplace	2019-12-25 09:40:08 +01:00
MascaraSnake	b9a276f5aa	Make slope vertices use mt->z directly instead of mt->options >> ZSHIFT	2019-12-25 09:10:20 +01:00
MascaraSnake	f11caefed7	Merge branch 'spawnhoopsandrings_refactor' into 'next' ... Hack P_SpawnHoopsAndRings into little pieces See merge request STJr/SRB2!572	2019-12-25 03:00:07 -05:00
MascaraSnake	64df10f7be	P_MobjThinker: Separate fuse handling into its own function	2019-12-25 00:36:24 +01:00
Steel Titanium	f0ef4e3193	Fix edge case with R_SkinUsable	2019-12-24 18:31:47 -05:00
MascaraSnake	6032aa3cd1	P_MobjThinker: Separate MF2_FIRING handling into its own function	2019-12-25 00:18:12 +01:00
MascaraSnake	5d89e915c6	Continue cutting up P_MobjThinker into multiple functions	2019-12-25 00:14:53 +01:00
Steel Titanium	8d8e0ca22c	Clean up comment	2019-12-24 17:45:57 -05:00
Steel Titanium	b49672e3f9	Change this condition a bit	2019-12-24 17:44:06 -05:00
Steel Titanium	2f83c2977e	Merge branch 'next' into char-damage-fix	2019-12-24 17:08:23 -05:00
Jaime Passos	3622829504	Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery	2019-12-24 17:55:46 -03:00
MascaraSnake	ddccfbd73d	P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions	2019-12-24 21:07:55 +01:00
GoldenTails	25f8f2706b	Also cap dashspeed to at most maxdash.	2019-12-24 13:55:19 -06:00
James R	02779cb6ef	Merge remote-tracking branch 'origin/master' into next	2019-12-24 11:53:49 -08:00
James R	0780e48f86	Merge branch 'titlecard2' into 'next' ... More customisable title card See merge request STJr/SRB2!552	2019-12-24 14:47:55 -05:00
James R	75a5142aad	Merge branch 'wipes2' into 'master' ... Wipe styles cleanup See merge request STJr/SRB2!525	2019-12-24 14:47:14 -05:00
James R	f077413f31	Merge branch 'soc-srb2-fix' into 'master' ... The "SRB2" directive, for warning if a SOC isn't compatible See merge request STJr/SRB2!551	2019-12-24 14:44:55 -05:00
James R	e0a20a733c	Merge branch 'gl_gifs' into 'master' ... OpenGL GIF movie recording See merge request STJr/SRB2!549	2019-12-24 14:44:44 -05:00
James R	3f339384c8	Merge branch 'hwrtexfix' into 'master' ... Fix model texture blending See merge request STJr/SRB2!546	2019-12-24 14:44:19 -05:00
James R	1df31f2e98	Merge branch 'soundtest-fix' into 'master' ... Init MUSICDEFs regardless of music state See merge request STJr/SRB2!532	2019-12-24 14:44:08 -05:00
James R	be063c454a	Fix NOPNG compiling	2019-12-24 11:37:37 -08:00
Jaime Passos	c61c1e2514	Turn the babysitting deterrent into its own rule.	2019-12-24 16:30:18 -03:00
Jaime Passos	9319014d8d	Title card fixes.	2019-12-24 16:22:25 -03:00
James R	9d28351b5c	I'm an idiot	2019-12-24 11:14:21 -08:00
Jaime Passos	5b4d587b1a	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	b740daf5bf	GTR_HURTMESSAGES	2019-12-24 16:09:00 -03:00
James R	d1f12347cc	Merge remote-tracking branch 'origin/master' into time	2019-12-24 11:02:31 -08:00
MascaraSnake	0aa3c9b0a3	Fixed missing break in offset handling for horizontal springs	2019-12-24 13:01:17 +01:00
MascaraSnake	13eb71e1ee	Fixed missing break in offset handling for horizontal springs	2019-12-24 12:58:12 +01:00
MascaraSnake	a57f903933	Move bonus time handling into new function P_SetBonusTime()	2019-12-24 12:52:43 +01:00
MascaraSnake	ac3a57aaf5	Allow P_SpawnItemRow to spawn different item types in the same row	2019-12-24 12:47:44 +01:00
MascaraSnake	72a1571937	Allow P_SpawnItemCircle to spawn arbitrary mobjtypes (will be used in UDMF)	2019-12-24 12:38:16 +01:00
MascaraSnake	2dac47a54c	Allow P_SpawnItemRow to spawn arbitrary mobjtypes (will be used in UDMF)	2019-12-24 12:19:13 +01:00
James R	b7b4945c36	Correct usage of logdir	2019-12-24 01:59:05 -08:00
James R	f2c2836301	Overwrite an already existing symlink	2019-12-24 01:55:47 -08:00
MascaraSnake	dd01fce1a8	Separate P_SpawnHoopsAndRings into different functions: ... -Hoops are spawned in P_SpawnHoop -Item patterns are spawned in P_SpawnItemPattern -Ring-like items are spawned normally via P_SpawnMapThing -Bonus time items are spawned via P_SpawnBonusTimeItem, which is a wrapper for P_SpawnMapThing	2019-12-24 10:50:49 +01:00
Nev3r	36996c8c91	Treat strings inside ""s as a single token.	2019-12-24 10:27:23 +01:00
Nev3r	ce3f526a5e	Ignore '=' and ';' when tokenizing, for textmap reading's sake.	2019-12-24 10:25:38 +01:00
James R	9defd997c3	Merge branch 'fixsignalhandler' into 'master' ... Handle signals correctly on linux See merge request STJr/SRB2!530	2019-12-24 02:54:44 -05:00
MascaraSnake	04a56120d4	Merge branch 'spawnmapthing-refactor' into 'next' ... Hack P_SpawnMapThing into tiny little pieces See merge request STJr/SRB2!564	2019-12-24 01:59:36 -05:00
Jaime Passos	d76c4eaba8	Fix Lua HUD library crashes.	2019-12-24 00:14:25 -03:00
James R	25525a6aae	symlink latest-log.txt on nix, copy to the real log file everywhere else	2019-12-23 18:20:04 -08:00
Jaime Passos	40b0c853b7	Add IDENTIFIER to gametype DeHackEd.	2019-12-23 23:19:48 -03:00
Jaime Passos	89b4a558a8	Merge remote-tracking branch 'origin/next' into gametype-clownery	2019-12-23 23:08:16 -03:00
James R	98cb238d36	Create directories from -logfile too	2019-12-23 17:43:42 -08:00
James R	5fbe77cdda	Let an asbolute path work with -logfile	2019-12-23 17:40:43 -08:00
James R	457e986b75	-logdir lets the user change the log directory	2019-12-23 17:21:58 -08:00
GoldenTails	1f93ab0e0f	Optimise further, play beep on cut/copy, play beep when paste is successful.	2019-12-23 18:53:41 -06:00
James R	c285000c56	Change default log filename to not use a space ... bleh	2019-12-23 15:34:27 -08:00
James R	d9d13764e6	-logfile to let the user change the log file name	2019-12-23 15:31:50 -08:00
Jaime Passos	a657392d39	ViewpointSwitch improvements.	2019-12-23 20:22:57 -03:00
MascaraSnake	ffd6cf4aca	Replaced functions for spawning premade rows of rings with a function for spawning a generic row of rings (groundwork for UDMF)	2019-12-24 00:10:29 +01:00
Jaime Passos	630c06b7b0	Turn GTR_CHASECAM into GTR_FIRSTPERSON.	2019-12-23 19:24:06 -03:00
Jaime Passos	bb1f43d374	Add gametyperules to LUA_CheckGlobals.	2019-12-23 19:16:10 -03:00
Jaime Passos	e9f69b9c6a	Add sstimer to LUA_PushGlobals.	2019-12-23 19:08:57 -03:00
Jaime Passos	bbe946ac1e	Bail out earlier.	2019-12-23 19:00:46 -03:00
MascaraSnake	50dd0a71db	Turn size and number of items for item circle into function parameters (in preparation for UDMF)	2019-12-23 22:58:58 +01:00
Jaime Passos	d050e04dae	Bail out if there are no more free gametype slots.	2019-12-23 18:58:33 -03:00
Jaime Passos	edddc3e64e	Custom gametype constant support for Lua.	2019-12-23 18:54:25 -03:00
Jaime Passos	5ebd84c3e7	Move ALL the Lua global variable stuff into lua_script.c.	2019-12-23 18:49:23 -03:00
Jaime Passos	7425591815	Add pointlimit and timelimit to Lua.	2019-12-23 18:37:38 -03:00
Jaime Passos	d0f7877fd0	Turn noglobals into setglobals, move the extra global variable handling to gamestateglobals.	2019-12-23 18:33:39 -03:00
Jaime Passos	61b72203a8	Merge remote-tracking branch 'origin/master' into gametype-clownery	2019-12-23 18:21:13 -03:00
Zachary McAlpin	e9a31a44c4	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-23 14:46:09 -06:00
MascaraSnake	6939da0164	Turned nightsreplace into a macro so we have don't have to keep dragging it along as a function parameter	2019-12-23 21:35:03 +01:00
MascaraSnake	24f8d4ef51	Made a mapthing-independent version of P_GetMobjSpawnHeight so P_SpawnHoopsAndRings subfunctions can use it instead of duplicating code.	2019-12-23 21:17:12 +01:00
GoldenTails	a5a8d0c77b	Cap dashspeed to at least mindash before revving.	2019-12-23 14:01:37 -06:00
MascaraSnake	2b3922a8f3	Set mthing->mobj before the flags handling code, since at this point the setup can't fail anymore	2019-12-23 20:12:45 +01:00
MascaraSnake	6fc325f3d2	Merge branch 'netarchive_compare_changes' into 'next' ... Netarchive compare changes See merge request STJr/SRB2!563	2019-12-23 13:57:49 -05:00
MascaraSnake	eab5f8c851	P_SpawnMapThing(): Separate handling of MTF_AMBUSH and MTF_OBJECTSPECIAL in its own functions	2019-12-23 19:08:40 +01:00
MascaraSnake	e382c2e094	P_SpawnMapThing(): Separated the giant post-Lua hook switch-case statement into its own function, and separated some of the larger cases into their own function as well	2019-12-23 18:59:11 +01:00
MascaraSnake	8ddd078b20	P_MapThingSpawn(): Move early returning/substitution code into their own functions	2019-12-23 17:28:21 +01:00
MascaraSnake	e90eb9a5e7	Move P_GetMobjtype above first use	2019-12-23 16:54:26 +01:00
MascaraSnake	6a69aa4ffa	Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function	2019-12-23 16:53:45 +01:00
Nev3r	9a9f72f598	Don't reload mapthings in P_LoadThingsOnly() as they should no longer be modified past the mapload procedure.	2019-12-23 16:37:44 +01:00
Nev3r	d6a86c37b2	P_PrepareRawThings() is now where it was supposed to be at; moved save and flat & texture caching related functions to the end of P_LoadMapData().	2019-12-23 16:36:26 +01:00
Jaime Passos	6779c508e7	Satisfy rollangle table with a 3deg angle	2019-12-23 12:19:05 -03:00
MascaraSnake	112b15cca2	Add P_GetMobjtype for finding the mobjtype for a given mapthingnum	2019-12-23 14:45:43 +01:00
Nev3r	1221c108c6	Make lines and sides use the mapload copies in P_NetArchiveWorld() too; do no longer use vres stuff there.	2019-12-23 12:47:40 +01:00
Nev3r	bb54597552	Remove redundant netarchive-related sector vars as they're not used anymore. ... Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.	2019-12-23 12:42:38 +01:00
MascaraSnake	21dcbc856c	Split up P_SpawnHoopsAndRings() into subfunctions	2019-12-23 12:42:09 +01:00
Nev3r	eadf953957	Store a copy of sectors, lines and sides in memory so that P_NetArchiveWorld() can soon use them instead of relying on re-opening the original lumps. ... Fix print type issue.	2019-12-23 12:30:32 +01:00
MascaraSnake	efb47b3786	Move spawning of ring-like items into its own function, use P_GetMobjSpawnHeight()	2019-12-23 12:07:03 +01:00
James R	f574cd0ce2	Whoops I forgot player 2	2019-12-22 21:29:41 -08:00
Steel Titanium	356b25def4	Spawn Amy's shields for other players	2019-12-23 00:28:06 -05:00
James R	3e2b28e162	Merge remote-tracking branch 'origin/master' into turnmultiplier	2019-12-22 21:26:36 -08:00
James R	7e0152f37b	Merge branch 'hoop_refactor' into 'next' ... Make both NiGHTS hoop types use the same spawning code. See merge request STJr/SRB2!560	2019-12-23 00:16:46 -05:00
Steel Titanium	a0ce243051	Merge branch 'next' into char-damage-fix	2019-12-22 23:56:16 -05:00
James R	64af7badfb	Merge remote-tracking branch 'origin/master' into next	2019-12-22 20:47:15 -08:00
Zachary McAlpin	0f895706f4	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-22 18:55:58 -06:00
MascaraSnake	1e13604007	Merge branch 'flats-in-walls' into 'master' ... Flats in walls See merge request STJr/SRB2!548	2019-12-22 17:44:50 -05:00
MascaraSnake	63cf9d61fc	Merge branch 'supermusic-state-fix' into 'next' ... Fix super theme ending early if invincibility expired See merge request STJr/SRB2!559	2019-12-22 17:37:32 -05:00
MascaraSnake	154d2033b6	Merge branch 'dustdevilfix' into 'next' ... Fix pflags not being properly reset when entering dust devil from top See merge request STJr/SRB2!556	2019-12-22 17:35:51 -05:00
MascaraSnake	579362fd3b	P_LoadMapData(): Throw an error if resources are not found.	2019-12-22 23:22:15 +01:00
MascaraSnake	a4fde93fbb	Merge branch 'next' into virtres ... # Conflicts: # src/p_setup.c	2019-12-22 23:02:47 +01:00
MascaraSnake	97adf3e246	Merge branch 'next' into hoop_refactor ... # Conflicts: # src/p_mobj.c	2019-12-22 18:12:58 +01:00
MascaraSnake	dacd5614f9	Make both NiGHTS hoop types use the same spawning code. ... As a result, the old generic hoops now use 24 sprites instead of 32.	2019-12-22 17:37:54 +01:00
Steel Titanium	de1d25cf08	Fix super theme ending early if invincibility expired	2019-12-20 23:45:32 -05:00
Steel Titanium	c2e2ae6021	Merge branch 'next' into char-damage-fix	2019-12-20 23:24:29 -05:00
Steel Titanium	ace202daf0	Fix Amy and Fang being able to attack other players in MP Special Stages	2019-12-20 23:22:45 -05:00
GoldenTails	ed847e831b	Fix pasting going out of bounds and dash the possibility of memory leaks while pasting.	2019-12-20 20:28:30 -06:00
James R	cbb9c7c13a	Merge remote-tracking branch 'origin/master' into next	2019-12-20 14:40:10 -08:00
GoldenTails	a2faa975cb	Allow Clipboard actions.	2019-12-20 16:39:19 -06:00
James R	2ed5617c5f	Merge branch 'better-deadzone' into 'master' ... Better Deadzones See merge request STJr/SRB2!541	2019-12-20 17:33:29 -05:00
James R	c50fe1874d	Merge branch 'random-port' into 'master' ... Choose a random port as a client See merge request STJr/SRB2!554	2019-12-20 17:33:12 -05:00
James R	70336933bd	Merge branch 'elemental-tweak' into 'next' ... Don't uncurl from spin if Elemental Stomp is used See merge request STJr/SRB2!555	2019-12-20 17:32:59 -05:00
Zachary McAlpin	124a0754a6	Revert "Added CalculateCamera Hook" ... This reverts commit 9f82cdb401.	2019-12-19 17:21:55 -06:00
Zachary McAlpin	f5c2341f59	Revert "Fix CalculateCamera compiling error" ... This reverts commit c1465c5acc.	2019-12-19 17:21:46 -06:00
Zachary McAlpin	652e53c629	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features	2019-12-19 17:20:31 -06:00
Zachary McAlpin	c1465c5acc	Fix CalculateCamera compiling error	2019-12-19 17:17:17 -06:00
Zachary McAlpin	9f82cdb401	Added CalculateCamera Hook	2019-12-19 16:41:25 -06:00
Jaime Passos	6d7bdf8fdb	Lua gametyperules	2019-12-19 18:27:11 -03:00
Zachary McAlpin	e82b317451	Revert "Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition" ... This reverts commit 3fc1069082.	2019-12-19 15:07:34 -06:00
Zachary McAlpin	c1815bfe11	Revert "Don't execute LUAh_PlayerThink(player) for respawning bots" ... This reverts commit fc70164f93.	2019-12-19 15:07:28 -06:00
Jaime Passos	551828607c	Load SPR_ lumps as SpriteInfo	2019-12-19 17:25:19 -03:00
Jaime Passos	320b7777b0	Merge remote-tracking branch 'origin/master' into rotsprite2	2019-12-19 17:20:21 -03:00
Jaime Passos	4e349cbd0f	Remove W_UnlockCachedPatch calls to avoid crashing	2019-12-19 17:14:56 -03:00
James R	77747c66df	Fix switching to software ... Would show a black screen for me on Linux. My suspsicion is that some things are not initialized with just VID_CheckRenderer.	2019-12-19 17:13:23 -03:00
Jaime Passos	5c8604aeb7	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-19 17:09:47 -03:00
Jaime Passos	4ad1727b66	Don't spawn End Level Signs without the GTR_ALLOWEXIT rule	2019-12-19 17:06:07 -03:00
Jaime Passos	74a4ec6f54	Make G_PlatformGametype only check the gametype rules, to avoid unintended side effects	2019-12-19 16:31:38 -03:00
Jaime Passos	9b2b526eb4	Removing commented out code	2019-12-19 16:22:55 -03:00
Steel Titanium	a39b6a1286	Allow access to bluescore and redscore	2019-12-19 16:17:08 -03:00
Jaime Passos	7efd9662d1	Remove GTR_NOGAMEEND	2019-12-19 16:13:27 -03:00
Jaime Passos	f4bb618f93	Organise rules	2019-12-19 16:12:10 -03:00
Jaime Passos	6d7262e985	Remove GTR_PLATFORM	2019-12-19 16:05:03 -03:00
Jaime Passos	768080977f	Remove GTR_ROUNDENDMESSAGE	2019-12-19 15:47:37 -03:00
Alam Ed Arias	1771c7c8ce	Revert "Travis yflip error" ... This reverts commit 2a9a2c0f02.	2019-12-19 10:25:54 -05:00
Alam Ed Arias	a66fd274a1	Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer	2019-12-19 10:24:04 -05:00
Jaime Passos	ce0e4201b8	GTR_DEATHMATCHSTARTS	2019-12-19 02:26:17 -03:00
Jaime Passos	ebdd9c6257	fix warnings	2019-12-19 02:20:49 -03:00
Jaime Passos	019e52a4f4	allow CTF spawns in GTR_TEAMS gametype rule	2019-12-19 02:17:03 -03:00
Jaime Passos	0accadf02f	Merge remote-tracking branch 'origin/next' into gametype-clownery	2019-12-19 02:15:45 -03:00
Jaime Passos	fb6f2fc9b0	Lua! Lua! Lua! ... Expecting the buildbot to complain	2019-12-19 02:13:09 -03:00
lachwright	d401ba558d	Fix pflags not being properly reset when entering dust devil from top	2019-12-19 12:03:36 +08:00
Jaime Passos	00440224d2	De-fuck team change	2019-12-19 00:31:13 -03:00
Jaime Passos	e4b4b60cb6	Remove this debugging command, as I don't need it anymore.	2019-12-19 00:15:19 -03:00
Jaime Passos	5da55e8b76	Shadowed variable declarations whoopsie!!! uwu	2019-12-18 23:53:26 -03:00
Jaime Passos	6f857df5e5	ViewpointSwitch hack so nobody does anything evil ... Prints the generic "can't do this in a HUD hook" message. Whatever. I'm tired.	2019-12-18 23:47:17 -03:00
Jaime Passos	be5fd1a0db	TeamSwitch hook for Lua	2019-12-18 23:40:58 -03:00
Steel Titanium	96cf03b716	Don't uncurl from spin if Elemental Stomp is used	2019-12-18 21:28:34 -05:00
Jaime Passos	b496cc0d62	Whoops	2019-12-18 23:02:07 -03:00
Jaime Passos	ef7e53488d	GTR_CAMPAIGN and GTR_NOGAMEEND	2019-12-18 22:50:49 -03:00
Jaime Passos	5daedc70e7	Special Stages/token stuff	2019-12-18 22:46:17 -03:00
Jaime Passos	9228f99260	Fix timelimit/pointlimit checks in HU_DrawRankings, organise rules in gametypedefaultrules a bit	2019-12-18 22:23:30 -03:00
Jaime Passos	5e818e1dab	Custom gametype rankings	2019-12-18 22:02:37 -03:00
James R	843d9b9f0a	-clientport (it's back!) and -serverport, which is an alias to -port ... If you ever need to, you can change the client port number.	2019-12-18 15:47:47 -08:00
Jaime Passos	0421c81e04	ViewpointSwitch hook for Lua	2019-12-18 20:43:54 -03:00
James R	4e32101289	Use a pointer for port_name ... Using strcpy is stupid because we don't know how long the argument would be. There's no need for a buffer anyway.	2019-12-18 15:43:29 -08:00
James R	f584b61c93	Use a random port when connecting	2019-12-18 15:34:55 -08:00
Jaime Passos	d0e18444fb	GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes	2019-12-18 20:12:52 -03:00
Jaime Passos	04ee98a1a1	point limit/time limit	2019-12-18 19:43:12 -03:00
Jaime Passos	396106829a	Ringslinger tweaks	2019-12-18 19:26:45 -03:00
Jaime Passos	eadb3dec9e	Limits checking	2019-12-18 18:59:47 -03:00
Jaime Passos	74d69f3731	Fix comment	2019-12-18 18:52:10 -03:00
Jaime Passos	b8d47dbc60	Accept gametype rules in SOC by just their names as parameters.	2019-12-18 18:50:04 -03:00
Jaime Passos	ec8682b2af	GTR_NOTITLECARD	2019-12-18 18:39:59 -03:00
Jaime Passos	61cad09505	Fix lib_getenum. Also, adding gametypes also creates constant names for them.	2019-12-18 18:30:24 -03:00
Jaime Passos	cb0e14035b	Intermission HUD hook for Lua	2019-12-18 18:09:56 -03:00
Jaime Passos	5f73d48614	Some sort of intermission tally support.	2019-12-18 17:13:05 -03:00
Jaime Passos	e3584e8230	GTR_ALLOWEXIT	2019-12-18 16:52:05 -03:00
Jaime Passos	5b0a094f67	TOL stuff	2019-12-18 16:00:02 -03:00
Jaime Passos	94f2b8f970	Fix warnings	2019-12-18 15:41:03 -03:00
Jaime Passos	7c3cde4564	How did I mess this up?	2019-12-18 15:23:41 -03:00
Jaime Passos	7768e2c7f9	More spectator tweaks	2019-12-18 15:14:24 -03:00
Jaime Passos	d3d91726f5	GTR_EMERALDHUNT and GTR_SPAWNENEMIES	2019-12-18 14:57:42 -03:00
Jaime Passos	0577cec01b	GTR_NOSPECTATORSPAWN	2019-12-18 14:47:39 -03:00
Jaime Passos	1e2331d672	SOC stuff	2019-12-18 14:37:48 -03:00
Jaime Passos	79d5192b7c	TOL/Level platter stuff	2019-12-18 13:24:10 -03:00
Jaime Passos	b759ebf622	Death of TOL_CUSTOM	2019-12-18 12:40:46 -03:00
Jaime Passos	45580ce557	Make NUMGAMETYPEFREESLOTS lower because netcode	2019-12-18 12:36:54 -03:00
Jaime Passos	aa619e1b34	Rankings tweaks	2019-12-18 12:36:02 -03:00
Jaime Passos	7807424633	NUMGAMETYPES vs gametypecount	2019-12-18 12:30:01 -03:00
Jaime Passos	86ac94817a	Spectator HUD tweaks	2019-12-18 12:28:01 -03:00
Jaime Passos	15862ed02c	G_NewGametype	2019-12-18 12:23:42 -03:00
Jaime Passos	6660d63028	There are only so many bits	2019-12-18 12:14:18 -03:00
Jaime Passos	da4e759a73	GTR_DEATHPENALTY	2019-12-18 12:13:24 -03:00
Jaime Passos	83732f38a9	GTR_PITYSHIELD	2019-12-18 12:09:44 -03:00
Jaime Passos	1b81232d32	sike	2019-12-18 11:47:26 -03:00
Jaime Passos	299f2bd8cd	GTR_TEAMFLAGS	2019-12-18 11:43:50 -03:00
Jaime Passos	185fa2799d	Update comments	2019-12-18 11:33:56 -03:00
Jaime Passos	ea5e0d28ed	More gametype rules yay!!	2019-12-18 01:54:45 -03:00
James R	23951cf938	bleh	2019-12-17 20:54:44 -08:00
Jaime Passos	7bfdc2caa0	Gametype rules draft, mind the debug command	2019-12-18 01:25:57 -03:00
Jaime Passos	317191ec7c	Freeslot moment!	2019-12-18 00:52:50 -03:00
Jaime Passos	254d812901	More customisable title card ... Add TitleCardZigZag, TitleCardZigZagText and TitleCardActDiamond fields to SOC. Add the same fields to Lua under their internal names. Turn map header level flags into an UINT16, so that NoTitleCard works. (NOBODY caught this, I'm actually disappointed.)	2019-12-18 00:28:58 -03:00
James R	4029167a57	Merge branch 'fix-divby0-spindash-crash' into 'next' ... Fix a divide by zero crash when mindash and maxdash were the same. See merge request STJr/SRB2!539	2019-12-17 20:42:56 -05:00
Zachary McAlpin	3fc1069082	Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition	2019-12-17 19:20:46 -06:00
Zachary McAlpin	fc70164f93	Don't execute LUAh_PlayerThink(player) for respawning bots	2019-12-17 18:41:26 -06:00
Zachary McAlpin	01f11cdca6	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features	2019-12-17 18:21:17 -06:00
James R	d1b944121a	Fix "SRB2" SOC directive, though its usefulness is debatable	2019-12-17 14:11:45 -08:00
James R	e009d62dc3	Merge branch 'hud-toggling' into 'next' ... Let Lua toggle Team Match/CTF team scores HUD element See merge request STJr/SRB2!544	2019-12-17 16:17:01 -05:00
James R	184d04e6d5	Merge branch 'rvz1-crashfix' into 'next' ... Fix crash on mapload when removing Dragonbomber with Lua See merge request STJr/SRB2!545	2019-12-17 16:16:51 -05:00
Jaime Passos	79daafd893	Fix missing "-" prefix on "-software" cmdline parm	2019-12-17 18:04:05 -03:00
Jaime Passos	53885e5ac0	Free PU_HWRMODELTEXTURE tag	2019-12-17 16:28:32 -03:00
Jaime Passos	e359f802fd	Update comments	2019-12-17 16:14:26 -03:00
Jaime Passos	cc54163210	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-17 16:12:44 -03:00
Jaime Passos	a0971d0756	Put loadgame patch loading back in M_ReadSaveStrings	2019-12-17 15:56:56 -03:00
Jaime Passos	c3f0e6aa44	Avoid recreating the color LUT mid-recording-frame	2019-12-17 15:37:43 -03:00
Jaime Passos	0af71fafc5	Don't use the local palette, because OpenGL mixes it into the textures themselves	2019-12-17 15:20:22 -03:00
Jaime Passos	3d08664de4	Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs	2019-12-17 15:14:22 -03:00
Jaime Passos	141d0376a5	Merge remote-tracking branch 'origin/master' into flats-in-walls	2019-12-17 15:05:16 -03:00
Jaime Passos	e3ab21c85f	opengl	2019-12-17 13:48:48 -03:00
Jaime Passos	aff5b52eba	change ROTANGLES to 72	2019-12-17 13:39:26 -03:00
Jaime Passos	8422c88063	optimise R_CacheRotSprite	2019-12-17 13:25:55 -03:00
Jaime Passos	c6f36fc470	un-ROTSPRITE rollangle and spriteinfo	2019-12-17 13:09:25 -03:00
Jaime Passos	6a5ea548e6	make ROTANGLES be 360	2019-12-17 13:00:50 -03:00
Jaime Passos	7e55dd31f5	fix menu spacing	2019-12-17 12:53:26 -03:00
Jaime Passos	369563ad92	allow models to change colors more than once.	2019-12-17 12:50:41 -03:00
James R	4da57653eb	Merge branch 'spawn_z_refactor' into 'next' ... (UDMF prereq.) Spawn Z refactor See merge request STJr/SRB2!536	2019-12-16 23:21:07 -05:00
James R	4f33476fc0	Merge branch 'fix-sector-lines' into 'next' ... Fix sector.lines in Lua See merge request STJr/SRB2!542	2019-12-16 23:05:52 -05:00
Steel Titanium	0e371774c8	Fix crash on mapload when removing Dragonbomber with Lua	2019-12-16 21:25:41 -05:00
Tatsuru	0ab31b3de0	Let Lua toggle Match/CTF team scores HUD element	2019-12-16 17:58:00 -03:00
Monster Iestyn	46f431616c	Added a lot of SOC-editable variables to Lua, as well as the tutorialmode boolean	2019-12-16 20:26:19 +00:00
Monster Iestyn	f028bb0219	Fix numoflines calculations in sectorlines_* functions by first typecasting seclines (the sector.lines address) to size_t before doing any math on it, then (after the math) typecast the result to size_t * and dereference it. ... And yes, this time I tested it to make sure it works :)	2019-12-16 17:46:27 +00:00
Monster Iestyn	130794cc4d	Merge branch 'master' into next	2019-12-16 15:41:47 +00:00
MascaraSnake	79350992df	Some more cleanup of map loading code	2019-12-16 00:17:20 +01:00
MascaraSnake	bb3440d021	Minor cleanup of virtual resources code	2019-12-16 00:04:48 +01:00
James R	53c7df4818	Merge branch 'map-command-no-mapheaderinfo' into 'master' ... Let the map command warp to maps without a level header See merge request STJr/SRB2!528	2019-12-15 16:59:03 -05:00
James R	adc87640d9	Merge branch 'cmake-fixes' into 'master' ... Various cmake adjustments See merge request STJr/SRB2!538	2019-12-15 16:58:45 -05:00
MascaraSnake	230006553d	Set mapthing z in OP_CreateNewMapThing	2019-12-15 21:43:50 +01:00
fickleheart	1f88c70d6a	Fix RVZ autocam AGAIN	2019-12-15 13:33:21 -06:00
Sryder	a093c76cfb	Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into better-deadzone	2019-12-15 15:47:45 +00:00
Monster Iestyn	eb179e4d6a	Remove anti-Tails restriction for the Allow super Pandora's Box cheat. ... Despite popular belief, this was just some experimenting from 2.2 development that we forgot to remove!	2019-12-15 15:40:56 +00:00
Sryder	76d59330f7	Port the deadzone cvar stuff from kart. ... Add menu items for deadzone.	2019-12-15 15:36:13 +00:00
Sryder	b17bf5d836	Use Scaled Radial Deadzones, instead of Axial deadzones. ... Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.	2019-12-15 14:37:30 +00:00
GoldenTails	23b3f5a649	Fix a divide by zero crash when mindash and maxdash were the same. ... Props to rumia1 for finding this and Lach for figuring out this was a divide by zero error.	2019-12-15 04:09:56 -06:00
MascaraSnake	8a6e244e60	SpawnEmeraldHunt() -> P_SpawnEmeraldHunt()	2019-12-15 09:49:54 +01:00
Eidolon	d63ad82dc5	[cmake] Remove srb2dd target	2019-12-15 00:47:58 -06:00
Eidolon	11f5911943	[cmake] Use same executable names as Makefile	2019-12-15 00:39:04 -06:00
fickleheart	a885380e8a	Add analog deadzone option separate from digital deadzones	2019-12-14 19:41:54 -06:00
Zachary McAlpin	fce6ea0384	Fixed mistake with #endif placement	2019-12-14 19:32:49 -06:00
fickleheart	3db7e48c73	[POTENTIALLY RISKY] Show target arrow above lock-on target ... My judgement on "is this netgame-safe" is "Gunslinger's targeting spawns this only for the local player, so maybe".	2019-12-14 19:21:11 -06:00
fickleheart	7fd2153c08	Realign camera options menu options	2019-12-14 19:20:19 -06:00
fickleheart	0702e366b6	Allow setting center view to a toggle	2019-12-14 19:17:41 -06:00
fickleheart	a812ddd88e	Fix turn-to-input jerk when braking sideways	2019-12-14 19:04:29 -06:00
Zachary McAlpin	ee9e72f48b	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features	2019-12-14 17:59:21 -06:00
James R	1123b5debd	Merge remote-tracking branch 'origin/master' into next	2019-12-14 15:28:25 -08:00
MascaraSnake	bcfd9fe504	Cleaned up GetMobjSpawnHeight a bit. Ring-likes no longer ignore MF_SPAWNCEILING, because why should they?	2019-12-15 00:22:17 +01:00
Jaime Passos	4d87bcca13	Move position of R_PlaneRipple in the file so this looks more organised	2019-12-14 19:50:40 -03:00
Jaime Passos	871ebef332	Merge remote-tracking branch 'origin/master' into ripple2	2019-12-14 19:36:54 -03:00
James R	14674223e8	Merge branch 'opengl-is-a-bad-renderer' into 'master' ... OpenGL fixes See merge request STJr/SRB2!519	2019-12-14 16:48:50 -05:00
James R	b121bc2b3b	Merge branch 'fix-shield-hover' into 'next' ... Stop characters from being able to activate their abilities when doing a shield ability! See merge request STJr/SRB2!522	2019-12-14 16:48:12 -05:00
James R	64eb89fc56	Merge branch 'portalcullsector' into 'master' ... Restore portal culling code that went gone by pure accident See merge request STJr/SRB2!523	2019-12-14 16:47:51 -05:00
James R	e5714db75c	Merge branch 'software-drawers-refactor' into 'master' ... Optimize Software drawers See merge request STJr/SRB2!533	2019-12-14 16:47:27 -05:00
James R	65a17a8f09	Merge branch 'customexitvars-rework' into 'next' ... Rework G_SetCustomExitVars to allow skipstats 2 See merge request STJr/SRB2!534	2019-12-14 16:47:18 -05:00
Steel Titanium	b3d678a252	Merge branch 'master' into next	2019-12-14 16:44:56 -05:00
James R	c1d54007e4	Fix C90 error from NOHW	2019-12-14 13:30:10 -08:00
Zachary McAlpin	87b816e408	Added PlayerThink hook	2019-12-14 15:28:24 -06:00
James R	2a22adaa60	Oops C90	2019-12-14 12:55:11 -08:00
fickleheart	0047dba279	Fix float cvars saving wrong when set to max	2019-12-13 23:05:36 -06:00
fickleheart	bc2ed52625	Double sensitivity and halve default of turn to input	2019-12-13 22:55:34 -06:00
fickleheart	252b77c651	Scale angle-related camera turns by player speed ... They also operate at full when idle, too.	2019-12-13 22:30:04 -06:00
fickleheart	097fc48f52	Even MORE tta changes: ... - All automatic turning is suspended upon manual rotation - Dest angle uses drawangle again for rolling only	2019-12-13 20:30:56 -06:00
fickleheart	fdc3347e22	More turn-to-angle changes	2019-12-13 20:19:38 -06:00
fickleheart	f82f1513ba	Tweaks to camera shifting	2019-12-13 20:17:31 -06:00
fickleheart	022a44fb01	Don't turn-to-ability while climbing	2019-12-13 19:49:56 -06:00
fickleheart	a03ab5e294	Patch slight camera turn when airbraking	2019-12-13 19:37:01 -06:00
fickleheart	1a60f7a2ad	Fix wacky CEZ2 platform camera	2019-12-13 19:30:19 -06:00
James R	8a23ff0bc8	Handle log file in parent properly	2019-12-13 16:51:49 -08:00
fickleheart	87ad91a2be	LMAO right stick checking used the wrong value	2019-12-13 17:35:48 -06:00
James R	553ad46c74	Add this back for Windoodoo because I'm an idiot	2019-12-13 15:04:31 -08:00
Jaime Passos	4c13190b48	Merge remote-tracking branch 'origin/master' into software-drawers-refactor	2019-12-13 19:22:47 -03:00
Jaime Passos	7f092b884b	Initialise the variable, obviously	2019-12-13 19:04:36 -03:00
Jaime Passos	a27a225a81	Remove SPANDRAWFUNC_MMX, as it's not needed anymore.	2019-12-13 19:02:36 -03:00
Steel Titanium	ad776e560c	Rework G_SetCustomExitVars to allow skipstats 2	2019-12-13 16:36:33 -05:00
Jaime Passos	6720279969	Separate non-powers-of-two draw routines into its own file	2019-12-13 13:11:56 -03:00
Jaime Passos	fa58c1fb26	stuff	2019-12-13 12:26:47 -03:00
James R	c415d80e19	Merge branch 'dashmode-shader' into 'master' ... Add TC_DASHMODE color shader See merge request STJr/SRB2!526	2019-12-13 01:58:18 -05:00
James R	d64a7defed	Merge branch 'toomanyflats-fix' into 'master' ... Fix Ploadflat closing the game with "Too many flats in level" error message See merge request STJr/SRB2!529	2019-12-13 01:57:55 -05:00
fickleheart	c41b2e7456	Suspend turn-to-angle when rotating the camera	2019-12-13 00:52:48 -06:00
fickleheart	098c99a834	Adjust how turn-to-angle tweens	2019-12-13 00:34:34 -06:00
James R	8bea7f6dbc	Rename signal caught message to be more obvious	2019-12-12 22:01:16 -08:00
James R	838850ffc1	Fix signal handler setup error reporting	2019-12-12 21:57:54 -08:00
fickleheart	bc4b1e1abe	Allow switching lockon targets with turn buttons	2019-12-12 23:52:13 -06:00
James R	35053adfb2	Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place	2019-12-12 21:30:35 -08:00
James R	72ee91702c	Kill child when wait fails, so I_Error exits both	2019-12-12 21:21:25 -08:00
James R	f34886850f	Fix idiot mistake	2019-12-12 21:20:51 -08:00
fickleheart	d14fa39d7a	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	4941ef4aac	Don't turn strafe keys into turn when locked onto something	2019-12-12 22:13:44 -06:00
Jaime Passos	b0ffe7ed70	Update v_video.c	2019-12-12 23:30:09 -03:00
Jaime Passos	4e814cd424	FINALLY, COLORCUBIUM	2019-12-12 23:18:39 -03:00
Jaime Passos	228b29e23b	HWR_AllowModel	2019-12-12 22:53:19 -03:00
Jaime Passos	ca83bafae8	Initialise the variable, obviously	2019-12-12 22:32:19 -03:00
Jaime Passos	a138a3ab5f	Merge remote-tracking branch 'origin/dashmode-shader' into opengl-is-a-bad-renderer	2019-12-12 22:31:34 -03:00
Jaime Passos	08794559f0	Fix TC_ blending	2019-12-12 22:26:28 -03:00
Jaime Passos	01399c7076	Update hw_main.c	2019-12-12 21:52:59 -03:00
Jaime Passos	ff348fb60a	Add missing prototype, ugh	2019-12-12 21:43:19 -03:00
Jaime Passos	af3cf93683	grafik designe is m passion	2019-12-12 21:41:13 -03:00
Jaime Passos	d80bfb4e94	PU_HWRCACHE_UNLOCKED bmomento bróder	2019-12-12 21:23:55 -03:00
Jaime Passos	08d4a36f63	Texture blending port ... Co-authored-by: TehRealSalt <tehrealsalt@gmail.com>	2019-12-12 21:22:36 -03:00
James R	6dcdb8d951	Move everything to i_system.c ... This also simplifies things; SDL isn't initialized in the parent process.	2019-12-12 15:08:27 -08:00
Jaime Passos	6c3111d809	Stop crashing with models because someone keeps freeing those tags	2019-12-12 19:54:47 -03:00
James R	55f3f27b55	Fix NOHW warnings	2019-12-12 14:00:13 -08:00
Steel Titanium	eb787c2b59	Move S_InitMusicDefs call outside of the check. ... As far as I know, this is competely safe.	2019-12-12 16:32:40 -05:00
Jaime Passos	3bebfb279e	Fix gr_anisotropicmode	2019-12-12 18:28:05 -03:00
Jaime Passos	58a08504c8	Make gr_spritebillboarding on by default sorry not sorry Azeon	2019-12-12 17:48:43 -03:00
Jaime Passos	a4b0195430	Model lighting	2019-12-12 17:48:29 -03:00
Jaime Passos	9246526e8a	Merge remote-tracking branch 'origin/master' into opengl-is-a-bad-renderer	2019-12-12 17:39:18 -03:00
Jaime Passos	f077d17301	Save filtering mode and anisotropic mode cvars to config	2019-12-12 17:37:55 -03:00
Jaime Passos	db61d1a705	Remove HWR_AddEngineCommands	2019-12-12 17:35:41 -03:00
Jaime Passos	bf520b9e33	Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!!	2019-12-12 17:30:19 -03:00
Steel Titanium	4af0cfae36	Init MUSICDEFs if started game with music off and toggled on	2019-12-12 15:17:50 -05:00
Jaime Passos	b7c7529e75	Don't reset the FOV	2019-12-12 17:06:04 -03:00
Jaime Passos	08e3caf9bb	Remove unused cvars	2019-12-12 16:53:31 -03:00
Jaime Passos	792750ee48	Add HWD_SET_MODEL_LIGHTING state	2019-12-12 16:48:37 -03:00
Nev3r	c5d8fe4752	Fix oversight on mapthing spawn Z calculation; ONFLOORZ and ONCEILINGZ don't equal to spawning the object at the base plane intersection.	2019-12-12 15:04:48 +01:00
Nev3r	c64a9d7ae9	Stop things from becoming Chocapic in THZ3, ACZ2, and special stages. ... Temporarily revert function call order for mapthings.	2019-12-12 11:37:48 +01:00
Nev3r	ec9f727e53	Move map data load procedure to separate functions.	2019-12-12 11:16:55 +01:00
Nev3r	43cbad200c	Move loading functions around a bit and refactor the stage data allocation code.	2019-12-12 10:35:38 +01:00
James R	7c383e4a1f	nix: Fork before game code and wait to catch signals and coredumps ... Ditched signal_handler to avoid worrying about async-signal-safe functions. D_QuitNetGame is not called, so players whose programs are interrupted by a signal will time out from the server. Because the game runs in a child process, the window can close before the "Signal Caught" text box appears. "(core dumped)" is also included in the message if core dumping could be determined.	2019-12-11 23:46:57 -08:00
fickleheart	a188cd5db8	Add boss target assist and finally organize camera options	2019-12-12 00:48:15 -06:00
James R	0ff421d001	Move I_ShutdownConsole to I_ShutdownSystem	2019-12-11 22:10:22 -08:00
fickleheart	efec52c48a	Fix input turning still happening with centered view	2019-12-11 22:47:09 -06:00
Jaime Passos	c578cee0b1	Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs	2019-12-12 01:39:46 -03:00
Jaime Passos	3ca0fbf5c3	da ba dee da ba die	2019-12-12 01:29:59 -03:00
fickleheart	34706515ca	Make locked input turn act the same as normal turning	2019-12-11 21:34:32 -06:00
fickleheart	a0ecb4b71d	Fix the console spam issue AGAIN	2019-12-11 21:20:07 -06:00
fickleheart	a830a20c52	[pink text] nter View	2019-12-11 21:12:38 -06:00
fickleheart	f1b5a2b2d3	Move Z-targeting behavior to Center View	2019-12-11 21:09:23 -06:00
Jaime Passos	ea129f701c	Fix Ploadflat closing the game with "Too many flats in level" error message	2019-12-11 22:45:47 -03:00
Tatsuru	d40359ee02	Hugging now requires being in the same Z position ... Don't try this at home	2019-12-11 19:13:22 -06:00
Jaime Passos	e01eb19044	Sad!	2019-12-11 22:11:00 -03:00
Jaime Passos	0652ffd67f	Merge remote-tracking branch 'origin/master' into flats-in-walls	2019-12-11 21:53:47 -03:00
James R	7a59ade63d	Merge branch 'garbage' into 'master' ... memset SERVERINFO maptitle See merge request STJr/SRB2Internal!624	2019-12-11 19:19:29 -05:00
James R	6464df9876	Maybe I'm mistaken but this probably isn't needed	2019-12-11 16:14:06 -08:00
lachwright	8a70759e0a	Add TC_DASHMODE color shader	2019-12-12 01:27:41 +08:00
Jaime Passos	37679bb44e	Organise	2019-12-11 13:26:28 -03:00
Jaime Passos	9340557d2d	Update f_wipe.c	2019-12-11 13:09:27 -03:00
Jaime Passos	43946d9826	Merge remote-tracking branch 'origin/master' into wipes2	2019-12-11 12:57:59 -03:00
Nev3r	edfe053cc3	Treat warnings as errors; comment out unused function.	2019-12-11 16:37:41 +01:00
Jaime Passos	be13f463f0	Update r_plane.c	2019-12-11 12:36:54 -03:00
Nev3r	d34fd4b755	Epic oversight in upside-down spawn offset.	2019-12-11 15:48:44 +01:00
Jaime Passos	dedd5527da	Restore portal culling code that went gone by pure accident	2019-12-11 11:35:34 -03:00
Nev3r	222336ac0b	Oversight, do not free the data yet vres_Free() does it already at the end.	2019-12-11 15:16:56 +01:00
Nev3r	a87a9e6ff6	Remove wrappers and dupes for map lump reading, as they are no longer used.	2019-12-11 14:40:31 +01:00
Nev3r	9952bae5ee	P_MakeMapMD5() now uses virtres.	2019-12-11 14:20:08 +01:00
Nev3r	14ad3b938e	Use virtres in P_SpawnSpecials(). Whether accessing the lump again here is right or not is also a different question.	2019-12-11 14:04:09 +01:00
Nev3r	4d86dc11a6	'prepare' mapthings using virtres in P_LevelInitStuff(). Whether 'preparing' them or not is actually necessary is another matter.	2019-12-11 13:54:15 +01:00
Nev3r	bf5a2c68d5	P_SetupLevel() no longer makes distinction on whether the map is a WAD in a PK3 or not.	2019-12-11 13:22:07 +01:00
Nev3r	854d50f479	Added 'virtual resource' mechanism for temporary memory loaded lump lists. If you can come up with a better name then I'm all ears.	2019-12-11 11:44:46 +01:00
Nev3r	d2cbdd4fb1	Do not overwrite the mapthing Z when spawning rings and similars, as it now causes them to respawn in wrong places because it is being actually used now.	2019-12-11 11:10:31 +01:00
Nev3r	584348b91e	Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead.	2019-12-11 10:13:52 +01:00
fickleheart	f74d7163e6	Fix RVZ camera stuff	2019-12-11 01:26:43 -06:00
GoldenTails	07316fc5bd	Stop characters from being able to activate their abilities when doing a shield ability! ... Fixes #61.	2019-12-10 23:55:52 -06:00
fickleheart	2ab83bac60	Run camera movement in the camera options menu ... It's really nice to see adjustments reflected in real time.	2019-12-10 23:18:46 -06:00
fickleheart	69b623e086	Add option to always turn with input while locked ... Uhhh also camera options scrolls now.	2019-12-10 22:01:17 -06:00
fickleheart	cdf5287fcc	Turn camera with strafe keys in camlock while charging spindash	2019-12-10 21:34:57 -06:00
fickleheart	a89f8e91f7	Change defaults and factors of simplecam options	2019-12-10 21:24:43 -06:00
fickleheart	054d51dac6	Make input turn speed tween by lateral momentum, not total	2019-12-10 21:14:50 -06:00
Jaime Passos	f531a8971f	Update m_menu.c	2019-12-10 23:40:15 -03:00
Jaime Passos	9248f12d55	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-10 23:01:10 -03:00
Jaime Passos	f51253a0a8	Tilted water	2019-12-10 17:01:19 -03:00
Nev3r	ca6a7ffbb3	Fix NiGHTS bumpers height.	2019-12-10 18:53:49 +01:00
Nev3r	8466dc5813	Move mobj spawn Z calculating to a separate function.	2019-12-10 18:03:15 +01:00
fickleheart	2b70b4bf36	TODO	2019-12-10 09:08:30 -06:00
fickleheart	72cf5d9927	Don't flood directionchar commands!!!	2019-12-10 08:17:41 -06:00
fickleheart	194e77a6f0	Give spindash turn a separate slider	2019-12-10 08:07:41 -06:00
fickleheart	e1d4e2edcb	Suspend directionchar while holding cam reset ... This should make it completely clear that thok will face the camera while it's held.	2019-12-10 07:58:50 -06:00
fickleheart	08ab15b1b9	Disable thok camera snap	2019-12-10 07:54:27 -06:00
Nev3r	3dfa526eea	Separate Emerald Hunt emerald spawning into another function.	2019-12-10 14:21:08 +01:00
fickleheart	2fa1e75016	I'm hilarious	2019-12-09 22:45:34 -06:00
fickleheart	a3961efc43	Draw crosshair in Simple mode while holding cam reset ... I think this gives extra indication that abilities face toward the camera now.	2019-12-09 22:12:19 -06:00
fickleheart	2a9819947e	Disable all new camera behavior if playstyle is not Simple	2019-12-09 22:09:58 -06:00
fickleheart	b5f7f5f732	Replace direction toggles with a playstyle selection ... It's kinda ugly right now...	2019-12-09 22:06:50 -06:00
fickleheart	834a3bf334	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	3735134948	Fix smoothing into input-based camera rotation	2019-12-09 20:31:19 -06:00
fickleheart	27996ada04	Scale down turn values (and increase defaults to compensate) ... This allows more granularity in menu sliders while limiting the maximums to reasonable amounts.	2019-12-09 20:26:12 -06:00
fickleheart	e4626e9396	Lock camera behind player when holding cam reset ... This also disables abilitydirection movement temporarily.	2019-12-09 20:21:32 -06:00
James R	4f9e227830	Cvar and menu option to let user increase turn speed ... cam_turnmultiplier and cam2_turnmultiplier. "Camera Speed" has been renamed to "Camera Spacial Speed" in the menu. "Camera Turning Speed" is now an option.	2019-12-09 16:30:03 -08:00
Nev3r	6fe6db8e18	Removed seemingly redundant (and incorrect) mapthing Z load code. ... The proper code seems to sit inside P_SpawnMapThing() and the SpawnHoop functions. Time will tell if I've actually commited an atrocity.	2019-12-09 14:05:22 +01:00
Nev3r	8ea7dd418a	Move the axis spawning code out of the mapthing read function, and read the mapthing z in the mapthing read function.	2019-12-09 13:26:31 +01:00
fickleheart	c99b137298	Fix abilitydirection camera breaking minecarts	2019-12-08 20:47:11 -06:00
Jaime Passos	4d83db5bb2	Die, Apple!	2019-12-08 22:31:59 -03:00
Jaime Passos	5c02bc59db	Speed up level loading ... Don't flush every texture just because the palette MAY have changed	2019-12-08 22:28:13 -03:00
Jaime Passos	c6769e7220	Die	2019-12-08 22:12:56 -03:00
fickleheart	0cad5021a9	Make input turn slow down when moving slowly	2019-12-08 18:26:20 -06:00
Jaime Passos	7f58002e12	Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer	2019-12-08 21:10:48 -03:00
Jaime Passos	25464c867a	Translate the French	2019-12-08 21:10:14 -03:00
fickleheart	a30623e4ed	Default to no turn-facing since it looks like controller drift	2019-12-08 15:54:37 -06:00
fickleheart	e92d7eca8e	Shift camera sideways toward player angle	2019-12-08 15:54:16 -06:00
fickleheart	4784eb68fa	Don't do thok camera snap in replays	2019-12-08 15:49:10 -06:00
fickleheart	575b5027e8	Don't snap thok if the player is holding a camera control	2019-12-08 15:22:51 -06:00
fickleheart	c94d7895df	Make cam_rotspeed affect non-mouse turn speed ... 10 remains the default and is vanilla behavior.	2019-12-08 15:17:46 -06:00
fickleheart	eee0d42b1f	Make first-person and directionchar-off work as expected	2019-12-08 15:05:44 -06:00
fickleheart	ebd2861593	Add menu options for new camera controls ... Crank everything down to zero and set ability direction to "Camera", and you're back to base 2.2 behavior.	2019-12-08 14:43:25 -06:00
fickleheart	36fa94a22c	Automatically rotate camera to reflect player actions	2019-12-08 14:35:50 -06:00
fickleheart	075f751f67	Add cvar to use abilities in input direction	2019-12-08 14:17:48 -06:00
fickleheart	32c9c912ab	Consolidate G_BuildTiccmd	2019-12-08 13:27:11 -06:00
Alam Ed Arias	e91a689478	Merge branch 'master' into opengl-is-a-bad-renderer	2019-12-08 12:50:45 -05:00
Alam Ed Arias	d8eccc2921	Merge remote-tracking branch 'public/strcasestr-swap' into buildbot	2019-12-08 12:36:23 -05:00
Alam Ed Arias	1d0cd586ba	P_AddWadFile: the PK3 may not have folders	2019-12-08 12:35:21 -05:00
Alam Ed Arias	623629b04a	OpenGL: note that the Buffer API is OpenGL 1.5, so we can be used in STATIC_OPENGL	2019-12-08 12:33:11 -05:00
Alam Ed Arias	35168ddeae	OpenGL: yflip is used to hold more then true/false	2019-12-08 12:32:23 -05:00
Jaime Passos	d74f2a003b	HWR_FreeMipmapCache already calls HWR_FreeMipmapCache indirectly ... (done by calling HWR_LoadTextures, which in turn calls HWR_FreeTextureCache)	2019-12-08 04:40:29 -03:00
Jaime Passos	4c808cb7e2	Actually don't even call HWR_FreeMipmapCache between levels because I feel like it's futile outside of PWAD loading	2019-12-08 04:32:25 -03:00
Jaime Passos	d8a804febc	LMFAOOOOOOOOOOOOOOOOOOOOOOOO	2019-12-08 04:15:25 -03:00
Jaime Passos	cc12496e9c	Optimize mipmaps	2019-12-08 03:23:37 -03:00
Jaime Passos	ce61b17117	Update hw_main.c	2019-12-08 02:27:51 -03:00
Jaime Passos	964978a337	Delete md2_transform	2019-12-08 02:25:53 -03:00
Jaime Passos	bc60a0a887	Make some things clearer here.	2019-12-08 01:54:03 -03:00
Jaime Passos	40b862967d	Just in case?	2019-12-07 23:55:28 -03:00
Jaime Passos	e9e0683d5e	Cleanup FreeMipmapColormap	2019-12-07 23:46:05 -03:00
James R	d5816d44f3	Use a third variable of XOR nonsense	2019-12-07 17:36:45 -08:00
James R	cadaecbfcf	memset this or the stupid masterserver (used to) show garbage bytes ... Also for security I guess...	2019-12-07 15:47:18 -08:00
mazmazz	2a9a2c0f02	Travis yflip error	2019-12-07 14:30:51 -05:00
mazmazz	0d41a55071	Deployer fixes for 2.2.0	2019-12-07 13:56:05 -05:00
Jaime Passos	69c08f93bb	Update d_main.c	2019-12-07 11:55:53 -03:00
MascaraSnake	79b04c5872	One more asset hash change	2019-12-07 14:17:26 +01:00
toaster	0bd1399c52	Revert paperprojection, but keep it as a #define in case someone fixes it in a patch.	2019-12-07 10:22:10 +00:00
Alam Ed Arias	d02648450a	Let fix that GCC warning	2019-12-06 18:12:50 -05:00
James R	53cfba1f42	Use strncpy	2019-12-06 15:09:07 -08:00
MascaraSnake	0d22970c78	Change versionstring to 2.2.0	2019-12-06 23:47:05 +01:00
MascaraSnake	f6563c85ed	Updated MD5 hashes	2019-12-06 23:43:54 +01:00
MascaraSnake	bf477c6ed4	Merge branch 'master' into nondevelop	2019-12-06 23:23:01 +01:00
MascaraSnake	239242f513	Merge branch 'stretch-credits' into 'master' ... Lengthen credits for msuic parity See merge request STJr/SRB2Internal!620	2019-12-06 17:19:17 -05:00
MascaraSnake	78de32b623	Merge branch 'creditweak' into 'master' ... Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox. See merge request STJr/SRB2Internal!621	2019-12-06 17:18:54 -05:00
Steel Titanium	5f9f255f77	Correct comment	2019-12-06 17:10:14 -05:00
toaster	66bd864592	Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.	2019-12-06 22:06:35 +00:00
lachwright	8f2d81ec74	Lengthen credits for msuic parity	2019-12-07 05:59:26 +08:00
MascaraSnake	a0ebb32912	Merge branch 'introskiptext' into 'master' ... Add "Press ENTER to skip..." text to the intro's first scene See merge request STJr/SRB2Internal!619	2019-12-06 16:48:29 -05:00
MascaraSnake	a3549cc8f2	Merge branch 'datestuff' into 'master' ... Date stuff See merge request STJr/SRB2Internal!618	2019-12-06 16:10:36 -05:00
MascaraSnake	f3fd5a50cb	Merge branch 'signpost-cleanup' into 'master' ... Signpost fixes See merge request STJr/SRB2Internal!602	2019-12-06 15:58:46 -05:00
toaster	674fcd7923	Add "Press ENTER to skip..." text to the intro's first scene, for new players who might otherwise sit through a load of (polished) crap. :P	2019-12-06 20:50:41 +00:00
MascaraSnake	f4c89c2dac	Merge branch 'analogfixes' into 'master' ... Small analog mode fixes See merge request STJr/SRB2Internal!604	2019-12-06 15:32:10 -05:00
Steel Titanium	f304931ac4	get lua_blockmaplib.c too	2019-12-06 15:27:20 -05:00
Steel Titanium	86cd363d16	Merge branch 'datestuff' of git.magicalgirl.moe:STJr/SRB2Internal into datestuff	2019-12-06 15:23:02 -05:00
Steel Titanium	f02418e70c	Fix copy+paste goof	2019-12-06 15:21:41 -05:00
Jaime Passos	fcc4427de6	Update r_patch.h	2019-12-06 17:07:57 -03:00
Jaime Passos	c4518cce9d	Update r_patch.c	2019-12-06 17:05:36 -03:00
MascaraSnake	201cdef381	Merge branch 'f12fix' into 'master' ... Fix F12 issues Closes #356 and #377 See merge request STJr/SRB2Internal!616	2019-12-06 15:01:28 -05:00
Alam Ed Arias	1f183e1c1f	Not dealing with size_t mess with SDL code	2019-12-06 14:42:47 -05:00
MascaraSnake	e105c2f749	Merge branch 'undo_double' into 'master' ... OpenGL cast to float, not store in double See merge request STJr/SRB2Internal!617	2019-12-06 14:28:41 -05:00
Jaime Passos	d7bfe7d652	Merge branch 'lt-extraneous-parameters' into 'master' ... Remove unnecessary function parameters from title card code See merge request STJr/SRB2Internal!603	2019-12-06 14:22:39 -05:00
Steel Titanium	d415cd5c6d	Update copyright date on source files	2019-12-06 13:49:42 -05:00
Alam Ed Arias	f576e61753	OpenGL cast to float, not store in double	2019-12-06 13:45:11 -05:00
lachwright	2e77970526	Fix whitespace issues from when I was new to this shit	2019-12-07 02:31:31 +08:00
lachwright	4a26aec031	Actually fix F12 issues	2019-12-07 02:27:48 +08:00
lachwright	e7574957bc	Hopefully fix F12 issues	2019-12-07 01:52:40 +08:00
toaster	6e8299f39d	Update comments in the config on when main assets/patch.pk3 hashes have been updated (I know MS is going to update the hashes again later, but this'll still be valid to have done then).	2019-12-06 17:38:23 +00:00
toaster	fd6ecb4425	Make modid 18 to match Rob's work.	2019-12-06 17:23:55 +00:00
toaster	1684cf76bd	Make modversion 40 to match Rob's work.	2019-12-06 17:19:42 +00:00
toaster	9e38af7421	* Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461). ... * Update md5s. * Update modversion. TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?	2019-12-06 17:14:51 +00:00
lachwright	c4f48ee979	Make Buggles spawn immediately breathable bubbles	2019-12-06 16:29:52 +08:00
MascaraSnake	c468ae5239	Merge branch 'rockcrumblefix' into 'master' ... Edit some rock crumble states to match new sprites. See merge request STJr/SRB2Internal!601	2019-12-05 17:10:34 -05:00
MascaraSnake	69da1a7733	Merge branch 'perfectra' into 'master' ... Record Attack perfect bonus stuff Closes #457 See merge request STJr/SRB2Internal!607	2019-12-05 17:02:38 -05:00
MascaraSnake	bbc5d33266	Merge branch 'notutclear' into 'master' ... Fix clearing maps/unlockables causing crashes and hangs. See merge request STJr/SRB2Internal!609	2019-12-05 17:02:10 -05:00
MascaraSnake	87843365fc	Merge branch 'nightslevsel' into 'master' ... NiGHTS Attack left-right level selection See merge request STJr/SRB2Internal!608	2019-12-05 16:53:21 -05:00
MascaraSnake	6393542dc3	Merge branch 'wordwrapfix' into 'master' ... Fix V_WordWrap and the new additional text colour codes. See merge request STJr/SRB2Internal!612	2019-12-05 16:32:30 -05:00
MascaraSnake	adfbf3630c	Merge branch 'tailsbubblefix' into 'master' ... Tails Bubble Fix See merge request STJr/SRB2Internal!606	2019-12-05 16:20:24 -05:00
MascaraSnake	114753e2fe	Merge branch 'paperfix2' into 'master' ... Another potential papersprite crash fix Closes #456 See merge request STJr/SRB2Internal!605	2019-12-05 16:19:33 -05:00
Alam Ed Arias	c0ec90901e	frameFrame is unsigned, let set it to 0xFF	2019-12-05 15:50:44 -05:00
toaster	b2e9e8fb18	Fix V_WordWrap and the new additional text colour codes.	2019-12-05 19:43:37 +00:00
Jaime Passos	7765dd538c	Merge remote-tracking branch 'origin/master' into wipes2	2019-12-05 16:26:50 -03:00
toaster	b76a1d3df7	* Don't iterate through the list twice to print "No hidden emblems on this map". ... * Make it "No hint available for this emblem" instead of "No hints available", which people may confuse as the first message (I know I did!)	2019-12-05 19:26:31 +00:00
Jaime Passos	ed34cb8d79	Change st_overlay to cv_showhud.value	2019-12-05 16:25:19 -03:00
toaster	514616c546	Allow for 10 emblem hints on a map by poking the drawer a bit. ... This is a very small diff, but I can understand if you'd not feel comfortable having this until after 2.2.0.	2019-12-05 19:09:41 +00:00
toaster	7bd5d291ce	Fix unlockable checklist literally hanging if any unlockables are cleared.	2019-12-05 18:40:30 +00:00
Alam Ed Arias	3120c99eeb	Fix compiling for MSVC	2019-12-05 12:38:50 -05:00
Alam Ed Arias	0ca87560ab	Fix building libpng and zlib with MSVC	2019-12-05 12:33:18 -05:00
Alam Ed Arias	f1d2968c19	Merge branch 'public_next' into private	2019-12-05 11:18:33 -05:00
Alam Ed Arias	b1571f81b1	Merge branch 'master' into next	2019-12-05 10:52:17 -05:00
Alam Ed Arias	0a24c82346	Fix building with MSVC	2019-12-05 10:51:55 -05:00
toaster	7f6c98f046	Fix clearing maps making the Tutorial option on the SP menu crash.	2019-12-05 13:42:08 +00:00
toaster	848d7ad819	Allow the NiGHTS Attack menu to have the levels selectable left-and-right-wise, just like Record Attack.	2019-12-05 11:12:35 +00:00
toaster	2b5957fd1c	Fix #457 and another bug I just realised in one fell swoop. ... That is to say, MV_PERFECT can be applied in singleplayer, but that doesn't update your best rings on the map in record attack, so the thing being yellow doesn't make sense if your rings are (none). Therefore, make it a two-flag, two-bit process.	2019-12-05 09:47:29 +00:00
toaster	25eacbffb8	Make Tails' "I'll give you a hand!" bubble a hnext chain instead of a target set, which is way less likely to be clobbered in standard gameplay. ... Should resolve both #440 and #458, which are two sides of the same issue - target being overwritten.	2019-12-05 09:36:58 +00:00
toaster	7c7f258c2d	Another potential papersprite crash fix, but way more confident about this one.	2019-12-05 09:28:28 +00:00
lachwright	cffc6a0e46	Fix diagonal input acceleration and glide directioning in analog mode	2019-12-05 15:59:16 +08:00
Jaime Passos	13c6b38b13	Merge remote-tracking branch 'origin/lt-extraneous-parameters' into wipes2	2019-12-05 02:03:09 -03:00
lachwright	28fbdab3d4	Make signpost camera distance consistent in analog mode & don't target signpost in 2D mode	2019-12-05 12:58:44 +08:00
Jaime Passos	c0cc742fb8	Remove unnecessary function parameters from title card code	2019-12-05 01:58:19 -03:00
Jaime Passos	b5d5749bfb	Merge remote-tracking branch 'origin/master' into wipes2	2019-12-05 01:48:58 -03:00
Jaime Passos	7384522aef	Fix Continue game state wipes	2019-12-05 01:47:51 -03:00
lachwright	fdf3944f60	Merge branch 'master' into signpost-cleanup	2019-12-05 12:37:03 +08:00
lachwright	8ddfdf2d0f	Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode	2019-12-05 12:36:25 +08:00
sphere	d1b456b893	Edit some rock crumble states to match new sprites.	2019-12-05 02:22:25 +01:00
Jaime Passos	6adb957f0f	Slap colormap fades everywhere	2019-12-04 19:25:39 -03:00
MascaraSnake	e6f1b82cc4	Merge branch 'minusoneframes' into 'master' ... Minus One Frames See merge request STJr/SRB2Internal!593	2019-12-04 17:15:51 -05:00
MascaraSnake	6b344b9ddf	Merge branch 'freemipmapcolormap-momento-irmao' into 'master' ... Fix FreeMipmapColormap yet again See merge request STJr/SRB2Internal!597	2019-12-04 17:10:06 -05:00
MascaraSnake	a7884e479a	Merge branch 'timeoverrings' into 'master' ... Time Over rings (resolves #446). Closes #446 See merge request STJr/SRB2Internal!596	2019-12-04 17:09:32 -05:00
MascaraSnake	6928763961	Merge branch 'nullplayerslopelaunch' into 'master' ... Fix slope launch with NULL player causing SIGSEGV. See merge request STJr/SRB2Internal!595	2019-12-04 17:07:04 -05:00
MascaraSnake	01da9f7f16	Merge branch 'tokenultimate' into 'master' ... Fix tokens not spawning in ultimate mode See merge request STJr/SRB2Internal!594	2019-12-04 17:06:43 -05:00
MascaraSnake	5662f8de00	Merge branch 'credits-update' into 'master' ... Credits update See merge request STJr/SRB2Internal!484	2019-12-04 16:59:46 -05:00
MascaraSnake	6a811515db	Merge branch 'have_png-compile-fix' into 'master' ... NO_PNG_LUMPS compile fix See merge request STJr/SRB2Internal!598	2019-12-04 16:59:13 -05:00
MascaraSnake	77d446cc04	Merge branch 'spsmshgular' into 'master' ... sfx_spsmsh (hhz spikeball) is now singular Closes #451 See merge request STJr/SRB2Internal!599	2019-12-04 16:58:56 -05:00
toaster	fe0b92d01a	sfx_spsmsh (hhz spikeball) is now singular	2019-12-04 20:32:46 +00:00
Jaime Passos	81cfca29d8	Fix FreeMipmapColormap yet again	2019-12-04 15:50:17 -03:00
Jaime Passos	b646922967	fix Ploadflat warning	2019-12-04 15:41:29 -03:00
Jaime Passos	839251633c	fix ErrorIfPNG errors	2019-12-04 15:26:51 -03:00
toaster	e8ac1c391c	Make rings 0 in competition winner selection if you gamed or timed over, and use the MAXSCORE macro instead of a hardcoded value.	2019-12-04 17:32:47 +00:00
Alam Ed Arias	c432f86624	change from shifting bits to multi for a OLD video function marco	2019-12-04 10:43:33 -05:00
Alam Ed Arias	0751f8987a	Libs: move pngconf.h out of top level libpng source folder	2019-12-04 10:41:54 -05:00
toaster	7f82d7451d	Fix slope launch with NULL player causing SIGSEGV.	2019-12-04 12:13:27 +00:00
Steel Titanium	41210708e2	Merge branch 'fade-timeout-fix' into 'master' ... Temporary fix for the fade timeout See merge request STJr/SRB2Internal!592	2019-12-03 20:19:33 -05:00
toaster	c843f22a24	Spawn tokens in ultimate mode now they no longer give you rings on successful special stage completion.	2019-12-03 23:21:36 +00:00
MascaraSnake	20c1a0158d	Added Sev to the Art section of the credits	2019-12-04 00:07:56 +01:00
MascaraSnake	c2577b6eb3	Added more people to the credits and reorganized them slightly	2019-12-04 00:02:47 +01:00
MascaraSnake	602ba32ecc	A few more credits additions/adjustments	2019-12-03 22:22:48 +01:00
toaster	e75490c99d	Semi-hacky fix to R_AddSpriteDefs printing Added -1 frames in 0 sprites: if the start marker is equal to or beyond the end marker, none of r_things' for (l = startlump; l < endlump; l++) loops will run, so just assume no sprites. ... Simply put, `W_CheckNumForFolderStartPK3` and its `End` equivalent will never return INT16_MAX for nonexistence, and I don't want to break any assumptions elsewhere by modifying those functions directly, so this is the simplest possible fix.	2019-12-03 21:05:05 +00:00
MascaraSnake	7a8d1b4d4b	Merge branch 'creditsart' into 'master' ... New credits art + credits header support See merge request STJr/SRB2Internal!591	2019-12-03 14:28:51 -05:00
Louis-Antoine	84e7672cca	Temporary fix for the fade timeout	2019-12-03 12:02:14 +01:00
MascaraSnake	0c048d2667	Merge branch 'tailsbotdetect' into 'master' ... Attempt to detect Tailsbot and Sonic spawning on top of each other See merge request STJr/SRB2Internal!584	2019-12-03 02:20:30 -05:00
MascaraSnake	f9460434f8	Merge branch 'savedatareorder' into 'master' ... Savedata load order of operations change See merge request STJr/SRB2Internal!583	2019-12-03 02:18:06 -05:00
MascaraSnake	c30886a47f	Merge branch 'botregrab' into 'master' ... Allow re-grabbing Tails AI mid-flight (resolves #428) Closes #428 See merge request STJr/SRB2Internal!590	2019-12-03 02:17:37 -05:00
MascaraSnake	c1d5f411e0	Merge branch 'paperfixes' into 'master' ... Nail a likely culprit in papersprite rendering resolving #427 and #375. Closes #427 and #375 See merge request STJr/SRB2Internal!589	2019-12-03 02:16:26 -05:00
MascaraSnake	ab400e926a	Merge branch 'emeraldfall' into 'master' ... Fix emerald coordinate overflow in failed SS tally (resolves #421). Closes #421 See merge request STJr/SRB2Internal!586	2019-12-03 02:15:47 -05:00
MascaraSnake	ba0dc5c884	Merge branch 'ideyagun' into 'master' ... Ideyagun (resolves #406). Closes #406 See merge request STJr/SRB2Internal!582	2019-12-03 02:15:26 -05:00
Alam Ed Arias	b5738620c1	Fixup compiling errors	2019-12-02 12:12:26 -05:00
lachwright	be3d7b7dcd	- Remove y coordinate from struct for credits_pics ... - Update x coordinates for credits_pics entries - Reorder credits_pics entries (what even was the previous order lol) - Add zig zag graphics to credits roll - Attempt to scale the y positions of credits graphics with the length of the credits roll - New escape character for credits entries: \2, which centers the text and makes it yellow - Add support for colored text to V_DrawStringAtFixed	2019-12-02 22:24:05 +08:00
toaster	2bc67bf813	Allow re-grabbing Tails AI mid-flight (resolves #428)	2019-12-01 13:31:33 +00:00
toaster	f21ebaea0c	Nail a likely culprit in papersprite rendering for #427 and #375.	2019-12-01 13:21:41 +00:00
MascaraSnake	ae2594e5ce	Merge branch 'metalfix' into 'master' ... Boss Scream fix See merge request STJr/SRB2Internal!581	2019-12-01 02:26:24 -05:00
MascaraSnake	97fdc5aaf0	Merge branch 'introfix' into 'master' ... Fix intro's BRITEGG/DARKEGG scale See merge request STJr/SRB2Internal!580	2019-12-01 02:25:22 -05:00
sphere	ec3548c7f4	Merge remote-tracking branch 'origin/master' into credits-update	2019-12-01 00:32:01 +01:00
toaster	f662ef9454	Fix emerald coordinate overflow in failed SS tally (resolves #421).	2019-11-30 20:02:51 +00:00
sphere	d9a88ec10c	Promote some programmers, add Blade & CoatRack to texture artists.	2019-11-30 18:23:57 +01:00
toaster	515600c4d0	Attempt to detect Tailsbot and Sonic spawning at the same coords and restrict some undesirable stuff happening, just in case we miss any situations (or for the sake of mods).	2019-11-30 16:54:51 +00:00
mazmazz	be44f0701e	Clean up music error messages	2019-11-30 11:53:45 -05:00
toaster	6e278c1138	Change the order of operations such that savedata info is loaded before mapthings are spawned, so that if you have all the emeralds, the emerald objects won't spawn in BCZ2 if you use the SP savefile's level select to go to it directly.	2019-11-30 15:52:41 +00:00
toaster	3267a98fe9	Remove tracer nulling, likely a leftover from when P_LookForEnemies set tracer directly.	2019-11-30 15:28:50 +00:00
toaster	9d442ae6ea	Wait, no, I'm an idiot.	2019-11-30 14:56:43 +00:00
toaster	2eb8e6be49	...why is Metal overwriting his movecount to spawn explosions?	2019-11-30 14:37:21 +00:00
lachwright	6613286f1c	Fix intro's BRITEGG/DARKEGG scale	2019-11-30 22:07:21 +08:00
MascaraSnake	e664e8b7f3	Merge branch 'jumphood' into 'master' ... Jumphood See merge request STJr/SRB2Internal!573	2019-11-30 06:53:15 -05:00
lachwright	d46f022837	Restore spindash sounds to DSSPNDSH	2019-11-30 19:30:58 +08:00
toaster	85e3180056	Make the fling always occur, and only have the horizontal momentum apply if not MTF_EXTRA.	2019-11-30 10:31:18 +00:00
toaster	0d4158bbd0	Fix the flung Brak not being removed on deathpits.	2019-11-30 10:29:51 +00:00
MascaraSnake	0d433b9e51	Merge branch 'brakyeet' into 'master' ... This Black Eggman? ***YEET*** (resolves #399) Closes #399 See merge request STJr/SRB2Internal!575	2019-11-30 05:21:55 -05:00
MascaraSnake	b22e8c809f	Merge branch 'goldstatue' into 'master' ... Gold statue MTF_EXTRA See merge request STJr/SRB2Internal!576	2019-11-30 05:19:27 -05:00
toaster	c2bd91af50	Discovered this was wrong when working on the config for brakyeet, MS objected to the hack so he's updating the tutorial map accordingly.	2019-11-30 10:12:45 +00:00
MascaraSnake	23b0b03d4d	Merge branch 'spd' into 'master' ... Deton alert sound See merge request STJr/SRB2Internal!491	2019-11-30 05:04:10 -05:00
MascaraSnake	c72f501042	Merge branch 'sandtnoflip' into 'master' ... S&T no flip See merge request STJr/SRB2Internal!571	2019-11-30 05:03:07 -05:00
MascaraSnake	6bbc412eac	Merge branch 'finalcountdown' into 'master' ... The final countdown (resolves #400). Closes #400 See merge request STJr/SRB2Internal!574	2019-11-30 04:03:07 -05:00
MascaraSnake	8a3c7da1d2	Merge branch 'mapinter' into 'master' ... Intermission Buffer Clear On Map Command (no funny name today) See merge request STJr/SRB2Internal!570	2019-11-30 04:02:44 -05:00
MascaraSnake	3bddd4365a	Merge branch 'newintro' into 'master' ... New intro graphics See merge request STJr/SRB2Internal!524	2019-11-30 04:01:51 -05:00
lachwright	916fec2c41	Make INTRO4 display at high res	2019-11-30 12:31:23 +08:00
lachwright	d88eef3e95	Merge branch 'master' into newintro	2019-11-30 12:30:12 +08:00
toaster	339907fd5d	This Black Eggman? ***YEET*** ... Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.	2019-11-29 21:55:25 +00:00
toaster	fdcc8c912a	Actually, wait; this is way better and cleaner.	2019-11-29 20:41:13 +00:00
toaster	ed0529b9d5	Match final countdown timer to timer (resolves #400).	2019-11-29 20:35:59 +00:00
toaster	0db38d213b	Make Cobalt-picked sound effect audible from far away, like the original.	2019-11-29 20:04:14 +00:00
toaster	de34298bbd	Merge branch 'master' into spd	2019-11-29 19:19:55 +00:00
toaster	1fa87611f7	Give the Robo-Hood a cute jump sound whenever it's fleeing you.	2019-11-29 19:18:05 +00:00
toaster	92f8c002f3	Prevent exit sectors having any effect whatsoever outside of platform gametypes (resolve #396).	2019-11-29 19:11:17 +00:00
toaster	960ee7fe72	Don't flip P1 of a two-character save card, for aesthetique reasons.	2019-11-29 15:58:37 +00:00
toaster	cbc49882bc	Fix screen buffer not being cleared if a map command is used during the intermission.	2019-11-29 15:25:55 +00:00
MascaraSnake	bc00380aa4	Merge branch 'endelinger' into 'master' ... Endelinger (resolves #384). Closes #384 See merge request STJr/SRB2Internal!569	2019-11-28 16:10:04 -05:00
MascaraSnake	ebcb17d607	Merge branch 'sleepwalkin' into 'master' ... Sleepwalkin (resolves most of #382) Closes #382 See merge request STJr/SRB2Internal!567	2019-11-28 16:08:40 -05:00
James R	ccbb122143	Holy shit	2019-11-28 12:10:57 -08:00
MascaraSnake	2495e58bdb	Merge branch 'campokes' into 'master' ... Camera pokes (resolves #359, #363, and #383). Closes #359, #363, and #383 See merge request STJr/SRB2Internal!566	2019-11-28 14:21:18 -05:00
toaster	f5dd0c5c3b	Update ending cutscene(s) to linger for an additional two seconds, so that the music can properly fade out (resolves #384).	2019-11-28 19:11:12 +00:00
MascaraSnake	546c54b390	Merge branch 'mpspecfix2' into 'master' ... Counting spheres (resolves #378). Closes #378 See merge request STJr/SRB2Internal!564	2019-11-28 13:54:47 -05:00
Louis-Antoine	ec69195fc9	Keep counting players as finished even after dying	2019-11-27 17:32:02 +01:00
toaster	803b22a3e7	Change required for Tails' tails to behave like falling sprite.	2019-11-27 13:54:13 +00:00
toaster	7ff218efaf	Change SPR_NFLT default to superised SPR2_FALL (resolves code side of #382).	2019-11-27 13:47:38 +00:00
toaster	ae84246721	Fix camera not being flipped when camera is stopped due to game design hack reasons (resolves #383).	2019-11-27 13:37:03 +00:00
LJ Sonic	c29540a201	Merge branch 'exit-move-lj' into 'master' ... No more drowning with exitmove now. See merge request STJr/SRB2Internal!563	2019-11-27 08:17:22 -05:00
toaster	bcbf5e7c38	Correct tutorialmode case doubling up on camerascale.	2019-11-27 12:54:00 +00:00
toaster	7ff4a9b1e7	Make camerascale have no effect in 2D mode (resolves #359 and resolves #363).	2019-11-27 12:31:23 +00:00
toaster	a3050063cd	Resolve #378, because I knew as soon as I saw that issue name that it was my fault.	2019-11-27 09:03:21 +00:00
MascaraSnake	9a1dd06776	Merge branch 'continuequestionmark' into 'master' ... Continue? See merge request STJr/SRB2Internal!562	2019-11-26 17:24:25 -05:00
MascaraSnake	c8c52315fa	Merge branch 'burningpoint' into 'master' ... Burning points (resolves #373). Closes #373 See merge request STJr/SRB2Internal!561	2019-11-26 17:24:22 -05:00
MascaraSnake	3aa72c5553	Merge branch 'ballstuck' into 'master' ... BALL STUCK!! BALL!!!! STUCK!!!!!! (Resolve #374) Closes #374 See merge request STJr/SRB2Internal!560	2019-11-26 17:24:20 -05:00
MascaraSnake	07afb52a2a	Merge branch 'deadstuff' into 'master' ... Matters of mortality See merge request STJr/SRB2Internal!558	2019-11-26 17:24:17 -05:00
MascaraSnake	b98b56670e	Merge branch 'bottweaks' into 'master' ... Bot fixes See merge request STJr/SRB2Internal!557	2019-11-26 17:24:15 -05:00