10417 commits

Author	SHA1	Message	Date
Jaime Passos	1751d7afed	Cache the console patch only once in CON_DrawBackpic	2020-08-14 20:48:15 -03:00
Jaime Passos	1950f1c7f7	Fix cv_glshearing 2 in first person	2020-08-14 20:31:30 -03:00
James R	be14b8a564	dumbass doesn't test changes before pushing directly to next	2020-08-14 08:25:12 -07:00
James R	aa19bce4a9	Autocomplete aliases in console	2020-08-14 00:00:45 -07:00
James R	f0a79df2b8	Use AsciiChar to get the input from windows console window	2020-08-13 21:57:36 -07:00
James R	4734b9d728	Stop treating apostrophes, parenthesis and curly braces as separate arguments	2020-08-13 21:11:45 -07:00
Louis-Antoine	9dd5c11322	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate ... # Conflicts: # src/d_clisrv.c # src/d_clisrv.h # src/d_net.c # src/p_saveg.c # src/p_saveg.h	2020-08-13 13:53:10 +02:00
James R	3e02f5d0cb	Add http-mserv to fuck ... (cherry picked from commit 1a1c215a9110491a3c7324045dc96c18b604d9e7)	2020-08-09 23:34:16 -07:00
Steel Titanium	3d1110a0c2	Fix cmake using wrong libs if internal libs is turned on ... Use '\0' instead, just in case (cherry picked from commit 9293c6cb32109b5b003114ab441e312df76f263c)	2020-08-09 20:28:33 -07:00
James R	0af38bc5eb	Bump MAXNETNODES to 127 ... (cherry picked from commit 9d9f8fd8a337a1786efa0d348c89e05b26ce8571)	2020-08-09 18:32:05 -07:00
James R	e9748e5317	Merge branch 'clipboard-crash-fix-2' into 'next' ... Fix buffer overrun in I_ClipboardPaste (resolves #205) Closes #205 See merge request STJr/SRB2!1105	2020-08-09 21:06:18 -04:00
James R	3e8cf5ab06	Merge branch 'bt_spin' into 'next' ... Replace all occurances of BT_USE with BT_SPIN (2.2!) See merge request STJr/SRB2!982	2020-08-09 21:03:17 -04:00
James R	85d0199661	Merge branch 'audio-cleanup' into 'next' ... Audio cleanup See merge request STJr/SRB2!1101	2020-08-09 20:49:28 -04:00
James R	a808294c0c	Merge branch 'kill-cd-support' into 'next' ... Kill CD support See merge request STJr/SRB2!1102	2020-08-09 20:48:25 -04:00
James R	8301e4f93c	Merge branch 'word-delet' into 'next' ... Word delete and backspace in console See merge request STJr/SRB2!1092	2020-08-09 20:46:37 -04:00
James R	8394bf6055	Merge branch 'opengl-skydome-fixes' into 'next' ... Move the sky dome code out of r_opengl.c, fix issues with shaders See merge request STJr/SRB2!1071	2020-08-09 20:45:01 -04:00
James R	23f218117c	Merge branch 'http-mserv' into 'next' ... HTTP Based Master Server + Multithreading See merge request STJr/SRB2!940	2020-08-09 20:24:26 -04:00
James R	46a4bd2d08	Merge branch 'lmaogalog' into 'next' ... Make old analog functional again See merge request STJr/SRB2!1098	2020-08-09 20:13:04 -04:00
GoldenTails	23edfd6d09	Fix string drawing functions so they account for V_NOSCALEPATCH effectively multiplying the width of the screen	2020-08-09 11:03:02 -05:00
James R	5153338bf5	Merge branch 'kill-dos' into 'next' ... Remove support for DOS See merge request STJr/SRB2!1090	2020-08-08 21:26:18 -04:00
James R	cd30f0e933	Match MAXSERVERLIST to MAXNETNODES, increase MAXNETNODES ... Each server in the server list requires a node. It's also MAXNETNODES-1 because the first node is yourself. (cherry picked from commit 1484f0484f6c22382b2cae955a93c01f83d54655)	2020-08-08 15:13:21 -07:00
James R	54e446199d	Merge remote-tracking branch 'origin/next' into http-mserv	2020-08-08 15:05:03 -07:00
Jaime Passos	9772bbeda1	Fix buffer overrun in I_ClipboardPaste	2020-08-08 15:36:01 -03:00
Jaime Passos	2a0e47e28f	Remove LUA_PATCH_SAFETY	2020-08-08 14:56:04 -03:00
Jaime Passos	91ed56ef40	Refactor patch loading	2020-08-08 05:16:47 -03:00
Jaime Passos	74dfa9f700	Shader code cleanup	2020-08-07 18:17:05 -03:00
Steel Titanium	dff0e87e03	Kill CD support	2020-08-07 17:06:19 -04:00
Steel Titanium	2d39af8604	Remove all this unused playlist related code	2020-08-07 16:44:16 -04:00
Steel Titanium	5c53157192	Remove every musserv and sndserv def'd code	2020-08-07 16:40:46 -04:00
James R	cc677d2d50	Merge branch 'com-buf-insert-text-optional-player' into 'next' ... Make the player optional for COM_BufInsertText and COM_BufAddText. See merge request STJr/SRB2!1093	2020-08-05 19:53:28 -04:00
James R	cc508d0ba3	Merge branch 'ogl-model-lighting-shader' into 'next' ... Add capability to use model lighting with shaders enabled See merge request STJr/SRB2!1073	2020-08-05 19:50:31 -04:00
James R	1c9633504d	Merge branch 'hide-followmobj' into 'next' ... Hide Metal Sonic's jet fume in first person Closes #204 See merge request STJr/SRB2!1099	2020-08-05 19:47:13 -04:00
James R	a31c8d12b4	Merge branch 'udmf-fixmapthingheight' into 'next' ... UDMF: Fix mapthing spawn height scaling improperly with the object scale; only special… See merge request STJr/SRB2!1096	2020-08-05 19:46:48 -04:00
James R	d8834143cb	Merge branch 'ogl-sector-alignment-fix' into 'next' ... Fix sector flat alignment issues in OpenGL See merge request STJr/SRB2!1094	2020-08-03 12:47:29 -04:00
James R	f5d9029d2a	Merge branch 'ogl-big-room-fix' into 'next' ... Big room fix for OpenGL See merge request STJr/SRB2!1089	2020-08-03 12:44:09 -04:00
lachwright	3a96142c8b	Hide Metal Sonic's jet fume in first person	2020-08-03 20:09:35 +08:00
Nev3r	ba5d09eb2e	Fix smooth brain bruhments.	2020-07-31 22:38:37 +02:00
Nev3r	0520725069	Fix the OpenGL FOF issue with a different approach. Not fond of it either but at least it works.	2020-07-31 14:55:26 +02:00
Zachary McAlpin	e5b6d19f57	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port	2020-07-30 15:37:41 -05:00
lachwright	837c9bbec3	Make old analog functional again	2020-07-30 18:22:15 +08:00
Nev3r	b99385e159	Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now.	2020-07-30 09:45:58 +02:00
James R	40dc532ea2	Merge branch 'clarify-md5-mismatch' into 'next' ... Include "is old" in the list of possible causes for a MD5 mismatch. See merge request STJr/SRB2!1095	2020-07-29 21:19:23 -04:00
Nev3r	c914ac99b4	Bring back P_FindSpecialLineFromTag() for backwards compatibility reasons; emulate the old taglist behavior for this function.	2020-07-29 17:26:43 +02:00
Nev3r	729c8b2ec6	Fix FOF intersections with multitags for the OpenGL in a kind of hacky way.	2020-07-29 14:53:27 +02:00
Nev3r	3b55c9e940	Fix FOF intersections in multitagging for the software renderer.	2020-07-29 14:52:21 +02:00
Nev3r	c65ada7dd7	Merge branch 'next' into udmf-multitag ... # Conflicts: # src/hardware/hw_main.c	2020-07-29 13:55:14 +02:00
Nev3r	f791c1b4ec	Fix gl_linedef renaming which went off radars on the udmf branch	2020-07-28 20:39:11 +02:00
Nev3r	6dfe236602	Merge branch 'udmf-next' into 'next' ... Merge udmf-next into next See merge request STJr/SRB2!1075	2020-07-28 14:03:59 -04:00
GoldenTails	55d137215f	Include "is old" in the list of possible causes for a MD5 mismatch.	2020-07-28 03:53:25 -05:00
James R	fb6bac46ec	Merge branch 'extras-credits-unskippable' into 'next' ... Fix Credits sequence from Extras being unskippable See merge request STJr/SRB2!1091	2020-07-27 19:35:14 -04:00
Hannu Hanhi	85f5cb20e6	Fix sector flat alignment issues in OpenGL	2020-07-26 21:25:11 +03:00
GoldenTails	03b7a1c368	Make the player optional for COM_BufInsertText and COM_BufAddText. ... When no player is supplied, the command will run for all players.	2020-07-26 12:08:33 -05:00
Zachary McAlpin	cbba71051d	Allow cmd to be modified using the PlayerCmd hook	2020-07-25 20:08:41 -05:00
Zachary McAlpin	117943012a	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port	2020-07-25 20:06:12 -05:00
James R	2aa2eaf939	Merge remote-tracking branch 'origin/master' into next	2020-07-25 17:45:20 -07:00
James R	1bdcb8d92f	Merge branch 'titlecard-clowning' into 'next' ... Stretch the fallback titlecard to the screen See merge request STJr/SRB2!1019	2020-07-25 20:21:08 -04:00
James R	63b15f784f	Merge branch 'musicpref-var' into 'next' ... Console variable to select music preference See merge request STJr/SRB2!939	2020-07-25 20:14:22 -04:00
James R	005e7ce793	Merge branch 'g_findmap-lua' into 'next' ... G_FindMap and G_FindMapByNameOrCode for Lua See merge request STJr/SRB2!693	2020-07-25 20:06:44 -04:00
Steel Titanium	492ca3cea3	Remove some more DOS related stuff	2020-07-25 19:15:54 -04:00
Steel Titanium	0d48d4c833	WIP: Remove support for DOS ... WIP because I don't know if this wording is right for the error.	2020-07-25 18:55:51 -04:00
Hannu Hanhi	24b828b362	Use 64-bit R_PointToAngle in OpenGL culling to fix some big room issues	2020-07-25 21:50:24 +03:00
James R	a9a68474f7	Ctrl + Backspace/Delete in Console	2020-07-24 04:06:04 -07:00
James R	d90fe93982	Fix Credits sequence from Extras being unskippable ... This is because a server is not started before going to the credits. I'm way too stupid/lazy to try starting a server, so have a special case!	2020-07-24 03:58:38 -07:00
James R	e47fbe7dd9	Compiler error :V	2020-07-24 02:58:05 -07:00
James R	4059c6a654	Update LATEST_GCC_VERSION too	2020-07-24 02:33:39 -07:00
James R	00943e9e82	Add missing GCC version flags to the Makefile	2020-07-24 02:32:10 -07:00
James R	6fd9e25b11	Merge remote-tracking branch 'origin/next' into g_findmap-lua	2020-07-24 02:14:03 -07:00
James R	28931b90dc	Merge branch 'ogl-polyobject-tex-fix' into 'next' ... Fix OpenGL polyobject texture distortion See merge request STJr/SRB2!1086	2020-07-24 04:49:25 -04:00
James R	932bf9b20e	Merge branch 'ogl-shader-light-clamp' into 'next' ... Clamp light level for shaders. Fixes #194. Closes #194 See merge request STJr/SRB2!1085	2020-07-24 04:47:57 -04:00
James R	b45bd6990e	Merge branch 'ogl-fog-block-fix' into 'next' ... Don't discard zero alpha fog block fragments. Fixes #198. Closes #198 See merge request STJr/SRB2!1084	2020-07-24 04:45:50 -04:00
James R	47581607ef	Merge branch 'netticbuffer-port' into 'next' ... Port netticbuffer from Kart See merge request STJr/SRB2!1077	2020-07-24 04:45:08 -04:00
Hannu Hanhi	e331c9d18e	Fix OpenGL polyobject texture distortion	2020-07-23 20:51:05 +03:00
Hannu Hanhi	e4d6e92f37	Clamp light level for shaders. Fixes #194.	2020-07-23 19:05:17 +03:00
Hannu Hanhi	80172ee932	Don't discard zero alpha fog block fragments. Fixes #198.	2020-07-23 18:24:41 +03:00
James R	c944d3adf4	Merge branch 'fix-nights-fullbright' into 'next' ... NiGHTS fullbright fixes See merge request STJr/SRB2!1080	2020-07-22 22:15:07 -04:00
James R	4d16f16dab	Merge branch 'fix-superfloat' into 'next' ... Fix Super Sonic exploiting CA_FLOAT abilities See merge request STJr/SRB2!1081	2020-07-22 22:13:51 -04:00
James R	8d60579e6c	Merge branch 'demo-quit-crash-fix' into 'next' ... Fix crash if you start recording a replay and immediately close the game See merge request STJr/SRB2!1082	2020-07-22 22:11:03 -04:00
Jaime Passos	ca060a4372	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats	2020-07-21 22:25:00 -03:00
James R	196beead7d	Parenthesis	2020-07-21 16:16:03 -07:00
James R	735942a437	Merge branch 'next-lc-uint16' into 'next' ... Allow modification of built-in skincolors See merge request STJr/SRB2!1078	2020-07-21 17:56:12 -04:00
Steel Titanium	76702d6712	Fix crash if you start recording a replay and immediately close the game	2020-07-20 22:19:44 -04:00
lachwright	242e128aa0	Fix Super Sonic exploiting CA_FLOAT abilities	2020-07-21 03:50:26 +08:00
SwitchKaze	5332fff540	Deny standard color accessibility changes	2020-07-20 12:06:57 -05:00
lachwright	cea3f64c88	Fix default NiGHTS skin brightness for non-super characters	2020-07-20 22:24:16 +08:00
SwitchKaze	ee9c146b5d	Re-enable built-in color modification	2020-07-19 17:23:08 -05:00
Steel Titanium	e9a03401cb	Port netticbuffer from Kart	2020-07-19 15:24:27 -04:00
Steel Titanium	05ac0fc7ea	Fix muspostbossname sometimes returning garbage.	2020-07-19 13:47:33 -04:00
Hannu Hanhi	b03e7f63c5	Fix shader comment	2020-07-19 16:07:53 +03:00
Hannu Hanhi	92ebbdfc10	Don't override custom shaders with model lighting shader	2020-07-18 15:48:37 +03:00
Hannu Hanhi	c1cf41fb0c	Add capability to use model lighting with shaders enabled	2020-07-18 15:08:59 +03:00
Jaime Passos	48a6652973	Move the sky dome code out of r_opengl.c, fix issues with shaders	2020-07-17 02:48:05 -03:00
Zachary McAlpin	c42e06221d	Bruh I screwed up	2020-07-17 00:33:07 -05:00
Zachary McAlpin	d26c7654ff	Ported Lat's PlayerCmd hook to vanilla SRB2	2020-07-17 00:08:38 -05:00
James R	7c2f81e4ed	Merge branch 'next-lc-uint16' into 'next' ... Fix skincolor-related memory leak See merge request STJr/SRB2!1066	2020-07-16 22:01:07 -04:00
James R	fa90ff6bae	Merge remote-tracking branch 'origin/master' into next	2020-07-16 19:00:21 -07:00
Hannu Hanhi	0e5631fe66	More work on sprite-texture model uv adjustment 2	2020-07-16 22:39:44 +03:00
Hannu Hanhi	afd0858b4d	More work on sprite-texture model uv adjustment	2020-07-16 22:11:36 +03:00
James R	d6b831053f	Merge branch 'fix-lib_freeslot' into 'next' ... Fix lib_freeslot See merge request STJr/SRB2!1064	2020-07-14 18:32:10 -04:00
SwitchKaze	734033250d	Fix skincolor-related memory leak	2020-07-14 17:09:31 -05:00
Hannu Hanhi	893ff0fa19	Merge remote-tracking branch 'upstream/next' into ogl-model-uv-adjust	2020-07-14 20:30:56 +03:00
kaysrishaq	7f9175033d	minor lua fixes ... minor lua fixes	2020-07-14 01:34:57 -04:00
kaysrishaq	29a116ba81	Fix lib_freeslot	2020-07-13 18:56:07 -04:00
James R	34bd0d9fe7	Merge branch 'various-color-fixes' into 'next' ... Various color fixes See merge request STJr/SRB2!1060	2020-07-13 18:24:55 -04:00
kaysrishaq	f541c37ebc	Fix formatting ... PREFAVAILABLE -> S_PrefAvailable move declarations to top of blocks	2020-07-13 15:16:49 -04:00
James R	f5c5ec000d	Use SRB2VERSION here...	2020-07-13 08:59:41 -07:00
James R	93615b07be	Merge remote-tracking branch 'origin/next' into http-mserv	2020-07-13 08:58:43 -07:00
James R	00ceca8cc6	Merge remote-tracking branch 'origin/master' into next	2020-07-12 17:11:22 -07:00
James R	4985d94386	Merge remote-tracking branch 'origin/master' into cmake-adjustments	2020-07-12 16:24:24 -07:00
James R	42b0ab1851	Merge branch 'p-xymovement-lua-exposure' into 'next' ... Expose several movement-related functions to Lua. See merge request STJr/SRB2!884	2020-07-12 19:11:47 -04:00
James R	839f086216	A few more instances of "gr" to purge	2020-07-12 16:09:43 -07:00
Kays Ishaq	e849c9898e	move dupenum declaration to beginning of block	2020-07-12 19:05:27 -04:00
James R	b9a24001d8	Merge remote-tracking branch 'origin/next' into remove-glide-2	2020-07-12 16:05:15 -07:00
GoldenTails	ada06910dc	Expose P_MovePlayer to Lua.	2020-07-12 18:02:50 -05:00
GoldenTails	4b3d6f04f8	Expose P_PlayerZMovement to Lua. ... Finishing off these changes; how a player moves vertically.	2020-07-12 18:02:50 -05:00
GoldenTails	df1fd0c456	Expose P_SceneryZMovement to Lua. ... Still more complex than P_RingZMovement.	2020-07-12 18:02:50 -05:00
GoldenTails	4710e4f07c	Expose P_RingZMovement to Lua. ... Ever wanted to move like a ring vertically?	2020-07-12 18:02:50 -05:00
GoldenTails	6d3a2919a2	Expose P_ZMovement to Lua. ... Because P_XYMovement wasn't enough.	2020-07-12 18:02:50 -05:00
GoldenTails	27c25bfa1e	Expose P_SceneryXYMovement to Lua. ... Ironically this seems slightly more advanced than P_RingXYMovement...	2020-07-12 18:02:50 -05:00
GoldenTails	6ac3d62321	Expose P_RingXYMovement to Lua. ... Ever wanted to move like a ring horizontally?	2020-07-12 18:02:50 -05:00
GoldenTails	fe67781d68	Expose P_XYMovement to Lua. ... It was so easy; it took a grand total of one compile to implement! Why wasn't this done before...	2020-07-12 18:02:49 -05:00
James R	bc2f83ec05	Merge branch 'p-rail-thinker-lua-exposure' into 'next' ... Expose P_RailThinker to Lua. See merge request STJr/SRB2!1059	2020-07-12 18:54:28 -04:00
James R	6c875a8097	Merge branch 'marathoninfo2' into 'next' ... Marathon Run fixes (Resolves #184) Closes #184 See merge request STJr/SRB2!1061	2020-07-12 18:47:38 -04:00
James R	6f8dfb6fca	Merge branch 'version-prep-is-a-stinky-butt-head' into 'master' ... Automate some of the version numbers nonsense See merge request STJr/SRB2!1054	2020-07-12 18:45:51 -04:00
James R	f1a5f5952b	Merge branch 'fix-required-flat' into 'next' ... Comment out unused border patch variables. See merge request STJr/SRB2!1055	2020-07-12 18:42:42 -04:00
Monster Iestyn	ed70675df3	added some helpful comments, remove duplicate code	2020-07-12 22:37:36 +01:00
Monster Iestyn	b8a794e37f	socklen_t isn't actually needed in either i_tcp.c or mserv.c if NONET is on! ... (also added some more tabbing)	2020-07-12 22:29:15 +01:00
Monster Iestyn	0f4487eb68	* i_tcp.c: merge these three ifndef USE_WINSOCK blocks together ... * mserv.c: added i_tcp.c's USE_WINSOCK macros so socklen_t isn't redundantly defined if Winsock 2 is used	2020-07-12 22:24:10 +01:00
Monster Iestyn	e133d8ec37	i_tcp.c: SCOUW2 and SCOUW7 haven't been defined since we got rid of Doom Legacy's makefiles for UnixWare 2/7 (which are ANCIENT), so get rid of them!	2020-07-12 22:08:35 +01:00
Monster Iestyn	43e53368b5	added tabbing to some of the preprocessor code in i_tcp.c and mserv.c to make it easier to read them (and to allow me to understand what I need to do for the next commit)	2020-07-12 21:31:25 +01:00
Monster Iestyn	8a032256bf	don't define __USE_MINGW_ANSI_STDIO in makefiles ... (according to modern MinGW versions, defining this macro directly is deprecated)	2020-07-12 21:02:24 +01:00
Hannu Hanhi	3a488c243f	Fix translucency comparison from previous commit	2020-07-12 22:23:15 +03:00
Hannu Hanhi	9909746718	Fix crash by handling precip mobjs correctly in ogl sprite sorting	2020-07-12 21:50:00 +03:00
toaster	0a625d3e19	Fix live event backups being created at run start; there's no meaningful progress in GFZ1 to recover from.	2020-07-12 19:00:58 +01:00
kaysrishaq	a73f468ea4	Don't check empty string for duplicate name	2020-07-12 12:02:49 -04:00
Kays Ishaq	6e4b14588c	Update lua_infolib.c	2020-07-12 11:12:16 -04:00
Hannu Hanhi	ec13272d8c	Adjust model uvs when used sprite texture changes	2020-07-12 18:04:56 +03:00
kaysrishaq	a734129eae	lua_isboolean -> lua_toboolean ... solves bugged set field accessible	2020-07-12 10:07:32 -04:00
Nev3r	2cdfb8ffc6	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next	2020-07-12 14:59:38 +02:00
toaster	e1a217dc10	Two minor fixes for Marathon Mode. ... * Apply the RTA penalty to the live event backup rather than the current timer. (Resolves #184) * Snap the character name and timer mode text to the bottom of the screen, just above the bar.	2020-07-12 13:00:08 +01:00
kaysrishaq	74cfeaff30	A bit of cleaning	2020-07-12 07:56:25 -04:00
kaysrishaq	0f9e3554e2	various color fixes	2020-07-12 07:39:52 -04:00
GoldenTails	7015e656ce	Expose P_RailThinker to Lua.	2020-07-12 00:36:22 -05:00
GoldenTails	572bafa0f9	Use kinda counter-intuitive ternary operator to hack in a check for "use" for 2.2 compatibility	2020-07-11 21:59:54 -05:00
GoldenTails	da3ab1a14c	Ok fiiineee, I'll support 2.2	2020-07-11 21:59:54 -05:00
GoldenTails	a2635b2b86	The only "use" that I had to change to "spin" after a manual half hour search	2020-07-11 21:59:54 -05:00
GoldenTails	1f1589384a	Replace PF_USEDOWN with PF_SPINDOWN	2020-07-11 21:59:54 -05:00
GoldenTails	999d8018ca	Oops! Missed a couple...	2020-07-11 21:59:54 -05:00
GoldenTails	8b140b1831	Replace 'use' with 'spin' in game control constants	2020-07-11 21:59:54 -05:00
GoldenTails	8616823d7d	Remove another unneeded comment	2020-07-11 21:59:54 -05:00
GoldenTails	7b4dee87e6	Remove unneeded comment	2020-07-11 21:59:54 -05:00
GoldenTails	457714e480	Remove 2 characters of whitespace ... This is what I get for using find+replace I guess lol	2020-07-11 21:59:54 -05:00
GoldenTails	465ad1a7bc	Replace all occurances of BT_USE with BT_SPIN (2.3?) ... I'd use `next-major` but it doesn't exist lol	2020-07-11 21:59:54 -05:00
James R	84373b1726	Merge branch 'opengl-blending-fix' into 'next' ... Fix ASTBlendPixel outputting empty pixels sometimes See merge request STJr/SRB2!945	2020-07-11 20:57:30 -04:00
James R	6c3663812b	Merge branch 'ogl-linkdraw' into 'next' ... MF2_LINKDRAW support for OpenGL See merge request STJr/SRB2!1031	2020-07-11 20:52:11 -04:00
James R	479bbeacbe	Merge remote-tracking branch 'origin/next' into http-mserv	2020-07-11 17:41:46 -07:00
James R	2f30e81fdd	ADD to the buffer size ... (cherry picked from commit bae37aea2c1b1ffab22f79e27415914f7e25fc89)	2020-07-11 17:41:09 -07:00
James R	ab3878e282	masterserver_token is back ... (cherry picked from commit e7d949aeb2b9ef2297287ba35f9296684078f184)	2020-07-11 17:41:09 -07:00
James R	0b5062d31c	Set timeout on HMS connections ... (cherry picked from commit fcbe4e668f1ac79811d1ab2fb9cfd44729e56e93)	2020-07-11 17:41:09 -07:00
James R	f32d91cc57	Resize response body buffer as needed ... (cherry picked from commit 85fef2655cc78c9453aed423f5a1df6011ce3262)	2020-07-11 17:41:09 -07:00
James R	4e1d54c332	It's not always GCC, but it probably is gcc (I hope)	2020-07-11 12:45:35 -07:00
sphere	e95265a7fa	Comment out unused border patch variables, so GFZFLR01 isn't required anymore.	2020-07-11 12:11:26 +02:00
Nev3r	9f06903d72	What the fuck was I thinking? ... Fixed really stupid brainless code piece involving polyobject spawnpoint tagging.	2020-07-11 11:01:05 +02:00
Nev3r	4013c0e0a1	Merge branch 'udmf-next' into udmf-multitag	2020-07-11 08:47:58 +02:00
Nev3r	a9dbf6daf6	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next	2020-07-11 08:47:32 +02:00
James R	6a54e5f4a6	Merge remote-tracking branch 'origin/master' into next	2020-07-10 23:04:50 -07:00
James R	8bcc2662d1	Merge branch 'netid-take-2' into 'next' ... Use ordered id for netvars instead of shitty hash See merge request STJr/SRB2!1010	2020-07-11 02:00:06 -04:00
James R	df98601b12	Merge branch 'bubbleshieldoverhaul' into 'next' ... Bubble Shield overhaul See merge request STJr/SRB2!1046	2020-07-11 01:56:53 -04:00
James R	f336b1e979	Merge branch 'i-added-the-branch-name-into-the-version-command-when-outside-of-develop-mode' into 'master' ... Adds the branch name into the version command printout when outside of DEVELOP mode. See merge request STJr/SRB2!981	2020-07-11 01:48:38 -04:00
James R	5cebf5c7bf	Merge branch 'makefile-detect-version' into 'master' ... Detect GCC version in Makefile See merge request STJr/SRB2!1002	2020-07-11 01:47:50 -04:00
James R	99e0c48f7b	Fix a lot of stuff related to the version automation	2020-07-10 22:39:46 -07:00
James R	1757002ddb	Automate VERSION/SUBVERSION; move version related definitions to version.h ... CMake support. Srb2win.rc still needs touchy, whatever.	2020-07-10 22:20:33 -07:00
Steel Titanium	e22964ee0a	I screwed up	2020-07-10 23:16:18 -04:00
Steel Titanium	db6fc75b4f	Update player.dta hash	2020-07-10 20:53:42 -04:00
Steel Titanium	778089458c	Merge branch 'next' into 226-prep	2020-07-10 20:06:16 -04:00
Louis-Antoine	f8aefc2fd3	Revert "Fix computation of very high pings" ... This reverts commit 82dbe95e22.	2020-07-11 01:55:40 +02:00
Steel Titanium	d9483dabfd	Merge branch 'next' into 226-prep	2020-07-10 19:11:28 -04:00
Steel Titanium	759f9171a2	Update patch.pk3 hash again	2020-07-10 19:09:49 -04:00
Jaime Passos	d87c874559	Fix GL y-shearing ignoring a Y-flipped transform	2020-07-10 19:19:51 -03:00
Steel Titanium	dcd56a7fe3	Update patch.pk3 hash and Srb2win.rc	2020-07-10 18:13:01 -04:00
toaster	958d397cdb	Merge branch 'marathoninfo' into 'next' ... Marathon Run adjustments See merge request STJr/SRB2!1048	2020-07-10 17:54:51 -04:00
Steel Titanium	307125e84e	Update version number	2020-07-10 17:29:03 -04:00
Nev3r	6c6f16e158	Merge branch 'ogl-model-spr-uv-fix' into 'next' ... Fix models that use sprite textures See merge request STJr/SRB2!1049	2020-07-10 17:17:52 -04:00
toaster	217ac14ac5	Introduce a live event backup penalty for non MA_INGAME runs, since the change to saving time causes problems for this.	2020-07-10 21:36:37 +01:00
toaster	4c9cdcca0d	Hopefully fix the issue, which I can't recreate, of live event backups being created even if they shouldn't.	2020-07-10 21:27:34 +01:00
toaster	1956e9e670	Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback.	2020-07-10 21:24:25 +01:00
toaster	8a5069156f	Add a small amount of extra info to the Evaluation screen for Marathon Mode, on request from multiple runners.	2020-07-10 21:16:28 +01:00
Hannu Hanhi	ad57426713	Adjust model uvs to power of two texture if sprite texture is used	2020-07-10 23:05:21 +03:00
toaster	205d4c8d20	Fix the issue where custom exits with skipped intermission screens (notably, Black Core Zone 2 and 3) would cause the game to softlock when playing on a save file, or with a live event backup.	2020-07-10 20:30:16 +01:00
Hannu Hanhi	5fdc4578db	Merge remote-tracking branch 'upstream/next' into ogl-linkdraw	2020-07-10 21:14:57 +03:00
Nev3r	ad55f5f872	Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag ... # Conflicts: # src/hardware/hw_main.c # src/p_ceilng.c # src/p_floor.c # src/p_mobj.c # src/p_mobj.h # src/p_polyobj.c # src/p_saveg.c # src/p_setup.c # src/p_spec.c # src/p_spec.h # src/p_user.c # src/r_bsp.c # src/r_defs.h	2020-07-10 18:18:07 +02:00
Snu	be8f0853ef	Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul ... Updated to 2.2.5	2020-07-10 17:08:53 +01:00
Nev3r	710097a0ca	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next	2020-07-10 11:47:16 +02:00
Snu	d392c59935	Changed Bubble Shield functionality	2020-07-10 05:59:10 +01:00
Lachlan Wright	12ea5398c8	Merge branch 'restore-supergold' into 'next' ... Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3 See merge request STJr/SRB2!1042	2020-07-09 12:37:31 -04:00
Lachlan Wright	867728ca16	Merge branch 'custom-color-fixes' into 'next' ... Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades Closes #179 and #182 See merge request STJr/SRB2!1043	2020-07-09 12:37:16 -04:00
GoldenTails	59bd6d45a3	Whose idea was it to make the aPNG speed 1/2x by default?!	2020-07-08 18:14:11 -05:00
lachwright	3226a5d699	Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades	2020-07-09 05:56:11 +08:00
lachwright	c28ed25628	Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3	2020-07-09 00:00:21 +08:00
SteelT	31364d2120	Merge branch '225-prep' into 'next' ... 2.2.5 preparation See merge request STJr/SRB2!1039	2020-07-07 14:55:06 -04:00
Lachlan Wright	337ec7bf6c	Merge branch 'remove-tricks' into 'next' ... Remove Software tricks See merge request STJr/SRB2!1036	2020-07-07 13:47:33 -04:00
Lachlan Wright	b9a088b16f	Merge branch 'fix-autoexec-netvars' into 'next' ... Fix autoexec file trying to set netvars when joining from command-line See merge request STJr/SRB2!1040	2020-07-07 13:47:13 -04:00
lachwright	994bf78fe2	Update Srb2win.rc	2020-07-08 00:48:01 +08:00
lachwright	129fd2e27b	Update patch.pk3 hash	2020-07-08 00:42:31 +08:00
toaster	274f649a02	M_RATHON header text.	2020-07-07 17:30:20 +01:00
Louis-Antoine	0858c2f6ed	Fix autoexec file trying to set netvars when joining from command-line	2020-07-07 16:19:25 +02:00
lachwright	706b3c509d	Make A_FlickyCenter usable in SOC/Lua	2020-07-07 20:42:00 +08:00
James R	d31c6ac5b5	Contact the master server admims	2020-07-06 19:15:40 -07:00
Steel Titanium	7d75c72263	Update the version number	2020-07-06 21:29:02 -04:00
Steel Titanium	ded902678c	Update md5 hash for player.dta and patch.pk3	2020-07-06 21:22:57 -04:00
Louis-Antoine	78f8a44c25	Fix timeout	2020-07-07 02:06:26 +02:00
Jaime Passos	3a4ce6aea3	Merge remote-tracking branch 'origin/next' into opengl-blending-fix	2020-07-06 19:48:13 -03:00
Jaime Passos	7911deebf8	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats	2020-07-06 19:29:14 -03:00
Steel Titanium	7d00255dc4	Merge branch 'master' into next	2020-07-06 12:13:00 -04:00
Nev3r	42d92eab2c	Fix erroneous merge conflict resolution.	2020-07-06 11:54:55 +02:00
Nev3r	fd5b05cafc	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next	2020-07-06 11:13:27 +02:00
Jaime Passos	4f6420274f	Remove Software tricks	2020-07-06 01:26:56 -03:00
Jaime Passos	5c5d907251	gr_ -> gl_	2020-07-06 01:15:08 -03:00
Jaime Passos	a739cb0da9	Remove unused texture formats	2020-07-06 00:58:09 -03:00
Jaime Passos	3d50bef0e5	Rename structs, turn GrTextureFormat_t into an enum	2020-07-06 00:52:10 -03:00
Jaime Passos	ac04853f8c	Remove GrTexInfo	2020-07-06 00:35:48 -03:00
Jaime Passos	abeedc4b65	Delete hw_glide.h	2020-07-06 00:27:34 -03:00
Hannu Hanhi	b4aa5cecc1	Merge remote-tracking branch 'upstream/next' into ogl-linkdraw	2020-07-05 13:27:51 +03:00
James R	de8019f163	Merge branch 'hahaha-credits' into 'next' ... The credit See merge request STJr/SRB2!1033	2020-07-04 18:00:49 -04:00
LJ Sonic	9c1bee694b	Merge branch 'knuxtweaks' into 'next' ... Knuckles tweaks See merge request STJr/SRB2!1030	2020-07-04 16:37:35 -04:00
LJ Sonic	9f69396054	Merge branch 'fix-gif-delay' into 'next' ... Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with See merge request STJr/SRB2!1023	2020-07-04 16:28:59 -04:00
LJ Sonic	6c61baa818	Merge branch 'fix-oldbrak-missiles2' into 'next' ... Take 2: Fix Old Brak missiles + add pw_ignorelatch See merge request STJr/SRB2!1006	2020-07-04 16:28:48 -04:00
James R	96bccd5f9f	Credit Oni for CODE	2020-07-04 12:59:56 -07:00
James R	d9005203c7	Fuck you macro	2020-07-04 12:52:01 -07:00
James R	e741a7b3c7	Actually save the cvar name in demos	2020-07-04 12:51:07 -07:00
LJ Sonic	17616967d3	Merge branch 'levelflat_name' into 'next' ... Use levelflat->name instead of flatname See merge request STJr/SRB2!1024	2020-07-04 08:46:04 -04:00
LJ Sonic	77e39a0fd5	Merge branch 'make-linedef-422-smarter' into 'next' ... Make Linedef type 422 smarter See merge request STJr/SRB2!1014	2020-07-04 08:35:42 -04:00
lachwright	17daf2faa2	Reduce speed cut when gliding underwater	2020-07-04 19:17:38 +08:00
LJ Sonic	cf4087a014	Merge branch 'jetjawsound' into 'next' ... Jet Jaw Sounds See merge request STJr/SRB2!1018	2020-07-04 07:09:43 -04:00
LJ Sonic	804ba6da9e	Merge branch 'more-platform-fixes' into 'next' ... More platform fixes See merge request STJr/SRB2!999	2020-07-04 07:07:17 -04:00
LJ Sonic	8d511ed565	Merge branch 'cez3debris' into 'next' ... New Debris for CEZ3 See merge request STJr/SRB2!1012	2020-07-04 07:00:20 -04:00
lachwright	f03addc5a7	Merge remote-tracking branch 'origin/next' into knuxtweaks	2020-07-04 18:53:26 +08:00
LJ Sonic	98c657e703	Merge branch 'sf_nosupersprites' into 'next' ... Add SF_NOSUPERSPRITES See merge request STJr/SRB2!1000	2020-07-04 06:51:11 -04:00
LJ Sonic	5ee94c8ce7	Merge branch 'patch-1' into 'next' ... Rename "Legacy" control scheme See merge request STJr/SRB2!1029	2020-07-04 06:50:15 -04:00
lachwright	527e682931	Add sightcheck boolean to P_RadiusAttack ... Also now destroys Egg Guard shields, and circumstantially Minuses	2020-07-04 18:27:06 +08:00
Lachlan	e2bdb56f97	Merge remote-tracking branch 'origin/next' into more-platform-fixes	2020-07-04 05:25:38 +08:00
Lachlan	cdb247d08f	Fix compiler warning	2020-07-04 05:25:34 +08:00
LJ Sonic	3679df07aa	Merge branch 'dragonbomber-height' into 'next' ... Fix Dragonbomber z positioning See merge request STJr/SRB2!1004	2020-07-03 17:05:10 -04:00
LJ Sonic	07bbebd9b0	Merge branch 'shift-when-hiding-in-1p-menu' into 'next' ... Tweak display of hidden items in "1 Player" menu See merge request STJr/SRB2!1013	2020-07-03 17:04:42 -04:00
LJ Sonic	6e7446dea3	Merge branch 'ff_horizontalflip' into 'next' ... FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements) See merge request STJr/SRB2!987	2020-07-03 16:56:32 -04:00
Lachlan	e44d93f76b	Fix skiddust positional scaling	2020-07-04 04:30:57 +08:00
Lachlan	84000a0add	P_Earthquake: Use P_RadiusAttack in favor of thinker iteration	2020-07-04 04:00:28 +08:00
Lachlan	7e72009a87	Fix buildbot warning	2020-07-04 03:21:48 +08:00
SteelT	186335c2ac	Merge branch 'na-char-replays' into 'next' ... Add support for saving/loading per-skin NiGHTS replays See merge request STJr/SRB2!1025	2020-07-03 14:51:05 -04:00
lachwright	8652bbc1a5	Knuckles changes: ... - Buffed crouch landing; lasts slightly shorter and cuts speed less - Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater - Improved glide controls in 2D mode - Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies - Refactored skid dust - Made super sparks use FF_FULLBRIGHT - Added P_SpawnSkidDust and P_Earthquake to Lua	2020-07-04 01:54:00 +08:00
colette	1cc2ab120d	"Legacy controls" was a mistake of a name	2020-07-02 23:17:33 -04:00
Hannu Hanhi	b29873ce1c	Better MF2_LINKDRAW support for OpenGL	2020-07-03 00:28:52 +03:00
lachwright	3ebc17ac3a	Merge branch 'next' into knuxtweaks	2020-07-02 13:08:04 +08:00
Zippy_Zolton	29dfa5f605	sound caption	2020-07-01 23:18:20 -05:00
James R	9eb58a8e42	Merge branch 'cheese' into 'next' ... Cheese See merge request STJr/SRB2!1028	2020-07-01 23:28:08 -04:00
James R	7a17c74893	Merge branch 'credits-225' into 'next' ... More credits changes See merge request STJr/SRB2!1027	2020-07-01 23:27:59 -04:00
James R	2cbf7ac27d	Cheese mode activate!	2020-07-01 16:37:36 -07:00
James R	e1996a437d	Add "Discord Community Testers" to the Testing section	2020-07-01 16:29:26 -07:00
James R	99a9c935f9	Credits: add back fickle, add Chrispy and Hannu	2020-07-01 16:23:26 -07:00
James R	fae583915a	Remove Producer role from the credits	2020-07-01 16:04:46 -07:00
Nev3r	ff8759e507	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next ... # Conflicts: # src/hardware/hw_main.c	2020-06-30 20:29:48 +02:00
Louis-Antoine	40e98e5712	Fix crash when a polyobject rotates a non-player mobj	2020-06-30 18:37:21 +02:00
Steel Titanium	612386aef0	Correct comment	2020-06-29 23:57:39 -04:00
Steel Titanium	e641895268	Address compat with old-style names	2020-06-29 23:54:45 -04:00
James R	696f9707fc	Merge branch 'special_save' into 'next' ... Special saves! (Resolves #162) Closes #162 See merge request STJr/SRB2!1016	2020-06-29 19:18:30 -04:00
James R	84391f558b	Merge branch 'titlecard-double-clown-town' into 'next' ... ACTUALLY fix #172 Closes #172 See merge request STJr/SRB2!1020	2020-06-28 18:41:22 -04:00
James R	e56fc08757	Merge branch 'delete-connection-screen-and-midgame-joins' into 'next' ... Delete connection screen and midgame joins See merge request STJr/SRB2!1021	2020-06-28 18:41:07 -04:00
Steel Titanium	3f3ff0688b	Add support for saving/loading per-skin NiGHTS replays	2020-06-28 16:59:36 -04:00
James R	335fc0b327	Use levelflat->name instead of flatname	2020-06-27 14:30:41 -07:00
SteelT	22459df1f1	Merge branch 'increase-input-buffer-more' into 'next' ... Increase the length of the player input buffer even more See merge request STJr/SRB2!951	2020-06-27 13:32:19 -04:00
GoldenTails	fef15be0af	Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with	2020-06-27 10:56:15 -05:00
Louis-Antoine	93cc48054a	Expose "server" and "dedicated" to Lua scripts ... Careful! Both are local variables and are always false for clients, and therefore should obviously not be used in anything gamelogic-related.	2020-06-27 15:30:23 +02:00
Louis-Antoine	c96e07b61c	Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines	2020-06-27 02:01:16 +02:00
Louis-Antoine	82dbe95e22	Fix computation of very high pings	2020-06-26 15:34:26 +02:00
James R	fbbfe3b3b1	Add back the int_none check ... It got removed by 864e703355 but he forget how it was before the hook was there. :(	2020-06-25 13:43:07 -07:00
James R	607a4dbee7	Remove caching of INTERSCW	2020-06-25 13:09:00 -07:00
James R	78e6bcc8ff	Just stretch the fallback card to the screen resolution	2020-06-25 13:08:00 -07:00
James R	864e703355	Only fill the intermission with blapck if we can't draw patches ... This fixes an issue where patches cease to be drawn due to Y_UnloadData, but the screen is still overwritten, causing the next wipe to start from void.	2020-06-25 13:04:03 -07:00
Zachary McAlpin	b973b43271	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-25 10:31:55 -05:00
toaster	f258131e55	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into special_save ... # Conflicts: # src/g_game.c	2020-06-25 10:48:36 +01:00
Zippy_Zolton	dc2f689957	Jet Jaw Sounds	2020-06-25 00:38:07 -05:00
James R	7317bbb692	Merge branch 'ogl-sprite-qsort' into 'next' ... Faster OGL sprite sorting algorithm See merge request STJr/SRB2!1008	2020-06-24 23:22:06 -04:00
James R	067d9b9a63	Merge remote-tracking branch 'origin/next' into gtr-fixes	2020-06-24 19:31:19 -07:00
Zachary McAlpin	b14f18c1a9	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-24 20:55:08 -05:00
James R	207d8aee4b	Merge branch 'acz3-softlock-fix' into 'next' ... ACZ3 softlock fix See merge request STJr/SRB2!1015	2020-06-24 21:43:42 -04:00
James R	95cc10d735	Merge branch 'ogl-mdl-tex-repeat-search-fix' into 'next' ... Don't repeatedly look for model texture files See merge request STJr/SRB2!1009	2020-06-24 21:42:40 -04:00
James R	9eb8fd8ac8	Merge branch 'fixeggsign' into 'next' ... Fix the Eggman signpost's background color See merge request STJr/SRB2!1007	2020-06-24 21:42:12 -04:00
James R	2e827705b4	Merge branch 'ogl-drawnode-fix' into 'next' ... Faster and more correct OGL transparent surface sorting See merge request STJr/SRB2!1005	2020-06-24 21:42:01 -04:00
James R	ac71bb76b6	Merge branch 'gme-cleanup-fixes' into 'next' ... GME cleanup and fixes See merge request STJr/SRB2!1001	2020-06-24 21:41:49 -04:00
Zachary McAlpin	5ef8c95cdb	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-24 19:47:52 -05:00
Monster Iestyn	7d2de8394f	Merge branch 'lua-side-enum-bruh' into 'next' ... Fix missing bruh string in Lua side string options. See merge request STJr/SRB2!1017	2020-06-22 15:23:34 -04:00
Latapostrophe	80e0d35391	Fix missing bruh string in lua side options. This is stupid.	2020-06-22 21:11:33 +02:00
toaster	4502604007	Special saves! ... All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.	2020-06-22 19:00:47 +01:00
GoldenTails	f0787077e3	More people ought to know what modulo is... ... Or modulous if your prefer.	2020-06-22 04:14:42 -05:00
GoldenTails	6fe0874606	Stop resetting cusval cause that's annoying	2020-06-21 23:21:42 -05:00
GoldenTails	d609cfc9e3	Make it so Linedef type 422 instead sets cusval when the titlemap is in action. ... I have no idea why it wasn't like this before, but oh well.	2020-06-21 22:20:06 -05:00
Zwip-Zwap Zapony	ae474b6945	Fix re-opening 1 Player menu re-lowering options ... If an add-on disabled an option, re-opening the 1 Player menu multiple times would lower the above options multiple times Also fix Marathon Run and Tutorial being "perma-(un)lock"-able	2020-06-21 16:16:12 +02:00
sphere	e9e9cd6133	Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking.	2020-06-21 16:01:24 +02:00
Zwip-Zwap Zapony	5655db11ab	Tweak display of hidden items in "1 Player" menu ... If an option in the "1 Player" menu is unavailable in an add-on, lower the above options to close the gap from the invisible option Also make Marathon Run display as question marks if locked And also change "sploadgame" to "spstartgame"	2020-06-21 09:30:55 +02:00
Louis-Antoine	65054bd0aa	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into increase-input-buffer-more	2020-06-21 01:20:39 +02:00
Zippy_Zolton	ca7fc22388	t_lspr	2020-06-20 14:16:22 -05:00
James R	7ec0b6c792	I meant consvar_number_of_netids to be exclusive :V	2020-06-20 00:53:51 -07:00
Zippy_Zolton	fc68134938	Thanks for the feedback, I have fixed your issues.	2020-06-20 02:04:18 -05:00
Zippy_Zolton	bfa1382736	New Debris for CEZ3	2020-06-20 02:02:13 -05:00
James R	3e52764935	Actually print a warning if the old demo id collides	2020-06-19 19:59:14 -07:00
James R	db34d70faa	Cvar compatibility with older demos	2020-06-19 18:04:20 -07:00
James R	32134a01fe	Save cvar names in demos; refactor cvar loading	2020-06-19 17:58:42 -07:00
James R	32773b71e0	Use ordered ids instead of hashes for cvar netid ... Originally 6acd99c0a4	2020-06-19 16:36:36 -07:00
kaysrishaq	c74a607c54	Whoops, switched these for no reason	2020-06-19 11:11:19 -04:00
kaysrishaq	cad1f57b1e	FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)	2020-06-19 11:11:18 -04:00
Hannu Hanhi	f3212746d2	Don't repeatedly look for model texture files	2020-06-19 16:18:04 +03:00
Hannu Hanhi	6f9b9aacf4	Faster OGL sprite sorting algorithm	2020-06-19 14:32:34 +03:00
lachwright	cab87b4632	lol should have tested before pushing	2020-06-19 15:59:09 +08:00
lachwright	47d9d87654	Fix the Eggman signpost's background color	2020-06-19 15:49:24 +08:00
kaysrishaq	682791a024	brak missile fix, pw_ignorelatch, small Recycler fix	2020-06-18 17:09:29 -04:00
Hannu Hanhi	ffaffdf3e1	Faster and more correct OGL transparent surface sorting	2020-06-18 20:27:19 +03:00
lachwright	7b2e54b426	Fix Dragonbomber z positioning	2020-06-19 00:52:24 +08:00
Hannu Hanhi	9477d372b9	Backwards compatibility for shaderless hardware	2020-06-18 17:39:34 +03:00
James R	193c45aa2f	Forgot a comma	2020-06-17 22:58:11 -07:00
James R	489bb81d00	Makefile: Move the PREFIX stuff up so version detection can take advantage of	2020-06-17 22:52:19 -07:00
James R	bf90fbb91f	Detect the compiler version and set the correct GCC flag ... If the version is not supported by the Makefile, the flag for the latest version supported is set instead.	2020-06-17 22:49:12 -07:00
SteelT	bff6b19056	Merge branch 'marathonmode' into 'next' ... MARATHON RUN See merge request STJr/SRB2!941	2020-06-17 19:36:10 -04:00
Steel Titanium	8365d975d3	A even more better fix for this	2020-06-17 18:40:56 -04:00
Steel Titanium	1e655fb2c1	Better fix for may be used uninitialized, maybe fixes GCC 4.x	2020-06-17 18:23:54 -04:00
Steel Titanium	3946309ece	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport ... # Conflicts: # src/hardware/r_opengl/r_opengl.c	2020-06-17 18:15:07 -04:00
Steel Titanium	5708325d2b	Use SAMPLERATE for consistency with the rest of the code	2020-06-17 14:50:22 -04:00
Steel Titanium	f626b9f4d9	Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong	2020-06-17 14:31:49 -04:00
Steel Titanium	a34be0e370	Reduce code duplication by creating get_zlib_error function ... Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong Return false if it fails to decompress VGZ data in some form.	2020-06-17 14:19:19 -04:00
Steel Titanium	d3d5496a78	Fix facecolor may be used uninitialized.	2020-06-17 14:09:49 -04:00
lachwright	7d92631d97	Whoops, forgot hu_stuff.c	2020-06-17 05:27:42 +08:00
lachwright	edfd64877c	Add SF_NOSUPERSPRITES	2020-06-17 04:53:42 +08:00
lachwright	e403de7459	Merge branch 'next' into more-platform-fixes	2020-06-17 01:53:19 +08:00
lachwright	29738fcdd0	Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain	2020-06-17 01:46:36 +08:00
lachwright	38e2c999c5	Platform fixes	2020-06-14 12:17:30 +08:00
Zachary McAlpin	6eccc7030d	I forgot to pop the error handler	2020-06-12 07:50:57 -05:00
Zachary McAlpin	965d42f974	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-12 07:32:44 -05:00
Nev3r	2322644488	Merge branch 'dofile' into 'next' ... Add dofile() to Lua See merge request STJr/SRB2!969	2020-06-12 02:32:16 -04:00
Steel Titanium	b056bf1d6c	Merge branch 'master' into next	2020-06-11 20:11:26 -04:00
SteelT	c810ea3945	Merge branch 'next-lc-uint16' into 'next' ... Custom skincolor bugfixes See merge request STJr/SRB2!971	2020-06-11 20:08:50 -04:00
Zachary McAlpin	0d70e16b0b	Updated LUAh_GameQuit to use new error handler	2020-06-11 15:11:01 -05:00
Zachary McAlpin	08e9efee76	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-11 15:02:31 -05:00
lachwright	fad82265e0	Allow macOS builds to be launched through Steam	2020-06-12 01:19:06 +08:00
mazmazz	8fc414536f	CMAKE: Move launch-c into more sensible location	2020-06-10 15:08:09 -04:00
LJ Sonic	7ffee074d8	Merge branch 'next' into 'better-download' ... # Conflicts: # src/d_clisrv.c	2020-06-10 07:57:49 -04:00
LJ Sonic	bc2edb2ae4	Merge branch 'snake' into 'next' ... Add a Snake minigame to the file transfer screen See merge request STJr/SRB2!903	2020-06-10 07:38:37 -04:00
Zachary McAlpin	291479e3e8	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-09 19:54:47 -05:00
mazmazz	46b383acda	CMAKE: Fix toggle fullscreen breakage due to missing define ... This is lazy. The correct solution is to eliminate the define in the program code	2020-06-09 17:32:14 -04:00
MascaraSnake	a76c8af60c	Compiling fix	2020-06-09 22:10:02 +02:00
mazmazz	36e17006b7	CMAKE: Fix OS X ccache scripts	2020-06-09 11:12:52 -04:00
MascaraSnake	d07c376f6d	Adapt POF_SPLAT to UDMF setup	2020-06-09 09:44:49 +02:00
MascaraSnake	4a0206b38d	Merge branch 'next' into udmf-next ... # Conflicts: # src/p_mobj.c # src/p_polyobj.c	2020-06-09 09:38:01 +02:00
Steel Titanium	2abdc86537	Fix these "may be used uninitialized in this function" errors with batching	2020-06-08 20:18:32 -04:00
Steel Titanium	3dd89f67fa	Fix no previous prototype for TimeFunction	2020-06-08 19:56:24 -04:00
Steel Titanium	62d73968e2	Merge branch 'next' into sal-oglshaderport	2020-06-08 19:36:23 -04:00
mazmazz	01ff46326f	Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments	2020-06-08 11:57:57 -04:00
Digiku	70eb5ba634	Merge branch 'buffer-offset-fix' into 'master' ... Strike null-pointer-arithmetic error in BUFFER_OFFSET See merge request STJr/SRB2!989	2020-06-08 11:56:48 -04:00
Lachlan Wright	191e2e094d	Merge branch 'fix-spawn-desynch' into 'next' ... Fix desynch when a player spawns See merge request STJr/SRB2!977	2020-06-08 05:25:41 -04:00
Lachlan Wright	614a98bd9d	Merge branch 'dashmode-fixes' into 'next' ... Dashmode fixes See merge request STJr/SRB2!909	2020-06-08 05:25:30 -04:00
Lachlan Wright	590dfca582	Merge branch 'fix-continuing-mouse' into 'next' ... Fix mouse being grabbed in continue screen See merge request STJr/SRB2!983	2020-06-08 05:25:24 -04:00
mazmazz	f3c1db0650	CMAKE: Fix OSX CCache error	2020-06-08 03:08:58 -04:00
mazmazz	efba50c83c	CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package	2020-06-08 00:38:13 -04:00
mazmazz	aef9a1b522	CMAKE: Add CCACHE support	2020-06-08 00:35:31 -04:00
mazmazz	a5f7f9a534	Fix OPENMPT deprecation error, openmpt_module_ctl_set	2020-06-08 00:09:29 -04:00
mazmazz	2cefe82950	Fix OSX null-pointer-arithmetic error	2020-06-08 00:08:07 -04:00
mazmazz	ded6285249	CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo	2020-06-08 00:01:15 -04:00
mazmazz	a449fa4a1d	Added SDL Mixer X to CMAKE (Windows only)	2020-06-08 00:01:15 -04:00
Zachary McAlpin	78014cfd4c	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-07 22:42:43 -05:00
Hannu Hanhi	0e521922c6	Change some unsigned ints to UINT32	2020-06-07 21:32:52 +03:00
Hannu Hanhi	abe13651d0	OpenGL draw call batching system	2020-06-07 21:20:52 +03:00
MascaraSnake	de7a806ec3	Merge branch 'nospinmovecut' into 'next' ... Don't cut momentum if landing in a roll See merge request STJr/SRB2!972	2020-06-07 13:24:19 -04:00
Hannu Hanhi	da98ea242e	Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge	2020-06-07 20:01:05 +03:00
SteelT	db32b01222	Merge branch 'renderstats' into 'sal-oglshaderport' ... Render stats See merge request STJr/SRB2!914	2020-06-07 12:29:58 -04:00
sphere	82200d80a9	Fix mouse being grabbed in the continue screen.	2020-06-07 00:40:33 +02:00
Monster Iestyn	28550b221a	Merge branch 'master' into next	2020-06-06 20:50:12 +01:00
Monster Iestyn	d2fefb6b9a	use void rather than VOID, because the logging init code isn't exclusively Win32, whoops	2020-06-06 20:49:12 +01:00
Monster Iestyn	7e562a3ca5	Merge branch 'master' into next	2020-06-06 20:35:48 +01:00
Monster Iestyn	982d1db5d8	Merge branch 'cppcheck-fixes' into 'master' ... Cppcheck fixes See merge request STJr/SRB2!967	2020-06-06 15:28:48 -04:00
lachwright	f68a95016e	Merge branch 'next' into nospinmovecut	2020-06-07 02:45:26 +08:00
Monster Iestyn	a4d7ff3c6d	Merge branch 'master' into next	2020-06-06 17:39:43 +01:00
Monster Iestyn	56b8ea3587	added liolib.c to the VC10 project files, since it was missing from them	2020-06-06 17:38:35 +01:00
GoldenTails	9aa68f524e	Adds the branch name into the version command printout when outside of DEVELOP mode. ... Really just so I don't accidentally join netgames or record replays for vanilla SRB2 in the `next` branch...	2020-06-06 04:12:27 -05:00
MascaraSnake	50b47a1b25	Merge branch 'translucent-splat-planes' into 'next' ... Allow transparent parts in translucent FOF and PolyObject planes See merge request STJr/SRB2!978	2020-06-06 04:35:06 -04:00
Zachary McAlpin	ca66c5e7ee	Updated LUAh_GameQuit	2020-06-05 13:18:22 -05:00
Zachary McAlpin	7b779fa89b	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-05 12:59:41 -05:00
Monster Iestyn	9e4ed738b7	Sync turnobjs for polyrotate_t thinkers in netgames	2020-06-04 21:31:26 +01:00
Monster Iestyn	cb7423b97e	sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean	2020-06-03 20:47:49 +01:00
Monster Iestyn	b11d58aef5	clean up BUGTRAP code in win32/win_main.c to avoid unmatched } ... (though that said we don't officially care about the win32 folder files anymore)	2020-06-03 20:47:49 +01:00
Monster Iestyn	5349a0bf62	V_Init: count to NUMSCREENS, not NUMSCREENS+1 (though I can't help thinking this one might have been deliberate somehow?)	2020-06-03 20:47:49 +01:00
Monster Iestyn	bb1a2dbba7	sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code	2020-06-03 20:47:49 +01:00
Monster Iestyn	8092d30376	Polyobj_rotate and related: change "origin" to vector2_t since all it needs is x/y and not any of the new stuff for vertex_t	2020-06-03 20:47:49 +01:00
Monster Iestyn	7340442839	P_XYMovement: initialise slopemom to all zeros	2020-06-03 20:47:49 +01:00
Monster Iestyn	adb11eec1b	dehacked.c: use actual size of descriptions buffers rather than MAXLINELEN, which is way too large	2020-06-03 20:47:49 +01:00
Monster Iestyn	d11ba67288	G_ReadMetalTic: Make sure all three values for GZT_XYZ are read in the right order	2020-06-03 20:47:49 +01:00
Monster Iestyn	879a2bd20a	G_GhostTicker/G_ReadMetalTic: type should default to MT_NULL, not -1 ... This way, if for some reason the ghost has no skin, nothing should spawn at all	2020-06-03 20:47:49 +01:00
MascaraSnake	33ed36cf4b	Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent)	2020-06-03 19:41:47 +02:00
Louis-Antoine	9be188ff02	Minor edit	2020-06-02 10:31:56 +02:00
Louis-Antoine	286b316cf9	Fix dofile() return incorrect values	2020-06-01 15:43:14 +02:00
LJ Sonic	6895d7df92	Merge branch 'next' into 'dofile' ... # Conflicts: # src/lua_script.c # src/lua_script.h	2020-06-01 09:28:56 -04:00
Louis-Antoine	e6ffedbce8	Fix food occasionally spawning inside the snake	2020-06-01 15:21:16 +02:00
LJ Sonic	04c7eeb6ae	Merge branch 'deprecate-fixedrem' into 'next' ... Deprecate FixedRem. See merge request STJr/SRB2!952	2020-06-01 08:30:44 -04:00
LJ Sonic	715cb857f5	Merge branch 'next' into 'better-download' ... # Conflicts: # src/sdl/i_system.c # src/win32/win_sys.c	2020-06-01 08:16:53 -04:00
LJ Sonic	e2b860dc28	Merge branch 'next' into 'fix-spawn-desynch' ... # Conflicts: # src/p_map.c	2020-06-01 08:15:02 -04:00
MascaraSnake	11493e61d2	Merge branch 'executordelay' into 'udmf-next' ... UDMF linedef executor delay See merge request STJr/SRB2!918	2020-06-01 07:57:23 -04:00
MascaraSnake	b13f29852f	Merge branch 'gravflip-shadows' into 'next' ... Move drop shadows to the ceiling for objects in reverse gravity See merge request STJr/SRB2!973	2020-06-01 07:23:29 -04:00
MascaraSnake	8d7f4e3265	Merge branch 'movement-refactor' into 'next' ... Clean up some movement code See merge request STJr/SRB2!912	2020-06-01 07:21:41 -04:00
Louis-Antoine	3c3a60d189	Fix "downloads" command reporting incorrect progress	2020-06-01 10:37:05 +02:00
LJ Sonic	dd18915570	Merge branch 'traceback' into 'next' ... Traceback See merge request STJr/SRB2!974	2020-06-01 04:17:30 -04:00
MascaraSnake	508160ed42	Use 0 instead of 0xffff as dummy mobjnum	2020-05-31 22:58:14 +02:00
MascaraSnake	3a4502fa87	Netsync waypoint sequences	2020-05-31 22:44:25 +02:00
SwitchKaze	5a18bdf20b	Fix SOC color name reading	2020-05-30 16:52:44 -05:00
Louis-Antoine	d31346822d	Refactor hook library a little	2020-05-30 20:28:45 +02:00
Louis-Antoine	1bacaedde2	Show the traceback when a Lua script error happens	2020-05-30 20:24:33 +02:00
lachwright	f32d29f700	Oops, forgot to #undef	2020-05-31 01:26:23 +08:00
lachwright	a7f73bfa85	Move drop shadows to the ceiling for objects in reverse gravity	2020-05-31 01:21:26 +08:00
lachwright	5136a4d41d	Don't cut momentum if landing in a roll	2020-05-30 19:07:16 +08:00
lachwright	b874da5229	Ensure followmobj ghost exists before applying fuse	2020-05-30 18:26:11 +08:00
lachwright	51b640ad5a	Feedback so far indicates the old booster effect is preferred	2020-05-30 18:21:39 +08:00
lachwright	ae5d5b9546	Merge branch 'next' into dashmode-fixes	2020-05-30 18:13:21 +08:00
SwitchKaze	d589e6bc95	Fix signpost shade.	2020-05-29 21:41:20 -05:00
Zachary McAlpin	7bdea21435	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-05-29 15:32:59 -05:00
Louis-Antoine	1dbb755743	Add dofile() to Lua	2020-05-29 17:35:07 +02:00
LJ Sonic	b7c5163419	Merge branch 'luacolors-gcc10-fix' into 'next' ... Fix the "Custom skincolors" branch not compiling with GCC 10. See merge request STJr/SRB2!966	2020-05-29 11:23:54 -04:00
sphere	71cf31fcaf	Fix the "Custom skincolors" branch not compiling with GCC 10.	2020-05-28 18:43:04 +02:00
Louis-Antoine	c6e13d0e30	Fix crash when setting a mobj's angle from a Lua script	2020-05-28 18:34:56 +02:00
Monster Iestyn	755e9d659d	Merge branch 'master' into next	2020-05-28 16:34:06 +01:00
SteelT	07da7f7d29	Merge branch 'scroller-tweaks' into 'next' ... Add back side wall scrollers & allow using offsets for tagged wall scrollers. See merge request STJr/SRB2!955	2020-05-28 11:29:39 -04:00
LJ Sonic	aab6339e66	Merge branch 'possibly-fix-dedi-crash' into 'next' ... Possible fix for dedicated server crashes (aka the msvcrt.dll!_mbscat crash) See merge request STJr/SRB2!963	2020-05-28 11:29:00 -04:00
SteelT	1c42102ddb	Merge branch 'fix-input-buffer' into 'next' ... Allow input buffer to hold more than 64 tics See merge request STJr/SRB2!950	2020-05-28 11:27:39 -04:00
SteelT	f0b64971a0	Merge branch 'next-lc-uint16' into 'next' ... Custom skincolors See merge request STJr/SRB2!960	2020-05-28 11:23:05 -04:00
Louis-Antoine	67eef5a37f	Fix potential desynch when a player spawns	2020-05-28 11:03:35 +02:00
Louis-Antoine	bb1e3fdf13	Add a few missing calls to GameQuit hook	2020-05-27 14:58:10 +02:00
Monster Iestyn	40566e6926	Got_AddPlayer: check that I_GetNodeAddress(node) is non-NULL before using strcpy to copy it to the playeraddress array	2020-05-25 21:27:48 +01:00
mazmazz	272362a86f	Fix NOWIPE bugs with colormap fade and title card	2020-05-25 00:20:23 -04:00
mazmazz	8fee9a51ce	Add NOWIPE behavaior for colormap fades	2020-05-25 00:19:41 -04:00
Monster Iestyn	ed25fefcae	T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5 due to P_FloorzAtPos messing up as a result)	2020-05-24 21:15:31 +01:00
SwitchKaze	f508f5b881	Fix typo SKINCOLOT	2020-05-24 12:36:20 -05:00
SwitchKaze	b37c73b008	Make colors UINT16, increase color freeslots to 1024	2020-05-23 19:35:36 -05:00
Zachary McAlpin	566a5a0ab7	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-05-23 15:23:43 -05:00
MascaraSnake	747d784c77	Merge branch 'splitshot-notarget-fix' into 'next' ... A_SplitShot no target fix See merge request STJr/SRB2!956	2020-05-23 07:52:36 -04:00
SwitchKaze	46191cade7	Update to 2.2.4	2020-05-22 16:47:51 -05:00
Monster Iestyn	4b7f0f49f1	added the ability to get the # of a mapthing_t in Lua	2020-05-22 18:32:34 +01:00
Monster Iestyn	c9c7327011	A_SplitShot fix: don't even attempt to A_FaceTarget (or anything beyond) if there is no target to face to begin with	2020-05-21 19:42:48 +01:00
Monster Iestyn	7722d41be6	Merge branch 'sprite-projection-fixes' into 'next' ... Sprite projection fixes See merge request STJr/SRB2!954	2020-05-20 15:33:30 -04:00
Monster Iestyn	702a7041d4	also do the fovtan multiplication thing with precip sprites	2020-05-20 19:34:18 +01:00
Louis-Antoine	bf00955786	Wait for acks before resending file fragments	2020-05-20 16:21:18 +02:00
James R	4eeae51cbb	Merge branch 'more-lua-map-names' into 'next' ... G_BuildMapTitle for Lua, G_BuildMapName outside of levels See merge request STJr/SRB2!694	2020-05-19 23:13:35 -04:00
Louis-Antoine	06060c02d3	Add a command to list current file transfers	2020-05-20 00:24:53 +02:00
Louis-Antoine	c8948909d3	Fix I_Error when queuing multiple Lua files	2020-05-19 23:50:37 +02:00
sphere	934b28989f	Add linedef actions 507 & 508, allow using offsets for actions 502-504.	2020-05-19 23:39:35 +02:00
Monster Iestyn	c3d576058a	on second thought maybe we don't need extra tx clamping, it turns out to be more effort than it's worth (at least for now) ... meanwhile, let's move x/yscale calculations down since we don't actually need them until later on	2020-05-19 22:00:34 +01:00
Louis-Antoine	f620b52672	Fix sending Lua files in text mode	2020-05-19 21:36:21 +02:00
Louis-Antoine	34c5da39e2	Create FIL_ConvertTextFileToBinary	2020-05-19 20:00:58 +02:00
Monster Iestyn	65d6b04fd2	change limits for tx based on fov, by multiplying by fovtan ... this makes it so that higher fov values can actually let you see all the sprites that should be in the view	2020-05-19 18:54:39 +01:00
Monster Iestyn	35e5d673e0	do tx checking after tz clamping, not before	2020-05-19 18:43:33 +01:00
Monster Iestyn	12e1094143	We don't actually need x1 or x2 until these points in the function, at least for papersprites	2020-05-19 17:23:22 +01:00
Monster Iestyn	1a790235c6	added basic culling of papersprites if tx for either is too large, proper clamping to be added later ... also removed some commented out old code	2020-05-19 17:19:44 +01:00
Monster Iestyn	c8320b6c9d	split "rot" into two variables: frame and rot, for frame number and rotation angle ... it always bothered me that "rot" was used for both of the above, since it confused me as to what it was for every time I look at this function	2020-05-19 16:58:53 +01:00
Monster Iestyn	dd42682791	remove gxt and gyt, as they are unnecessary ... also add a few comments to explain what tx/tz are	2020-05-19 16:48:50 +01:00
Louis-Antoine	06d3af6716	Refactor Lua file transfer code	2020-05-19 15:16:51 +02:00
Louis-Antoine	db85c62c6f	Allow resuming the most recent file transfer	2020-05-19 11:28:24 +02:00
MascaraSnake	ff37975892	Merge branch 'next' into movement-refactor ... # Conflicts: # src/p_map.c	2020-05-19 09:50:23 +02:00
MascaraSnake	6f854f2de3	Merge branch 'more-polyobject-cleanup' into 'next' ... Smooth polyobject movement and other cleanup See merge request STJr/SRB2!947	2020-05-18 16:00:55 -04:00
MascaraSnake	33a22331f8	Merge branch 'waypoints' into 'next' ... Store waypoints at map load instead of iterating through the thinker list to find them See merge request STJr/SRB2!938	2020-05-18 16:00:46 -04:00
Zachary McAlpin	530d0e3421	Remove redundant M_QuitResponse call	2020-05-18 14:56:10 -05:00
Zachary McAlpin	ed78d17ed3	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-05-18 14:50:58 -05:00
Louis-Antoine	d40a8efce2	I forgot to test OpenGL :slight_smile:	2020-05-18 20:35:30 +02:00
GoldenTails	8b801921a4	Deprecate FixedRem. ... It's about time!	2020-05-18 11:29:56 -05:00
Louis-Antoine	435643b958	Fix P_GetZAt for Lua	2020-05-18 16:16:45 +02:00
Louis-Antoine	d0abd6e86c	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup ... # Conflicts: # src/hardware/hw_main.c # src/p_spec.c	2020-05-18 16:14:05 +02:00
Louis-Antoine	a06c4a8c98	Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt	2020-05-18 15:23:56 +02:00
Louis-Antoine	37d2796b91	Increase the length of the player input buffer even more	2020-05-18 12:35:55 +02:00
Louis-Antoine	56cc5190e5	Allow input buffer to hold more than 64 tics	2020-05-18 11:34:09 +02:00
Louis-Antoine	e49d3d0bb9	Use per-node reference tics in ExpandTics	2020-05-17 20:23:07 +02:00
Louis-Antoine	fc07db26c0	Store starttic as a raw value in PT_SERVERTICS packets ... This avoids some desynch issues and is simpler to handle. Those packets are always big anyway, so the difference is irrelevant.	2020-05-17 20:09:11 +02:00
MascaraSnake	c05d1dd979	Merge branch 'software-missing-sprite-column' into 'next' ... Fix missing sprite column (resolves #135) See merge request STJr/SRB2!944	2020-05-17 02:30:32 -04:00
MascaraSnake	a7c7f7afa9	Merge branch 'fof-cleanup' into 'next' ... FOF cleanup See merge request STJr/SRB2!910	2020-05-17 02:30:16 -04:00
Louis-Antoine	bf11e3a361	Add missing packet name	2020-05-16 23:22:33 +02:00
Louis-Antoine	66ecfb741a	Show total size when downloading gamestate	2020-05-16 22:49:20 +02:00
Louis-Antoine	3c7c758d17	Rewrite file transfer code ... This code uses a custom packet acknowledgement system, which is more suited for file transfer and does not suffer from the small sender window used by the default acknowledgement system	2020-05-16 22:09:00 +02:00
Jaime Passos	423494381e	Fix mistake	2020-05-16 14:01:42 -03:00
Jaime Passos	c64e231b2b	Attempt to properly match Software texture blending ... without messing with the original ASTBlendPixel function	2020-05-16 13:51:10 -03:00
Monster Iestyn	20e4d5ab9e	lib_sStopSoundByID: fixed mixed declaration and code compiler warning	2020-05-16 16:14:47 +01:00
MascaraSnake	969c48fac8	Merge branch 'udmf-next' into udmf-polyobjects ... # Conflicts: # src/p_polyobj.c	2020-05-16 11:18:47 +02:00
MascaraSnake	9b25ab27ca	Merge branch 'stop-sound-by-id' into 'next' ... S_StopSoundByID Lua support See merge request STJr/SRB2!925	2020-05-16 04:55:46 -04:00
MascaraSnake	5d7bea6400	Merge branch 'more-demo-cleanup' into 'next' ... More Demo code cleanup See merge request STJr/SRB2!942	2020-05-16 04:52:31 -04:00
MascaraSnake	371a1851e3	Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location	2020-05-16 10:24:06 +02:00
MascaraSnake	536e355cdf	polywaypointdata_t: Turn reverse and continuous into flags	2020-05-16 09:49:30 +02:00
MascaraSnake	06dda9c69d	EV_DoPolyObjWaypoint: Don't discard movement if you start at the last waypoint	2020-05-16 09:09:26 +02:00
MascaraSnake	3680b246c9	T_PolyObjWaypoint: We can find waypoints in constant time now, so no need to store the waypoint mobj in the thinker anymore	2020-05-16 09:03:02 +02:00
MascaraSnake	1057c0f7c1	T_PolyObjWaypoint: If the polyobject reaches its target exactly, find next waypoint in the same tic	2020-05-16 08:49:03 +02:00
MascaraSnake	e422d1fa1d	Rewrite T_PolyObjWaypoint to move more smoothly	2020-05-16 08:45:06 +02:00
Steel Titanium	69c86c63b3	Fix A_SpinSpin not being usable in Lua or SOC due to an error	2020-05-15 23:05:29 -04:00
MascaraSnake	ed9b76e4b9	Merge branch 'opengl-character-select-mipmap-memory-leak-fix' into 'next' ... Fix colormap mipmap memory leak on the character select in OpenGL See merge request STJr/SRB2!943	2020-05-15 16:41:19 -04:00
MascaraSnake	8f4ed5af62	Merge branch 'nights-character-select' into 'next' ... Character select in Nights mode. See merge request STJr/SRB2!862	2020-05-15 16:39:38 -04:00
toaster	a5150e07fd	* Swap location of Tutorial and Marathon Run, per sphere's suggestion. ... * Lock Marathon Run if Record Attack isn't available, to avoid confusing new players.	2020-05-15 21:32:54 +01:00
toaster	a615de3504	Correctly reset map/timer for retries where the first map in Marathon Run is LF_NORELOAD (by forcing a reload when the retry option is used).	2020-05-15 21:17:57 +01:00
James R	1ccca987cb	Jart? What's that?	2020-05-15 12:57:31 -07:00
Jaime Passos	288d7166bc	Fix ASTBlendPixel outputting empty pixels if the background pixel was empty, BUT if the foreground pixel had no alpha at all	2020-05-15 16:41:39 -03:00
Jaime Passos	00ac9deb5b	Fix missing sprite column	2020-05-15 16:17:31 -03:00
Jaime Passos	dd3c7aa0af	Fix colormap mipmap memory leak on the character select in OpenGL	2020-05-15 15:58:20 -03:00
Jaime Passos	5e28e358ad	Fix memory leak	2020-05-15 15:45:00 -03:00
MascaraSnake	0508f99419	T_PolyObjWaypoint: Move duplicated movement code into its own function	2020-05-15 17:35:07 +02:00
toaster	9686ad2d70	* In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default. ... * Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.	2020-05-15 16:33:20 +01:00
toaster	1e3e9c81ac	Remove emblem hints from Marathon Run (I think Options is good just for the sake of live events, though).	2020-05-15 15:23:31 +01:00
toaster	47419ce0df	Introducing "antisplice" - a pair of small highlights on the Marathon bar that is based on the real time the executable has been open for and *isn't* restored with the Live Event Backup, making spliced runs basically intractable.	2020-05-15 15:08:45 +01:00
toaster	f06206cd5f	Fix "press any other key" sending you to HOM hell.	2020-05-15 14:24:29 +01:00
toaster	271c6d354b	Re-order Marathon bar to be drawn before FPS and captions if applicable.	2020-05-15 13:39:27 +01:00
toaster	4348ebdfa8	Make live event backup files savedata specific (new format: live%s.bkp, where %s is the time attack folder name/savegame name - so vanilla's is livesrb2sav.bkp).	2020-05-15 13:37:06 +01:00
toaster	2aa542d2bf	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode ... # Conflicts: # src/doomdef.h	2020-05-15 13:23:37 +01:00
toaster	e99d38ffaf	Make a falsy useBlackRoc prevent doing Black Rock sparkle calculations and Egg Rock pulse sounds.	2020-05-15 13:19:52 +01:00
MascaraSnake	9cd9d2e0d7	Merge branch 'carry-dust-devil' into 'next' ... Add carry types to Dust devils See merge request STJr/SRB2!886	2020-05-15 02:50:29 -04:00
Jaime Passos	1a79f6246d	Merge remote-tracking branch 'origin/next' into pictureformats	2020-05-15 01:34:54 -03:00
James R	2ec97b87a0	This is SRB2	2020-05-14 17:29:36 -07:00
James R	57c7df74d9	Rename hms123311.c to http-mserv.c ... HMS lives on in our hearts! (cherry picked from commit e8a2397deaacdd7dc6f80717755bc89161247cb5)	2020-05-14 17:28:55 -07:00
James R	fec8879797	Use Unlock_state here too ... (cherry picked from commit a6ce21b450644a79b08b9533166704c7ef093816)	2020-05-14 17:28:55 -07:00
toaster	d593e2e1bb	Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) ... Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features. Benefits include: * An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending. * Disable the console (pausing is still allowed, but the timer will still increment). * Automatically skip intermissions as if you're holding down the spin button. * Show centiseconds on HUD automatically, like record attack. * "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout. * "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port). * Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them. * Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext). * Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for). * Gorgeous new menu (no new assets required, unless you wanna give it a header later). Changes which were required for the above but affect other areas of the game include: * "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories). * Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true). * Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.) * The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs). * A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier. * Minor m_menu.c touchups and refactorings here and there. Built using feedback from the official server's #speedruns channel, among other places.	2020-05-14 23:10:00 +01:00
Monster Iestyn	ee520b4a0d	split significant chunks of G_CheckDemoStatus into their own smaller functions, also give writing demo checksums its own little function	2020-05-14 20:57:21 +01:00
kaysrishaq	70896f9095	clean whitespace	2020-05-14 07:42:06 -04:00
kaysrishaq	c2a54acae3	Minor reorganization	2020-05-14 07:17:58 -04:00
kaysrishaq	fd31c5cd5e	Update ... Worked out some edge cases that had resulted in tracks restarting in the same format when they shouldn't - or tracks not switching to the other format when they should. Removed stray }	2020-05-14 06:33:03 -04:00
kaysrishaq	53252f0d14	Merge branch 'next' into musicpref-var	2020-05-14 03:38:38 -04:00
James R	0b9c20cc70	ok	2020-05-13 17:52:49 -07:00
ZipperQR	6a9543b1c2	no message	2020-05-14 03:35:46 +03:00
James R	ae45333535	Revert "Use new two digit version number for HMS" ... This reverts commit 7d2b3b0877.	2020-05-13 17:31:51 -07:00
James R	4b19a3321b	Bind HMS connection with -bindaddr	2020-05-13 17:26:53 -07:00
James R	fb6572f080	Reset the masterserver address if the old one was set by the config	2020-05-13 17:26:34 -07:00
James R	35419cd77e	Clarify where debug prints go when using masterserver_debug	2020-05-13 17:26:34 -07:00
James R	d91d7773be	Use IPv4 for master server connections ... Your server's address is gathered from the request, so it needs to be IPv4!	2020-05-13 17:26:34 -07:00
James R	7d2b3b0877	Use new two digit version number for HMS	2020-05-13 17:26:34 -07:00
James R	3e936a0878	Oops a debug condition snuck in there	2020-05-13 17:26:34 -07:00
James R	f9ec2a634c	Fix switching the master server	2020-05-13 17:26:34 -07:00
James R	47bc3bff13	Put some mutex on CONS_Printf etc. hahaha	2020-05-13 17:26:34 -07:00
James R	ca8b3e95af	Fucking multithreading in the server registration ... AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA	2020-05-13 17:25:52 -07:00
James R	a80c7a26dd	Wait for threads before SDL_Quit (lol)	2020-05-13 17:25:52 -07:00
James R	5fff4c35fc	Create cond if it doesn't exist when signaling	2020-05-13 17:25:52 -07:00
James R	00ffb29f95	Use malloc for hms	2020-05-13 17:25:52 -07:00
Steel Titanium	ff8987f745	Support for http downloads ... (cherry picked from commit 6fcc06bf72cf3b95c30f04919e807c7aaacec68d) (cherry picked just the libcurl stuff)	2020-05-13 17:25:52 -07:00
James R	7ebde22b77	Make mod update, room list and server list multithreaded ... This took fucking ages and it still fails sometimes in edge cases, but I don't give a FUCK right now.	2020-05-13 17:24:27 -07:00
James R	886bd34be5	Multithreading in my SRB2???	2020-05-13 17:21:19 -07:00
James R	1584b7394b	WHY THE FUCK DID I DO THIS	2020-05-13 17:21:18 -07:00
James R	676865c1b9	Oops	2020-05-13 17:21:18 -07:00
James R	9216406eea	Handle NULL hms buffer	2020-05-13 17:21:18 -07:00
James R	197cffb7f5	Compiler errors: won't stop, can't stop	2020-05-13 17:21:18 -07:00
James R	4fcd24d848	masterserver_update_rate cvar determines wait between updates in minutes ... The new default is 15 minutes as well. And if you think that's too long, I have confirmed that the Master Server delists inactive servers after a whopping 40 minutes, at least.	2020-05-13 17:20:59 -07:00
James R	bb8b279cd4	Don't try to update right after registering	2020-05-13 17:20:59 -07:00
James R	eac7b2e060	Add a hack so the 'All' room isn't display for hosting	2020-05-13 17:20:59 -07:00
James R	4fd707984b	Kill the old mserv, long live HMS!	2020-05-13 17:20:59 -07:00
James R	1e4e5275b5	Clean up header text	2020-05-13 17:18:27 -07:00
James R	1f295b8e50	HTTP update alert	2020-05-13 17:18:27 -07:00
James R	1f04f8e0c0	Fix some goofs	2020-05-13 17:18:27 -07:00
James R	ec1d4c9a91	Bruh	2020-05-13 17:18:27 -07:00
James R	bcfbd5563b	Clean up a bunch of stuff and follow the Master Server API more closely	2020-05-13 17:18:27 -07:00
James R	b15b90f217	Windows certs do work, thanks Steel!	2020-05-13 17:18:27 -07:00
James R	a4bbc06f25	Handle more errors	2020-05-13 17:18:27 -07:00
James R	f26ad18e28	Kill masterserver_token	2020-05-13 17:18:27 -07:00
James R	273e1ff170	This will be the Master Server in 2020	2020-05-13 17:18:27 -07:00
James R	bec97faf5c	Use https because my web server redirects	2020-05-13 17:18:27 -07:00
James R	768ad80a97	strtok can return NULL	2020-05-13 17:18:27 -07:00
James R	9e0c1b3f1f	This time I fucked up	2020-05-13 17:18:27 -07:00
James R	bec233515e	Windows gaysed: the sequel	2020-05-13 17:18:27 -07:00
James R	acdced643c	Windows is weird	2020-05-13 17:18:27 -07:00
James R	2cfb04f90b	masterserver_debug to set CURLOPT_VERBOSE	2020-05-13 17:18:27 -07:00
James R	8228182823	Don't show "All" room when hosting	2020-05-13 17:18:27 -07:00
James R	06764dd88e	I don't even know my own website	2020-05-13 17:18:26 -07:00
James R	83365e6ce0	lol	2020-05-13 17:18:26 -07:00
James R	06da1425b3	The big bad HTTP master server ... Cvars: http_masterserver is the url to the master server's API. masterserver_token may be an authentication token.	2020-05-13 17:18:26 -07:00
kaysrishaq	7f7ccc9911	musicpref console variable ... Adds musicpref to console and sound options menu, which allows users to select whether to prioritize MIDI or Digital music. Functions GameMIDIMusic_OnChange and GameDigiMusic_OnChange updated to not assume digital music priority, and to have more consistent behavior between the two. Positive side effect of using P_RestoreMusic in these functions means that powerup music (speed shoes, invincibility) will restore in the correct position when reenabling the original MusicType they loaded in with.	2020-05-13 19:20:21 -04:00
MascaraSnake	7413da918b	Store PolyObject waypoint return behavior in an enum	2020-05-13 16:21:47 +02:00
MascaraSnake	b561ee7921	Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway	2020-05-13 14:40:07 +02:00
MascaraSnake	acdb4b42ea	Merge branch 'actnum-tweaks' into 'next' ... Act number tweaks See merge request STJr/SRB2!905	2020-05-13 04:25:53 -04:00
MascaraSnake	9d06cb4be4	Merge branch 'fix-window-icon' into 'master' ... Fix window icon being reset when switching renderers on non-Windows platforms See merge request STJr/SRB2!898	2020-05-13 04:14:51 -04:00
MascaraSnake	0e2fb59650	Merge branch 'ogl-gif-fix' into 'master' ... Fix OpenGL only recording the first frame of unoptimized GIFs See merge request STJr/SRB2!928	2020-05-13 04:09:58 -04:00
MascaraSnake	ff3768f3e0	Merge branch 'udmf-next' into executordelay	2020-05-13 10:01:41 +02:00
MascaraSnake	1ccda0b85c	Merge branch 'next' into udmf-next	2020-05-13 10:01:12 +02:00
MascaraSnake	d3ec12c842	Merge branch 'udmf-next' into executordelay ... # Conflicts: # src/p_spec.c	2020-05-13 09:55:25 +02:00
MascaraSnake	aa16bd22f9	Fix accidental swap of first and last waypoint	2020-05-13 09:32:00 +02:00
MascaraSnake	36843cbfd6	Merge branch 'next' into waypoints	2020-05-12 23:51:32 +02:00
MascaraSnake	d708789c3a	Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly	2020-05-12 23:50:30 +02:00
Louis-Antoine	bf660dd35a	Rename local variables	2020-05-12 19:58:16 +02:00
Monster Iestyn	8c88c3dbb4	added missing extern keyword for ntemprecords in doomstat.h (definition is in g_game.c)	2020-05-12 18:43:49 +01:00
Monster Iestyn	064f4bcf34	added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case)	2020-05-12 18:42:16 +01:00
Monster Iestyn	dab212dc56	turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)	2020-05-12 18:40:51 +01:00
Monster Iestyn	89cd756cd8	make savegamename in doomdef.h an extern, put the actual definition in d_main.c	2020-05-12 18:37:15 +01:00
Louis-Antoine	061fd4761a	Rename some file transfer functions	2020-05-12 19:06:40 +02:00
sphere	4eb5f09c6f	Restore SHORT().	2020-05-12 17:20:29 +02:00
sphere	0287c6956e	Fix some errors and add some comments. Also, actnum is not an INT32.	2020-05-12 17:20:28 +02:00
sphere	69c11a8220	Support act numbers up to 99 and draw both digits individually.	2020-05-12 17:17:24 +02:00
MascaraSnake	435e6c9812	Rename variables for Fang waypoints, in preparation for new global waypoint data structure	2020-05-12 14:53:10 +02:00
Steel Titanium	feced5ec3c	Merge branch 'master' into next	2020-05-11 18:20:09 -04:00
SteelT	78fe9af56a	Merge branch 'splitscreen-titlecards-fix' into 'master' ... Fix splitscreen Title Card act name regression See merge request STJr/SRB2!934	2020-05-11 18:18:22 -04:00
SteelT	432cca7556	Merge branch 'menu-soc-bullshit-mergefix' into 'master' ... Menu soc bullshit mergefix See merge request STJr/SRB2!933	2020-05-11 18:17:59 -04:00
James R	e80f6497d7	Merge remote-tracking branch 'origin/next' into 2.2.4-prep	2020-05-11 15:01:32 -07:00
Louis-Antoine	0c4f983eb5	Fix crash with rollout rock	2020-05-11 23:48:35 +02:00
James R	a645f3a44f	Update patch.pk3 asset hash	2020-05-11 14:41:36 -07:00
James R	c52c8e0282	Update version names, SUBVERSION, MODVERSION	2020-05-11 14:41:36 -07:00
Monster Iestyn	d508d16cef	Merge branch 'master' into next	2020-05-11 20:08:02 +01:00
Zwip-Zwap Zapony	334ad93c56	Fix splitscreen Title Card act name regression ... This fixes act names not being shown on player 2's view	2020-05-11 19:57:20 +02:00
MascaraSnake	e288c9d4f2	Merge branch 'fix-simple-camera-and-eggstatue' into 'next' ... Fix Simple Camera not working with the tutorial's statue challenge See merge request STJr/SRB2!931	2020-05-11 13:31:09 -04:00
toaster	e5bc0583e5	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit ... # Conflicts: # src/m_menu.c	2020-05-11 15:00:31 +01:00
James R	7257fc730a	Remove instances of HAVE_BLUA that actually disable Lua now	2020-05-10 19:59:56 -07:00
James R	6b4ee94e38	Use camera angle, not mobj angle, when comparing Angle Anchor	2020-05-10 19:40:28 -07:00
sphere	61dfee7e13	Don't show the FPS counter during startup.	2020-05-11 01:33:34 +02:00
Steel Titanium	fabd76a5fe	Merge branch 'next' into 2.2.3-prep	2020-05-10 17:05:56 -04:00
Monster Iestyn	49864f646e	Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep	2020-05-10 20:10:11 +01:00
Monster Iestyn	197da95a23	Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj! ... precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct	2020-05-10 20:09:08 +01:00
lachwright	215ff828f8	Merge branch 'master' into next	2020-05-11 01:29:10 +08:00
Lachlan Wright	357ad68599	Merge branch 'patch_music' into 'next' ... patch_music.pk3 See merge request STJr/SRB2!812	2020-05-10 12:51:49 -04:00
lachwright	b7af502ed4	Update MD5 hashes for player.dta and patch.pk3	2020-05-11 00:23:32 +08:00
Monster Iestyn	3ce4c1b789	Fix logging on Mac ... These fixes were suggested by Sveciaost on #mac-users on Discord	2020-05-10 16:47:01 +01:00
Monster Iestyn	baee6a1d57	Update version number to 2.2.3 in all the usual files, also updated MODVERSION	2020-05-10 16:02:23 +01:00
Louis-Antoine	dc55ab9ae2	Use W_CachePatchLongName in Snake minigame	2020-05-10 11:02:45 +02:00
Louis-Antoine	614f45b380	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into snake	2020-05-10 11:00:30 +02:00
LJ Sonic	280633019a	Merge branch 'gfz3laser-mkii' into 'next' ... New Greenflower Zone 3 laser See merge request STJr/SRB2!924	2020-05-09 16:40:40 -04:00
LJ Sonic	62d5d16f5c	Merge branch 'optimise-archiving' into 'next' ... Optimise net-archiving of Lua strings, numbers and booleans See merge request STJr/SRB2!904	2020-05-09 16:40:28 -04:00
Jaime Passos	38c74cecc0	Avoid a crash	2020-05-09 17:26:27 -03:00
Jaime Passos	39c5ab4e17	Merge remote-tracking branch 'origin/next' into gtr-fixes	2020-05-09 17:12:52 -03:00
Jaime Passos	ab7987d1cf	Fix OpenGL only recording the first frame of unoptimized GIFs	2020-05-09 16:59:09 -03:00
Zachary McAlpin	61562683c2	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-05-09 00:05:05 -05:00
sphere	c55d6dbc9f	Make showfps save to config, and add a compact option.	2020-05-08 15:40:50 +02:00
Lachlan	426925c5fc	Play the 1-up sound when 1upsound is set to sound	2020-05-08 04:07:00 +08:00
MascaraSnake	60aa0f82f3	Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next	2020-05-07 22:00:02 +02:00
MascaraSnake	650f44566f	Fixed a typo	2020-05-07 21:59:39 +02:00
lachwright	9d21d790a4	Prevent laser sprites clipping into walls/off ledges	2020-05-08 02:58:56 +08:00
lachwright	36b400387e	Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it	2020-05-07 23:24:33 +08:00
lachwright	3a1988fc01	Fix knockback scaling	2020-05-07 22:47:34 +08:00
lachwright	51a5ece294	Merge remote-tracking branch 'origin/next' into gfz3laser-mkii	2020-05-07 22:34:44 +08:00
Alam Ed Arias	24df9f032f	Merge branch 'master' into next	2020-05-06 18:36:20 -04:00
Alam Ed Arias	38232ce07e	fix build errors in public master	2020-05-06 18:35:54 -04:00
Monster Iestyn	30105621d4	Merge branch 'master' into next	2020-05-06 21:51:36 +01:00
Zipper	87f7100d2e	Update p_user.c	2020-05-06 09:30:15 -04:00
ZipperQR	d0376e284a	S_StopSoundByID Lua support	2020-05-06 16:22:04 +03:00
Lachlan	05ea95d0eb	Merge branch 'next' into gfz3laser-mkii	2020-05-06 09:10:27 +08:00
lachwright	63cb58a10a	Update new GFZ3 laser	2020-05-06 09:03:03 +08:00
lachwright	92c900f284	New GFZ3 laser	2020-05-06 09:01:02 +08:00
Louis-Antoine	2d6c9a94f4	Fix compiler warning	2020-05-05 14:05:19 +02:00
MascaraSnake	5282f01a53	Fix PolyObject flags not being applied when there is no parameter line	2020-05-05 08:40:59 +02:00
MascaraSnake	df3ca712d8	Move polyobject crush option to the first line args	2020-05-04 23:27:26 +02:00
MascaraSnake	8c36b9efa5	Adapt basic PolyObject setup to UDMF	2020-05-04 22:40:49 +02:00
MascaraSnake	6e7373a475	Merge branch 'next' into udmf-next	2020-05-04 20:32:56 +02:00
MascaraSnake	023c095d55	Merge branch 'polyobject-cleanup' into 'next' ... PolyObject cleanup See merge request STJr/SRB2!919	2020-05-04 14:18:08 -04:00
MascaraSnake	de100b076a	PolyObject: Allow translucency to be set via X offset	2020-05-04 19:47:39 +02:00
MascaraSnake	d03742b15b	Merge branch 'level-header-sector-typeskd' into 'next' ... Allow some map-wide settings to be set via level header instead of sector types See merge request STJr/SRB2!917	2020-05-04 05:21:49 -04:00
MascaraSnake	248df41a2f	Simplify set/fade polyobject translucency code	2020-05-04 10:29:35 +02:00
MascaraSnake	e3ddb413aa	Make PolyObject special functions return boolean instead of INT32	2020-05-04 10:07:38 +02:00
MascaraSnake	78a700f5fa	Remove non-descriptive comments	2020-05-04 10:01:44 +02:00
MascaraSnake	2be775e74c	Move parameter parsing for EV_DoPolyObjFlag into its own function	2020-05-04 09:58:27 +02:00
MascaraSnake	482adc6124	Pass parameters to EV_DoPolyObjFlag in a struct and not via the line	2020-05-04 09:54:32 +02:00
MascaraSnake	02c347ada2	Refactor Polyobj_findSegs	2020-05-04 01:28:21 +02:00
MascaraSnake	8ae635c7ba	Purge uninformative comments	2020-05-04 00:17:05 +02:00
MascaraSnake	b82c3c2089	Clean up Polyobj_GetInfo	2020-05-03 23:55:23 +02:00
MascaraSnake	5de11441a1	Remove "explicitly include line in polyobject" code which has never worked	2020-05-03 23:47:26 +02:00
MascaraSnake	a881662ca9	Implement "set linedef executor delay" linedef type	2020-05-03 21:03:15 +02:00
MascaraSnake	f26648e6f2	Adapt linedef executor delay to UDMF	2020-05-03 20:41:37 +02:00
MascaraSnake	7fec1211fd	Bugfix in XGL3 ZNODES parsing	2020-05-03 19:28:52 +02:00
MascaraSnake	700b340827	Allow map-wide gravity to be set via level header	2020-05-03 18:33:18 +02:00
MascaraSnake	4b87bee759	Add level header options for setting special stage time and spheres requirements	2020-05-03 17:56:49 +02:00
MascaraSnake	a9bd307dc0	Merge branch 'next' into egg-capsule ... # Conflicts: # src/p_spec.c	2020-05-03 15:29:20 +02:00
MascaraSnake	dd50990e85	Add "trigger egg capsule" linedef executor	2020-05-03 15:22:13 +02:00
ZipperQR	0d7c49e7e4	no message	2020-05-03 14:02:23 +03:00
MascaraSnake	d0d25025e1	Refactor P_CheckBouncySectors	2020-05-03 10:01:58 +02:00
Steel Titanium	887c25e047	Remove inline keyword from P_DoTwinSpin function ... The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error	2020-05-02 17:39:55 -04:00
Hannu Hanhi	c9114867cc	Dummy I_GetTimeMicros	2020-05-02 23:24:49 +03:00
Hannu Hanhi	1b6e65b91c	Implement I_GetTimeMicros without affecting I_GetTime behaviour details	2020-05-02 23:14:20 +03:00
Hannu Hanhi	724e093ce8	Render stats cleanup	2020-05-02 23:14:08 +03:00
Hannu Hanhi	7e8543a408	More render stats for software mode, renamed and relocated some render stats variables	2020-05-02 23:13:53 +03:00
Hannu Hanhi	8dcc2fe20d	Move some render stats variables to better locations, add I_FinishUpdate timing	2020-05-02 23:13:32 +03:00
Hannu Hanhi	64a153fdee	Render stats	2020-05-02 23:13:08 +03:00
Monster Iestyn	1528f2aef8	Fix drop shadow and rotsprite code to use SHORT()	2020-05-02 17:13:16 +01:00
MascaraSnake	d9ed914e14	Merge branch 'amyswings' into 'next' ... Restore jump-related pflags properly during twinspin See merge request STJr/SRB2!908	2020-05-02 10:03:49 -04:00
MascaraSnake	452fd100b8	Refactor P_CheckBustableBlocks	2020-05-02 15:50:18 +02:00
MascaraSnake	122104815a	Revert some very incorrect refactoring	2020-05-02 15:33:15 +02:00
MascaraSnake	ddb4c2c97f	Refactor P_PushableCheckBustables	2020-05-02 15:30:56 +02:00
MascaraSnake	bc2d0dcea6	Some minor PTR_GlideClimbTraverse cleanup	2020-05-02 15:25:19 +02:00
MascaraSnake	929064b998	Refactor PTR_SlideTraverse	2020-05-02 15:21:53 +02:00
MascaraSnake	a67c8786ae	P_PlayerZMovement: Move PolyObject handling code into its own function	2020-05-02 13:49:16 +02:00
MascaraSnake	29192eff9a	Merge branch 'remove-polyobjects' into movement-refactor	2020-05-02 13:37:13 +02:00
MascaraSnake	afc6378868	P_PlayerZMovement: Move checks for Mario blocks into their own function	2020-05-02 13:34:24 +02:00
MascaraSnake	2605f29bd4	P_PlayerMobjThinker: Move check for floatbob platforms into its own function	2020-05-02 13:08:13 +02:00
MascaraSnake	19d77bfc53	P_PlayerMobjThinker: Move crumbling platforms check into its own function	2020-05-02 12:50:09 +02:00
MascaraSnake	485a4e5035	Remove POLYOBJECTS and POLYOBJECTS_PLANES defines	2020-05-02 12:08:31 +02:00
MascaraSnake	2a39265156	Make the laser thinker find the FOF itself instead of storing it in the thinker struct	2020-05-02 10:03:16 +02:00
MascaraSnake	c1304e019d	Clean up Thwomp spawning code	2020-05-02 09:15:34 +02:00
Zipper	dd645d88ea	Update p_user.c	2020-05-01 08:25:37 -04:00
MascaraSnake	5c8b50ca8b	Merge branch 'next' into udmf-next ... # Conflicts: # src/p_saveg.c # src/p_slopes.c # src/p_spec.c	2020-05-01 12:44:39 +02:00
MascaraSnake	2449c66b78	Merge branch 'find-sector-from-tag' into 'next' ... Remove P_FindSectorFromLineTag and P_FindLineFromLineTag See merge request STJr/SRB2!901	2020-05-01 05:49:52 -04:00
MascaraSnake	7922306113	Merge branch 'more-thinker-refactor' into 'next' ... More thinker refactoring See merge request STJr/SRB2!900	2020-05-01 05:47:14 -04:00
MascaraSnake	790affd13b	Merge branch 'next' into elevator-cleanup ... # Conflicts: # src/p_saveg.c	2020-05-01 11:42:05 +02:00
MascaraSnake	be0959fa90	Remove bogus comments from p_saveg.c	2020-05-01 11:25:32 +02:00
LJ Sonic	ef5f8f3bd2	Merge branch 'join-delay' into 'next' ... Add a minimum delay between connections See merge request STJr/SRB2!889	2020-05-01 03:29:15 -04:00
lachwright	165b6c2435	Dashmode fixes: ... - Don't force the player's default normalspeed and jumpfactor while not in dashmode - Properly trim the fuse for followmobj ghosts spawned during dashmode - Add deliberate dashmode ghosts for Metal's jet fume	2020-05-01 08:26:23 +08:00
lachwright	f9b831c00b	Restore jump-related pflags properly during twinspin	2020-05-01 06:34:30 +08:00
Monster Iestyn	279ad0707e	Merge branch 'strncpy-brullshit' into 'next' ... Fix a few strncpy bullshit See merge request STJr/SRB2!895	2020-04-30 14:53:46 -04:00
Hannu Hanhi	be99670a39	More HWR_ProcessSeg sky code from master	2020-04-30 19:57:28 +03:00
Hannu Hanhi	ff8f48647b	HWR_ProcessSeg skywall processing from master	2020-04-30 19:57:15 +03:00
Monster Iestyn	0d3876abf3	Merge branch 'next' into netarchive-cleanup	2020-04-29 15:27:07 +01:00
Monster Iestyn	2f0bf3860f	Don't discard const, added missing &	2020-04-29 15:24:28 +01:00
Monster Iestyn	d89d2505bb	Whoops the third	2020-04-29 14:45:52 +01:00
Louis-Antoine	9b3917cd72	Revert "Replace a few instance of strncpy with strlcpy" ... This reverts commit 2e27f32d3e.	2020-04-29 10:55:49 +02:00
Zachary McAlpin	196c12549c	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-04-28 18:31:15 -05:00
Louis-Antoine	ae05f11c45	Optimise number archiving	2020-04-28 23:12:02 +02:00
Louis-Antoine	3e8fb8db25	Optimise boolean archiving	2020-04-28 23:11:28 +02:00
Louis-Antoine	2e3c110534	Optimise string archiving and allow for longer strings	2020-04-28 22:19:44 +02:00
LJ Sonic	5c16e33432	Merge branch 'fix-intermission-mouse' into 'next' ... Fix mouse being grabbed in intermission and cutscenes See merge request STJr/SRB2!891	2020-04-28 04:25:32 -04:00
Louis-Antoine	752b48de3a	Update sound and closed captions in connection screen	2020-04-28 00:37:58 +02:00
Louis-Antoine	231a835bf6	Minor adjustements in Snake minigame	2020-04-27 23:15:18 +02:00
Louis-Antoine	dfdace22bb	Add bonuses and maluses to Snake minigame	2020-04-27 23:10:13 +02:00
Louis-Antoine	a3dcc100c0	Add pause and retry to Snake minigame	2020-04-27 22:06:32 +02:00
MascaraSnake	df692645c4	Merge branch 'raisethinker' into 'next' ... Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF) See merge request STJr/SRB2!899	2020-04-27 15:04:37 -04:00
Louis-Antoine	647d74bad5	Add a background to Snake minigame	2020-04-27 15:31:38 +02:00
MascaraSnake	4cec927bbb	Replace P_FindLineFromLineTag with P_FindLineFromTag	2020-04-27 14:34:42 +02:00
MascaraSnake	0a0812bc57	Remove P_FindSectorFromLineTag	2020-04-27 14:31:37 +02:00
Louis-Antoine	c7cd53d5b2	Call rand() a few times after calling srand()	2020-04-27 14:22:45 +02:00
MascaraSnake	4f3d837835	Store "no bosses" setting for lasers in thinker instead of checking sourceline.	2020-04-27 13:09:57 +02:00
MascaraSnake	630af5d225	Pass thwomp settings to P_AddThwompThinker	2020-04-27 13:01:31 +02:00
Louis-Antoine	58c0383e88	Use sprites for snake and apple	2020-04-27 13:01:14 +02:00
MascaraSnake	556c2a8c18	Store tag instead of sourceline in raise thinker	2020-04-27 12:54:08 +02:00
MascaraSnake	2f9cccf287	Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)	2020-04-27 11:19:07 +02:00
Steel Titanium	e0f9b82544	Fix window icon being reset when switching renderers on non-Windows platforms	2020-04-26 18:46:43 -04:00
Louis-Antoine	380e246be3	Lower the download progress bar	2020-04-26 21:57:17 +02:00
Louis-Antoine	7c9ce1faee	Prevent edge warping in Snake minigame	2020-04-26 21:17:15 +02:00
MascaraSnake	c026b707ce	Make new thinker loading functions set floordata/ceilingdata where necessary	2020-04-26 18:54:03 +02:00
MascaraSnake	fb1746e95b	Deprecate the camera scanner effect and print a warning when it's used	2020-04-26 18:42:31 +02:00
MascaraSnake	82bf72f5e1	Remove obsolete stuff from elevator_t	2020-04-26 18:38:45 +02:00
MascaraSnake	f4282718dc	Accidentally changed the wrong SaveElevatorThinker call to SaveCrumbleThinker	2020-04-26 18:31:39 +02:00
MascaraSnake	554de0e0f5	T_StartCrumble refactoring, part 1	2020-04-26 16:51:14 +02:00
MascaraSnake	295ed303af	Make T_StartCrumble use its own thinker data structure	2020-04-26 11:55:10 +02:00
Louis-Antoine	2e27f32d3e	Replace a few instance of strncpy with strlcpy	2020-04-26 00:42:17 +02:00
Louis-Antoine	212358dbba	Restore old entry searching functions and add alternate versions for long names	2020-04-26 00:39:52 +02:00
Monster Iestyn	7034e2537a	whoops the sequel	2020-04-25 16:53:52 +01:00
Monster Iestyn	049a7db877	whoops	2020-04-25 16:52:11 +01:00
Hannu Hanhi	78c2928b8b	Optimization: also don't reset shader on models	2020-04-25 16:32:44 +03:00
Hannu Hanhi	c0c095e1d1	Optimization: only call pglUseProgram if shader actually needs changing	2020-04-25 16:32:32 +03:00
Hannu Hanhi	0758a8caec	Optimization: Don't reset shader program at end of DrawPolygon, instead reset it in UnSetShader	2020-04-25 16:32:21 +03:00
Nev3r	9ebb4071ee	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag ... # Conflicts: # src/p_floor.c # src/p_mobj.c # src/p_spec.c # src/r_segs.c	2020-04-25 10:47:45 +02:00
MascaraSnake	04c10ed41b	Merge branch 'next' into udmf-next	2020-04-25 08:19:26 +02:00
MascaraSnake	3cd8f62ae9	Remove a line I overlooked in the thinker cleanup branch	2020-04-25 08:18:48 +02:00
James R	fe9b933b97	Merge remote-tracking branch 'origin/master' into HEAD	2020-04-24 22:10:59 -07:00
Monster Iestyn	49cceda15b	Do the same with writing ARCH_FFLOOR values in Lua archiving code (reading was already dealt with years ago)	2020-04-24 22:43:23 +01:00
Monster Iestyn	7dda5f6b94	created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID	2020-04-24 22:29:41 +01:00
Louis-Antoine	10fbaaf781	Fix compiler warnings	2020-04-24 22:19:05 +02:00
Monster Iestyn	e406a7bef5	no diff3 needed for line archiving	2020-04-24 20:58:38 +01:00
Monster Iestyn	1e61229cb7	we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)	2020-04-24 20:57:48 +01:00
Monster Iestyn	c1d2b8301b	split sector/lines archiving-related code into their own functions too	2020-04-24 20:40:50 +01:00
Monster Iestyn	2d45decbb0	remove statsec and statline as they appear to be entirely unused	2020-04-24 20:28:01 +01:00
Monster Iestyn	08a7fcbe8d	Split off FOF archiving-related code into their own functions	2020-04-24 20:26:57 +01:00
MascaraSnake	3170f2b8c3	Merge branch 'next' into udmf-next ... # Conflicts: # src/p_mobj.c # src/r_segs.c	2020-04-24 21:15:53 +02:00
Monster Iestyn	d1d006a1a7	Merge branch 'thinker-cleanup' into 'next' ... Plane movement thinker cleanup See merge request STJr/SRB2!880	2020-04-24 14:30:52 -04:00
Louis-Antoine	d235d401bc	Improve controls handling in connection screen minigame	2020-04-24 19:27:42 +02:00
Louis-Antoine	9ac3fd202f	Add a Snake minigame to the downloading screen	2020-04-24 19:27:29 +02:00
Louis-Antoine	e4f2c1dc70	Fix mouse being grabbed in intermission and cutscenes	2020-04-24 18:33:35 +02:00
Monster Iestyn	9df5d6e1e0	These are flags! Serves me right for just rushing this out	2020-04-24 16:53:54 +01:00