6409 commits

Author	SHA1	Message	Date
MPC	fcb65951b8	change implementation of square root	2018-12-20 17:37:06 -03:00
Jimita	5b285a60a2	Update r_segs.c	2018-12-20 16:15:19 -03:00
Jimita	ffd5061531	Merge branch 'next' into sw_largeroomfix	2018-12-20 16:56:05 -02:00
Monster Iestyn	76fe78571e	fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic	2018-12-20 16:47:17 +00:00
Monster Iestyn	dfbbab35f4	Merge branch 'master' into next	2018-12-20 16:41:21 +00:00
mazmazz	e2b8ff26db	Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua	2018-12-20 10:56:36 -05:00
Digiku	dd107724de	Merge branch 'lua-nextmapoverride' into 'next' ... Lua: nextmapoverride & skipstats changing outside of G_ExitLevel See merge request STJr/SRB2!396	2018-12-20 10:55:30 -05:00
mazmazz	71da6836c0	Reset default controls for LOADCONFIG command	2018-12-20 10:13:43 -05:00
mazmazz	04916edc07	Update EXECVERSION to MODVERSION 27	2018-12-20 04:03:35 -05:00
mazmazz	9d212b340b	Update code versions to 2.1.22	2018-12-20 02:35:27 -05:00
Digiku	25f0dc7eae	Merge branch 'version-string-develop' into 'master' ... Add DEVELOP build flag to version string See merge request STJr/SRB2!401	2018-12-20 02:28:21 -05:00
mazmazz	7f8d16d3cd	Add DEVELOP build flag to version string	2018-12-20 02:27:30 -05:00
mazmazz	60bcf92525	Adjust execversion retrieval in CV_FilterVarByVersion	2018-12-20 02:18:59 -05:00
mazmazz	969960a1eb	Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro	2018-12-20 02:18:11 -05:00
mazmazz	ed7178bca4	Assign joy button defaults for 1 and 2 player	2018-12-20 01:47:35 -05:00
Digiku	722ceb5285	Merge branch 'pk3-stray-blockmap-msg' into 'master' ... Comment out stray PK3 blockmap message See merge request STJr/SRB2!399	2018-12-20 01:11:44 -05:00
mazmazz	78501dcd0c	Comment out stray PK3 blockmap message	2018-12-20 01:11:07 -05:00
Digiku	223257e237	Merge branch 'using-offsetof' into 'next' ... Use the `offsetof` function See merge request STJr/SRB2!394	2018-12-19 21:53:37 -05:00
Alam Ed Arias	e5e978f8bd	Merge branch 'master' into next	2018-12-19 13:20:54 -05:00
Digiku	7982b1695a	Merge branch 'ogl-zfighting-fix' into 'master' ... OpenGL z-fighting fix [by Azeonus] Closes #43 See merge request STJr/SRB2!395	2018-12-19 13:05:04 -05:00
Digiku	bea76aa4bf	Merge branch 'save-override' into 'next' ... Feature: Save override for level header See merge request STJr/SRB2!392	2018-12-19 13:04:41 -05:00
Digiku	4c69fe23f6	Merge branch 'kart-luatextures-backport' into 'next' ... Lua: Kart textures backport (non-foolish vers) See merge request STJr/SRB2!391	2018-12-19 13:04:24 -05:00
Latapostrophe	387173ea89	Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT	2018-12-19 16:50:49 +01:00
Latapostrophe	a31b85e124	Some messages relevant to discussions now go in the chat.	2018-12-19 16:44:57 +01:00
mazmazz	96cad09db6	Change 0.05 to 0.05f	2018-12-18 16:59:59 -05:00
Azeonus	67cd6dcdd2	dispoffset OGL fix [by Azeonus]	2018-12-18 16:50:03 -05:00
TehRealSalt	42a9e66883	Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication.	2018-12-18 15:03:54 -05:00
TehRealSalt	0e34e7f32f	G_SetCustomExitVars for setting nextmapoverride & skipstats ... This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.	2018-12-18 14:48:04 -05:00
Alam Arias	b62e6ee909	Merge branch 'next' into the_second_remote_view_camera_fix	2018-12-18 14:11:43 -05:00
Alam Ed Arias	d5c7ca1d23	Merge branch 'master' into next	2018-12-18 14:05:07 -05:00
Alam Arias	056cfe71a4	Merge pull request #373 from monster-psychic-cat/sw_planefixes ... Software plane fixes	2018-12-18 14:02:21 -05:00
Alam Arias	afecb2fc85	Merge branch 'next' into the_second_remote_view_camera_fix	2018-12-18 13:57:48 -05:00
TehRealSalt	03a4bd8f53	Revert default changes ... Digiku said they'd handle the new button defaults so \m/	2018-12-18 12:55:05 -05:00
Latapostrophe	9f17039e2e	Merge branch 'srb2chat' into 'SRB2-CHAT' ... fix my fucking code See merge request SinnamonLat/SRB2!1	2018-12-18 11:51:18 -05:00
mazmazz	1fcf607b41	Fix strncpy nodenum length overflow	2018-12-17 21:31:00 -05:00
mazmazz	876ddd48f1	Change int to INT32	2018-12-17 19:09:05 -05:00
mazmazz	bf21b7c483	Mixed D&C fixes for HU_DrawTeamTabRankings	2018-12-17 19:03:09 -05:00
mazmazz	7a92c9d3d0	Mixed D&C fixes; replace a couple int's with INT32	2018-12-17 19:02:22 -05:00
mazmazz	245a125551	Fix compile errors	2018-12-17 18:55:21 -05:00
Monster Iestyn	bd58ff8c49	Merge branch 'frame-backslash-fix' into 'next' ... Accept '+' as substitute for '\' for sprite frames (PK3) See merge request STJr/SRB2!380	2018-12-17 17:34:41 -05:00
MPC	ca4329bcb6	fix the fucking warning	2018-12-17 18:09:29 -03:00
MPC	82601e881b	fix my fucking code	2018-12-17 17:57:53 -03:00
Latapostrophe	2fdf27c507	make sure to change p_dispy and not y for /pm list. Also make MPC happy.	2018-12-17 21:39:49 +01:00
Latapostrophe	ff957baae3	Don't overlap ringslinger HUD	2018-12-17 21:31:31 +01:00
Jimita	1d40676f3a	Merge branch 'master' into automap_fix	2018-12-17 17:46:29 -02:00
Jimita	3329c10b60	Merge branch 'next' into the_second_remote_view_camera_fix	2018-12-17 17:46:17 -02:00
Jimita	f3956ffb4c	Merge branch 'master' into sw_planefixes	2018-12-17 17:45:36 -02:00
Latapostrophe	45aba493c7	2.1.21 and all of the kart additions. Woo.	2018-12-17 20:43:59 +01:00
mazmazz	b64dd82034	Attempt to fix cv_execversion being accessible by console	2018-12-17 13:39:24 -05:00
mazmazz	657e7321f6	Decouple execversion from MODVERSION; add scheme for MINORMODVERSION	2018-12-17 13:38:23 -05:00
Jimita	362fb491f7	Merge branch 'next' into the_second_remote_view_camera_fix	2018-12-17 15:40:20 -02:00
Monster Iestyn	e9be5e895e	Merge branch 'master' into next	2018-12-17 17:34:41 +00:00
mazmazz	b958f00f17	Better rewrite for addons draw adjustment	2018-12-17 10:59:27 -05:00
TehRealSalt	bef3bb23f8	Undo dc92bb49	2018-12-16 21:36:54 -05:00
TehRealSalt	97639848e1	Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport	2018-12-16 21:22:06 -05:00
TehRealSalt	9e596d15af	Save override for level header ... Kind of like 2.2's, but with backwards-compatability with 2.1	2018-12-16 20:09:59 -05:00
mazmazz	6dbe930997	Use labs for long value	2018-12-16 19:47:02 -05:00
mazmazz	2d2bd59099	Remove FIXUPO0 GCC pragma	2018-12-16 19:39:16 -05:00
mazmazz	296b678d7e	Wstrict-overflow adjustment	2018-12-16 19:38:46 -05:00
TehRealSalt	ec53e12294	Foolish	2018-12-16 18:19:53 -05:00
TehRealSalt	e763eab6cd	2.2 camera changes backport ... - Very slightly less claustrophobic camera defaults - Changed camera settings are saved - Camera distance increases relatively with splitscreen & analog mode. These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration	2018-12-16 18:18:59 -05:00
Alam Ed Arias	14e98df69b	Revert "Merge branch 'kart-luatextures-backport' into 'next'" ... This reverts merge request !387	2018-12-16 22:57:39 +00:00
TehRealSalt	c69cfefb6d	2.2 backport of jump/spin axes ... Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.	2018-12-16 17:45:49 -05:00
Monster Iestyn	6b1b11441d	Merge branch 'sdl-sound-fix' into 'master' ... SDL: Force use DirectSound driver to fix wrong-pitch sound effects See merge request STJr/SRB2!375	2018-12-16 17:16:49 -05:00
mazmazz	1b7a9aaa01	2.1 Score/Time/Rings lump name	2018-12-16 16:53:13 -05:00
mazmazz	899120e475	Revert NMUSlist to original 2.1	2018-12-16 16:42:57 -05:00
mazmazz	d7321fd8c4	Pull expanded NMUSlist from 2.2	2018-12-16 16:40:40 -05:00
mazmazz	046d36a657	Remove Kart entries from NMUSlist	2018-12-16 16:08:31 -05:00
mazmazz	6d94568f4b	Hide kart-specific addons behavior behind USE_KART	2018-12-16 16:07:47 -05:00
TehRealSalt	cc22ef3f05	Add deprecation warning to admin	2018-12-16 16:05:18 -05:00
TehRealSalt	4ba23e1028	Expose R_TextureNumForName ... Backport from SRB2Kart	2018-12-16 15:58:47 -05:00
mazmazz	c3ff0b6d16	Uncomment Secrets menu toggle when exiting Addons	2018-12-16 15:52:01 -05:00
Alam Ed Arias	6e79722437	Fix float-equal warning in Win32 interface	2018-12-16 14:01:28 -05:00
Alam Ed Arias	11aef0b3f1	Merge branch 'master' into float_equal	2018-12-16 13:52:45 -05:00
Latapostrophe	25e6d5388c	merge conflict	2018-12-16 16:48:15 +01:00
mazmazz	f0967520ed	Compile fixes; enable PK3 support in addons menu ... * Add missing vars highlightflags, recommendedflags, warningflags from Kart * V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us * V_GetStringColormap() made non-static	2018-12-15 21:44:39 -05:00
mazmazz	37950341ec	Merge remote-tracking branch 'public-gitlab/next' into addons-backport	2018-12-15 20:52:46 -05:00
mazmazz	0a3b3736bf	Handle Kart-specific changes; add PK3 to exttable	2018-12-15 20:50:33 -05:00
mazmazz	b32f50648d	Merge branch 'addons_menu' into 'master' ... Addons menu See merge request KartKrew/Kart!8	2018-12-15 20:46:42 -05:00
Alam Ed Arias	15d0673685	fix compiling for clang	2018-12-14 21:31:37 -05:00
Alam Ed Arias	78634679f1	fix compiling for MSVC	2018-12-14 20:42:37 -05:00
Alam Ed Arias	6fd66bdb49	Clear float equal warnings	2018-12-14 20:34:06 -05:00
Monster Iestyn	f4ce770c1c	try out using offsetof for these three macros in d_clisrv.h	2018-12-14 23:56:11 +00:00
Monster Iestyn	e0079ea1a2	remove NearVertice (which was unused anyway), clean up maz's changes	2018-12-14 23:28:07 +00:00
mazmazz	de96fe8e7b	Revert "compiler SSE tweak for 32-bit" ... This reverts commit 09d9a555c6.	2018-12-14 16:47:38 -05:00
mazmazz	abae63a64b	SameVertice floating point match; fixes 64-bit OGL holes	2018-12-14 16:47:24 -05:00
mazmazz	66efc7ea7f	Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup	2018-12-14 16:23:42 -05:00
Monster Iestyn	c1e0041a0b	copy doom legacy's replacement for the den == 0.0 calc in fracdivline	2018-12-14 21:22:13 +00:00
mazmazz	09d9a555c6	compiler SSE tweak for 32-bit	2018-12-14 16:21:07 -05:00
Monster Iestyn	623d1574ce	minor cleanup	2018-12-14 21:00:53 +00:00
MPC	9c04a066d9	Update r_plane.h	2018-12-14 15:49:32 -03:00
Monster Iestyn	b42c306ef3	remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway	2018-12-14 18:14:08 +00:00
Monster Iestyn	52fd3dcbed	split loading status code into a separate function	2018-12-14 18:11:30 +00:00
Monster Iestyn	02fc845a72	Make sure nptfront is explicitly > 0, so we don't alloc a poly for negative number points at all	2018-12-14 18:01:18 +00:00
Monster Iestyn	4089b6b8e9	use continue if NULL instead of a big if block if ...not NULL ... also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards	2018-12-14 18:00:08 +00:00
Monster Iestyn	3a125dbbd5	compare with actual doubles, not ints	2018-12-14 17:14:03 +00:00
Jimita	cf792ef4f3	Merge branch 'master' into the_second_remote_view_camera_fix	2018-12-14 15:09:24 -02:00
MPC	9c2197db17	Software plane fixes	2018-12-14 14:08:25 -03:00
Jimita	d70dbada1c	Merge branch 'master' into automap_fix	2018-12-14 15:07:53 -02:00
mazmazz	c49a5ed8d2	Better I_InitJoystick log message	2018-12-14 06:14:21 -05:00
mazmazz	d094a70ec3	Allow use_joystick/2 to be saved once again	2018-12-14 06:07:20 -05:00
mazmazz	fa63ddda86	Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick	2018-12-14 06:05:31 -05:00
mazmazz	70d6845d6c	Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously	2018-12-14 05:57:10 -05:00
mazmazz	b2c02838c4	Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys()	2018-12-14 05:31:47 -05:00
mazmazz	e548f6f139	Don't override an already-active controller ... * Menu improvements to tell the user that they can't set a controller if it's already active	2018-12-14 05:02:41 -05:00
mazmazz	3b6de810e1	Lots of changes to better support hotplugging and unstable device indexes ... * Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run * Properly set cv_usejoystick/2 for menu toggling * Force-disable a player's joystick if setting another player's joystick to the same device * Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging	2018-12-14 03:58:07 -05:00
mazmazz	6b9fe87b60	Properly handle unstable device indexes for hotplug	2018-12-14 01:45:18 -05:00
mazmazz	44d6a1d236	Attempt to handle unstable device IDs	2018-12-14 00:22:25 -05:00
mazmazz	216e710b87	Improve hotplug edge case with changing device indexes; return proper joy_open output on error	2018-12-13 23:52:04 -05:00
mazmazz	14cde2d227	Change joystick log messages to DBG_GAMELOGIC	2018-12-13 23:26:07 -05:00
mazmazz	e81f05c496	Handle unstable device index when hotplugging controller	2018-12-13 23:09:05 -05:00
mazmazz	bcd747c1cd	Adjust SDL_JOYDEVICEREMOVED handler by checking the player's joy device explicitly	2018-12-13 22:26:13 -05:00
mazmazz	a3063ce89f	Merge tag 'SRB2_release_2.1.21' into vanilla-hotplug	2018-12-13 22:16:48 -05:00
Monster Iestyn	ef6533fb83	Merge branch 'master' into next	2018-12-13 22:21:31 +00:00
Monster Iestyn	880c017f8f	Merge branch 'cfg-srb2home-fix' into 'master' ... Apply srb2home path to EXEC, SAVECONFIG, and debugfile See merge request STJr/SRB2!379	2018-12-13 16:16:52 -05:00
mazmazz	dc7992a815	R_Char2Frame special case for backslash: accept plus as substitute	2018-12-13 14:59:12 -05:00
mazmazz	d18b2cda59	Apply srb2home to saveconfig ONLY if srb2home isn't already there	2018-12-13 13:32:38 -05:00
mazmazz	93f7f0a8df	Apply srb2home to debugfile	2018-12-13 13:23:09 -05:00
mazmazz	b1641aa8e9	Apply srb2home to SAVECONFIG	2018-12-13 13:17:56 -05:00
mazmazz	93eda4e7c9	EXEC: Search for CFG by file path	2018-12-13 13:11:25 -05:00
mazmazz	b84470ec51	Fix savegamename being improperly built due to missing null char after copying timeattackfolder	2018-12-13 12:01:07 -05:00
Jimita	e628d98f20	Update am_map.c	2018-12-12 19:59:21 -02:00
Jimita	a5874019cb	Update am_map.c	2018-12-12 19:57:52 -02:00
MPC	649b6c9ca1	Remove MINIAUTOMAP code	2018-12-12 18:53:13 -03:00
MPC	6b22dc183b	Fix the automap	2018-12-12 18:01:52 -03:00
Jimita	966afb6017	Update p_user.c	2018-12-12 13:09:47 -02:00
MPC	c68875ad93	Fix remote viewpoint cameras for real ... I'm so sorry	2018-12-11 20:48:45 -03:00
Monster Iestyn	582c5332f4	Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens	2018-12-11 18:39:58 +00:00
MPC	348ed1e43f	Large room fix	2018-12-09 19:34:17 -03:00
mazmazz	47ee3525af	Indentation	2018-12-08 14:10:56 -05:00
mazmazz	01f1933f69	Force directsound to fix wrong-pitch sound effects	2018-12-08 14:05:58 -05:00
mazmazz	df89781623	Windows string adjustment	2018-12-06 15:42:58 -05:00
mazmazz	ba60989c00	Adjust version strings	2018-12-06 15:39:19 -05:00
mazmazz	60afce5771	Disable XINPUT before initing the joy subsystem	2018-12-06 14:03:46 -05:00
Digiku	17e9188c89	Merge branch 'execversion' into '21-version' ... Block previous versions' config defaults with EXECVERSION consvar See merge request STJr/SRB2!371	2018-12-06 12:41:20 -05:00
mazmazz	3ceeb6a205	Register execversion and remove CV_SAVE because we write manually	2018-12-06 12:28:30 -05:00
mazmazz	0be61e8830	a stray if block	2018-12-06 12:03:53 -05:00
mazmazz	a5eb62b73e	alwaysfreelook -> alwaysmlook string	2018-12-06 12:02:45 -05:00
mazmazz	70aa4ce18e	Add alwaysfreelook2 and mousemove2 to config versioning ... * Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)	2018-12-06 11:59:34 -05:00
mazmazz	6694b7d679	Controller hotplugging by always keeping joy subsystem on (thanks WOLFS) ... (with log messages)	2018-12-06 10:54:58 -05:00
mazmazz	f0c7848e50	Use proper DD define for use_joystick	2018-12-06 06:50:18 -05:00
mazmazz	5b3a1e0c55	Implement EXECVERSION consvar to invalidate previous versions' default config values	2018-12-06 06:28:34 -05:00
mazmazz	a802069313	Move joyaxis_fire default to right trigger	2018-12-06 05:55:56 -05:00
mazmazz	aaf5d2e1dc	Change 2p controller defaults	2018-12-06 05:26:28 -05:00
mazmazz	9055c9aeab	Hex instead of octal colors	2018-12-05 13:08:25 -05:00
mazmazz	c5b349ddc4	More concise bitness check	2018-12-05 13:06:56 -05:00
mazmazz	1ea2fa447a	Make the ifdefs cleaner	2018-12-05 13:00:42 -05:00
mazmazz	389c2d4ea1	_WINDOWS instead of _WIN32 for DD	2018-12-05 12:55:05 -05:00
mazmazz	6d9fb0d3fd	Merge remote-tracking branch 'public-gitlab/21-version' into versionflags	2018-12-05 12:49:21 -05:00
Monster Iestyn	aee8dcdff8	Fix 64-bit build-using admins not being able to kick players besides themselves, by not checking sendingsavegame[] code at all if not the server ... it turns out playernode[pn] is typically 255 in the above situation, so sendingsavegame[playernode[pn]] goes out of bounds ...but goodness knows why 32-bit builds didn't suffer the same bug, seems to have been pure luck	2018-12-05 17:39:02 +00:00
mazmazz	a6dcd5555e	Add various flags to version string	2018-12-05 11:43:33 -05:00
Monster Iestyn	ae14fd2f85	Fix motd being broken for admins ... It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands	2018-12-04 21:09:28 +00:00
Monster Iestyn	b4b82e681c	Fix the game being basically broken due to multi-admin, by porting over some missing changes from Kart	2018-12-04 18:54:36 +00:00
Monster Iestyn	e353e2ef70	Merge branch 'next' into 21-version	2018-12-04 17:19:36 +00:00
Monster Iestyn	f2b0db5a1c	Merge branch 'master' into next	2018-12-04 17:18:19 +00:00
Digiku	e6e5856fd8	Merge branch 'auto-joystick' into 'master' ... Use Joystick 1 and Joystick 2 by default if plugged in See merge request STJr/SRB2!364	2018-12-04 11:53:58 -05:00
Digiku	631f6ed406	Merge branch 'joystick-juggling' into 'master' ... Joystick juggling See merge request STJr/SRB2!355	2018-12-04 11:51:55 -05:00
Monster Iestyn	d1a8e3acdb	Merge branch 'tiny-makefile-fix' into 'master' ... Tiny Makefile Fix See merge request STJr/SRB2!289	2018-12-04 08:09:27 -05:00
mazmazz	c799584f3d	Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart)	2018-12-03 23:36:36 -05:00
mazmazz	60feae1014	Update OSX icon	2018-12-03 23:09:54 -05:00
Digiku	ba81e26f71	Merge branch 'controller-menu-touchup' into 'master' ... Controller select menu improvements. See merge request STJr/SRB2!354	2018-12-03 23:00:36 -05:00
Digiku	42cb597731	Merge branch 'joystick-juggling-two' into 'next' ... Joystick additions for menu, axis defaults, and vertical look toggle See merge request STJr/SRB2!359	2018-12-03 22:59:19 -05:00
Steel Titanium	fbb2cde800	Make this be consistent with non-CMake builds	2018-12-03 15:42:37 -05:00
Steel Titanium	168647275c	One small change	2018-12-03 13:32:24 -05:00
mazmazz	6ca1130551	Hardcode Screenshot, GIF, and Viewpoint to their F keys	2018-12-03 13:21:16 -05:00
mazmazz	205e52f6d4	thisjoyaiming fix for chasefreelook	2018-12-03 13:13:01 -05:00
mazmazz	7ce092128b	Revert "Make pause key bring up the menu if it's a joy button" ... This reverts commit 9de31cf2e7.	2018-12-03 13:11:48 -05:00
mazmazz	6730c6c765	Menu for joy first/third person vertical look	2018-12-03 13:10:49 -05:00
mazmazz	ed57d0d9f9	Add Joy2 for network abort	2018-12-03 13:10:47 -05:00
mazmazz	9de31cf2e7	Make pause key bring up the menu if it's a joy button ... * Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames	2018-12-03 13:10:27 -05:00
mazmazz	7e523a1e35	Reset vertical look when toggling joyaiming	2018-12-03 13:10:24 -05:00
mazmazz	0bb113130b	Add alwaysfreelook to joystick menu	2018-12-03 13:10:20 -05:00
mazmazz	59cabea8bd	Add joyaiming qualifier for joystick look up/down	2018-12-03 13:10:19 -05:00
mazmazz	3134d72c12	Preserve event ch for other responders	2018-12-03 13:10:18 -05:00
mazmazz	6bf31492b7	Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)	2018-12-03 13:10:16 -05:00
mazmazz	6dd44ca1de	Change PC axis defaults to 360-friendly values	2018-12-03 13:10:15 -05:00
mazmazz	78dde93f3e	Remap menu actions to better joy keys	2018-12-03 13:10:12 -05:00
mazmazz	06faf6ffe4	Unneeded input header in st_stuff	2018-12-03 12:36:42 -05:00
mazmazz	8851f39b84	Use static joyname instead of malloc	2018-12-03 12:35:12 -05:00
mazmazz	6c78af3542	Missed (unused?) viewpoint strings	2018-12-03 12:20:19 -05:00
mazmazz	3d8bc85494	Forgot config strings for menu keys	2018-12-03 12:19:41 -05:00
mazmazz	5314c0e36b	Make F12 spectator string constant because of wrapping issues	2018-12-03 12:13:36 -05:00
mazmazz	60b16289e5	Change spectator string for "Press F12 to watch"	2018-12-03 12:11:03 -05:00
mazmazz	31f23fda8d	Add gc_viewpoint from Kart	2018-12-03 11:50:57 -05:00
mazmazz	2a87093ece	Add gc_screenshot and gc_recordgif from Kart	2018-12-03 11:31:48 -05:00
mazmazz	8e190932e7	Add gc_systemmenu from Kart	2018-12-03 11:21:25 -05:00
mazmazz	d8e70c32e0	Remove console messages for joynames	2018-12-03 05:39:10 -05:00
mazmazz	19d19543b7	Copy string from SDL_JoystickNameForIndex before the subsystem is shut down	2018-12-03 05:37:07 -05:00
Monster Iestyn	978a28004d	add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus	2018-12-02 21:52:30 +00:00
Monster Iestyn	13b0e9c3c5	make menu respond to joystick axis events without joyscale having to be 0	2018-12-02 21:18:28 +00:00
MonsterIestyn	10832db244	Merge branch 'next' into lua_mapchange	2018-12-02 20:54:32 +00:00
Monster Iestyn	a63ba7084a	Disable the axis parts of I_GetJoystickEvents and its player2 counterpart. ... (This is what I should have done in the first place)	2018-12-02 17:42:51 +00:00
Monster Iestyn	ce4e63a366	Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet	2018-12-02 17:12:05 +00:00
Monster Iestyn	33c1ac33f5	Merge branch 'next' into 21-version ... # Conflicts: # src/d_netcmd.c	2018-12-02 15:45:07 +00:00
wolfy852	e12890c84e	s	2018-12-02 09:08:05 -06:00
wolfy852	2af04203ea	Fix a dumb mistake	2018-12-02 08:57:35 -06:00
Steel Titanium	0f11116e7b	Fix up controller menu support	2018-12-01 20:13:14 -05:00
Monster Iestyn	11cb163435	Backport the Blockmap library I made two years ago	2018-11-30 17:11:11 +00:00
Jimita	6d7689c1a7	Merge branch 'next' into lua_mapchange	2018-11-30 15:10:59 -02:00
MPC	54cae84849	Change MapChange so Lua returns the map number you change	2018-11-30 14:01:40 -03:00
Monster Iestyn	e0a1c43813	Free lump names *before* either lumpinfo or the WAD itself!	2018-11-30 14:19:47 +00:00
Sryder	bc1f08f89d	Fix 2 of the Unsuffixed Float Constant warnings ... The other one is related to M_PI for me, which I'm still not sure about where it's getting it from	2018-11-29 22:12:14 +00:00
Sryder	c5e8e0badb	Merge branch 'master' into tiny-makefile-fix	2018-11-29 21:57:47 +00:00
Monster Iestyn	305ad4f73e	backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading	2018-11-29 14:16:02 +00:00
wolfy852	c517862f7e	I must be some kind of idiot.	2018-11-29 07:34:05 -06:00
wolfy852	d294be2054	Fix a quick merge mistake.	2018-11-29 07:15:54 -06:00
TehRealSalt	c70cf5908d	IsPlayerAdmin support, since admin was removed ... # Conflicts: # src/lua_baselib.c	2018-11-29 07:12:15 -06:00
Wolfy	b59718d3ad	Remove hardcoded limit on admins ... # Conflicts: # src/d_netcmd.c	2018-11-29 07:05:49 -06:00
Wolfy	b8ce51bff2	Multiple admins ... # Conflicts: # src/d_netcmd.c # src/d_netcmd.h	2018-11-29 06:46:59 -06:00
Alam Ed Arias	7bd0900fad	Merge remote-tracking branch 'private/master' into EOL	2018-11-27 23:36:09 -05:00
Alam Ed Arias	e39e689aeb	fix EOL on src/p_enemy.c	2018-11-27 21:32:15 -05:00
Monster Iestyn	e158206e55	backport string len tweaks I made to LUA_LoadLump in internal	2018-11-27 23:06:31 +00:00
Monster Iestyn	cb53bc8afe	remove redundant wadfile loop within wadfile loop for ANIMDEFS code	2018-11-27 23:05:33 +00:00
mazmazz	97ea4086a5	Redundant type 1800 check for MT_COIN	2018-11-27 14:10:55 -05:00
Monster Iestyn	cd57be640c	Merge branch '21-controls' into 'next' ... Default control changes for 2.1.21 See merge request STJr/SRB2!343	2018-11-27 11:50:42 -05:00
Monster Iestyn	3e6388c183	use UINT8 * instead of void or Bytef *	2018-11-27 15:49:41 +00:00
Monster Iestyn	6e839d30a2	Merge branch 'master' into next	2018-11-27 15:31:28 +00:00
Monster Iestyn	95e13d9ad3	Merge branch 'save-soundmenu-toggles' into 'master' ... Save sound toggles to config See merge request STJr/SRB2!348	2018-11-27 10:07:06 -05:00
Monster Iestyn	1889c36dea	add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?)	2018-11-27 13:57:32 +00:00
Alam Ed Arias	b7f7c2ecf7	PK3: fixup support for newer version of zlib	2018-11-26 20:08:26 -05:00
Alam Ed Arias	9a042cd5e2	Merge branch 'master' into next	2018-11-26 19:49:19 -05:00
Alam Ed Arias	78a1931bdf	Makefile: disable implicit-fallthroug warnings	2018-11-26 19:38:14 -05:00
Alam Ed Arias	5a3f469593	Makefile: skip implicit-fallthroug warnings	2018-11-26 19:28:55 -05:00
Alam Ed Arias	ac2ec6c982	Makefile: disable some warnings for GCC 8.x	2018-11-26 19:01:40 -05:00
Alam Ed Arias	4e332b3848	Fix MSVC build	2018-11-26 18:27:07 -05:00
Digiku	a2678dcb2e	Merge branch 'public-nights-invertloopfix' into 'next' ... NiGHTS fix lap detection on inverted axis See merge request STJr/SRB2!300	2018-11-26 16:08:24 -05:00
Digiku	fd891aa21d	"Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk	2018-11-26 15:48:08 -05:00
Monster Iestyn	4b0d45afd8	Merge branch 'opengl-noloading' into 'master' ... Hide OpenGL loading screen See merge request STJr/SRB2!349	2018-11-26 15:30:45 -05:00
MonsterIestyn	b53cd70201	Merge branch 'next' into PK3-BackportNext	2018-11-26 18:56:51 +00:00
Monster Iestyn	a71ca1d259	Merge branch 'fof-slope-skew-backport' into 'master' ... FOF wall slope skewing backport See merge request STJr/SRB2!341	2018-11-26 08:54:29 -05:00
Steel Titanium	ba111d42ca	Last minute changes.	2018-11-26 00:24:11 -05:00
Steel Titanium	cf01e820c4	Take the command line params into account ... Really I'm just making it return early if either of the parms are used.	2018-11-25 22:39:11 -05:00
mazmazz	930835f1a2	Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show	2018-11-25 21:47:56 -05:00
mazmazz	900f7e3dc9	FORCEWIPEOFF define in place of wipegamestate = -2	2018-11-25 19:40:18 -05:00
mazmazz	ab47e83939	Merge remote-tracking branch 'origin/master' into menu-execs	2018-11-25 19:03:22 -05:00
Monster Iestyn	1b2aea81dc	Merge branch 'master' into next	2018-11-25 20:39:17 +00:00
mazmazz	73be0c33ae	Use get_number in dehacked readmenu	2018-11-25 15:16:53 -05:00
mazmazz	e2ca92a3db	Remove unused menu hierarchy methods	2018-11-25 15:09:25 -05:00
mazmazz	0439479b3e	Remove M_ApplyMenuPresState	2018-11-25 15:08:36 -05:00
mazmazz	eb95289ea4	Rearranged menu presentation methods ... * Menu parameter retrieval and hierarchy in m_menu * Presentation logic (background display) in f_finale	2018-11-25 15:08:12 -05:00
Steel Titanium	7d4c9dda91	Add newline to end of file	2018-11-25 14:24:50 -05:00
Steel Titanium	981a1192fb	Save sound toggles to config	2018-11-25 14:22:52 -05:00
Monster Iestyn	aaabf062b8	Merge branch 'ms-cvars-fix' into 'master' ... Update server name insantly See merge request STJr/SRB2!344	2018-11-25 14:04:12 -05:00
Monster Iestyn	5069acb110	Merge branch 'mpc-software-yslope-fix' into 'master' ... Fix glitches with flats visible when looking up/down in 1st person (software renderer fix) See merge request STJr/SRB2!282	2018-11-25 11:51:54 -05:00
Monster Iestyn	028236006b	Merge branch '21-copyright-followup' into 'master' ... Print copyright notice in stdout console on program start See merge request STJr/SRB2!347	2018-11-25 11:07:34 -05:00
Monster Iestyn	8b4a64ac05	Merge branch 'last-min-cleanup' into 'master' ... Last min cleanup See merge request STJr/SRB2!342	2018-11-25 10:14:34 -05:00
Monster Iestyn	11cb2e05ba	Merge branch 'cmake-use-internal-libs' into 'master' ... CMake: Use internal libs. See merge request STJr/SRB2!325	2018-11-25 09:33:50 -05:00
Monster Iestyn	85305791d8	Merge branch 'objectplace-skybox-fix' into 'next' ... Objectplace skybox fix. See merge request STJr/SRB2!319	2018-11-25 09:30:16 -05:00
mazmazz	e4d7ba39a9	Whitespace	2018-11-25 08:17:57 -05:00
mazmazz	83531469d7	Print GPL license notice and SEGA disclaimer in console on start	2018-11-25 08:12:19 -05:00
Digiku	40dfe89273	Merge branch '21-source-copyright' into 'master' ... Update source copyrights to 2018 See merge request STJr/SRB2!346	2018-11-25 07:36:41 -05:00
mazmazz	bd4743007e	Update source copyrights to 2018, outdated targets	2018-11-25 07:35:53 -05:00
mazmazz	ea7162a76a	Update source copyrights to 2018	2018-11-25 07:35:38 -05:00
Digiku	62443c9090	Merge branch '21-credits-update' into 'master' ... Extra credits update .21 See merge request STJr/SRB2!345	2018-11-25 07:21:31 -05:00
Nev3r	d7b3cf9314	Forgot the alignment for compact structs. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-25 11:35:19 +01:00
Nev3r	b48c1d1ce6	Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext ... # Conflicts: # src/w_wad.c	2018-11-25 11:18:28 +01:00
Nev3r	32a9e40baa	Progress? ... Get all IO outputs used for possible errors. Attempt to fix errors from travis-ci. Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-25 11:11:50 +01:00
Nev3r	7c44054aa3	Take out the ifdef? ... Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-25 09:48:52 +01:00
Steel Titanium	f3ea628fea	Update server name instantly on change	2018-11-24 21:24:05 -05:00
Alam Ed Arias	1113849f5c	Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext	2018-11-24 18:00:14 -05:00
Nev3r	ec67c4cbd6	Fix uninitialized pointer. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-24 23:39:31 +01:00
Alam Ed Arias	1bcfe16933	Do not remove newlines from the end of files	2018-11-24 17:30:49 -05:00
Alam Ed Arias	4ac481bcc6	Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext	2018-11-24 17:22:11 -05:00
Nevur	3f69e7c9b4	Merge branch 'next' into PK3-BackportNext	2018-11-24 23:08:52 +01:00
Nev3r	a1fb333e9b	Revamped the lumpinfo_t array generation code. ... -The resource type is 'adequately*' detected first. -The type-specific behaviors are now contained in their own functions, which are called accordingly for each. -The PKZip lumpinfo_t generation has been almost entirely rewritten. -If the functions return null pointer, the resource addition is considered invalid and pops an error.	2018-11-24 22:58:35 +01:00
mazmazz	f80691eb6e	Revert "Adjust mouse scaling calculation for SDL in windowed mode" ... This reverts commit 3b298b7c42.	2018-11-24 15:36:50 -05:00
Alam Ed Arias	c1d4ef3296	Merge branch 'next' into PK3-BackportNext	2018-11-24 14:54:42 -05:00
Alam Ed Arias	148d8ec9e0	Merge branch 'PK3-Backport' into PK3-BackportNext	2018-11-24 14:54:07 -05:00
Alam Ed Arias	17528a6aa9	LFS fixup for PK3 support	2018-11-24 14:48:56 -05:00
Nev3r	6f5e3d42ff	Merge branch 'PK3-Backport' into 'PK3-BackportNext' ... Pk3 backport See merge request Nev3r/SRB2!1	2018-11-24 06:02:19 -05:00
Nev3r	cb0c31fa9a	Final touches ... -Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES. -Removed now-unused function. Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-24 09:26:52 +01:00
mazmazz	cf8b4a6cb1	Additional 2.1 credits update	2018-11-23 21:57:07 -05:00
mazmazz	3b298b7c42	Adjust mouse scaling calculation for SDL in windowed mode	2018-11-23 21:43:50 -05:00
mazmazz	b60c10dc9b	Change default mouse sensitivity	2018-11-23 20:51:57 -05:00
Monster Iestyn	794d27b49e	Kill CheckMissileImpact, it has been useless for probably a decade and a half	2018-11-23 23:14:49 +00:00
Monster Iestyn	0a0336a674	Merge branch 'master' into fof-slope-skew-backport ... # Conflicts: # src/r_segs.c	2018-11-23 22:40:28 +00:00
Monster Iestyn	4e616f54ad	Merge branch 'master' into next	2018-11-23 21:01:03 +00:00
Monster Iestyn	d228e35fcb	Merge branch 'responsefile-fix' into 'master' ... Fix M_FindResponseFile returning garbage data See merge request STJr/SRB2!254	2018-11-23 15:59:40 -05:00
Steel Titanium	97dd291f3f	Merge branch 'master' into responsefile-fix	2018-11-23 15:29:52 -05:00
Alam Arias	30b9cef043	Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix ... Render the skies correctly on splitscreen in OpenGL mode	2018-11-23 14:48:05 -05:00
Alam Arias	b1587cb0a3	Merge pull request #325 from monster-psychic-cat/opengl_startup_screen ... Render the startup screen on OpenGL mode	2018-11-23 14:47:56 -05:00
Alam Arias	3d0fd7ff2e	Merge pull request #258 from light2yellow/master ... m_fixed: asm: cc is not a register	2018-11-23 14:47:36 -05:00
Monster Iestyn	08af33c51f	Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't	2018-11-23 19:12:48 +00:00
Nev3r	0487558a98	Add missing tweaks ... Also remove a test printf. Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-23 17:58:45 +01:00
Nev3r	c548aaa347	Backported PK3 support to 2.1 ... Hopefully I'm not missing anything. Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-23 16:58:16 +01:00
Digiku	9a3d2d0ee5	Merge branch '21-credits-update' into 'master' ... 2.1.21 credits update See merge request STJr/SRB2!339	2018-11-23 07:38:28 -05:00
Digiku	3c95a63fc2	Merge branch 'public-darker-credits' into 'master' ... Make the credits pics darker See merge request STJr/SRB2!336	2018-11-23 07:35:44 -05:00
mazmazz	2f7f472ca2	Update credits for 2.1.21	2018-11-23 07:34:23 -05:00
mazmazz	36e020c366	Update version to 2.1.21	2018-11-23 06:58:45 -05:00
Steel Titanium	fe43deacec	Merge branch 'master' into responsefile-fix	2018-11-22 23:02:20 -05:00
Steel Titanium	933c1311cd	Make the error less confusing	2018-11-22 22:59:46 -05:00
Steel Titanium	6020abab94	Fix the not found errors on DLLs	2018-11-22 22:44:47 -05:00
mazmazz	0d4cd35e13	Make the credits pics darker	2018-11-22 20:08:02 -05:00
mazmazz	edd98842d5	Added chasefreecam to menu	2018-11-22 17:32:03 -05:00
mazmazz	17ff7e69a0	Add chasefreelook to separate third and first person mouselook	2018-11-22 17:05:24 -05:00
Monster Iestyn	8f48f082d1	Merge branch 'master' into next	2018-11-22 20:12:59 +00:00
mazmazz	146dd52d24	Smarter pause/break rejection for setcontrol	2018-11-22 14:48:33 -05:00
mazmazz	a8e01ee69b	Smarter pause/break rejection for setcontrol	2018-11-22 14:47:01 -05:00
mazmazz	7075cdbfa8	Don't accept KEY_PAUSE for control console command	2018-11-22 14:37:28 -05:00
mazmazz	f926774ee1	Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key	2018-11-22 14:37:21 -05:00
mazmazz	4b5246d5b7	Adjust menu for movement and camera controls	2018-11-22 14:13:28 -05:00
Monster Iestyn	37c0e646e4	Merge branch 'ms-update-alert-fix' into 'master' ... Master Server Update alert fix See merge request STJr/SRB2!333	2018-11-22 13:34:43 -05:00
Digiku	38b4425030	Merge branch 'new-control-names' into 'master' ... Change camera control names to Look See merge request STJr/SRB2Internal!207	2018-11-22 11:32:10 -05:00
mazmazz	dd1ecb04cf	Change camera control names to Look	2018-11-22 11:28:32 -05:00
mazmazz	2a5ae054f9	Make movement controls consistent with 2.2	2018-11-22 10:41:21 -05:00
mazmazz	6a3b41ea6f	Let skins jump their regular strength variances in NiGHTS	2018-11-21 21:24:44 -05:00
mazmazz	40eda0e749	Nerf jumping	2018-11-21 21:13:15 -05:00
Digiku	9e75774fd2	Merge branch 'nights-ideyaspawn-dronebox' into 'master' ... NiGHTS: Ideya Anchor Points See merge request STJr/SRB2Internal!160	2018-11-21 21:03:29 -05:00
mazmazz	250aab5889	Missed sign cast	2018-11-21 20:30:26 -05:00
Digiku	c6bd1111e5	Merge branch 'nights-dronebox' into 'master' ... NiGHTS: Drone hitbox improvements and player position correction on Nightserize See merge request STJr/SRB2Internal!158	2018-11-21 20:19:39 -05:00
Steel Titanium	ff9c41ca5f	Merge branch 'master' into cmake-use-internal-libs	2018-11-21 20:05:08 -05:00
Digiku	bb38aa649f	Merge branch 'nov20-build-fixes' into 'master' ... Nov20 build fixes See merge request STJr/SRB2Internal!205	2018-11-21 17:23:20 -05:00
Digiku	e599428442	Merge branch 'debug_stuff' into 'master' ... Debug tweaks See merge request STJr/SRB2Internal!144	2018-11-21 16:41:51 -05:00
Digiku	f3e4cf1f9d	Merge branch 'nights-fastercapsule' into 'master' ... NiGHTS: Faster Egg Capsule destruct sequence See merge request STJr/SRB2Internal!164	2018-11-21 16:30:01 -05:00
Digiku	597877773b	Merge branch 'nights-onfootcapsulefix' into 'master' ... NiGHTS: Allow player to destroy capsule on-foot before transforming into NiGHTS See merge request STJr/SRB2Internal!185	2018-11-21 16:29:37 -05:00
Monster Iestyn	3acc312923	Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop.	2018-11-21 20:45:03 +00:00
mazmazz	9bdab67de6	Don't accept KEY_PAUSE for control console command	2018-11-21 11:21:17 -05:00
mazmazz	2acad7ad86	Dont show Hold to Retry HUD when using Pause/Break key	2018-11-21 11:10:18 -05:00
mazmazz	8a9c10e633	Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key	2018-11-21 10:58:07 -05:00
mazmazz	74da082c75	Merge remote-tracking branch 'origin/master' into HEAD	2018-11-20 23:19:36 -05:00
Marco Z	c0df7b47c5	Merge branch 'c88bbda028a21a51058488ee0214ce925625f0a0' into nov20-build-fixes ... # Conflicts: # src/hardware/hw_main.c	2018-11-20 22:42:20 -05:00
Marco Z	ddd357d27c	VC build fixes	2018-11-20 21:54:20 -05:00
mazmazz	0af071dbca	build errors	2018-11-20 20:23:48 -05:00
mazmazz	dcac157ccd	Merge remote-tracking branch 'origin/master' into menu-execs	2018-11-20 18:31:30 -05:00
mazmazz	5870d145b2	Draw connection screen correctly; make scroll speed inherit global setting	2018-11-20 18:13:18 -05:00
mazmazz	094ec7ce3c	Performance improvements ... * Don't loop every frame for menu drawing parameters * Fixed in-game escape menu not dimming correctly * Fixed glitches on default title screen parameters	2018-11-20 17:28:26 -05:00
Monster Iestyn	b2c3a39a2f	I forgot to do this earlier, welp	2018-11-20 21:17:46 +00:00
Monster Iestyn	224c0fccdb	Merge branch 'public_next' ... # Conflicts: # src/Makefile.cfg # src/d_clisrv.c # src/p_setup.c # src/r_segs.c # src/r_things.c	2018-11-20 14:33:10 +00:00
Monster Iestyn	66900c70ee	Merge branch 'master' into next	2018-11-20 13:55:36 +00:00
Monster Iestyn	948466658f	Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master' ... FOF wall rendering fixes and cleanup See merge request STJr/SRB2!317	2018-11-20 08:54:09 -05:00
mazmazz	cfaa017e7d	stray #if to #ifdef	2018-11-19 20:52:01 -05:00
mazmazz	6cc6edc137	Changed Mixer X sources to 2.2.0; added x64 gcc support	2018-11-19 20:51:54 -05:00
Monster Iestyn	2d1f927a17	Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs. ... ...that was a mouthful	2018-11-19 22:12:26 +00:00
Monster Iestyn	418943acdc	change return type of M_CheckMODVersion to boolean	2018-11-19 17:47:23 +00:00
Monster Iestyn	797f9d180e	Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages	2018-11-19 17:46:38 +00:00
Alam Ed Arias	a290c4727b	Merge branch 'master' into Travis_CI-gcc8	2018-11-18 21:23:27 -05:00
Alam Ed Arias	42afd3532d	Merge branch 'master' into next	2018-11-18 20:22:40 -05:00
Alam Ed Arias	0b5069f36c	We need to include the NUL char	2018-11-18 20:21:32 -05:00
Alam Ed Arias	5a09d44fd2	Merge remote-tracking branch 'public/master' into Travis_CI-gcc8	2018-11-18 19:59:21 -05:00
Monster Iestyn	ab39534ef6	Merge branch 'mingw-64bit' into 'master' ... MinGW: Fix compiling on 64-bit Windows. See merge request STJr/SRB2!329	2018-11-18 19:49:18 -05:00
mazmazz	4fa6895f60	Fixed skullAnimCounter type for text prompts	2018-11-18 12:56:37 -05:00
Monster Iestyn	8c71cd0b90	Merge branch 'master' into next	2018-11-18 17:11:57 +00:00
Monster Iestyn	a400bb9ef6	Merge branch 'camera-subsector-crash-fix' into 'master' ... Camera subsector crash fix See merge request STJr/SRB2!318	2018-11-18 08:28:38 -05:00
mazmazz	53b956f540	Mirror a wipe if it's forced off and the counter-wipe is specified	2018-11-18 04:39:34 -05:00
mazmazz	765e4b3134	Compiler fixes	2018-11-18 04:32:38 -05:00
mazmazz	3d1e5fa7e8	Allow inherited wipes when switching menus without a common ancestor (Multiplayer > Server Settings)	2018-11-18 03:32:19 -05:00
mazmazz	5fc91e8405	Fix lingering titlemapcameraref when reloading title screen	2018-11-18 03:19:32 -05:00
mazmazz	3acabdab93	Fix MN_SPECIAL check for menu meta state	2018-11-18 03:19:07 -05:00
mazmazz	3c2d30072e	Allow backgrounds for player select	2018-11-18 02:49:08 -05:00
mazmazz	f3be97a95a	Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too	2018-11-18 02:41:35 -05:00
mazmazz	758647fab2	More title screen features; menu meta state implementation (active and previous menu types) ... * Draw background over titlemap * HIDEBACKGROUND to show titlemap * Specify NOMUSIC or IGNOREMUSIC (to not change music) * Linedef execs implemented for tree hierarchy, including bubbling (NOENTERBUBBLE/NOEXITBUBBLE) * Specify ENTERWIPE and EXITWIPE * Menuid hierarchy fixes (Control mapping, joystick setup) * Time attack handling fixes * Specify custom wipes on runtime for D_Display and P_SetupLevel (for titlemap) * Allow for forcing and skipping a wipe * Wipe utility functions F_GetWipeLength and F_WipeExists	2018-11-17 19:08:30 -05:00
mazmazz	d2bbddbed4	Implemented features ... * M_SkyScroll optimization with still speeds; refactor background drawing * Music (in time attack screens so far) * FadeStrength * HideTitlePics * Scrolling backgrounds in Time Attack (moved F_SkyScroll to m_menu)	2018-11-17 01:21:21 -05:00
mazmazz	1e6369e8de	Implement scrolling menu backgrounds	2018-11-16 18:26:26 -05:00
mazmazz	32dc47207d	Merge branch 'menu-execs' into menu-execs-skyscroll	2018-11-16 15:11:02 -05:00
mazmazz	0e0437b894	Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg	2018-11-16 15:01:28 -05:00
mazmazz	4d3ddda5b5	Sky scroll attempt	2018-11-16 14:34:28 -05:00
mazmazz	9c76c61384	Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg	2018-11-16 14:18:35 -05:00
mazmazz	c4cddf8741	Menumeta iterators	2018-11-16 14:16:41 -05:00
mazmazz	199bc155bc	Make MENU dehacked block top-level; TITLESCREEN is not necessary	2018-11-16 12:12:11 -05:00
mazmazz	15c0bab0c9	Title screen menu SOC	2018-11-16 12:07:47 -05:00
mazmazz	75dab7850f	Refactor MM_ menu types to MN_	2018-11-16 09:56:22 -05:00
mazmazz	3ec96d8b99	Menutypes for dehacked	2018-11-16 09:46:32 -05:00
mazmazz	b69756f5e5	Use bitshifting for menu IDs and hierarchy instead	2018-11-16 09:22:27 -05:00
mazmazz	9dab65fce0	Add MM menutype flags to menu defs	2018-11-15 19:41:27 -05:00
mazmazz	c8f5aa688a	Express menu defs as flags	2018-11-15 19:41:05 -05:00
mazmazz	f7cc62d9d9	Define menu enum, encode hierachy by number places	2018-11-15 15:51:29 -05:00
Steel Titanium	02c08a3e10	Some small changes	2018-11-14 21:01:54 -05:00
Steel Titanium	f02105732e	Fix up compiling on DD version	2018-11-14 18:00:10 -05:00
Steel Titanium	c5a97dcfe6	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit	2018-11-14 17:28:41 -05:00
Alam Ed Arias	4695841b8d	fix format-truncation: need bigger string buffers	2018-11-14 16:50:52 -05:00
Monster Iestyn	09f9572a8f	Merge branch 'master' into next	2018-11-14 21:49:11 +00:00
Monster Iestyn	3e6fcf1b8b	Merge branch 'opengl-hud-scale-fix' into 'master' ... OpenGL HUD scaling fix See merge request STJr/SRB2!320	2018-11-14 16:48:13 -05:00
Alam Ed Arias	fb08950c19	Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length	2018-11-14 16:32:57 -05:00
Alam Ed Arias	4e9fc881a2	Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?	2018-11-14 16:26:46 -05:00
Steel Titanium	1b79b9527c	Properly check if cmake is running on wwindows ... Thanks Monster Iestyn for informing me this is the correct way.	2018-11-14 15:58:45 -05:00
Alam Ed Arias	d4cb81cb28	Merge branch 'master' into next	2018-11-14 15:45:29 -05:00
MonsterIestyn	772c072064	Merge branch 'master' into analog-flipcam-synch-fix	2018-11-14 19:36:39 +00:00
Alam Ed Arias	97fd69951a	Merge branch 'master' into next	2018-11-14 11:07:12 -05:00
Alam Ed Arias	de5b626520	Fix misleading indentation	2018-11-14 11:06:45 -05:00
Alam Ed Arias	f81d01edca	Merge branch 'vc-xpm-fix' into 'master' ... Remove unnecessary SDLCALL from IMG_xpm.c declarations See merge request STJr/SRB2!327	2018-11-14 11:00:20 -05:00
Alam Ed Arias	d14f87b8c6	Cleanup whitespace	2018-11-14 10:54:33 -05:00
Alam Ed Arias	938bf1605c	Merge branch 'master' into next	2018-11-14 10:52:49 -05:00
Alam Ed Arias	f73ea4f984	Clean up warnings	2018-11-14 10:52:16 -05:00
mazmazz	cf834f3503	Line 457: Calculate input angle tolerance correctly	2018-11-14 10:13:39 -05:00
Marco Z	8777d5c6c9	Comment context for declaration changes; remove extern terms	2018-11-14 08:15:38 -05:00
Marco Z	51768e7dd1	Remove unnecessary SDLCALL from xpm declarations	2018-11-14 08:06:07 -05:00
Monster Iestyn	f3b59c1731	Fix VC project files to include hw_clip.c/h	2018-11-14 12:11:57 +00:00
Marco Z	0b97b2a76c	Missed #ifdef HAVE_LIBGME in win_snd	2018-11-13 22:50:08 -05:00
Steel Titanium	2ca5e29110	Make sure the new option only works on Windows. ... Is this how you do it? I'm not really sure.	2018-11-13 20:37:14 -05:00
Steel Titanium	4836e711d3	Fix up 64-bit MINGW	2018-11-13 20:32:18 -05:00
Steel Titanium	d0b64222f7	Merge branch 'master' into cmake-use-internal-libs	2018-11-13 19:46:43 -05:00
Monster Iestyn	302358c403	Merge branch 'mixer-sound-x64-fix' into 'master' ... mixer_sound fix x64 build issue See merge request STJr/SRB2!323	2018-11-13 17:42:23 -05:00
Steel Titanium	9029cf5d9c	Fix skybox disappearing after using objectplace command	2018-11-13 17:25:42 -05:00
mazmazz	2db2b6e6af	Win32 boolean fixes	2018-11-13 17:24:19 -05:00
Steel Titanium	95ed3fcf7e	Save current renderer to screenshots	2018-11-13 17:19:22 -05:00
mazmazz	894ee02f3f	Fix x64 build issue	2018-11-13 17:12:18 -05:00
mazmazz	f2bfed7892	Merge branch 'musicplus-core' into musicplus-sdlmixerx	2018-11-13 14:34:40 -05:00
mazmazz	119cf49452	Merge branch 'master' into musicplus-core	2018-11-13 14:19:04 -05:00
mazmazz	6bb408da08	Remove misplaced tutorialmode = false due to debugging	2018-11-13 14:12:22 -05:00
mazmazz	8f87bf82cd	Merge branch 'master' into musicplus-core	2018-11-13 13:46:30 -05:00
Monster Iestyn	e9fe0ebae1	Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy	2018-11-13 18:14:59 +00:00
Monster Iestyn	0d38061db8	Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode	2018-11-13 18:13:51 +00:00
mazmazz	6c69dd1f78	Merge branch 'master' into text-prompts	2018-11-13 11:12:44 -05:00
Digiku	b6a0b2f1d9	Merge branch 'tutorial-time' into 'master' ... Tutorial mode handling See merge request STJr/SRB2Internal!201	2018-11-13 10:49:02 -05:00
Digiku	fae095f9e8	Merge branch 'control-switching' into 'master' ... Game control switching See merge request STJr/SRB2Internal!202	2018-11-13 10:48:18 -05:00
Digiku	3ccfd57fba	Merge branch 'tracerangle' into 'master' ... Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away See merge request STJr/SRB2Internal!198	2018-11-13 10:48:01 -05:00
Digiku	1b7f7ef7cc	Merge branch 'monitor-exec' into 'master' ... Run linedef exec upon popping a monitor See merge request STJr/SRB2Internal!199	2018-11-13 10:47:37 -05:00
mazmazz	dbb4924348	Compile errors	2018-11-13 10:43:40 -05:00
mazmazz	c1c815ce6e	Compile errors	2018-11-13 10:31:06 -05:00
mazmazz	4b3dff3ef3	Tutorial named tag detection adjustment	2018-11-13 02:00:58 -05:00
mazmazz	3d7b185ea0	Check specifically for gcs_fps when starting tutorial	2018-11-13 01:57:51 -05:00
mazmazz	6f435ee410	F_AdvanceToNextPage adjustment	2018-11-13 01:38:20 -05:00
mazmazz	75c4a96e69	NextTag implementation ... * Adjust named tag implementation to be more portable * Next page adjustments	2018-11-13 00:13:36 -05:00
mazmazz	f4ad5ebfba	text-prompts gclist -> gcl refactor	2018-11-12 23:31:10 -05:00
mazmazz	3a00439f3a	Merge branch 'control-selector' into text-prompts	2018-11-12 23:26:27 -05:00
mazmazz	96da056f81	tutorial-time gclist -> gcl refactor	2018-11-12 23:25:49 -05:00
mazmazz	870ee89371	Merge branch 'control-selector' into tutorial-time	2018-11-12 23:23:52 -05:00
mazmazz	1d86cc348d	Refactor gclists	2018-11-12 23:23:39 -05:00
mazmazz	eb7718bfeb	PicToStart implementation; fix NumPrompts limitation error	2018-11-12 23:16:24 -05:00
mazmazz	d31b4b792b	F_GetTextPromptTutorialTag implementation	2018-11-12 22:47:20 -05:00
mazmazz	a362407886	Merge branch 'control-selector' into text-prompts	2018-11-12 21:11:53 -05:00
mazmazz	7ec4a42d9f	Force chasecam for tutorialmode	2018-11-12 20:37:55 -05:00
mazmazz	a0926b5314	First time tutorial prompt fixes	2018-11-12 19:10:41 -05:00
mazmazz	5200f55e40	Merge branch 'tutorial-time' into tutorial-time-firstprompt	2018-11-12 18:08:48 -05:00
mazmazz	118da60615	Freeze camera values in tutorialmode with proper defaults	2018-11-12 18:08:24 -05:00
mazmazz	a58461c29e	Merge branch 'tutorial-time' into tutorial-time-camera	2018-11-12 17:41:49 -05:00
mazmazz	80c613561c	->defalutvalue -- .defaultvalue adjustment	2018-11-12 17:37:54 -05:00
mazmazz	40e5a2104b	Also set cv_analog for tutorialgcs ... * M_TutorialSaveControlResponse CV_Set adjustment	2018-11-12 17:34:56 -05:00
mazmazz	acd922886a	Change mouse cv vars temporarily alongside control scheme	2018-11-12 17:30:21 -05:00
mazmazz	44b42af22b	Merge branch 'control-selector' into tutorial-time	2018-11-12 17:17:02 -05:00
mazmazz	1a5ccb2781	Uncomment gcs_platform	2018-11-12 17:16:54 -05:00
mazmazz	4986d5945b	Restrict control changes if tutorialgcs is active	2018-11-12 16:56:06 -05:00
mazmazz	45381058b3	Merge branch 'control-selector' into tutorial-time	2018-11-12 16:54:49 -05:00
mazmazz	31c1145cf3	Uncomment gcs_platform defaults	2018-11-12 16:54:42 -05:00
mazmazz	ab084f1bc9	Add tutorialgcs variable for optional control scheme loading	2018-11-12 16:50:03 -05:00
Monster Iestyn	e85f73117c	Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set!	2018-11-12 20:07:45 +00:00
Monster Iestyn	63ba59341b	Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing	2018-11-12 16:23:59 +00:00
mazmazz	8f7c1e7f71	Fix CopyControls not firing when starting tutorial while keeping current controls	2018-11-11 23:42:02 -05:00
mazmazz	ce7f168568	Fix PICSMETAPAGE	2018-11-11 14:50:10 -05:00
mazmazz	424bc557c2	Dehacked typos	2018-11-11 14:44:57 -05:00
mazmazz	3f1ade35f3	Merge branch 'tutorial-time' into tutorial-time-firstprompt	2018-11-11 09:37:36 -05:00
mazmazz	703cb6be0f	Check reduced control set for tutorial time; change the entire tutorial control set when prompted	2018-11-11 09:37:19 -05:00
mazmazz	9fc58d0a68	Merge branch 'control-selector' into tutorial-time	2018-11-11 09:35:27 -05:00
mazmazz	c7a855de7a	Split gclist_tutorial_check from gclist_tutorial	2018-11-11 09:35:15 -05:00
mazmazz	3be9981231	Merge branch 'control-selector' into tutorial-time	2018-11-11 09:22:06 -05:00
mazmazz	fd83e1ed5c	num_gclist_tutorial adjustment	2018-11-11 09:21:54 -05:00
mazmazz	c883b13b5d	Merge branch 'tutorial-time' into tutorial-time-firstprompt	2018-11-11 09:21:10 -05:00
mazmazz	54f04fa5cf	Tutorial control message adjustments	2018-11-11 09:15:43 -05:00
mazmazz	ea9f499936	Merge branch 'control-selector' into tutorial-time	2018-11-11 08:57:07 -05:00
mazmazz	181d13fe73	gclist_tutorial include lookup/lookdown for conflict reasons	2018-11-11 08:56:40 -05:00
mazmazz	80b19ff566	gclist adjustments	2018-11-11 08:52:21 -05:00
mazmazz	9ff27ebbae	gclist adjustments	2018-11-11 08:51:51 -05:00
mazmazz	6be583eac6	Merge branch 'control-selector' into tutorial-time	2018-11-11 08:46:06 -05:00
mazmazz	3f72e1bacf	New gclists and const modifier; added tutorialmode declarations to this branch	2018-11-11 08:44:08 -05:00
mazmazz	9f1c40f881	G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)	2018-11-11 08:21:11 -05:00
mazmazz	85bcf6d389	Tutorial mode support for control switching	2018-11-11 08:20:08 -05:00
mazmazz	75fc91644b	G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)	2018-11-11 08:19:44 -05:00
mazmazz	1e00381075	Merge branch 'control-selector' into tutorial-time	2018-11-10 17:30:33 -05:00
mazmazz	775b34e3f2	Made gamecontrol tables more portable ... * G_DefineDefaultControls * G_GetControlScheme * G_CopyControls * G_SaveKeySetting * gamecontrolschemes_e	2018-11-10 17:26:30 -05:00
mazmazz	7deeb8bac4	Stub netgame support; ignore bots on linedef special	2018-11-10 15:34:56 -05:00
mazmazz	0c72d7e70a	Let triggering splitscreen player control the text prompt	2018-11-10 14:47:30 -05:00
mazmazz	80973e8b65	Splitscreen "support" (one prompt only, both players freeze controls)	2018-11-10 14:30:59 -05:00
MPC	eb4a72440a	Render the skies correctly on splitscreen in OpenGL mode	2018-11-10 16:19:41 -03:00
Monster Iestyn	e4f157786c	Merge branch 'public_next' ... # Conflicts: # src/Makefile # src/doomtype.h # src/hardware/hw_clip.c # src/hardware/hw_main.c # src/sdl12/sdl_sound.c	2018-11-10 19:18:34 +00:00
Monster Iestyn	fced19d291	Merge branch 'master' into next	2018-11-10 19:05:33 +00:00
Monster Iestyn	c7e58b7cd5	Merge branch 'opengl-new-clipping-backport' into 'master' ... OpenGL new clipping backport See merge request STJr/SRB2!315	2018-11-10 13:57:16 -05:00
Monster Iestyn	46b58cba55	Merge branch 'alias-recursion-hotfix' into 'next' ... Alias recursion hotfix See merge request STJr/SRB2!314	2018-11-10 13:56:43 -05:00
Monster Iestyn	51df32dd3d	Merge branch 'gcc-compiling-cleanup' into 'master' ... Compiling cleanup and fixes See merge request STJr/SRB2!311	2018-11-10 13:56:17 -05:00
MPC	ff642df1f2	Render the startup screen on OpenGL mode	2018-11-10 15:56:13 -03:00
mazmazz	727ca143b5	Branch G_Controldefault into FPS and PLATFORM	2018-11-10 13:28:10 -05:00
mazmazz	8c6de7ff60	Pictoloop zero-based fix	2018-11-10 12:54:59 -05:00
mazmazz	9a038b28e1	Implemented GFX for text prompts ... * PicMode SOC * PicToLoop SOC	2018-11-10 12:42:13 -05:00
Monster Iestyn	323c89dbaf	fix using abs() on unsigned	2018-11-10 17:40:09 +00:00
Monster Iestyn	dd83652b71	Whoops, this broke my non-NEWCLIP test build	2018-11-10 16:10:25 +00:00
Monster Iestyn	8ba0f2a177	clipping code didn't seem so bad this time (at least compared to without), let's enable it now?	2018-11-10 16:09:52 +00:00
Monster Iestyn	c4569e61a8	Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly ... R_IsEmptyLine is now a thing too btw	2018-11-10 16:09:21 +00:00
Monster Iestyn	1e98e3b4f2	More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now ... Other notes: * on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way * despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall	2018-11-10 16:08:56 +00:00
Monster Iestyn	a733a29f4c	Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least ... Other notes: * Renamed all new functions to have HWR_ prefix instead of gld_, for consistency * HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory * The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included	2018-11-10 16:08:26 +00:00
mazmazz	631c6f93f5	Implement music switching for prompts	2018-11-10 11:05:33 -05:00
Monster Iestyn	896de73c60	....ow this slipup hurt me badly	2018-11-10 16:00:33 +00:00
Monster Iestyn	d456a5362c	Whoops, mucked up this part of the conflict resolving	2018-11-10 15:55:09 +00:00
Monster Iestyn	a8291c122a	adding lua_maplib.c comments for new slope-related userdata types	2018-11-10 15:47:04 +00:00
Monster Iestyn	268bde3fdf	Merge branch 'public_next' ... # Conflicts: # src/d_netcmd.c # src/d_netcmd.h # src/dehacked.c # src/g_game.h # src/hardware/hw_draw.c # src/hardware/hw_main.c # src/lua_baselib.c # src/lua_hook.h # src/lua_hooklib.c # src/lua_hudlib.c # src/lua_libs.h # src/lua_maplib.c # src/lua_script.c # src/m_misc.h # src/p_mobj.c # src/s_sound.c # src/sdl12/mixer_sound.c # src/w_wad.c	2018-11-10 15:41:57 +00:00
mazmazz	3d9ce630d2	SOC for prompt gfx and music	2018-11-10 10:33:58 -05:00
mazmazz	99a0831b0b	Hardcode tutorial prompt offset index	2018-11-10 10:15:16 -05:00
mazmazz	a197c19742	Prompt page string field length adjustment; check empty named tag before prompt search	2018-11-10 09:38:32 -05:00
mazmazz	e1e94c3af2	Added page tags and find page by tag ... * Added tutorial mode defines to this branch	2018-11-10 09:32:53 -05:00
Monster Iestyn	31301660cd	Merge branch 'master' into next	2018-11-10 14:27:27 +00:00
Monster Iestyn	925a56ad98	Merge branch 'opengl-improvements-backport' into 'master' ... Opengl improvements backport See merge request STJr/SRB2!304	2018-11-10 09:25:18 -05:00
Monster Iestyn	e01c7ae743	Merge branch 'copyright-info-update' into 'master' ... Update copyright info See merge request STJr/SRB2!309	2018-11-10 08:33:09 -05:00
Monster Iestyn	2da335a1c4	Place limit on the amount of alias recursion allowed, to prevent cycles or otherwise excessive recursion	2018-11-10 13:08:26 +00:00
mazmazz	28238c41df	WIP: First-time tutorial prompt	2018-11-10 02:30:21 -05:00
mazmazz	ffed9f4d20	Force camera defaults during tutorialmode (doesn't work in all cases)	2018-11-10 01:31:30 -05:00
mazmazz	a542006ae8	Hide Tutorial menu option if no tutorialmap	2018-11-10 01:17:11 -05:00
mazmazz	33a94ba2b8	Prompt HUD hiding implementation	2018-11-10 01:00:18 -05:00
mazmazz	54dc5d1892	Merge branch 'text-prompts' into text-prompts-hidehud	2018-11-10 00:10:42 -05:00
mazmazz	19a8b15912	Actually fix empty prompt text crash	2018-11-10 00:10:16 -05:00
mazmazz	7ac641450f	Text prompt Hide HUD dehacked	2018-11-09 23:50:25 -05:00
mazmazz	9ee894f777	Make gray/black text prompt backcolor darker in OpenGL	2018-11-09 22:52:13 -05:00
mazmazz	7daf5d4727	Set up separate background color for prompts vs. console	2018-11-09 22:38:55 -05:00
mazmazz	ae4c1e0e82	Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start	2018-11-09 22:07:32 -05:00
mazmazz	b8897db308	Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES	2018-11-09 21:55:14 -05:00
Monster Iestyn	4b8232d777	Merge branch 'master' into next	2018-11-09 23:18:14 +00:00
Alam Arias	1c22c6a1f9	Merge pull request #320 from monster-psychic-cat/remote_view_fixes ... Minor remote viewpoint bugfixes.	2018-11-09 16:09:20 -05:00
Monster Iestyn	b3befae143	Merge branch 'public-op-nightsbumper-fix' into 'next' ... Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS See merge request STJr/SRB2!299	2018-11-09 12:11:11 -05:00
Monster Iestyn	17223aa520	Merge branch 'master' into next	2018-11-09 16:09:49 +00:00
Monster Iestyn	f974bb96ac	Merge branch 'music-clean' into 'master' ... Some code cleanup. See merge request STJr/SRB2!298	2018-11-09 10:58:57 -05:00
Monster Iestyn	98fd9f8e42	WHY DID I FORGET THIS	2018-11-08 21:22:45 +00:00
Monster Iestyn	82c738ea4b	Remove hasslope, per colette's warning about it potentially causing desyncs	2018-11-08 21:13:58 +00:00
Monster Iestyn	d8f3a20e65	Merge branch 'Playerquit_hook' into 'next' ... "PlayerQuit" Lua Hook See merge request STJr/SRB2!127	2018-11-08 15:53:35 -05:00
Monster Iestyn	a9cfd6a781	Merge branch 'lua-slopes' into 'next' ... Lua support for slopes See merge request STJr/SRB2!307	2018-11-08 15:52:44 -05:00
Monster Iestyn	91113cb79c	Merge branch 'master' into next	2018-11-08 20:50:58 +00:00
Monster Iestyn	7cc5caf69c	Merge branch 'winsock-error-handling-fixes' into 'master' ... Winsock error handling fixes See merge request STJr/SRB2!303	2018-11-08 15:49:35 -05:00
Monster Iestyn	f50f10ef30	d_main.c: remove the _MAX_PATH define, the file hasn't used it since v2.0	2018-11-08 20:09:00 +00:00
Monster Iestyn	fa80d61799	byteptr.h: include endian.h to help define WRITE/READ macros correctly according to endianness	2018-11-08 17:16:54 +00:00
Monster Iestyn	fd20bbb54e	More doomtype.h cleaning up: ... * Move the misc types in the file to bottom, so that ATTRPACK at least is usable for RGBA_t * Include endian.h, so that UINT2RGBA can be defined correctly for big endian builds * Add more comments to make clear the main sections of the file	2018-11-08 17:05:35 +00:00
Monster Iestyn	5c61c40551	Clean up doomtype.h a bit, add indenting and comments to make some preprocessor code more readable	2018-11-08 16:31:20 +00:00
Monster Iestyn	0bdbdd1b1e	Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)	2018-11-08 16:26:55 +00:00
Monster Iestyn	c47f0045d6	ST_Ticker also should not have FUNCMATH, as it also has side effects	2018-11-07 21:45:27 +00:00
Monster Iestyn	b3e8a1ed88	HU_Start should not have FUNCMATH, it has side effects	2018-11-07 21:37:42 +00:00
Monster Iestyn	4a4e07e138	D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function.	2018-11-07 21:21:36 +00:00
Monster Iestyn	f66979ba1a	P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway)	2018-11-07 21:00:38 +00:00
GoldenTails	a3bc7ddfa0	Add Lua Ultimate Mode global variable so people can use it.	2018-11-06 18:09:45 -06:00
MPC	1cc8619c9e	Minor remote viewpoint bugfixes.	2018-11-05 20:40:51 -02:00
mazmazz	eb204b6cc4	Add exec to GoldMonitorPop; transfer Angle tag to mobj->lastlook for Lua compat	2018-11-05 07:41:02 -05:00
mazmazz	311cb27818	Close text prompt upon level load	2018-11-04 22:32:47 -05:00
mazmazz	96e9b4143a	Pause TextPrompt when game is paused	2018-11-04 22:32:47 -05:00
mazmazz	c16c59fd73	Support underscores -> spaces in TextPrompt name	2018-11-04 22:32:47 -05:00
mazmazz	722da815ea	Move Line 449 to Line 459; allow post exec tag by either Back X offset or line tag	2018-11-04 22:32:47 -05:00
mazmazz	6356a6cf2e	Lowercase font for body text; added ICONFLIP parameter	2018-11-04 22:32:46 -05:00
mazmazz	1ca8fca602	Changed Line 449 post exec tag to line tag	2018-11-04 22:32:46 -05:00
mazmazz	73ae273348	Implemented auto-advancing TextPrompts ... * Fixed TextSpeed * New TimeToNext * Other bugs	2018-11-04 22:32:46 -05:00
mazmazz	0a766dc93b	Implemented progressive text printing for TextPrompt	2018-11-04 22:32:46 -05:00
Monster Iestyn	444462732b	added HWR_DrawTutorialBack for OpenGL	2018-11-04 22:32:46 -05:00
Monster Iestyn	d327f82e85	Fix errors found when compiling	2018-11-04 22:32:46 -05:00
mazmazz	98d532f119	EndTextPrompt: Fix tmthing crash with P_LinedefExecute	2018-11-04 22:32:46 -05:00
mazmazz	57d9e0aef6	TextPrompt: Implement player blocked controls and post-close run line	2018-11-04 22:32:46 -05:00
mazmazz	971151ab83	Fixes: MetaPage, AdvanceToNextPage, center/scale icons, button handling	2018-11-04 22:32:46 -05:00
mazmazz	5f1052729c	Line 449 param rearranging	2018-11-04 22:32:46 -05:00
mazmazz	7778507a70	Basic TextPrompt line action implemented	2018-11-04 22:32:45 -05:00
mazmazz	1855359ac0	Moved TextPrompt logic to f_finale.c ... * Added basic TextPrompt ticker and drawer functions * Added chevron animation	2018-11-04 22:32:45 -05:00
mazmazz	edcdf79b60	Text prompt: Fix V_DrawFixedPatch call for non-green resos	2018-11-04 22:32:45 -05:00
mazmazz	63e5cfecff	Linedef Exec 449 Control Text Prompt - beginnings	2018-11-04 22:32:45 -05:00
mazmazz	cbcb6a0d6c	Text prompt features: Name, Icon, IconAlign, Lines	2018-11-04 22:32:42 -05:00
mazmazz	a3d000a37e	Kind of support line breaks with PAGETEXT. Can't trim trailing whitespace yet.	2018-11-04 22:31:52 -05:00
mazmazz	ef241b4521	Broken attempt at supporting linebreaks for PageText, like cutscenes	2018-11-04 22:31:52 -05:00
mazmazz	95c68c331a	TextPrompt/Page freeslots; SOC Prompt/Page parsing	2018-11-04 22:31:52 -05:00
Monster Iestyn	77447492ec	Add V_DrawTutorialBack for drawing a console-like background box, add Lorem ipsum as filler test	2018-11-04 22:31:49 -05:00
mazmazz	b7c6661c76	Add MTF_EXTRA flag to monitors, to run linedef exec by Angle (Tag + 16384) upon pop	2018-11-04 20:16:33 -05:00
mazmazz	eaf89cf7b9	TRACERANGLE: Run exec *after* resetting mobj values	2018-11-04 17:34:00 -05:00
mazmazz	4fc335a26b	Line 458: Only do disable operation if MFE_TRACERANGLE is set	2018-11-04 16:48:18 -05:00
mazmazz	cf6a6991cb	Trigger line exec by whether mobj is facing its tracer ... * MFE_TRACERANGLE * Thing 758 MT_ANGLEMAN * mobj thinker behavior * Line Exec 457/458 Enable/Disable	2018-11-04 16:28:25 -05:00
mazmazz	eec3f630cf	Merge remote-tracking branch 'origin/master' into tutorial-time	2018-11-03 10:58:11 -04:00
mazmazz	15020ae01d	Removed TextPrompt-specific code for text-prompt branch	2018-11-03 10:57:43 -04:00
Monster Iestyn	02b14959cc	Merge branch 'master' into next	2018-11-03 12:29:04 +00:00
Monster Iestyn	924c3164b0	Merge branch 'soc-sanitising-the-sequel' into 'next' ... SOC sanitising the sequel! See merge request STJr/SRB2!308	2018-11-03 08:18:16 -04:00
Monster Iestyn	0f37411e2b	Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason. ... ESPECIALLY if the file is already loaded in SRB2, that's just silly.	2018-11-02 20:48:12 +00:00
Monster Iestyn	7b268d15b1	Merge branch 'lua-hudlib-addition' into 'next' ... Lua: hud.enabled and v.getLocalTransFlag() See merge request STJr/SRB2!306	2018-11-02 14:29:02 -04:00
Monster Iestyn	f37a573834	Merge branch 'master' into next	2018-11-02 11:02:35 +00:00
Monster Iestyn	ba5f5be3bb	Merge branch 'patch-offsets-fix' into 'master' ... Patch offsets fix See merge request STJr/SRB2!305	2018-11-02 07:00:37 -04:00
Steel Titanium	5a0cfc10f4	Update copyright info on some files	2018-11-01 14:47:19 -04:00
Monster Iestyn	4dd5abf534	Merge branch 'master' into next	2018-10-31 23:10:57 +00:00
Monster Iestyn	c450a1aee2	Merge branch 'mi-minor-refactoring-backport' into 'master' ... MI minor refactoring See merge request STJr/SRB2!294	2018-10-31 16:49:30 -04:00
Monster Iestyn	61c1b12960	Merge branch 'multipatchtex-translucent-cyanpixel-fix-backport' into 'master' ... Multi-patch texture support for transparency AND translucency See merge request STJr/SRB2!293	2018-10-31 16:48:38 -04:00
Monster Iestyn	e9ea1b47d5	Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens	2018-10-31 19:26:29 +00:00
Steel Titanium	0f9611df76	Merge remote-tracking branch 'upstream/master' into cmake-use-internal-libs	2018-10-30 21:06:06 -04:00
Steel Titanium	2f62a03f6c	Fix up 64-bit gme	2018-10-30 20:50:36 -04:00
Latapostrophe	6841458546	got rid of the settop as well	2018-10-30 22:51:05 +01:00
Latapostrophe	799d8d2749	remove gL check	2018-10-30 22:29:28 +01:00
Latapostrophe	a0495142df	Small hud library additions	2018-10-30 19:40:59 +01:00
Monster Iestyn	22e8dd1f9d	now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore	2018-10-30 14:22:21 +00:00
Monster Iestyn	2fa0896fd0	Fix an error I made in HWR_DrawFixedPatch	2018-10-30 13:44:01 +00:00
LJSonik	b52158eb48	Merge branch 'master' into analog-flipcam-synch-fix	2018-10-29 19:52:08 +01:00
Monster Iestyn	b022ff02a5	add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well	2018-10-29 13:34:54 +00:00
Monster Iestyn	f8fd8f8ec5	HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields	2018-10-29 13:29:16 +00:00
Monster Iestyn	df9c3ef3cd	Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own	2018-10-29 12:36:09 +00:00
Monster Iestyn	834a5e6b35	V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP	2018-10-29 12:06:22 +00:00
Louis-Antoine	3d0daf2202	Fix desynch when toggling analog mode or flipcam ... Special thanks to Lat' for asking weird questions	2018-10-29 00:49:23 +01:00
Monster Iestyn	32077897b6	Removed all remaining traces of VID_X11 code in hw_drv.h and hw_data.h, the macro is no longer used by Linux etc versions of SRB2. ... Unlike the rest of the commits in this branch (as of writing), I didn't make this commit between 1 and 2 years ago, I made it right now ;)	2018-10-27 19:58:51 +01:00
Monster Iestyn	aebcf3520b	Remove pointless drawtextured variable and redundant fake planes checks (R_FakeFlat would already have made gr_frontsector/backsector something else if they were)	2018-10-27 19:32:55 +01:00
Monster Iestyn	3d88ee9d55	Added missing checks in HWR_AddLine from the software version, move v** vars to the top since R_PointToAngle calls use the same values anyway	2018-10-27 19:31:24 +01:00
Monster Iestyn	09eecd36b4	Hack to make sure even (extra)subsectors without planepolys have segs adjusted ... this fixes a crash in (old) GFZ2 at the ramp as a result of creating pv1/pv2. This probably means before pv1/pv2 there could have been some silly typecasting from vertex_t to polyvertex_t to get fixed vertex coords and such...	2018-10-27 19:29:45 +01:00
Monster Iestyn	90cfa5ef16	Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore ... Yes I know they're void * in r_defs.h's seg_t definition, it's quicker than trying to figure out if including hardware/hw_glob.h is a good idea or not	2018-10-27 19:29:31 +01:00
Monster Iestyn	1cf2ce63c0	More optimising and otherwise fixing bizarre formatting in hw_trick.c	2018-10-27 18:58:05 +01:00
Monster Iestyn	2107aab666	Moved my added slope checks in hw_trick.c to isCeilingFloating/isFloorFloating ... I also optimised those two functions while I was there (why keep a "floating" variable when setting it to false guarantees the functions return false?)	2018-10-27 18:57:28 +01:00
Monster Iestyn	787d5b598d	gr_correcttricks fix: don't check if top/bottom textures are missing for sloped sectors, just ignore and cancel the hack ... This fixes GFZ2's mysterious flying flats at the ramp to the big room	2018-10-27 18:56:38 +01:00
Monster Iestyn	67a2922558	Ensure file is closed whenever MD2 reading errors happen	2018-10-27 18:53:38 +01:00
Monster Iestyn	b150e842fc	Add MD2_INDENT and MD2_VERSION so we can cleanly check that it's a valid MD2 from magic number/version	2018-10-27 18:53:18 +01:00
Monster Iestyn	29d8e34d03	Call V_DoPostProcessor only in software mode (it cancels itself in OGL anyway)	2018-10-27 18:52:34 +01:00
Monster Iestyn	9fb301ecb5	don't bother with inlining the function, on second thoughts	2018-10-27 16:47:56 +01:00
Monster Iestyn	bb3d850bbf	static the buffer, forgot to do this earlier	2018-10-27 16:27:00 +01:00
Monster Iestyn	e4e76f83c3	Use temporary buffer with a max size of 255 bytes instead of having Microsoft's FormatMessageA alloc one for us. Also, provide a fallback message in case no message was available for some reason	2018-10-27 16:09:14 +01:00
Monster Iestyn	3b39a25ade	Save the result of errno (aka WSAGetLastError() for WinSock) as soon as possible, to prevent anything in SOCK_GetNodeAddress resetting the value to 0 while trying to print the message for the error itself!	2018-10-27 15:49:04 +01:00
Monster Iestyn	ab38e6cebb	Creating a quick get_WSAErrorStr function to act as a wrapper for FormatMessageA so we can string-ify Winsock errors properly ... Untested!	2018-10-27 15:36:15 +01:00
Monster Iestyn	e95b54e64f	missed this ESLOPE-needed area from a few commits ago apparently :V	2018-10-21 20:35:14 +01:00
Monster Iestyn	772004d3fd	Fix editing slope xydirection with Lua	2018-10-21 18:25:13 +01:00
Monster Iestyn	3ec8743c1b	Fix up the ability to edit slope zdelta and zangle with Lua (zangle is untested as of writing)	2018-10-21 17:32:53 +01:00
Monster Iestyn	e15ed742c1	add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved	2018-10-21 16:27:54 +01:00
Monster Iestyn	bd0c187e68	Merge branch 'next' into lua-slopes	2018-10-21 16:03:48 +01:00
Monster Iestyn	10f9403619	Merge branch 'master' into next	2018-10-21 15:39:30 +01:00
Monster Iestyn	87afae9cf5	Fix unarchiving of mapheader_t userdata Lua variables	2018-10-21 15:15:54 +01:00
Monster Iestyn	efff869e6e	Add mobj.standingslope to Lua	2018-10-21 15:12:51 +01:00
Monster Iestyn	2ec4f2024f	Added support for pslope_t userdata variables in Lua archive/unarchive code	2018-10-21 15:00:07 +01:00
Monster Iestyn	e5d16c520d	Merge branch 'lua-action-userdata-quickfix' into 'master' ... Lua action userdata quickfix See merge request STJr/SRB2Internal!196	2018-10-21 06:00:35 -04:00
Monster Iestyn	9296aaa28c	zangle should be shifted down by ANGLETOFINESHIFT if we're to use FINETANGENT on it	2018-10-20 23:36:06 +01:00
Monster Iestyn	4edeeb6953	Add P_GetZAt to Lua	2018-10-20 21:08:59 +01:00
Monster Iestyn	61fa7026a1	add vector2 and vector3 userdata types to simplify getting a slope's o/d/normal	2018-10-20 19:00:37 +01:00
Monster Iestyn	7d4e27937d	Merge branch 'next' into lua-slopes ... # Conflicts: # src/lua_maplib.c	2018-10-20 18:31:06 +01:00
Monster Iestyn	b5c4b476a6	Merge branch 'public_next' ... # Conflicts: # src/d_main.c # src/m_menu.c # src/s_sound.c # src/sdl/sdl_sound.c	2018-10-20 15:31:48 +01:00
Monster Iestyn	d57c54f93b	Merge branch 'master' into next	2018-10-20 14:13:13 +01:00
Monster Iestyn	7d61201194	Fix slipup from when the smashing spikeballs from HHZ were hardcoded	2018-10-20 12:54:40 +01:00
mazmazz	cc0d1db9d8	Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup	2018-10-19 23:56:56 -04:00
mazmazz	a288b95458	Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup	2018-10-19 22:04:26 -04:00
Monster Iestyn	d4e11762fa	Merge branch 'public_next' ... # Conflicts: # src/nds/i_sound.c # src/r_data.c # src/sdl12/mixer_sound.c # src/sdl12/sdl_sound.c # src/win32ce/win_snd.c	2018-10-19 22:46:19 +01:00
Monster Iestyn	29b242a5bd	Merge branch 'endgame-code-refactor-backport' into 'next' ... Endgame code refactor See merge request STJr/SRB2!297	2018-10-19 17:31:19 -04:00
Monster Iestyn	fe2af34ee5	Merge branch 'master' into next	2018-10-14 20:49:35 +01:00
Monster Iestyn	423403eab5	Merge branch 'sound-handle-fix' into 'master' ... Handle fix for SDL Mixer See merge request STJr/SRB2!301	2018-10-14 15:46:25 -04:00
Monster Iestyn	b720cb10dc	Merge branch 'pris_accurate-gif-delay' into 'master' ... More accurate GIF delay See merge request STJr/SRB2!276	2018-10-14 15:44:33 -04:00
Sryder	3886888b30	Fix missing commas and missed interface	2018-10-14 10:14:07 +01:00
Sryder	6184f91dd3	Add an int to I_PlaySound to tell an interface which channel number SRB2 is using. ... I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.	2018-10-13 23:01:11 +01:00
Monster Iestyn	80cbad61c0	Do lightlist height stepping *after* the heights are used by the FOF rendering code, not before (yes, I caught that they remove a heightstep beforehand for FOFs, but that wasn't done for midtextures it seems?) ... Additionally add some macros for repeated slope end assignments and overflow tests	2018-10-13 18:57:40 +01:00
Monster Iestyn	bedfed2f00	Move shared code here instead of duplicating it for both dc_numlights and non-dc_numlights rendering code ... Also added a few comments, and include the out of range check in the "shared code" above	2018-10-13 15:37:11 +01:00
Steel Titanium	450b536147	Remove the condition in restartaudio command. ... No longer needed as S_RegisterSoundStuff will return early if in dedicated mode.	2018-10-11 20:11:37 -04:00
Monster Iestyn	8ab4915b5b	Whoops these should be L not gL here (not that it makes much difference normally though)	2018-10-11 21:44:25 +01:00
Steel Titanium	b3faed190b	Move commands and console variable into s_sound.c	2018-10-11 16:29:43 -04:00
Monster Iestyn	feceaf6d30	Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission ... Only real difference here is that CEcho messages will always be cleared when going to credits/evaluation, but that's hardly a loss tbh.	2018-10-11 21:25:15 +01:00
Monster Iestyn	2bb7df5f49	G_ExitLevel tweak: Use HU_ClearCEcho() instead of HU_DoCEcho(""), the latter causes an empty line to appear in log.txt	2018-10-11 21:25:04 +01:00
Monster Iestyn	31f3f8b8e7	Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame	2018-10-11 21:24:53 +01:00
Monster Iestyn	c1d5c711a9	Be gone ye old texture hack	2018-10-11 21:08:25 +01:00
Monster Iestyn	9c464742b7	Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now ... Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess	2018-10-11 20:00:45 +01:00
Monster Iestyn	ef78c942f7	Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore)	2018-10-11 20:00:34 +01:00
Monster Iestyn	49c5a6f7e4	Remove unused "runcount" variable from p_local.h	2018-10-11 20:00:23 +01:00
Monster Iestyn	91b2f5e570	"t" is not needed to take out fencepost cases from viewangletox	2018-10-11 20:00:05 +01:00
Monster Iestyn	07dd527e7e	Removed unused function prototypes in d_main.h ... Also corrected what appears to be a typo in some comments above?	2018-10-11 19:59:47 +01:00
Monster Iestyn	61a29bed85	Remove unused sscount variable ... (it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)	2018-10-11 19:59:26 +01:00
Monster Iestyn	a4419abfdc	debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else	2018-10-11 19:59:09 +01:00
Monster Iestyn	38ec0cc50a	These convar externs aren't moving files, I'm just shifting them up to live with their relatives	2018-10-11 19:39:28 +01:00
Monster Iestyn	0ad0f8afc4	Move analog consvars to g_game.h	2018-10-11 19:39:11 +01:00
Monster Iestyn	933508db89	Moved screenshot/movie consvar externs to m_misc.h	2018-10-11 19:38:11 +01:00
Monster Iestyn	e2a4c59e21	cv_controlperkey probably belongs in g_input.h too	2018-10-11 19:37:48 +01:00
Monster Iestyn	4b7af892e1	Moved most of d_netcmd.h's 2P mouse consvar externs to the files with their 1P counterparts	2018-10-11 19:37:24 +01:00
Monster Iestyn	72ab305bf4	Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8	2018-10-11 17:05:23 +01:00
Monster Iestyn	b9b0a8110c	Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency ... ...that was a mouthful	2018-10-11 17:05:13 +01:00
Monster Iestyn	77e85394d8	Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8	2018-10-10 14:59:44 +01:00
Monster Iestyn	d3da4cb527	Merge branch 'fof-slope-skew-backport'	2018-10-10 14:53:01 +01:00
Monster Iestyn	291ebf302c	Merge branch 'public_next' ... # Conflicts: # src/Makefile # src/lua_script.c # src/p_user.c # src/sdl/i_system.c # src/v_video.c # src/w_wad.c	2018-10-10 14:51:34 +01:00
Monster Iestyn	8196c59557	Merge branch 'master' into next	2018-10-09 22:55:55 +01:00
Monster Iestyn	c469fc242f	Merge branch 'movechasecamera-crashfix' into 'next' ... Fix for Chicmunk's weird camera related crash See merge request STJr/SRB2!284	2018-10-09 15:20:06 -04:00
Sryder	497314fdc4	Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close. ... No memory leak here, just a very tiny thing I noticed.	2018-10-09 19:43:18 +01:00
toaster	1324e0bfcd	* Fix a memory leak regarding implementation of SOC_ (improperly copypasted code from LUA_LoadLump!!) ... * Optimise the repeated strlen usage into a single call, which is stored for later.	2018-10-08 18:50:17 +01:00
Monster Iestyn	12e0222929	Merge branch 'drwhoandthesleepingweather' into 'master' ... Dr. Who And The Sleeping Weather See merge request STJr/SRB2!288	2018-10-08 09:36:18 -04:00
Monster Iestyn	1049f3451a	Merge branch 'sp-savegame-continue-crash-fix' into 'master' ... SP savegame continues icon crash See merge request STJr/SRB2!290	2018-10-08 09:20:45 -04:00
Monster Iestyn	1115f41f8e	Merge branch 'zlib-split' into 'master' ... Makefile: Split zlib and libpng See merge request STJr/SRB2!285	2018-10-08 07:20:27 -04:00
Steel Titanium	027e6e8e3c	Change win_snd.c also	2018-10-07 15:00:48 -04:00
Steel Titanium	232a7ae7b7	Change order of the ifdef	2018-10-07 14:52:25 -04:00
Steel Titanium	def090c9f0	Move the ifdef	2018-10-07 14:45:03 -04:00
Sryder	62d7049437	I'm fairly sure GCC64 should enable GCC63. ... No wonder I never got mixed declaration and code warnings.	2018-10-07 15:44:44 +01:00
toaster	b1e02467bf	Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!	2018-10-07 15:00:58 +01:00
Sryder	fb6c329870	Fix the crashing bug hopefully ... A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway. For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory) For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy) So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.	2018-10-07 10:37:45 +01:00
Sryder	02597e0bf9	Fix compiler warnings.	2018-10-07 09:26:18 +01:00
Sryder	d072dd2725	I think that should be NULL, not 0 actually.	2018-10-07 00:22:23 +01:00
Sryder	7b417b573c	Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound. ... Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk. I went back to Z_Malloc and Z_Free for this because they still work after this.	2018-10-07 00:15:42 +01:00
Sryder	725a65c1f7	Call SDL_RWclose after an SDL_RWFromMem call to close the RWops.	2018-10-07 00:15:11 +01:00
Monster Iestyn	1ec601af6b	Draw a star for continues if invalid skin numbers are somehow supplied	2018-10-05 22:42:36 +01:00
Steel Titanium	b812a6a4ab	Really fix DD compiling this time.	2018-10-04 22:56:11 -04:00
Steel Titanium	fc5d969642	Fix DD compiling	2018-10-04 22:44:26 -04:00
Steel Titanium	49cb1ffe9f	Restore deleted endif	2018-10-04 22:38:59 -04:00
Steel Titanium	79f5f4885c	Split zlib and libpng	2018-10-04 19:47:19 -04:00
Alam Ed Arias	348f4dc2cd	Merge branch 'master' into next	2018-10-02 09:14:59 -04:00
Monster Iestyn	800b3bb240	Move player + player mobj existence checks to top of P_MoveChaseCamera. This is the only place it makes sense to even check them tbh. ... While I'm at it, let's also use the "mo" variable instead of player->mo throughout the function (to be consistent)	2018-09-30 22:18:48 +01:00
Monster Iestyn	872e2f82c1	Redo OpenGL skewing support, so that it now itself supports the lower unpegged effect for FOFs in OpenGL!	2018-09-28 17:02:02 +01:00
Monster Iestyn	6a6d32e7c2	searchfilemenu: Replace first with 0 here as toaster suggested	2018-09-23 14:17:29 +01:00
mazmazz	f2033350fc	MP Jingle: A brace (Underwater restore, p_inter.c)	2018-09-21 15:53:03 -04:00
mazmazz	e0f9cdcfd1	MP Jingle: Fix underwater music not restoring on air bubble or shield	2018-09-21 15:44:52 -04:00
Steel Titanium	f88708bb75	Fix the weird indentation	2018-09-21 12:05:52 -04:00
Steel Titanium	68ec811909	Rearrange the code. ... Thanks again MonsterIestyn!	2018-09-21 11:26:08 -04:00
Steel	af58ba9ae3	Remove this that somehow slipped in.	2018-09-21 07:21:49 -04:00
Steel	be74b4e58b	Fix up errors with buildbots	2018-09-21 07:16:54 -04:00
mazmazz	d14db91133	MP Jingle: Remove P_RestoreMusic from space countdown (no reason to have it)	2018-09-20 19:05:05 -04:00
Steel Titanium	378495cb2b	Add some stuff	2018-09-20 18:33:50 -04:00
Steel Titanium	a53f036149	Use MemAvailable instead	2018-09-20 18:30:46 -04:00
mazmazz	d8addda298	MP Jingle: Add fade timing hack after ending a non-looping song	2018-09-20 18:30:21 -04:00
mazmazz	78c1b99cd4	MP Jingle: Changed music_stacks from fixed array to next/prev chain	2018-09-20 17:13:52 -04:00
mazmazz	b7947554e2	MP Core Win32: Fix FadeSong unused callback param (buildbots)	2018-09-20 08:42:28 -04:00
mazmazz	54f94b80db	MP Core Win32: Fix FadeSong unused callback param (buildbots)	2018-09-20 08:41:40 -04:00
mazmazz	551237350e	MP Mixer X: Fix double->UINT32 cast (buildbots)	2018-09-20 08:30:31 -04:00
mazmazz	4b4bd638a9	MP libopenmpt: Add doomdef.h header to load_libraries, resolve CONS_Printf (buildbots)	2018-09-20 08:23:29 -04:00
mazmazz	b38f6f6125	MP Libopenmpt: Fix UINT32->double cast (buildbots)	2018-09-20 07:42:35 -04:00
mazmazz	2896b3e3c4	MP Libopenmpt: SDL header in load_libraries	2018-09-20 07:39:53 -04:00
mazmazz	d5b3d74e6f	MP Libopenmpt: Separate loading into sdl/load_libraries.c	2018-09-19 23:18:06 -04:00
mazmazz	1508f3a320	MP Libopenmpt: Make explicit OPENMPT=1 for non-windows platforms	2018-09-19 23:03:35 -04:00
mazmazz	31343be41b	foundrover ffloor_t -> boolean	2018-09-19 20:11:30 -04:00
mazmazz	03367bdc60	Merge branch 'musicplus-core' into musicplus-feature-postboss	2018-09-19 20:07:03 -04:00
mazmazz	6f1a5cbfc9	Merge branch 'musicplus-core' into musicplus-sdlmixerx	2018-09-19 20:06:56 -04:00
mazmazz	7290723484	Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic	2018-09-19 19:57:19 -04:00
mazmazz	0bc6b2e4d8	Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel	2018-09-19 19:56:54 -04:00
mazmazz	7cd1bfb8d7	Merge branch 'public-musicplus-core' into public-musicplus-jingle	2018-09-19 19:56:50 -04:00
mazmazz	a4fade9b25	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2018-09-19 19:56:49 -04:00
mazmazz	f52659d9f9	MP Postboss: strnicmp -> boolean remove cast (buildbots)	2018-09-19 19:54:14 -04:00
mazmazz	af5aecb246	MP Jingle: Better empty_music_stack_entry initialization (buildbots)	2018-09-19 19:51:04 -04:00
mazmazz	7084fc89bd	MP Core s_sound: I_FadeSongFromVolume call fix (buildbots)	2018-09-19 19:47:21 -04:00
mazmazz	2644180b7e	MP Core s_sound: I_FadeSongFromVolume call fix (buildbots)	2018-09-19 19:46:57 -04:00
mazmazz	37addc02e6	MP Core Mixer: Old-style function dec fixes (buildbots)	2018-09-19 19:41:38 -04:00
mazmazz	49c678d2e9	MP Core s_sound: Mixed D+C fix (buildbots)	2018-09-19 19:41:23 -04:00
mazmazz	de47ab63f2	MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)	2018-09-19 19:40:24 -04:00
mazmazz	be5555d393	Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel	2018-09-19 19:32:52 -04:00
mazmazz	17fc39c62e	Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic	2018-09-19 19:32:51 -04:00
mazmazz	7cc0b6cf95	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2018-09-19 19:32:49 -04:00
mazmazz	affbc89602	Merge branch 'public-musicplus-core' into public-musicplus-jingle	2018-09-19 19:24:57 -04:00
mazmazz	17c796fe74	MP Jingle: Buildbot fixes	2018-09-19 19:24:35 -04:00
mazmazz	164be3056f	MP Core s_sound: Mixed D+C fix (buildbots)	2018-09-19 19:19:18 -04:00
mazmazz	96fa8996db	MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)	2018-09-19 19:18:35 -04:00
mazmazz	ade637798b	MP Core Mixer: Old-style function dec fixes (buildbots)	2018-09-19 19:06:24 -04:00
mazmazz	75558c40a2	Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel	2018-09-19 18:55:01 -04:00
mazmazz	d4cef2bf9b	Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic	2018-09-19 18:55:00 -04:00
mazmazz	af89cf92e2	Merge branch 'public-musicplus-core' into public-musicplus-jingle	2018-09-19 18:55:00 -04:00
mazmazz	86f3fadd5e	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2018-09-19 18:54:58 -04:00
mazmazz	1c314833db	Merge branch 'musicplus-core' into musicplus-feature-postboss	2018-09-19 18:53:46 -04:00
mazmazz	3e9b253438	Merge branch 'musicplus-core' into musicplus-sdlmixerx	2018-09-19 18:53:41 -04:00
mazmazz	1da3b921dd	Merge remote-tracking branch 'origin/master' into musicplus-core	2018-09-19 18:53:18 -04:00
mazmazz	e08bdec216	MP Jingle: Buildbot fixes	2018-09-19 18:42:35 -04:00
mazmazz	494c5290cf	MP Core Mixer: Unused param fixes (buildbots)	2018-09-19 18:26:59 -04:00
mazmazz	974b1d340a	MP Core Mixer: Unused param fixes (buildbots)	2018-09-19 18:26:33 -04:00
mazmazz	5e1b4272c1	Initialize foundrover to NULL (for debug checking)	2018-09-19 17:50:05 -04:00
mazmazz	24938473a5	Linedef exec FOF specials: Move logic into for (rover =...) block so procedure happens on every FOF match	2018-09-19 17:49:03 -04:00
Digiku	87087c190e	Merge branch 'nights-keeppoints' into 'master' ... NiGHTS: Deduct marescore when player hits ground, not immediately on timeout See merge request STJr/SRB2Internal!161	2018-09-19 11:03:24 -04:00
Digiku	106afd48af	Merge branch 'nights-score-lap' into 'master' ... NiGHTS: Intermission Bonuses See merge request STJr/SRB2Internal!159	2018-09-19 11:03:14 -04:00
Digiku	e3ecb61173	Nights intermission bonus y_inter.c: A comment	2018-09-19 10:53:11 -04:00
Digiku	1dadee6804	Nights intermission dehacked: a comment	2018-09-19 10:45:51 -04:00
mazmazz	481c0d7623	EndOfLevel: 2.1 _clear -> lclear music in y_inter	2018-09-18 23:32:00 -04:00
mazmazz	db9528f6e4	MP Core: 2.1 dehacked typo	2018-09-18 23:29:18 -04:00
mazmazz	b057b2932d	EndOfLevel: 2.1 dehacked setup fix	2018-09-18 23:28:39 -04:00
mazmazz	1dd47e850b	EndOfLevel: Check player->exiting > 0 && <= TICRATE, fixes start-of-level fading in 2.1 ... Braces in y_inter.c	2018-09-18 23:27:00 -04:00
mazmazz	26749d275c	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2018-09-18 22:24:44 -04:00
mazmazz	00bbb60e69	Mixer: Add back var_cleanup in I_LoadSong ... Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!	2018-09-18 22:24:07 -04:00
mazmazz	f99b6a89ed	Mixer: Add back var_cleanup in I_LoadSong ... Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!	2018-09-18 22:15:53 -04:00
mazmazz	81ad8f0681	Merge branch 'master' into le-fadefof	2018-09-18 17:11:33 -04:00
mazmazz	d542c2440d	musicplus-feature-endoflevel 2.2 -> 2.1 backport	2018-09-18 15:50:12 -04:00
mazmazz	b55191f09a	Merge branch 'musicplus-core' into musicplus-feature-postboss	2018-09-18 15:35:02 -04:00
mazmazz	2e0e0a3856	musicplus-le-changemusic 2.2 -> 2.1 backport	2018-09-18 15:28:57 -04:00
mazmazz	26721b673a	Lua P_RestoreMusic else if fix	2018-09-18 15:12:09 -04:00
mazmazz	0cfe0824b6	Lua P_RestoreMusic else if fix	2018-09-18 15:11:37 -04:00
mazmazz	be2342799e	Lua P_RestoreMusic else if fix	2018-09-18 15:10:42 -04:00
mazmazz	c60d61a493	musicplus-jingle 2.2 -> 2.1 backport	2018-09-18 15:10:00 -04:00
mazmazz	0f5b7e6630	MusicPlus core: Win32 DD compile fixes	2018-09-18 14:09:24 -04:00
mazmazz	e4f48cfb71	MusicPlus core: Win32 DD compile fixes	2018-09-18 14:09:13 -04:00
mazmazz	68c295c9e1	MusicPlus core: NOMIXER=1 compile fix	2018-09-18 13:23:59 -04:00
mazmazz	b71996106b	MusicPlus core: NOMIXER=1 compile fix	2018-09-18 13:23:42 -04:00
mazmazz	b48b5a29a4	Move cv_modfilter from mixer_sound.c to s_sound.c for other targets	2018-09-18 13:01:34 -04:00
mazmazz	38afb85b47	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2018-09-18 12:59:53 -04:00
mazmazz	1a935eabd5	Mixer I_StopSong: StopFadingSong and var_cleanup call fix	2018-09-18 12:55:19 -04:00
mazmazz	f079c9170f	Merge branch 'musicplus-core' into musicplus-sdlmixerx	2018-09-18 12:51:55 -04:00
mazmazz	67566f9a2f	Mixer I_StopSong: StopFadingSong and var_cleanup call fix	2018-09-18 12:51:42 -04:00
mazmazz	cf7d913f3b	Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx	2018-09-18 12:46:46 -04:00
mazmazz	8583785d72	Merge branch 'musicplus-core' into musicplus-sdlmixerx	2018-09-18 12:46:41 -04:00
mazmazz	4cba996a89	Define cv_midiplayer/soundfontpath/timiditypath in s_sound.c when NOMIXER=1	2018-09-18 12:41:49 -04:00
mazmazz	4d89beb105	musicplus-libopenmpt 2.2 -> 2.1 backport	2018-09-18 12:31:47 -04:00
mazmazz	a2c5c331c0	Merge branch 'master' into musicplus-core	2018-09-18 12:20:56 -04:00
mazmazz	66283ce36a	MusicPlus core: Lua separation fixes	2018-09-18 11:39:08 -04:00
Digiku	b7bcc16c98	Merge branch 'fof-fixes-movingplatexists' into 'master' ... Moving platform fix: Player snaps to floor when setting ~FF_EXISTS See merge request STJr/SRB2Internal!188	2018-09-18 11:29:11 -04:00
mazmazz	c45d523e8f	420: Don't interrupt existing light fade on duration timing except EFFECT5 ... (cherry picked from commit 3b957c32517a8f5148940c0067af7e88a51d1fee)	2018-09-18 11:08:33 -04:00
Digiku	a036c42973	Merge branch 'colormap-overhaul-fade' into 'master' ... Linedef Exec 455 Fade Colormap, 456 Stop Fading Colormap See merge request STJr/SRB2Internal!191	2018-09-18 11:06:09 -04:00
mazmazz	3cdd904fbc	Merge branch 'colormap-overhaul-fade' into le-fadefof	2018-09-18 11:05:30 -04:00
mazmazz	899e8ef2a0	Merge remote-tracking branch 'origin/master' into le-fadefof	2018-09-18 10:52:03 -04:00
Digiku	a32304c9d5	Merge branch 'colormap-overhaul-change-ldef' into 'master' ... Linedef Exec 447: Change Colormap relative value calc See merge request STJr/SRB2Internal!190	2018-09-18 10:49:54 -04:00
Digiku	843ed289a6	Merge branch 'polyobj-fade' into 'master' ... Linedef Exec 492: Fade PolyObject See merge request STJr/SRB2Internal!192	2018-09-18 10:48:46 -04:00
mazmazz	41964e084d	MusicPlus core: Lua separation fixes	2018-09-18 10:32:38 -04:00
mazmazz	c5ea6b5efe	MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport	2018-09-18 10:22:17 -04:00
mazmazz	34e403afcb	S_ChangeMusic: More specific load/play fail messages	2018-09-18 09:38:41 -04:00
mazmazz	94393e759d	Merge branch 'music-cleanup' into musicplus-core	2018-09-18 08:33:20 -04:00
mazmazz	2b2e179e63	S_ChangeMusic: More specific load/play fail messages	2018-09-18 08:32:34 -04:00
mazmazz	e7ecd84e80	p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec	2018-09-18 07:37:29 -04:00
mazmazz	5029c01c2b	492: Remove pre-existing thinker when setting up new fade	2018-09-18 07:31:19 -04:00
mazmazz	6567872229	492: Don't interrupt existing polyobj fader unless EFFECT5	2018-09-18 07:31:17 -04:00
mazmazz	9778cc2ad5	455: A line break	2018-09-18 07:30:37 -04:00
mazmazz	56ee711f33	455: Commented out, but allow existing fade overlap of 2 tics (or speed*2)	2018-09-18 07:30:35 -04:00
mazmazz	64b96c7192	455: Don't interrupt current color fading	2018-09-18 07:29:21 -04:00
mazmazz	27aa357053	453: A line break	2018-09-18 07:28:30 -04:00
mazmazz	f5b25c91f5	453: Commented out, but allow existing fade overlap of 2 tics (or speed*2)	2018-09-18 07:28:28 -04:00
mazmazz	5b16590ba2	453: Don't interrupt current FOF fade unless EFFECT5	2018-09-18 07:27:47 -04:00
Monster Iestyn	fab25a451f	Merge branch 'public_next'	2018-09-17 21:50:19 +01:00
mazmazz	20c4702986	Line exec trigger netsync: Save var2s in addition to vars	2018-09-17 14:13:31 -04:00
Digiku	6f1a44432b	Merge branch 'colormap-overhaul' into 'master' ... Colormap code overhaul See merge request STJr/SRB2Internal!189	2018-09-17 11:24:14 -04:00
mazmazz	c462bd4b17	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-17 10:57:02 -04:00
mazmazz	71df02c996	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-17 10:56:56 -04:00
mazmazz	69a4906911	Colormap netsync: Count ffloors for colormap loading upper limit	2018-09-17 10:38:17 -04:00
mazmazz	d417f733e5	Colormap netsync: Handle unaccounted dummy colormaps properly	2018-09-17 10:30:21 -04:00
mazmazz	1e7a4af207	Merge branch 'colormap-overhaul' into colormap-overhaul-fade	2018-09-17 08:06:17 -04:00
mazmazz	8b4c4e20d5	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-17 08:06:10 -04:00
mazmazz	752a963037	Colormap netsync: String format numsectors to UINT32 (thanks buildbot)	2018-09-17 08:05:51 -04:00
mazmazz	14339d651d	453: Use new colormap netsync for fade FOF thinker	2018-09-17 00:34:03 -04:00
mazmazz	c44ce7b401	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-17 00:28:16 -04:00
mazmazz	3ebd545523	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-17 00:27:11 -04:00
mazmazz	f3e1d280d0	Colormap netsync: Mixed D+C fixes	2018-09-17 00:26:58 -04:00
mazmazz	67c4e9e8a2	Postboss: S_ChangeMusicAdvanced -> Ex	2018-09-16 23:44:42 -04:00
mazmazz	c5d4ff5712	Merge branch 'musicplus-core' into musicplus-feature-postboss	2018-09-16 23:32:18 -04:00
mazmazz	48445c7733	Merge branch 'musicplus-core' into musicplus-sdlmixerx	2018-09-16 23:18:11 -04:00
mazmazz	d7f4c9be84	S_ChangeMusicAdvanced -> S_ChangeMusicEx	2018-09-16 23:10:23 -04:00
mazmazz	917dea7070	Separate Lua from musicplus-core	2018-09-16 23:09:37 -04:00
mazmazz	60ba0f5911	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-16 22:42:57 -04:00
mazmazz	4b55415add	New colormap netsync fixes	2018-09-16 22:42:36 -04:00
mazmazz	0a998fec02	New colormap netsync fixes	2018-09-16 22:41:08 -04:00
mazmazz	d4a18fd456	455: Fade colormap netsync use new colormap saving	2018-09-16 20:27:24 -04:00
mazmazz	545602d94d	Merge branch 'colormap-overhaul' into colormap-overhaul-fade	2018-09-16 20:25:59 -04:00
mazmazz	4cdbc7249f	Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector	2018-09-16 20:25:46 -04:00
mazmazz	e9b3cba300	Improve MIDI console parameters ... * Allow multiple SF2 for midisoundfont * Correctly branch when toggling midiplayer or midisoundfont	2018-09-16 16:02:26 -04:00
Monster Iestyn	1b7b1f3f79	Fix order of operations messups by adding brackets	2018-09-16 20:25:07 +01:00
mazmazz	45a7d36524	Improve MIDI console parameters ... * Allow multiple SF2 for midisoundfont * Correctly branch when toggling midiplayer or midisoundfont	2018-09-16 11:51:39 -04:00
Digiku	7aedb8d035	Merge branch 'lightfade-ticbased' into 'master' ... Linedef Exec 420: Fade Lighting add duration timing See merge request STJr/SRB2Internal!186	2018-09-16 08:24:09 -04:00
mazmazz	7c8fa151c4	Merge branch 'lightfade-ticbased' into le-fadefof	2018-09-16 08:20:57 -04:00
mazmazz	d49f0be4ee	420: Strip test comments	2018-09-16 08:20:14 -04:00
mazmazz	1321ab9d92	453: Extra parameter for Add_ColormapFader	2018-09-15 20:40:17 -04:00
mazmazz	17e23f55eb	492: Merge speed and duration logic for fade polyobject	2018-09-15 20:00:37 -04:00
Nev3r	350cd1435b	The thinker is entirely unified now, and there is no difference in the light levels between the "old" behavior and this one now.	2018-09-15 12:21:25 +02:00
mazmazz	d939e597a5	420: Unncessary include	2018-09-15 20:03:43 -04:00
mazmazz	ab4a825385	420: Combine speed and duration logic for fade lighting	2018-09-15 19:01:21 -04:00
mazmazz	809646e7fe	453: Try ResetFakeFloorFader if condition again	2018-09-15 02:24:44 -04:00
mazmazz	a85953a903	453: P_ResetFakeFloorFader stray & address if condition	2018-09-15 02:16:54 -04:00
mazmazz	efe0af960d	Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS	2018-09-15 02:10:55 -04:00
mazmazz	efacf356b0	Merge remote-tracking branch 'origin/master' into music-cleanup	2018-09-15 01:52:48 -04:00
mazmazz	79484de4ea	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-15 01:51:06 -04:00
mazmazz	5e55f6f311	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-15 01:50:53 -04:00
mazmazz	6844ed37c5	Colormap overhaul: %d format size_t -> UINT32 fix	2018-09-15 01:50:33 -04:00
mazmazz	001dbcceea	Merge branch 'musicplus-core' into musicplus-sdlmixerx	2018-09-15 01:17:33 -04:00
mazmazz	45dbadbbc2	Mixer: Add missing tag declarations in I_LoadSong	2018-09-15 01:14:24 -04:00
mazmazz	5585edf459	453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor	2018-09-15 01:05:21 -04:00
mazmazz	ca4a94eca5	492: Mixed D+C fix	2018-09-15 00:56:46 -04:00
mazmazz	1db8aee539	455: Mixed D+C fix	2018-09-15 00:53:21 -04:00
mazmazz	be6acdb019	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-15 00:52:45 -04:00
mazmazz	57959522e2	Colormap overhaul r_data: Mixed D+C fix	2018-09-15 00:49:03 -04:00
mazmazz	9eb39fb025	Merge branch 'music-cleanup' into musicplus-core	2018-09-15 00:46:02 -04:00
mazmazz	e695cf91fe	Merge branch 'music-cleanup' into music-sdlmixerx	2018-09-15 00:36:16 -04:00
mazmazz	40a8c9c1ee	Mixer: HAVE_LIBGME ifdef in I_LoadSong	2018-09-15 00:35:24 -04:00
mazmazz	30b8408c10	Mixer: HAVE_LIBGME ifdef in I_LoadSong	2018-09-15 00:34:55 -04:00
mazmazz	3c755a85df	Merge branch 'music-cleanup' into music-sdlmixerx	2018-09-15 00:28:38 -04:00
mazmazz	2e2acdd16a	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-14 22:36:09 -04:00
mazmazz	5f2df0f453	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-14 22:35:51 -04:00
mazmazz	2f995f4cbe	Remove possibly wrong comment about extracolormap_t->fog	2018-09-14 22:35:30 -04:00
mazmazz	f85d1da54f	Lua support for floorrover/ceilingrover	2018-09-14 21:43:43 -04:00
mazmazz	20bde0d21c	Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2) ... (cherry picked from commit 9a5eb02459)	2018-09-14 17:48:12 -04:00
mazmazz	9a5eb02459	Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2)	2018-09-14 17:47:04 -04:00
mazmazz	17ec5d8022	Mixer: Better MODPLUG/MP3_MAD defines ... (cherry picked from commit 5b724e18b5)	2018-09-14 17:27:31 -04:00
mazmazz	5b724e18b5	Mixer: Better MODPLUG/MP3_MAD defines	2018-09-14 17:27:00 -04:00
mazmazz	0563d77812	Fix compile errors on buildbots ... * Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED * Mixed D+C in I_LoadSong (cherry picked from commit fdbe3e80f6)	2018-09-14 17:09:21 -04:00
mazmazz	fdbe3e80f6	Fix compile errors on buildbots ... * Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED * Mixed D+C in I_LoadSong	2018-09-14 17:07:13 -04:00
mazmazz	3a343cf8f1	Don't call I_StartupSound in SFX toggle ... * Mixer: make I_StartupSound return early if already set up * Restartaudio: Add StopSFX call (cherry picked from commit b330dc2394)	2018-09-14 16:43:48 -04:00
mazmazz	b330dc2394	Don't call I_StartupSound in SFX toggle ... * Mixer: make I_StartupSound return early if already set up * Restartaudio: Add StopSFX call	2018-09-14 16:39:10 -04:00
Monster Iestyn	546fa383c1	Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items	2018-09-14 21:01:07 +01:00
mazmazz	4a5bcf43a2	Rip out SDL Mixer code from sdl_sound.c because superfluous ... * Mixer code has been in mixer_sound.c; this file is not invoked unless compiling with NOMIXER=1 * Remove everything under #ifdef HAVE_MIXER because this is never triggered * Comment out #ifdef HAVE_LIBGME because we don't support playing music anyway (but theoretically, it could have worked separately from Mixer) * Stub new music calls (cherry picked from commit 76be77b93a)	2018-09-14 14:53:56 -04:00
mazmazz	76be77b93a	Rip out SDL Mixer code from sdl_sound.c because superfluous ... * Mixer code has been in mixer_sound.c; this file is not invoked unless compiling with NOMIXER=1 * Remove everything under #ifdef HAVE_MIXER because this is never triggered * Comment out #ifdef HAVE_LIBGME because we don't support playing music anyway (but theoretically, it could have worked separately from Mixer) * Stub new music calls	2018-09-14 14:52:24 -04:00
Monster Iestyn	b82ddd4f08	Merge branch 'public_next'	2018-09-14 19:51:20 +01:00
mazmazz	517756606c	I_InitMusic SDL2: Don't unload GME indiscriminately ... (cherry picked from commit cb4e075137)	2018-09-14 13:57:24 -04:00
mazmazz	297653fa34	srb2dd music cleanup fixes ... (cherry picked from commit 0999b0f8a8)	2018-09-14 13:57:22 -04:00
mazmazz	a5948c3629	Separate StopMusic and UnloadMusic ... (cherry picked from commit e72610a3dc)	2018-09-14 13:57:20 -04:00
mazmazz	7f884591a7	Bring back music_data handle, for srb2dd ... (cherry picked from commit 8e05de17f0)	2018-09-14 13:56:14 -04:00
mazmazz	09df2c387a	newmusic -> mmusic typo, S_ChangeMusic	2018-09-14 13:55:07 -04:00
mazmazz	5c20aa79dd	More unnecessary if conditions, toggle SFX menu	2018-09-14 13:54:41 -04:00
mazmazz	cb4e075137	I_InitMusic SDL2: Don't unload GME indiscriminately	2018-09-14 13:36:01 -04:00
mazmazz	0999b0f8a8	srb2dd music cleanup fixes	2018-09-14 13:24:15 -04:00
mazmazz	e72610a3dc	Separate StopMusic and UnloadMusic	2018-09-14 12:47:33 -04:00
mazmazz	8e05de17f0	Bring back music_data handle, for srb2dd	2018-09-14 12:29:58 -04:00
mazmazz	aa1ec4d996	Sound menu toggle fix: unnecessary if condition	2018-09-14 11:25:25 -04:00
mazmazz	691de18fbb	Menu sound toggle fixes (and add starpost sfx to menu)	2018-09-14 11:24:28 -04:00
mazmazz	4b1bc53db1	Compile fixes	2018-09-14 10:58:41 -04:00
mazmazz	fac7d19637	Case-insensitive music_name comparison ... (cherry picked from commit a7ae059949)	2018-09-14 10:49:44 -04:00
mazmazz	8541963c61	I_SongPlaying detect GME properly ... (cherry picked from commit e88d147761)	2018-09-14 10:49:44 -04:00
mazmazz	d94f7e3cb0	Stub I_UnloadSong because we already unload in I_StopMusic ... * Stop-gap for now. Ideally the logic would be in the respective places. # Conflicts: # src/sdl/mixer_sound.c (cherry picked from commit eae5d3333f)	2018-09-14 10:49:44 -04:00
mazmazz	5f22b7d973	Volume fixes ... # Conflicts: # src/sdl/mixer_sound.c (cherry picked from commit d39b7011c5)	2018-09-14 10:49:44 -04:00
mazmazz	2fbe206ecb	A word ... (cherry picked from commit fb6f8c8a07)	2018-09-14 10:49:44 -04:00
mazmazz	b0c47e2fb1	GME fix: play song in I_PlaySong, not I_LoadSong ... (cherry picked from commit 5f21bf230d)	2018-09-14 10:45:39 -04:00
mazmazz	4d61f00b86	Refactor I_MusicType MusicPlaying and MusicPaused other targets ... (cherry picked from commit 9e6eebeb8d)	2018-09-14 10:45:39 -04:00
mazmazz	eacf0ba00b	Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ... ... (cherry picked from commit 4b82de9e54)	2018-09-14 10:45:38 -04:00
mazmazz	d535c14fc6	Refactoring and reordering other targets ... (cherry picked from commit cf065e106f)	2018-09-14 10:43:46 -04:00
mazmazz	5bac836d4c	Minor refactoring and reordering ... * I_GetMusicType() -> I_MusicType() * Wrap MIDI volume hack in #ifdef _WIN32 (cherry picked from commit a7d51bf810)	2018-09-14 10:42:27 -04:00
mazmazz	8c78d86c36	Play the opposite type music (Digital/MIDI) when toggling between them in menu ... * S_MusicInfo method to retrieve name, flags, and looping (cherry picked from commit f6ec93198f)	2018-09-14 10:38:32 -04:00
mazmazz	7e7899ae83	Toggle Digi/MIDI music in menu accurately; add S_MusicType ... (cherry picked from commit 4aa100aa57)	2018-09-14 10:37:08 -04:00
mazmazz	17cf310b84	nodigimusic nomusic nosound refactor other targets ... (cherry picked from commit 86f151db65)	2018-09-14 10:35:56 -04:00
mazmazz	a414ccf24a	nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled ... (cherry picked from commit 07738fb0bc)	2018-09-14 10:35:51 -04:00
mazmazz	44557d9c9d	I_MusicPlaying, I_MusicPaused other targets ... (cherry picked from commit d5ec388159)	2018-09-14 10:28:35 -04:00
mazmazz	011a043dba	Refactoring, music statues ... * S_Init -> S_InitSfxChannels because it did mostly SFX anyway * S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods * I_MusicPlaying, I_MusicPaused (cherry picked from commit f5f0b5e76c)	2018-09-14 10:28:29 -04:00
mazmazz	e58a8f4fe1	Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets ... (cherry picked from commit 9fb9386f84)	2018-09-14 10:23:47 -04:00
mazmazz	a7ed7b2c90	Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method ... * In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables * Simplified Dig/MidiMusicDisabled in s_sound * Method reordering (cherry picked from commit 701cc5a7dd)	2018-09-14 10:23:37 -04:00
mazmazz	46b53e8bae	Added I_GetMusicType and removed midimode variable: other targets ... (cherry picked from commit 14b393ab16)	2018-09-14 09:55:45 -04:00
mazmazz	06b7367941	Added I_GetMusicType and removed midimode variable ... * Revised S_PlayMusic arguments * Now music plays again! (cherry picked from commit 55f3803e4b)	2018-09-14 09:42:29 -04:00
mazmazz	b59aa27104	Loose ends other targets ... (cherry picked from commit 9a5fc5f66a)	2018-09-14 09:41:08 -04:00
mazmazz	25361713dc	NiGHTS drone loop: Change flyangle comparison to fix detection from vertical angles ... Use > 90 && < 270 instead of >= 90 && <= 270. Fixes a bug where if you fly directly up (flyangle 90) or directly down (flyangle 270), that registers as a backwards direction, so you trigger the loop detection by flying BACKWARDS, not FORWARDS. This edge case (only possible via JUMPTOAXIS) should default to FORWARDS looping. (cherry picked from commit ce215195f8)	2018-09-14 08:58:19 -04:00
mazmazz	ba7d97733d	Fix NiGHTS drone loop detection by using pl->flyangle ... (cherry picked from commit 67e4381284)	2018-09-14 08:57:37 -04:00
mazmazz	3359b221d6	Merge remote-tracking branch 'public-gitlab/master' into public-op-nightsbumper-fix	2018-09-14 08:55:30 -04:00
mazmazz	b666fa3131	P_SpawnMapThing: Ignore MTF_ flags if MT_NIGHTSBUMPER ... (cherry picked from commit d85f108997)	2018-09-14 08:52:10 -04:00
mazmazz	f8834b0201	MT_NIGHTSBUMPER Spawn: Don't reset mthing->options ... (cherry picked from commit dc9fd6f02e)	2018-09-14 08:52:10 -04:00
mazmazz	e8a5735f75	Merge branch 'lightfade-ticbased' into le-fadefof	2018-09-14 08:42:02 -04:00
mazmazz	714464993e	420: Removed unnecessary include (gametic no longer needed)	2018-09-14 08:26:52 -04:00
Monster Iestyn	6fbc014ea3	Merge branch 'thwomp-fixes' into 'next' ... Thwomp fixes: Don't trigger on spectator; don't trigger on ~FF_EXISTS See merge request STJr/SRB2!277	2018-09-13 14:47:40 -04:00
mazmazz	db41034ad9	Block song position changes on GME because unstable	2018-09-13 13:27:42 -04:00
mazmazz	8e4569381f	Merge branch 'master' into musicplus-core	2018-09-13 13:24:46 -04:00
mazmazz	ca5602f13b	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-13 12:19:28 -04:00
mazmazz	adca20b07f	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-13 12:19:10 -04:00
mazmazz	07af82aa84	Missed fog boolean -> integer	2018-09-13 12:18:53 -04:00
mazmazz	761150b12d	455: Fog flag fix for fading	2018-09-13 12:18:10 -04:00
mazmazz	21506873be	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-13 12:10:14 -04:00
mazmazz	103db964fe	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-13 12:08:56 -04:00
mazmazz	6824e6a359	Make extracolormap_t->fog UINT8; it's not boolean, but categorical	2018-09-13 12:08:46 -04:00
Digiku	89a6694d67	Don't trigger thwomp on spectators	2018-09-13 11:32:40 -04:00
mazmazz	c32c72c401	Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS	2018-09-13 11:32:38 -04:00
mazmazz	3fc8ed5a9f	455: Set timing by either Back Y or Front Y, but not line length	2018-09-13 10:53:03 -04:00
mazmazz	94939f6613	455: Don't override fadergba on default/no colormap init (~BOUNCY)	2018-09-13 10:43:41 -04:00
mazmazz	5aa66f8872	455: Add speed increment timing (~EFFECT4) to FadeColormap	2018-09-13 10:43:32 -04:00
mazmazz	539092bec5	491, 492: Allow BLOCKMONSTERS raw translucency value in floorheight	2018-09-13 00:26:49 -04:00
mazmazz	4ab3a986f3	492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes ... * 490: Set proper render flags according to spawnflags * 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP) * 492: * Tic-based (EFFECT4) and speed timing * Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP) * Set proper render flags according to spawnflags * Fix OpenGL >= NUMTRANSMAPS render bug	2018-09-13 00:06:11 -04:00
mazmazz	0697a1b90a	PolyObjFade: Apply RENDER, SOLID, and NOSPECIALS flags according to spawnflags	2018-09-13 00:06:08 -04:00
mazmazz	2f9e014aab	490 PolyVisible: Set proper spawn render flags instead of RENDERALL	2018-09-13 00:06:06 -04:00
mazmazz	63a3125df2	420: A parenthesis	2018-09-12 21:49:03 -04:00
mazmazz	46067f0579	Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased	2018-09-12 21:35:46 -04:00
mazmazz	41fe080a68	420: Allow Back Y Offset for timing parameter	2018-09-12 21:32:12 -04:00
mazmazz	dc72835679	Merge branch 'colormap-overhaul' into colormap-overhaul-fade	2018-09-12 21:06:27 -04:00
mazmazz	3b05f7f925	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 21:06:07 -04:00
mazmazz	0b2caa948f	Init side->colormap_data pointer to NULL (for paranoia)	2018-09-12 21:05:50 -04:00
mazmazz	05c91f1f81	455: Change to side->colormap_data	2018-09-12 20:52:05 -04:00
mazmazz	17a78ba674	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-12 20:47:00 -04:00
mazmazz	1fcfa7fcf1	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 20:46:02 -04:00
mazmazz	f7ff440250	Add colormap_data to side_t and store colormaps there on setup	2018-09-12 20:43:48 -04:00
mazmazz	fad12d6be3	Merge branch 'master' into le-fadefof	2018-09-12 18:01:42 -04:00
mazmazz	30b9ed59c0	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-12 17:40:24 -04:00
mazmazz	ad9ef5d593	Merge errors	2018-09-12 17:39:30 -04:00
mazmazz	978b9bdea2	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 17:30:09 -04:00
mazmazz	c58e9b0bae	Merge remote-tracking branch 'origin/master' into colormap-overhaul	2018-09-12 17:28:22 -04:00
mazmazz	9fb9b44383	Fade FOF colormap support	2018-09-12 16:59:35 -04:00
mazmazz	06fa05f6cd	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-12 16:30:10 -04:00
mazmazz	8535fb01c2	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 16:29:02 -04:00
mazmazz	62b6950e33	Use lightlist.extra_colormap double pointers in OpenGL	2018-09-12 16:28:55 -04:00
mazmazz	9170174768	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 16:07:07 -04:00
mazmazz	7d36aae7c4	Make lightlists react to control sector colormap changes (double pointer)	2018-09-12 16:06:56 -04:00
mazmazz	42f1f0acdb	P_ResetFakeFloorFader: Argument order error with dolighting	2018-09-12 12:40:56 -04:00
mazmazz	d2f636d5a2	T_FadeColormap: Fade subtraction error	2018-09-12 11:33:44 -04:00
mazmazz	51a2982226	455: TFERLINE - Set target sector's colormap first to control backsector's colormap	2018-09-12 11:21:49 -04:00
mazmazz	b120331151	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 11:14:52 -04:00
mazmazz	92c5cb8233	Colormap savegame failsafe - Handle NULL (default colormap)	2018-09-12 11:13:49 -04:00
mazmazz	d85019b4e4	More NULL failsafes	2018-09-12 11:11:22 -04:00
mazmazz	e95cd0f962	Colormap savegame failsafe - Handle NULL (default colormap)	2018-09-12 11:06:18 -04:00
mazmazz	8190433b71	456: Missing break	2018-09-12 09:42:51 -04:00
mazmazz	ee51f586c2	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 09:11:35 -04:00
mazmazz	4d9925e8cf	447: ResetColormapFader when changing colormap explicitly	2018-09-12 09:09:10 -04:00
mazmazz	c4079dfca9	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-12 09:07:55 -04:00
mazmazz	14b71bdbc5	Fade colormap special 455! And stop fade colormap 456 ... * Added T_FadeColormap thinker and netsync * Added sector_t fadecolormapdata property	2018-09-12 09:06:38 -04:00
mazmazz	9a6a8b0b82	Outdated comment; unused var	2018-09-12 08:07:34 -04:00
mazmazz	cb2ac9b4d3	Formatting	2018-09-12 08:06:44 -04:00
mazmazz	7767adbf32	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 08:03:45 -04:00
mazmazz	4d26cf6330	447: Allow relative calc from backside colormap (ML_TFERLINE)	2018-09-12 07:55:47 -04:00
mazmazz	6f0b28c48f	447: Allow alternate alpha without relative calc	2018-09-12 07:38:51 -04:00
mazmazz	9a388af8ec	447: AddColormap no longer returns chained colormap, so chain it ourselves	2018-09-12 07:31:10 -04:00
mazmazz	55c43a2161	R_AddColormap will not return an existing colormap, and new colormap is not added to chain	2018-09-12 07:24:22 -04:00
mazmazz	867bde3789	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 07:15:26 -04:00
mazmazz	87ad2a87f7	Smarter default fadergbaA and fadeend for relative calc	2018-09-12 07:14:23 -04:00
mazmazz	133c3598a7	Add fadestart/fadeend/fog to R_AddColormaps	2018-09-12 07:07:26 -04:00
mazmazz	6059b8edc9	447: Extra params for R_AddColormaps	2018-09-12 07:06:58 -04:00
mazmazz	8754268abe	Add fadestart/fadeend/fog to R_AddColormaps	2018-09-12 07:06:45 -04:00
mazmazz	5e59b8c55a	Duplicate lines	2018-09-11 22:49:32 -04:00
mazmazz	b56ff10ce7	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 22:44:44 -04:00
mazmazz	92a97fb1a6	Split colormap netsync to Load/SaveExtraColormap methods	2018-09-11 22:44:31 -04:00
mazmazz	90aeac5058	Add R_CheckEqualColormaps comparison method	2018-09-11 22:43:12 -04:00
mazmazz	f0c11eb135	R_AddColormaps method	2018-09-11 21:03:55 -04:00
mazmazz	54669a6cc8	Use R_AddColormaps method in 447 relative calc	2018-09-11 21:03:13 -04:00
mazmazz	0fb594ad58	R_AddColormaps method	2018-09-11 21:02:58 -04:00
mazmazz	a1a05c9972	Add relative color change to 447	2018-09-11 19:11:50 -04:00
mazmazz	b9e4cd40ca	Use RGB/RGBA macros in 447 code	2018-09-11 17:32:43 -04:00
mazmazz	3e49cc68d2	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 17:31:35 -04:00
mazmazz	548f02eea1	Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA	2018-09-11 17:30:43 -04:00
mazmazz	5975f26177	Don't set sector's extra_colormap if we just made a default clone ... * Allow colormap parsing to proceed in p_setup always * Add R_CheckDefaultColormap * Add R_GetRgbaR/G/B/A macros	2018-09-11 17:08:57 -04:00
mazmazz	5523fc3a8d	Account for NULL colormaps in alpha-only code 447	2018-09-11 17:07:50 -04:00
mazmazz	f703c19502	Don't set sector's extra_colormap if we just made a default clone ... * Allow colormap parsing to proceed in p_setup always * Add R_CheckDefaultColormap * Add R_GetRgbaR/G/B/A macros	2018-09-11 17:06:44 -04:00
mazmazz	bb6cf6a807	Added alpha-only, relative calc, and offset params to 447 Change Colormap	2018-09-11 16:50:35 -04:00
mazmazz	71ade23739	Ifdef typo	2018-09-11 15:59:56 -04:00
mazmazz	fb7ac4ccae	Ifdef typo	2018-09-11 15:59:13 -04:00
mazmazz	c6dbf2e560	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 15:57:58 -04:00
mazmazz	c920827032	Consolidate colormap matching into R_GetColormapFromList	2018-09-11 15:56:21 -04:00
mazmazz	3290104922	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 15:50:21 -04:00
mazmazz	78aefc05cf	Consolidate colormap matching into R_GetExistingColormap	2018-09-11 15:50:12 -04:00
mazmazz	87cf18b60b	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 15:20:58 -04:00
mazmazz	85d89287de	Add R_CopyColormap	2018-09-11 15:20:30 -04:00
mazmazz	5dad8d15b0	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 15:03:04 -04:00
mazmazz	3da58f436c	Merge branch 'master' into colormap-overhaul	2018-09-11 15:02:35 -04:00
mazmazz	ba88f8ebb6	Smarter string digit parsing; allow alpha-only values ... * GetDefaultColormap and CheckDefaultColormapValues methods	2018-09-11 15:01:05 -04:00
mazmazz	8695a5f5df	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 13:46:47 -04:00
mazmazz	4ef016e40f	Clear colormaps properly (resolve sigsegv crash)	2018-09-11 13:46:34 -04:00
mazmazz	19fbb177ec	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 13:33:31 -04:00
mazmazz	506ce43627	Initialize extra_colormaps to NULL on program start	2018-09-11 13:31:09 -04:00
mazmazz	a818b9a1dc	Remove cr/cg/cb/ca in favor of rgba * Change default colormap values to be in sync with rgba/fadergba	2018-09-11 13:27:04 -04:00
Monster Iestyn	82a26580de	Merge branch 'master' into change-colormap-ldef	2018-09-11 16:43:01 +01:00
Monster Iestyn	fd783f09ea	Merge branch 'public_next' ... # Conflicts: # src/p_setup.c # src/r_data.c	2018-09-11 16:41:27 +01:00
Monster Iestyn	3218ab17e0	Merge branch 'master' into next	2018-09-11 16:34:16 +01:00
mazmazz	4494630cdd	Merge branch 'musicplus-core' into musicplus-sdlmixerx	2018-09-11 11:26:12 -04:00
mazmazz	63699c6e14	Merge branch 'musicplus-core' into musicplus-feature-postboss	2018-09-11 11:25:21 -04:00
mazmazz	5f87f4a47a	Don't decrement fade timer if song is paused	2018-09-11 11:20:46 -04:00
mazmazz	5ea8dc3dfa	Change to percentage calc from interval decrement for volume fade	2018-09-11 11:17:30 -04:00
mazmazz	9a52816cb4	Use percentage calc instead of interval decrement for tic-based fading	2018-09-11 10:28:24 -04:00
mazmazz	c468451a63	Merge branch 'lightfade-ticbased' into le-fadefof	2018-09-11 10:08:13 -04:00
mazmazz	36923ae7b0	Use percentage calc instead of interval decrement for tic-based timing	2018-09-11 10:05:25 -04:00
mazmazz	df4ea79ab7	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-10 22:37:34 -04:00
mazmazz	b7a216c78b	Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order	2018-09-10 22:37:27 -04:00
mazmazz	36522665c3	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-10 22:35:45 -04:00
mazmazz	17e101a24b	Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order	2018-09-10 22:35:26 -04:00
mazmazz	f29acffb19	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-10 21:57:09 -04:00
mazmazz	43ae25c4fd	Make default extracolormap on init ... * Calc fadedist in R_CreateLightTable	2018-09-10 21:56:57 -04:00
mazmazz	0c4f3cbeca	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-10 21:15:44 -04:00
mazmazz	22746c1d91	Savegame fixes	2018-09-10 21:15:34 -04:00
mazmazz	c007dfacec	Savegame fixes	2018-09-10 21:12:56 -04:00
mazmazz	75267dfa2c	Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef	2018-09-10 21:06:28 -04:00
mazmazz	3da38f2a9b	Fixed colormap matching code again * Added debug messages for matching code	2018-09-10 20:56:59 -04:00
mazmazz	1e4f5e8d45	Remove MAXCOLORMAPS	2018-09-10 20:41:12 -04:00
mazmazz	8d78c22194	extracolormap_t refinement and netsyncing ... * Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor) * Crunched some UINT16/32 into UINT8 * Calculate mask values in R_CreateLightTable * ifdef out EXTRACOLORMAPLUMPS	2018-09-10 20:36:34 -04:00
mazmazz	c92226890e	Remove bottommap and topmap from savegame because unused	2018-09-10 16:50:35 -04:00
mazmazz	7e9297d06e	Savegame netsync for sector colormaps; add spawn_midmap and co for comparison	2018-09-10 16:50:27 -04:00
mazmazz	7608583c6f	Fix shared colormap matching	2018-09-10 16:42:07 -04:00
mazmazz	53733ddf76	Type 606 renderer check allow OGL again	2018-09-10 16:32:54 -04:00
mazmazz	2701976ba3	Compiler fixes	2018-09-10 16:28:39 -04:00
mazmazz	e0d8a6eec0	Get rid of bottommap, midmap, topmap	2018-09-10 16:16:04 -04:00
mazmazz	574a591d43	P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block)	2018-09-10 16:08:43 -04:00
mazmazz	e33ed45b7b	Colormap overhaul in r_data.c ... * Split R_CreateColormap to R_CreateLightTable * Replace extra_colormaps array with next/prev pointer chain * Remove foundcolormaps; instead store lumpnum in extracolormap_t * Add properties to extracolormap_t for portability	2018-09-10 15:59:31 -04:00
mazmazz	fef38acc59	Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup	2018-09-10 13:24:57 -04:00
PrisimaTheFox	4ada0b0a9e	Update m_anigif.c ... Remember gif_frames starts at 0	2018-09-10 17:12:10 +01:00
PrisimaTheFox	d26ba2ee54	Update m_anigif.c ... More accurate GIF delay.	2018-09-10 17:12:04 +01:00
mazmazz	88d9da79e6	Move tic-based to EFFECT4	2018-09-10 12:00:44 -04:00
mazmazz	acea0bfd68	Move tic-based to EFFECT4, relative calc to EFFECT3	2018-09-10 12:00:15 -04:00
Monster Iestyn	40ff436829	Remove commented out stuff, now I've confirmed everything works fine without them	2018-09-10 15:49:21 +01:00
mazmazz	148e3ff538	Use ML_NOCLIMB for FF_TRANSLUCENT handling in type 452	2018-09-10 10:17:39 -04:00
mazmazz	8e75fe50db	Default to using back offset params if back linedef exists; else fallback to distance-based params	2018-09-10 10:11:27 -04:00
mazmazz	da5a7a013d	Add type 452 Set FOF Alpha ... * Fade FOF moved to type 453 * Stop Fade FOF moved to type 454	2018-09-10 10:09:02 -04:00
mazmazz	02a94dc941	Add distance-based params and make default (ML_DONTPEGBOTTOM to use back offsets)	2018-09-10 09:49:52 -04:00
mazmazz	b8da218b61	Add relative destvalue calc (ML_EFFECT4) ... * rover->alpha init fixes with invisible FOFs	2018-09-10 09:49:00 -04:00
mazmazz	e171e565ce	Remove bottommap and topmap from savegame because unused	2018-09-10 09:03:58 -04:00
mazmazz	002f1bad8f	Savegame netsync for sector colormaps; add spawn_midmap and co for comparison	2018-09-10 09:01:09 -04:00
mazmazz	a6f959ba21	Set mobj->floorrover and ceilingrover in appropriate places	2018-09-10 00:38:07 -04:00
mazmazz	0d88f31bbd	Add floorrover and ceilingrover to precipmobj_t	2018-09-10 00:23:23 -04:00
mazmazz	943dc9412d	Initialize floorrover and ceilingrover on SpawnMobj	2018-09-10 00:20:51 -04:00
mazmazz	832f891cbb	Remove rovernum increment from P_CheckPosition because unused	2018-09-10 00:13:32 -04:00
mazmazz	03d1baf422	Savegame floorrover fixes	2018-09-10 00:07:22 -04:00
mazmazz	5136293f62	Store sectornum/ffloornum as UINT32, not INT32	2018-09-09 23:52:36 -04:00
mazmazz	dd35871699	Savegame netsync for mobj->floorrover and ceilingrrover	2018-09-09 23:48:42 -04:00
mazmazz	f33f9dd284	Replace sectornum/rovernum index vars with ffloor pointers	2018-09-09 23:12:37 -04:00
mazmazz	9cc186441b	Fix fog visual glitch with fading	2018-09-09 22:14:24 -04:00
mazmazz	d01193df80	Apply ~FF_EXISTS moving plat fix for VERTICALFLIP	2018-09-09 21:59:41 -04:00
mazmazz	231f19aaab	Revert "Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists" ... This reverts commit cc11459054, reversing changes made to 7e3d5cd373.	2018-09-09 21:02:43 -04:00
mazmazz	573e1d0017	Replace firsttic with timer increment	2018-09-09 21:01:00 -04:00
mazmazz	7a3eb31b57	A number	2018-09-09 20:51:08 -04:00
mazmazz	0202bbcfd3	Replace firsttic with timer increment	2018-09-09 20:45:12 -04:00
mazmazz	703764d769	Merge branch 'lightfade-ticbased' into le-fadefof	2018-09-09 20:18:57 -04:00
mazmazz	3d5f225702	Replace firsttic with decrement timer	2018-09-09 20:18:43 -04:00
mazmazz	ea2276eb07	Fix tic-based bug returning early	2018-09-09 19:57:41 -04:00
mazmazz	43ae628adc	Cap lightlevel fading at spawn_lightlevel (don't make darker)	2018-09-09 19:44:35 -04:00
mazmazz	c3c4a251f1	Added tic-based logic to FOF fade (ML_EFFECT5)	2018-09-09 19:31:32 -04:00
Monster Iestyn	c0bf79ad8e	R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be! ... With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup	2018-09-09 22:48:09 +01:00
mazmazz	80a4a03f8e	Finalize light level on fade finish (not forced stop) ... * Added destlightlevel property to fade_t * Fixed dotranslucent, dolighting, docollision order weirdness in function calls	2018-09-09 17:20:35 -04:00
mazmazz	368f96e605	Fade FOF lighting fixes; properly calculate destlightvalue	2018-09-09 15:41:30 -04:00
mazmazz	ca58fba24a	Merge branch 'lightfade-ticbased' into le-fadefof	2018-09-09 13:44:30 -04:00
mazmazz	aeb45132c5	Revert "Snap light level to software values (32 levels)" ... This reverts commit cc26d03c93.	2018-09-09 13:43:00 -04:00
mazmazz	baababcf0b	Add spawn_lightlevel to sector_t	2018-09-09 12:44:35 -04:00
mazmazz	675f69afea	Flag re-organization ... * Change alternate param flag from BLOCKMONSTERS to DONTPEGBOTTOM * Change tic-based flag from NOCLIMB to EFFECT5	2018-09-09 09:34:36 -04:00
mazmazz	032f95803d	Merge branch 'master' into change-colormap-ldef	2018-09-09 08:40:38 -04:00
mazmazz	5032f783d7	Don't add a thinker if alpha is already equal	2018-09-09 08:10:45 -04:00
mazmazz	3f4656e57e	Polyobject Fade logic	2018-09-09 08:08:48 -04:00
mazmazz	eb590910b2	Added NIGHTSLINK bonus type for the 2.1 Link Bonus	2018-09-09 01:13:02 -04:00
mazmazz	0049f904c0	Add light fading to FadeFakeFloor ... * Declare P_RemoveLighting in header for p_spec.c use	2018-09-08 23:44:29 -04:00
mazmazz	4ca38dc8a1	Merge branch 'lightfade-ticbased' into le-fadefof	2018-09-08 23:03:18 -04:00
mazmazz	cc26d03c93	Snap light level to software values (32 levels) ... * New properties `exactlightlevel` and `lightlevel` in `lightlevel_t`	2018-09-08 23:01:35 -04:00
mazmazz	68e67917f1	Split P_FadeLight into P_FadeLightBySector	2018-09-08 22:14:49 -04:00
mazmazz	1e1b01c157	Implemented tic-based light fading ... * ML_BLOCKMONSTERS specifies destvalue and speed by texture offsets * ML_NOCLIMB toggles tic-based logic * Added props `duration`, `interval`, and `firsttic` to `lightlevel_t`	2018-09-08 22:10:51 -04:00
mazmazz	81acf82e99	Re-render lighting when setting FF_EXISTS	2018-09-08 20:49:32 -04:00
mazmazz	069cc480c1	Add dolighting flag to FadeFakeFloor thinker	2018-09-08 20:41:45 -04:00
mazmazz	3eb7c3931e	When detecting invisible FOFs, don't include light blocks	2018-09-08 20:08:48 -04:00
mazmazz	3858a93cfa	Initialize invisible FOF alpha to 1 on first fade	2018-09-08 09:31:23 -04:00
mazmazz	fa0918c2f1	Handle rendering flags for invisible FOFs	2018-09-08 09:08:32 -04:00
mazmazz	fcc7180d5c	Enable FF_CUTSOLIDS handling and updating by sector->moved	2018-09-08 08:59:17 -04:00
mazmazz	47c9bf2ebc	Disable FadeFakeFloor for laser block	2018-09-08 01:33:12 -04:00
mazmazz	dc964738eb	Never handle FF_EXISTS if FF_BUSTUP	2018-09-08 01:23:15 -04:00
mazmazz	66dc84509a	Fix Mario block triggering during ghost fade	2018-09-08 01:12:34 -04:00
mazmazz	b629104197	Also check for FF_SOLID	2018-09-08 01:07:08 -04:00
mazmazz	cc11459054	Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists	2018-09-08 00:37:04 -04:00
mazmazz	7e3d5cd373	Comment out tmfloorrover and tmceilingrover because unused	2018-09-08 00:36:43 -04:00
mazmazz	76d7a54b2b	Fix player Z snap to floor on moving platform ~FF_EXISTS ... * Track player's old floorz by mo->floor_sectornum and floor_ffloornum * Track tmfloorz by tmfloorrover, tmfloor_sectornum, tmfloor_rovernum * Ceiling variants of the above	2018-09-08 00:34:56 -04:00
mazmazz	f52f72256b	Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS	2018-09-07 18:14:52 -04:00
Monster Iestyn	316c08bbbb	Merge branch 'netcode-nitpicking' into 'next' ... Netcode nitpicking See merge request STJr/SRB2!274	2018-09-07 15:59:49 -04:00
mazmazz	0b365d0d08	Initial polyobj fade skeleton	2018-09-07 15:27:18 -04:00
mazmazz	bc2f48a018	Merge branch 'master' into nights-dronebox	2018-09-07 09:06:32 -04:00
mazmazz	3b39895e4f	Stray nights-onfootfix line	2018-09-07 09:01:38 -04:00
mazmazz	c0ffbdafce	Revert "Ideya fixes when a player has more than one Ideya" ... This reverts commit e3facccb9d.	2018-09-07 08:56:53 -04:00
mazmazz	4fe1b2652d	Merge branch 'master' into nights-fastercapsule	2018-09-07 08:56:02 -04:00
mazmazz	49b27fc124	Deduct marescore immediately on instakill ... * Deduct player->spheres too, missed that one	2018-09-07 08:19:22 -04:00
mazmazz	c50a0d60f5	Merge branch 'master' into nights-keeppoints	2018-09-07 08:13:57 -04:00
mazmazz	4147773d0c	Merge branch 'master' into le-fadefof	2018-09-06 18:12:24 -04:00
mazmazz	9e5b9ac50e	Flicky colors indexing fix	2018-09-06 13:20:55 -04:00
mazmazz	956d48b5e0	Compiler errors	2018-09-06 13:16:50 -04:00
mazmazz	bd6bc368a3	Stray comments	2018-09-06 12:13:03 -04:00
mazmazz	1c273cdcc8	Make default flicky home radius 384	2018-09-06 11:59:55 -04:00
mazmazz	e75213b14d	Limit random fish color to SRB2's defaults	2018-09-06 11:56:55 -04:00
mazmazz	f15bb2dfba	Change default radius to 448 ... * Put default radius back in FLICKY_CENTER states	2018-09-06 11:54:06 -04:00
mazmazz	0c2340b0bc	Impose home radius on aimless flickies; improve randomness of flickyhitwall angle	2018-09-06 11:17:08 -04:00
mazmazz	f8d260b044	Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE)	2018-09-06 10:32:26 -04:00
mazmazz	7d834ff894	Erase default home radius from states and impose default on home check	2018-09-06 10:20:01 -04:00
mazmazz	2cfd941778	Re-organize flags for FLICKY_CENTER ... * Flickies can be in-place with just one flag (MF_GRENADEBOUNCE) * Flickies can now hop whether orbiting, aimless, or in-place * Removed ability to customize movedir for orbit; will always be random * Removed ability to customize gravity sink for aimless flying flickies * Misc: Use P_SetTarget to set actor->tracer for flicky center	2018-09-06 10:17:41 -04:00
mazmazz	fe2d1e9020	Merge branch 'master' into flicky-things	2018-09-06 08:09:02 -04:00
mazmazz	f000a68150	Impose default radius for orbiting flickies	2018-09-06 08:08:53 -04:00
mazmazz	21a55a4702	Make default behavior: aimless flying flickies stay at Z height	2018-09-06 08:07:13 -04:00
mazmazz	956b83729b	Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine	2018-09-06 07:55:15 -04:00
mazmazz	e5dd74eb45	Change flicky thing #s to 2200s	2018-09-06 07:24:46 -04:00
Monster Iestyn	16c7c264a5	Wrap the text and snap to bottom	2018-09-04 19:52:50 +01:00
Monster Iestyn	bffaafd61e	Add V_DrawTutorialBack for drawing a console-like background box, add Lorem ipsum as filler test	2018-09-04 19:21:58 +01:00
Monster Iestyn	df51997022	Merge branch 'master' into tutorial-time	2018-09-04 17:06:50 +01:00
Monster Iestyn	2b0ce807c7	Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround	2018-09-04 17:04:24 +01:00
Monster Iestyn	aba9bd13bb	Add "tutorialmode" var to help the game know when we're in a tutorial or not, add placeholder for tutorial HUD to test it works	2018-09-04 16:58:49 +01:00
Monster Iestyn	bcc9e58d0e	Merge branch 'master' into tutorial-time	2018-09-04 15:54:50 +01:00
Monster Iestyn	2ac50cd2b7	Merge branch 'public_next' ... # Conflicts: # src/r_main.c	2018-09-04 15:53:07 +01:00
Monster Iestyn	38ac999d77	Merge branch 'addfile-verify-fix' into 'next' ... Addfile command verify fix. See merge request STJr/SRB2!272	2018-09-03 17:17:46 -04:00
Monster Iestyn	ea06e8a62b	SOCK_Send: Split the actual sending data parts into a new function, SOCK_SendToAddr, to make everything look a bit neater in general	2018-09-03 20:53:40 +01:00
Monster Iestyn	7b083f07cd	UDP_Socket: I doubt client addresses are meant to be included in the total for broadcast addresses	2018-09-03 15:56:02 +01:00
Monster Iestyn	846bddfdcf	SOCK_Send: Fix what appears to be a mistaken use of i instead of j	2018-09-03 15:52:22 +01:00
Monster Iestyn	24aafa6dac	UDP_Socket: Add missing limit checks for s, for client and broadcast addresses	2018-09-03 15:43:36 +01:00
Digiku	01314b6674	Merge branch 'nightsplus-le' into 'master' ... NiGHTS Linedef Executor Triggers Closes #102 See merge request STJr/SRB2Internal!142	2018-09-02 18:10:50 -04:00
mazmazz	cea76fe41f	Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx	2018-09-02 08:16:40 -04:00
mazmazz	bb1af344ee	Linux Compiler fix HAVE_MIXERX cvars	2018-09-02 08:15:55 -04:00
Monster Iestyn	6ae78da47e	Merge branch 'master' into next	2018-09-02 13:00:56 +01:00
Steel Titanium	54fec7fa5c	Merge branch 'master' into addfile-verify-fix	2018-09-01 19:33:59 -04:00
mazmazz	dabd7f99e6	Add MUSICPOSTBOSSFADEIN	2018-09-01 13:10:50 -04:00
mazmazz	1681e6cc00	Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx	2018-09-01 11:38:26 -04:00
mazmazz	7fbe97a3d2	Reset MIDI music properly on settings change ... * Added reset flag to S_Start (now S_StartEx)	2018-09-01 11:37:53 -04:00
mazmazz	c8a9edca8d	Revert "Fix MIDI music not reloading sometimes on settings change" ... This reverts commit aa48278fd4.	2018-09-01 11:35:54 -04:00
mazmazz	aa48278fd4	Fix MIDI music not reloading sometimes on settings change	2018-09-01 11:34:03 -04:00
mazmazz	f0244c8b71	Fix MIDI music not reloading sometimes on settings change	2018-09-01 11:33:39 -04:00
mazmazz	9180f9b7ef	Add Mixer X retrieve song length and position natively, if available	2018-08-31 13:52:01 -04:00
mazmazz	8098d120cc	Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx	2018-08-31 12:19:03 -04:00
mazmazz	58ef056d48	Fix MIDI not reloading when erroring on a player	2018-08-31 12:18:54 -04:00
Monster Iestyn	322da62b3c	Fix HOM removal not working properly for non-green resolutions	2018-08-31 17:14:44 +01:00
Steel Titanium	0f5d685d1f	Only do this if the admin player isn't the server host also.	2018-08-30 18:32:26 -04:00
Monster Iestyn	4083ee9df7	Apparently I am blind and missed that splitscreen only CC offset that overrides the code for the other offset below	2018-08-30 20:08:17 +01:00
mazmazz	fed72c344a	Dummy out NiGHTS item faster attract	2018-08-30 10:50:03 -04:00
mazmazz	dae37e2749	Drill mash penalty fix	2018-08-30 09:09:19 -04:00
mazmazz	a44be49535	Merge remote-tracking branch 'origin/master' into nights-inufixes	2018-08-30 08:13:34 -04:00
Monster Iestyn	ceb0abb081	Fix compiler complaints, remove a slipup of mine from when I was dealing with merge conflicts	2018-08-29 22:07:38 +01:00
Monster Iestyn	7db7a739d4	Use INFLIVES macro in place of 0x7f for infinite lives check	2018-08-29 21:31:15 +01:00
Monster Iestyn	5eddb1f455	Merge branch 'master' into hud-n-menu-tidbits	2018-08-29 21:28:11 +01:00
Monster Iestyn	523a02aa54	Merge branch 'master' into hud-cleaning	2018-08-29 20:46:35 +01:00
Monster Iestyn	1c5080151d	Fix typo introduced by changes to the setrings command	2018-08-29 20:46:08 +01:00
mazmazz	38bb71bada	Add mapmusposition placeholder to LE 413 change music	2018-08-29 15:21:17 -04:00
Monster Iestyn	a48326383c	Merge branch 'master' into hud-cleaning ... # Conflicts: # src/y_inter.c	2018-08-29 16:39:02 +01:00
mazmazz	6d97a10273	Merge remote-tracking branch 'origin/master' into nightsplus-le	2018-08-29 11:06:00 -04:00
mazmazz	dc86fe9b5f	Merge remote-tracking branch 'origin/master' into nightsplus-laplogic	2018-08-29 10:16:49 -04:00
Digiku	e0601616fe	Merge branch 'nights-bumper-fix' into 'master' ... NiGHTS: Fix player positioning when touching Bumper See merge request STJr/SRB2Internal!165	2018-08-29 06:02:24 -04:00
Digiku	a28cc10861	Merge branch 'op-nights-bumper' into 'master' ... Objectplace: Place NiGHTS Bumpers with the player's fly angle See merge request STJr/SRB2Internal!166	2018-08-29 06:01:27 -04:00
Digiku	f8332f6765	Merge branch 'nights-nightserizeangle' into 'master' ... NiGHTS: Reset player another/flyangle on De/Nightserize See merge request STJr/SRB2Internal!139	2018-08-29 04:27:02 -04:00
Digiku	4882b7c3f8	Merge branch 'intermission-bonuslivesmax' into 'master' ... Intermission: MaxBonusLives level header option for # of lives in score tally See merge request STJr/SRB2Internal!162	2018-08-29 04:25:03 -04:00
Digiku	9746442a93	Merge branch 'le-ringspheres' into 'master' ... Line Execs: Make Ring triggers accept spheres in NiGHTS levels See merge request STJr/SRB2Internal!163	2018-08-29 04:24:47 -04:00
Digiku	78c78d9e63	Merge branch 'sphere-ring-concurrence' into 'master' ... Change SETSPHERES console command to SETRINGS to handle player->spheres transparently See merge request STJr/SRB2Internal!167	2018-08-29 04:24:23 -04:00
mazmazz	b0be27a54e	Fix music fade out when MUSICPOSTBOSS is not specified or doesn't exist	2018-08-28 18:46:30 -04:00
Monster Iestyn	73a66d22df	At toaster's suggestion, have 2p control whether closed captioning is moved up if the powerup display is 1st person only	2018-08-28 20:57:43 +01:00
Monster Iestyn	1af8d3ac02	Merge branch 'master' into hud-n-menu-tidbits ... # Conflicts: # src/m_menu.c # src/screen.c # src/st_stuff.c	2018-08-28 20:51:46 +01:00
Monster Iestyn	58a844d3cf	Merge branch 'public_next' ... # Conflicts: # src/r_things.c # src/v_video.c	2018-08-28 19:31:08 +01:00
mazmazz	9c35b3dfc5	Merge branch 'musicplus-core' into musicplus-sdlmixerx	2018-08-28 10:27:49 -04:00
mazmazz	9a5b8ec671	Merge branch 'musicplus-core' into musicplus-feature-postboss	2018-08-28 10:23:13 -04:00
mazmazz	75e6ad72ed	Fix MIDI looping/non-looping	2018-08-28 10:16:06 -04:00
mazmazz	0bea5729a7	Revise LUAh_MusicChange hook	2018-08-28 10:10:56 -04:00
mazmazz	9244a13721	Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx	2018-08-27 08:40:36 -04:00
mazmazz	359a71c059	Move cvars to D_RegisterClientCommands for config recall	2018-08-27 08:40:24 -04:00
mazmazz	36d650c530	Remove MP3 warning for win32 Mixer X	2018-08-27 06:16:55 -04:00
mazmazz	b760fbe89b	Corrected unterminated #endif in sdl_sound	2018-08-27 06:15:01 -04:00
mazmazz	b701316505	Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx	2018-08-27 05:59:55 -04:00
mazmazz	07ae007980	Remove unused methods (for now?)	2018-08-27 05:53:43 -04:00
mazmazz	9f6e913d43	Load Fluidsynth soundfont upon cvar change	2018-08-27 05:52:01 -04:00
mazmazz	878dc1af92	Lazy midi reload support on menu	2018-08-27 00:43:25 -04:00
mazmazz	535aed24bb	Advanced submenu for sound options	2018-08-26 23:58:43 -04:00
mazmazz	cc9d554dfd	Revert "Sound scroll menu attempt" ... This reverts commit 7b11855041.	2018-08-26 23:46:55 -04:00
mazmazz	7b11855041	Sound scroll menu attempt	2018-08-26 23:46:20 -04:00
mazmazz	28545822ba	Checkpoint: Add FluidSynth and Timidity support	2018-08-26 23:03:38 -04:00
mazmazz	8ee27d3297	Makefile comments	2018-08-26 23:02:57 -04:00
Monster Iestyn	61836e1565	Merge branch 'master' into next	2018-08-26 21:10:41 +01:00
mazmazz	65e5794ee3	HAVE_MIXERX and NOMIXERX compile flags (win32 only)	2018-08-26 15:12:00 -04:00
mazmazz	73b4c4c5b4	Fix S_ChangeMusic newmusic -> mmusic, merge error	2018-08-26 14:22:14 -04:00
mazmazz	768ce1a46f	Make SDL Mixer X win32-exclusive	2018-08-26 14:20:41 -04:00
mazmazz	35fdcee071	Merge branch 'music-cleanup' into music-sdlmixerx	2018-08-26 14:04:54 -04:00
toaster	710550bb9d	Missed one!	2018-08-26 12:38:53 +01:00
mazmazz	0f42363a97	Fixed post-boss music change with mapmusname comparison	2018-08-25 22:19:15 -04:00
mazmazz	a7ae059949	Case-insensitive music_name comparison	2018-08-25 22:00:31 -04:00
mazmazz	c82a5de4b7	Merge branch 'musicplus-core' into musicplus-feature-postboss	2018-08-25 21:55:49 -04:00
mazmazz	9f3549e5e1	Remove tolower music_name, because we do case-insensitive matching now	2018-08-25 21:53:22 -04:00
mazmazz	01c6dbed5c	Case-insensitive music matching	2018-08-25 21:50:56 -04:00
mazmazz	48b6255e93	Case-insensitive music_name comparison	2018-08-25 21:42:39 -04:00
mazmazz	083de09f88	Load mapmus vars post-boss even if another tune is playing, like a jingle	2018-08-25 17:42:46 -04:00
Monster Iestyn	d5ab3e75a5	Merge branch 'v_video_killed_the_r_radio_star' into 'master' ... v_video Killed The r_radio Star See merge request STJr/SRB2!270	2018-08-25 16:43:25 -04:00
Monster Iestyn	ed5bed4d2c	Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master' ... Zalloc Potter and the Death-Free Hallows See merge request STJr/SRB2!269	2018-08-25 16:43:14 -04:00
mazmazz	7d882c482f	UINT32 muspostbosspos fix	2018-08-25 16:28:56 -04:00
mazmazz	4dd6b733d6	MUSICPOSITION -> MUSICPOS ... * Added muspos level header var to lua # Conflicts: # src/dehacked.c # src/lua_maplib.c # src/p_setup.c	2018-08-25 16:23:01 -04:00
mazmazz	493bc86b08	MUSICPOSITION -> MUSICPOS ... * Added muspos level header var to lua	2018-08-25 16:21:34 -04:00
mazmazz	ed8288a028	MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS	2018-08-25 16:18:09 -04:00
toaster	85474e33dd	Introduce a temporary measure to enable the old stuff, minus one of the most obviously terrible bugbears of yesteryear. Let it be known that any downstream poirt will almost certainly toggle this ASAP.	2018-08-25 21:17:34 +01:00
mazmazz	21d08b39bf	Merge branch 'musicplus-core' into musicplus-feature-postboss ... # Conflicts: # src/dehacked.c # src/p_setup.c	2018-08-25 16:11:29 -04:00
mazmazz	610a83f60e	Added MUSICPOSTBOSSTRACK and MUSICPOSTBOSSPOSITION level header/variables	2018-08-25 16:10:46 -04:00
mazmazz	a3ed60d7bd	Added MUSICPOSTBOSS level header for boss post-defeat music	2018-08-25 16:02:12 -04:00
mazmazz	578e386e40	Add MUSICPOSITION level header and mapmusposition variable to instantly jump to position ... * Cutscene support too!	2018-08-25 15:59:20 -04:00
mazmazz	78ea3bebfe	Remove S_ChangeMusic call in G_PlayerReborn because redundant to S_Init	2018-08-25 15:23:48 -04:00
toaster	80ac2366ba	Clean up a bunch of v_video.c functions that previously exhibited unfortunate side effects when run in non-green resolutions. ... * V_DrawFixedPatch and ilk: * Change the offset of V_FLIP so it's not one screen-pixel off where its non-flipped sprite would have started being drawn from. * Write to x and y as well as desttop so that anti-screen-overflow checks later in the function behave properly with non-green resolutions. * V_DrawFill: * Reduce number of operations performed upon `c`. * V_DrawString and ilk: * Offset the left and right boundary checks in non-green resolutions such that you can actually draw stuff to the left of basevid screen x coordinate 0.	2018-08-25 19:52:17 +01:00
Digiku	cddb743fe1	Merge branch 'op-nightshoop' into 'master' ... NiGHTS objectplace: Place new hoop 1713 instead of 1705 See merge request STJr/SRB2Internal!136	2018-08-25 13:23:51 -04:00
mazmazz	4f388428bc	Add MUSIC_FORCERESET flag	2018-08-25 13:18:14 -04:00
toaster	91eb248e46	Fix up them there ghosts! ... * Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know? * Make ghosts spawn properly on slopes.	2018-08-25 17:11:49 +01:00
toaster	973b3c3f5e	Continuing my recent streak of making random lighting/colormap-related fixes to long-standing bugs: ... * Fix that thing where ALL transparent FOF planes were continuously fullbright unless encased in a fog which disables sprite fullbrightness, which was long-hated by many people in the community! * For backwards compatibility, setting flag 1 in that fog field (which is probably the most common "in-the-wild" usage of this feature) will continue to make objects un-fullbright. * For situations where you desperately want the behaviour to be enabled, you can apply fog flag 2. * Change the fadestart and fadeend range in which colormaps are generated. * The problem HERE was that the darkest light level reached by generated colormaps was actually slightly brighter than the darkest level reached by normal colormaps. * The typo I fixed does have SOME basis in fact - standard colormap lumps are 34 (33 in 0-indexing) long rather than 32 (31), but whoever wrote this didn't realise that the code for generating them didn't do it DooM style, just bright-to-dark with no extras on the end...	2018-08-25 16:46:45 +01:00
mazmazz	d9ab1e4424	Lua add S_MusicName	2018-08-25 08:08:30 -04:00
mazmazz	838d47acd3	Add S_MusicName back as a convenience function ... * Move MUSICRATE to doomdef.h	2018-08-25 08:08:25 -04:00
mazmazz	ec2bc29bb1	Add MUSICRATE to dehacked	2018-08-25 08:08:04 -04:00
mazmazz	942276fab0	#ifdef MUSICRATE 1000 for adjustable music timings	2018-08-25 08:07:34 -04:00
wolfy852	6ddee877c5	Expose NEWTICRATE and NEWTICRATERATIO to Lua ... This should keep 70FPS-compatible scripts from throwing nil value errors.	2018-08-25 03:40:43 -05:00
mazmazz	4f075bfb5d	Update functions for other targets	2018-08-24 18:20:53 -04:00
mazmazz	e88d147761	I_SongPlaying detect GME properly	2018-08-24 18:03:50 -04:00
mazmazz	eae5d3333f	Stub I_UnloadSong because we already unload in I_StopMusic ... * Stop-gap for now. Ideally the logic would be in the respective places. # Conflicts: # src/sdl/mixer_sound.c	2018-08-24 18:02:46 -04:00
mazmazz	d39b7011c5	Volume fixes ... # Conflicts: # src/sdl/mixer_sound.c	2018-08-24 18:01:57 -04:00
mazmazz	9d0d101d03	I_SongPlaying detect GME properly	2018-08-24 18:00:39 -04:00
mazmazz	4d91b44c63	Detect GME more simply	2018-08-24 17:58:56 -04:00
mazmazz	bd01c75a4e	Stub I_UnloadSong because we already unload in I_StopMusic ... * Stop-gap for now. Ideally the logic would be in the respective places.	2018-08-24 17:56:22 -04:00
mazmazz	a688de5dc2	Volume fixes	2018-08-24 17:56:14 -04:00
mazmazz	fb6f8c8a07	A word	2018-08-24 13:41:26 -04:00
mazmazz	df455fc638	Merge branch 'music-cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into music-cleanup	2018-08-24 13:36:07 -04:00
mazmazz	5f21bf230d	GME fix: play song in I_PlaySong, not I_LoadSong	2018-08-24 13:35:41 -04:00
mazmazz	bf4e7d2dd6	Lua S_MusicInfo fix and FMOD GME fix: play song in I_PlaySong, not I_LoadSong	2018-08-24 13:12:14 -04:00
mazmazz	bf61dbb6e2	Checkpoint: Revised fading routines for new load/play pattern ... * Perform fade-out/fade-in using callbacks * Move queued music from interface to s_sound	2018-08-24 13:11:38 -04:00
mazmazz	b5ef4e04d8	Lua method reordering for Musicplus ... * Change to S_MusicName to S_MusicInfo for API	2018-08-23 21:23:55 -04:00
mazmazz	a2d626384a	Merge branch 'music-cleanup' into musicplus-core ... Pending rewrite of fade music changing # Conflicts: # src/android/i_sound.c # src/djgppdos/i_sound.c # src/i_sound.h # src/s_sound.c # src/s_sound.h # src/sdl/mixer_sound.c # src/sdl/sdl_sound.c # src/win32/win_snd.c	2018-08-23 21:07:39 -04:00
mazmazz	9e6eebeb8d	Refactor I_MusicType MusicPlaying and MusicPaused other targets	2018-08-23 20:23:16 -04:00
mazmazz	4b82de9e54	Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ...	2018-08-23 20:14:46 -04:00
Monster Iestyn	aee7dce891	Rewrite seenames HUD code even more; use text color flags rather than the special text color chars	2018-08-23 23:00:15 +01:00
mazmazz	cf065e106f	Refactoring and reordering other targets	2018-08-23 17:54:40 -04:00
Monster Iestyn	011459790f	Add INFLIVES as a constant that Lua/SOC can use	2018-08-23 22:18:52 +01:00
Monster Iestyn	e2c280504b	Make switch case for cv_seenames.value in ST_Drawer	2018-08-23 22:09:48 +01:00
mazmazz	a7d51bf810	Minor refactoring and reordering ... * I_GetMusicType() -> I_MusicType() * Wrap MIDI volume hack in #ifdef _WIN32	2018-08-23 17:05:37 -04:00
Monster Iestyn	6a88a65b94	Add quick macro for drawing the 1st person timer icons with timer string, add comments to ST_drawPowerupHUD	2018-08-23 22:00:37 +01:00
mazmazz	f6ec93198f	Play the opposite type music (Digital/MIDI) when toggling between them in menu ... * S_MusicInfo method to retrieve name, flags, and looping	2018-08-23 16:46:40 -04:00
Monster Iestyn	0948b12eae	ST_drawNiGHTSHUD tweaks: Split NiGHTS link drawing into its own function, remove "minlink" hack and just do things properly	2018-08-23 21:13:45 +01:00
Monster Iestyn	d2a4408610	Make switch case for stplyr->textvar in ST_drawNightsRecords	2018-08-23 20:27:40 +01:00
Monster Iestyn	aa863e481e	Add INFLIVES macro, to make it easier to find infinite lives-related code	2018-08-23 20:09:39 +01:00
mazmazz	4aa100aa57	Toggle Digi/MIDI music in menu accurately; add S_MusicType	2018-08-23 13:09:20 -04:00
mazmazz	86f151db65	nodigimusic nomusic nosound refactor other targets	2018-08-23 12:43:38 -04:00
mazmazz	07738fb0bc	nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled	2018-08-23 12:42:57 -04:00
mazmazz	d5ec388159	I_MusicPlaying, I_MusicPaused other targets	2018-08-23 12:31:01 -04:00
mazmazz	f5f0b5e76c	Refactoring, music statues ... * S_Init -> S_InitSfxChannels because it did mostly SFX anyway * S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods * I_MusicPlaying, I_MusicPaused	2018-08-23 12:30:47 -04:00
mazmazz	9fb9386f84	Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets	2018-08-23 11:54:58 -04:00
mazmazz	701cc5a7dd	Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method ... * In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables * Simplified Dig/MidiMusicDisabled in s_sound * Method reordering	2018-08-23 11:54:36 -04:00
mazmazz	14b393ab16	Added I_GetMusicType and removed midimode variable: other targets	2018-08-23 10:19:04 -04:00
mazmazz	55f3803e4b	Added I_GetMusicType and removed midimode variable ... * Revised S_PlayMusic arguments * Now music plays again!	2018-08-23 10:18:38 -04:00
mazmazz	9a5fc5f66a	Loose ends other targets	2018-08-23 09:37:02 -04:00
mazmazz	e89eccf78e	Loose ends from previous work ... * Pause/ResumeSong remove handle argument * LoadSong declare char *data argument * Variable weirdness	2018-08-23 09:36:51 -04:00
mazmazz	3ec1a122e0	Revert "Nix'd midimusicvolume other targets" ... This reverts commit 58fbb4636f. # Conflicts: # src/android/i_sound.c # src/dummy/i_sound.c # src/win32/win_snd.c	2018-08-23 09:09:12 -04:00
mazmazz	75cbfab8c6	Playback routines other targets	2018-08-23 09:06:31 -04:00
mazmazz	7efab8b314	Revert "Nix'd midimusicvolume", don't know what I want to do with this yet ... This reverts commit b5c3095820. # Conflicts: # src/i_sound.h # src/s_sound.c # src/s_sound.h # src/sdl/mixer_sound.c	2018-08-23 09:06:13 -04:00
mazmazz	e42defa299	Playback routines: Load, Play, Pause, Stop, Unload ... * Re-purpose I_LoadSong for digital music loading * I_StartDigSong logic split between I_LoadSong and I_PlaySong * Pause, Stop, and Unload routines are combined from Digi and MIDI * music_lumpnum, music_data, music_handle from s_sound.c are gone	2018-08-23 09:02:14 -04:00
mazmazz	0bc9576eb0	Revert "CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong" ... This reverts commit 8b46bce155.	2018-08-23 07:50:02 -04:00
mazmazz	8b46bce155	CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong ... * music_lumpnum, music_data, music_handle are gone * Relevant interfaces I_PlaySong are transferred to I_StartDigSong	2018-08-23 07:49:09 -04:00
mazmazz	58fbb4636f	Nix'd midimusicvolume other targets	2018-08-23 07:39:45 -04:00
mazmazz	b5c3095820	Nix'd midimusicvolume	2018-08-23 07:39:32 -04:00
Monster Iestyn	e37f6585fa	Merge branch 'master' into tutorial-time	2018-08-22 21:30:29 +01:00
Monster Iestyn	f8c4c6dbc4	Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125	2018-08-22 17:16:11 +01:00
mazmazz	7d64c3114c	SDL Mixer X compile on Windows x86	2018-08-22 00:17:25 -04:00
mazmazz	3829998889	Initial work on SDL Mixer X	2018-08-21 14:57:53 -04:00
mazmazz	76f9890328	Position fixes with looppoint	2018-08-21 11:58:38 -04:00
Monster Iestyn	e88ebb6f75	Merge branch 'master' into tutorial-time	2018-08-21 15:41:35 +01:00
Monster Iestyn	87e37e21df	Merge branch 'public_next' ... # Conflicts: # src/sdl12/i_cdmus.c # src/win32ce/win_cd.c	2018-08-21 15:40:54 +01:00
Monster Iestyn	2daaf637d9	Merge branch 'master' into next	2018-08-21 15:36:36 +01:00
Monster Iestyn	9d3aad9036	Merge branch 'XPMupdate' into 'master' ... update XPM icon See merge request STJr/SRB2!267	2018-08-21 10:31:25 -04:00
mazmazz	6fac87cab2	S_MusicPlaying safety	2018-08-21 08:56:05 -04:00
mazmazz	5db6df59b5	S_ChangeMusicWithFade fixes ... * MusicSlot compatibility name fix	2018-08-21 08:55:53 -04:00
mazmazz	d6aa2c23aa	Lua FadeMusicFromVolume, GetMusicName refactor	2018-08-21 08:54:23 -04:00
mazmazz	f6789a6eb7	I_FadeSongFromLevel -> I_FadeSongFromVolume refactor other targets	2018-08-21 08:54:04 -04:00
mazmazz	2289a3bd79	I_FadeSongFromLevel -> I_FadeSongFromVolume refactor ... * S_MusicName->GetMusicName refactor * S_ChangeMusicWithFade->ChangeMusicAdvanced refactor	2018-08-21 08:53:51 -04:00
mazmazz	506db1e303	Interface name refactor: Music -> Song other targets	2018-08-21 06:22:42 -04:00
mazmazz	a1b1391e24	Interface name refactor: Music -> Song ... * Music refers to the music system, song refers to the entity being played. * s_sound doesn't follow this, everything is music	2018-08-21 06:22:35 -04:00
Monster Iestyn	dcf843e485	Merge branch 'defaultsoundvol' into 'master' ... Change default sound volume See merge request STJr/SRB2!238	2018-08-20 09:41:04 -04:00
mazmazz	17e2c3f5be	Debug messages	2018-08-20 08:47:41 -04:00
mazmazz	18daf255ee	Rename I_QueueDigSongPostFade to I_QueueDigSong	2018-08-20 01:16:52 -04:00
mazmazz	9539c597dd	Midimode safeties for song queueing/fading	2018-08-20 01:14:29 -04:00
mazmazz	6d8e3c2ac1	Lua comment	2018-08-20 01:14:16 -04:00
mazmazz	6b028049e0	Music lump existence minor fixes	2018-08-20 01:14:01 -04:00
mazmazz	60c9e5ab37	Lua player argument fixes, GetMusicLength and FadeMusic	2018-08-20 00:21:35 -04:00
mazmazz	9eeed6338f	Allow queueing music at end of song, not just fading	2018-08-20 00:12:23 -04:00
mazmazz	e51f9ecf90	* Allow S_ChangeMusic to queue the same track for fading ... * StopDigSong upon running queue so that GME works for queueing	2018-08-19 23:20:40 -04:00
mazmazz	fb0d1b45ac	I_FadeOutStopMusic, I_FadeInStartDigSong, S_ChangeMusic lua	2018-08-19 22:06:09 -04:00
mazmazz	9410676737	I_FadeOutStopMusic, I_FadeInStartDigSong other targets	2018-08-19 22:05:55 -04:00
mazmazz	2cf49f9361	I_FadeOutStopMusic, I_FadeInStartDigSong, S_ChangeMusicWithFade implementation ... * First attempt, a little messy but works fine	2018-08-19 22:05:42 -04:00
mazmazz	87b6fc613b	I_FadeMusicFromLevel/I_FadeMusic change for other targets	2018-08-19 17:02:27 -04:00
mazmazz	b844a908a1	Make S_FadeMusicFromLevel accept mandatory source_volume ... * Make S_FadeMusic a legitimate function to grab current internal volume	2018-08-19 17:02:13 -04:00
mazmazz	3d8c4585d4	Checkpoint	2018-08-19 16:25:12 -04:00
mazmazz	9b50eec56a	S_FadeMusic[FromLevel] and S_StopFadingMusic Lua ... * Fixed some arg position weirdness with other music lua funcs	2018-08-19 16:20:14 -04:00
mazmazz	5117bdebfe	S_FadeMusic[FromLevel] and S_StopFadingMusic other targets	2018-08-19 16:19:55 -04:00
mazmazz	918976bdcc	S_FadeMusic[FromLevel] and S_StopFadingMusic implementation	2018-08-19 16:19:48 -04:00
mazmazz	000847654e	I_SetInternalMusicVolume lua	2018-08-19 09:39:32 -04:00
mazmazz	7d03c19409	I_SetInternalMusicVolume other targets	2018-08-19 09:39:11 -04:00
mazmazz	d5dfde240d	I_SetInternalMusicVolume implementation	2018-08-19 09:38:57 -04:00
mazmazz	51228b328c	Framework for internal_volume; more fade code	2018-08-19 09:16:52 -04:00
mazmazz	69153194fe	Merge branch 'musicplus-core' into musicplus-fade-sdltimer	2018-08-19 08:35:56 -04:00
mazmazz	6ea002b1b5	Enable midi_volume, it actually works	2018-08-19 08:34:03 -04:00
mazmazz	47495e72b5	Fade checkpoint	2018-08-19 08:32:12 -04:00
mazmazz	c4ea18b2bb	Add LIBGME ifdefs	2018-08-19 06:43:57 -04:00
Latapostrophe	40b4d63620	Fix capslock being wonky.	2018-08-19 11:25:20 +02:00
Latapostrophe	b09019dc4a	Fix old chat detection.	2018-08-19 11:12:21 +02:00
Latapostrophe	8747a8529d	Changed chat position, ... Added chat back tint Fixed word wrapping glitches	2018-08-19 10:58:29 +02:00
mazmazz	a38664e109	Minor cleanup	2018-08-18 23:26:58 -04:00
mazmazz	3bd3e51313	Merge branch 'musicplus-core' into musicplus-fade-sdltimer ... # Conflicts: # src/sdl/mixer_sound.c	2018-08-18 23:12:58 -04:00
mazmazz	3e7d7cfcae	Fixed loop point counter bug	2018-08-18 21:29:18 -04:00
mazmazz	5487fd5be0	Fix S_SetMusicLoopPoint wrong method; trigger only on is_looping	2018-08-18 20:54:56 -04:00
mazmazz	5f564f7798	Consolidate variable cleanup in mixer_sound ... * Fix I_SetSongTrack MOD tracking returns the expected result * Make music_loop hook stop digital song properly if not looping	2018-08-18 20:44:32 -04:00
mazmazz	78b041800e	Loop point modulo by length	2018-08-18 20:29:19 -04:00
mazmazz	c18372dd06	I_GetMusicLoopPoint and I_SetMusicLoopPoint for Lua ... * Fix S_GetMusicLength for player compatibility	2018-08-18 20:20:18 -04:00
mazmazz	dc2c530d42	I_GetMusicLoopPoint and I_SetMusicLoopPoint for other targets	2018-08-18 20:19:54 -04:00
mazmazz	fdd1af62a8	I_GetMusicLoopPoint and I_SetMusicLoopPoint implementation ... * Stub pause for MIDI * Fix MP3 tag wide char search * Reset songpaused bool where appropriate	2018-08-18 20:19:44 -04:00
mazmazz	137291d50b	Lua merge fixes	2018-08-18 18:57:53 -04:00
Monster Iestyn	febefd41ba	Fix glitches with flats visible when looking up/down in 1st person	2018-08-18 23:31:20 +01:00
mazmazz	8b6c24c6fa	Remove I_MIDIPlaying from Lua	2018-08-18 17:46:14 -04:00
mazmazz	57c8cf25af	Remove I_MIDIPlaying from other targets	2018-08-18 17:46:06 -04:00
mazmazz	d7720a8556	Remove I_MIDIPlaying	2018-08-18 17:45:57 -04:00
mazmazz	58b204809f	Lua for MusicType	2018-08-18 17:18:22 -04:00
mazmazz	d88b923959	Other interfaces for I_MusicType	2018-08-18 17:18:13 -04:00
mazmazz	bd1eece7bc	S_MusicType implementation; MOD support for Get/SetMusicPosition and MusicLength ... * Misc MOD fixes	2018-08-18 17:17:53 -04:00
mazmazz	3c2f7038d0	Added GME for GetMusicLength, SetMusicPosition, GetMusicPosition ... * Misc fixes	2018-08-18 16:21:28 -04:00
mazmazz	f4a574aba2	Support wide chars when searching for music tags (MP3)	2018-08-18 15:26:31 -04:00
mazmazz	76c4f5dd5c	Lua for I_GetMusicLength	2018-08-18 14:18:58 -04:00
mazmazz	6b35857ed1	I_GetMusicLength declarations for other interfaces	2018-08-18 14:18:49 -04:00
mazmazz	c6035f5956	I_GetMusicLength implementation	2018-08-18 14:18:29 -04:00
mazmazz	34872bc146	Merge branch 'musicplus-core' into musicplus-fade-sdltimer	2018-08-18 09:34:49 -04:00
mazmazz	7833612c9e	HAVE_LUA_MUSICPLUS for testing	2018-08-18 09:33:37 -04:00
mazmazz	4b07246565	Add "finalize" flag to Type 453 Stop Fade	2018-08-18 06:04:11 -04:00
mazmazz	773d8bdb8d	P_ResetFakeFloorFader: Unclamp rover->alpha from software levels	2018-08-18 05:31:41 -04:00
mazmazz	d94608fa10	Add alpha clamping so OpenGL conforms to Software's translucent levels	2018-08-17 17:07:07 -04:00
mazmazz	bf5efe6457	Cleanup fade fake floor code	2018-08-17 15:59:34 -04:00
mazmazz	45ae6efbad	Refactor function and variable names; change defaults for fake floor fader line flags	2018-08-17 15:25:25 -04:00
mazmazz	020b18b84b	Revised and re-organized P_DoFakeFloorAlpha fading procedure ... * dosolid routine now refers to spawnflags	2018-08-17 14:49:33 -04:00
Digiku	e943259057	Remove unnecessary totalring deduction condition ... Because it would be triggered by !(maptol & TOL_NIGHTS) in the old code anyway	2018-08-17 09:11:59 -04:00
Digiku	792360ea97	Revert "Checkpoint (unfinished): player->totalsphere" ... This reverts commit 6a0175147f	2018-08-17 09:09:10 -04:00
mazmazz	677f19ede6	Move fading thinker to ffloor_t.fadingdata	2018-08-17 02:28:52 -04:00
mazmazz	2e252cb905	Move fadingdata (fade_t thinker) to line_t	2018-08-17 01:11:04 -04:00
mazmazz	cf853e3982	Merge branch 'le-fadefof-remove-storedthinker' into le-fadefof	2018-08-16 23:38:03 -04:00
mazmazz	931297e2d7	Rename dofadeinonly to doghostfade ... * Ghost fading: when transitioning to/from alpha=0, don't set solid/tangibility until fade is finished	2018-08-16 22:27:26 -04:00
mazmazz	e8c221f691	Place backwards Bumpers with the correct Thing angle	2018-08-16 22:07:53 -04:00
Monster Iestyn	b63290211a	Merge branch 'master' into next	2018-08-16 22:04:00 +01:00
Monster Iestyn	a4cfa9e82a	Merge branch 'lua-sector-names-fix' into 'next' ... Lua sector names fix See merge request STJr/SRB2!263	2018-08-16 16:57:41 -04:00
Monster Iestyn	364339e1ce	Merge branch 'sdl_mixer_fixes' into 'master' ... SDL Mixer fixes Closes #31 See merge request STJr/SRB2!260	2018-08-16 16:57:14 -04:00
mazmazz	18b6b53722	Adjust vertical angle and forwards/backwards of NiGHTS bumper in objectplace	2018-08-16 16:51:48 -04:00
mazmazz	6a0175147f	Checkpoint (unfinished): player->totalsphere	2018-08-16 13:11:32 -04:00
mazmazz	7474e073f8	Change SETRINGS to support player->spheres in NiGHTS	2018-08-16 12:13:57 -04:00
mazmazz	03c4a626c3	Line from revert	2018-08-16 11:35:35 -04:00
mazmazz	365a59f186	Revert "SETSPHERES console command for debugging/cheating" ... This reverts commit 4cb7036f51.	2018-08-16 11:34:57 -04:00
mazmazz	d01ca9fe95	Make Ideya Anchor use parameter # instead of angle for Ideya ID	2018-08-16 11:25:35 -04:00
mazmazz	08f35c0792	Don't apply autobrake on NiGHTS bumpers	2018-08-15 23:40:42 -04:00
mazmazz	81dade0cc4	Force non-nights player into rolling animation when destructing capsule	2018-08-15 23:11:32 -04:00
mazmazz	c3cb08d712	Reconcile spheres at end of destruct if you somehow gained or lost an unexpected # after timing calculations	2018-08-15 22:35:09 -04:00
mazmazz	432c1ab862	Also center non-NiGHTS players on NiGHTS bumpers	2018-08-15 19:09:54 -04:00
mazmazz	67da64a064	Use more efficient position setting. For Z, also adjust for bumper mobj scale.	2018-08-15 18:50:28 -04:00
mazmazz	55d2da2201	Fix NiGHTS Bumper player positioning	2018-08-15 18:42:20 -04:00
mazmazz	45612f9add	Recalc capsule timing when leaving the capsule during destruct sequence (somehow) ... * Would be nice to have more sophisticated behavior, e.g., resume the old timing; or drop out the capsule entirely. But how often is this case really going to happen?	2018-08-15 13:59:27 -04:00
mazmazz	ae0b7c9be8	Fix issue where capsule immediately re-triggers if player gains rings during destruct	2018-08-15 13:49:03 -04:00
mazmazz	2e8c4b5545	Fixed capsule timing logic ... * Force a total time, stretch out sphere deduction within that time * Make it more readable	2018-08-15 13:38:15 -04:00
mazmazz	59f71e4c48	Make camera further if on-foot and destroying the Egg Capsule	2018-08-15 12:29:06 -04:00
mazmazz	52e451aad5	Counter fix	2018-08-15 12:22:46 -04:00
mazmazz	02aed5b019	Merge branch 'nights-onfootcapsulefix' into nights-fastercapsule	2018-08-15 12:09:46 -04:00
mazmazz	8452ec5c7c	Checkpoint: Basic functions	2018-08-15 12:07:08 -04:00
mazmazz	d93ca34859	Hide MusicPlus lua behind an #ifdef HAVE_LUA_MUSICPLUS ... # Conflicts: # src/lua_hook.h # src/lua_hooklib.c # src/p_user.c	2018-08-15 03:37:11 -04:00
mazmazz	0254f4f368	Fix merge errors	2018-08-15 02:42:50 -04:00
mazmazz	878ea36559	Lua: Make P_RestoreMusic follow the non-local player nil output convention	2018-08-15 02:29:26 -04:00
mazmazz	8fe4c369bf	Lua: Fix music functions not returning proper values ... # Conflicts: # src/lua_baselib.c	2018-08-15 02:29:04 -04:00
mazmazz	6bde90f887	Lua: Make S_SpeedMusic and S_ChangeMusic return nil for invalid players	2018-08-15 02:23:18 -04:00
mazmazz	c71719ac6b	Music lua: Return nil for invalid players and non-nil for valid players ... # Conflicts: # src/lua_baselib.c	2018-08-15 02:22:52 -04:00
mazmazz	9dbc807528	Make S_StopMusic return nil for invalid player, true otherwise	2018-08-15 02:21:18 -04:00
mazmazz	8d0044c5f1	Lua S_GetMusicPosition: Remove erroneous position input line ... # Conflicts: # src/lua_baselib.c	2018-08-15 02:20:56 -04:00
mazmazz	3fb4559480	Lua: Make S_GetMusicPosition and S_SetMusicPosition return nil when non-local player is passed	2018-08-15 02:19:12 -04:00
mazmazz	9a5800d2bb	Lua: Added player_t input to S_DigitalPlaying, S_MidiPlaying, S_MusicPlaying, S_MusicPaused, S_MusicName	2018-08-15 02:19:06 -04:00
mazmazz	95e4d0d423	Add player parameter to S_GetMusicPosition lua ... # Conflicts: # src/lua_baselib.c	2018-08-15 02:18:46 -04:00
mazmazz	e0ab8c1ed0	Fix #6 #7 SDL looping and counter bugs when looping=false ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 02:15:05 -04:00
mazmazz	11c6148d4b	SDL: Fix looping bug when looping=false; reset bytes counter when non-looping ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 02:11:17 -04:00
mazmazz	a9776f7b25	Undoing malloc for S_MusicName, pass music_name instead. ... I don't think there's a reason for copying to a new var.	2018-08-15 02:11:01 -04:00
mazmazz	44c7410a41	Add S_DigitalPlaying	2018-08-15 02:10:53 -04:00
mazmazz	47423a69ed	Refactor to SetMusicPosition, GetMusicPosition ... # Conflicts: # src/lua_baselib.c # src/nds/i_sound.c # src/sdl12/mixer_sound.c # src/sdl12/sdl_sound.c # src/win32ce/win_snd.c	2018-08-15 02:10:46 -04:00
mazmazz	0ea40321ca	S_MusicName copy music_name to new buffer (is this ok?)	2018-08-15 02:07:51 -04:00
mazmazz	34ea90600a	Support mflags and looping in MusicChange hook ... # Conflicts: # src/lua_hook.h	2018-08-15 02:07:33 -04:00
mazmazz	d14eedd700	Implemented MusicChange lua hook ... # Conflicts: # src/lua_hook.h # src/lua_hooklib.c	2018-08-15 02:06:43 -04:00
mazmazz	79531b9683	Another loop fix to resolve music_bytes not resetting on non-looppoint tracks ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 02:03:04 -04:00
mazmazz	2e9dba352a	SDL mixer: Fix no looping bug when changing song position ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 02:02:33 -04:00
mazmazz	662c366830	S_MusicName, S_MusicExists, S_PauseMusic lua, S_ResumeMusic lua ... # Conflicts: # src/lua_baselib.c	2018-08-15 02:01:34 -04:00
mazmazz	eb52a14433	Implement I_MIDIPlaying, I_MusicPlaying, I_MusicPaused in other targets ... # Conflicts: # src/nds/i_sound.c # src/sdl12/sdl_sound.c # src/win32ce/win_snd.c	2018-08-15 01:59:01 -04:00
mazmazz	d39f804662	Use Mix_PausedMusic instead of our own music_paused flag in SDL2/SDL1.2 I_MusicPaused ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 01:55:49 -04:00
mazmazz	2483c11cc4	Implement I_MusicPaused in SDL2, SDL1.2, and FMOD; console and lua commands ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 01:55:03 -04:00
mazmazz	e4a6cb87d1	Fix SDL music counter pause issue	2018-08-15 01:54:17 -04:00
mazmazz	29904a21b2	Remove MUSICPOS command, can be done in lua	2018-08-15 01:53:59 -04:00
mazmazz	297a8d537a	Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 01:53:45 -04:00
mazmazz	25880643d4	MUSICPOS console command	2018-08-15 01:52:35 -04:00
mazmazz	a8d379a6da	Lua PositionMusic switch to UINT32	2018-08-15 01:52:20 -04:00
mazmazz	eab4d6b989	Lua PositionMusic/GetPositionMusic and console TUNES position	2018-08-15 01:50:19 -04:00
mazmazz	c6f63d9e9b	Lua funcs MidiPlaying/MusicPlaying	2018-08-15 01:44:11 -04:00
mazmazz	d47d18998b	Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 01:43:51 -04:00
mazmazz	2cf364ab8b	Fix SDL music position getting; dummy out position methods for MIDI ... # Conflicts: # src/sdl/mixer_sound.c # src/sdl12/mixer_sound.c	2018-08-15 01:42:15 -04:00
mazmazz	aed388976c	SDL fix for I_SetSongPosition ... # Conflicts: # src/sdl12/mixer_sound.c	2018-08-15 01:40:54 -04:00
mazmazz	8981ef2cdc	Change get/set music position to UINT32 parameter, milliseconds ... # Conflicts: # src/d_netcmd.c # src/lua_baselib.c # src/nds/i_sound.c # src/sdl12/mixer_sound.c # src/sdl12/sdl_sound.c # src/win32ce/win_snd.c	2018-08-15 01:40:20 -04:00
mazmazz	a4f7b17389	Initial attempt for get/set song position ... * Declared I_SetSongPosition, I_GetSongPosition * Implemented S_PositionMusic and S_GetPositionMusic * Exposed in console TUNES and lua * Implemented set position in SDL, SDL12, WIN32 * Implemented get position in WIN32 # Conflicts: # src/nds/i_sound.c # src/sdl12/mixer_sound.c # src/sdl12/sdl_sound.c # src/win32ce/win_snd.c	2018-08-15 01:38:06 -04:00
mazmazz	1107571744	Checkpoint: Force Egg Capsule time at 60 tics	2018-08-15 00:59:29 -04:00
mazmazz	7cdce4324b	Attempt 1: Guesstimate sphere pop rate and use that as the Capsule handling duration	2018-08-15 00:32:48 -04:00
mazmazz	56d8f47aaa	Nights capsule faster attract timing	2018-08-14 19:48:18 -04:00
mazmazz	9faace9e5d	capsule->extravalue2 tic timer	2018-08-14 19:21:32 -04:00
mazmazz	ac79f6975c	Look for two anchorpoints if player has two Ideyas ... * Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted	2018-08-14 17:48:14 -04:00
mazmazz	655b590c06	Ideya fixes when a player has more than one Ideya ... # Conflicts: # src/p_inter.c # Conflicts: # src/p_inter.c	2018-08-14 17:28:51 -04:00
mazmazz	0862aece9f	Ideya fixes when a player has more than one Ideya ... # Conflicts: # src/p_inter.c	2018-08-14 17:21:49 -04:00
mazmazz	e3facccb9d	Ideya fixes when a player has more than one Ideya	2018-08-14 17:13:23 -04:00
mazmazz	61c84be704	Fix bonus time quirk where lines are run if player->marebonuslap is 0 ... * Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.	2018-08-14 16:08:21 -04:00
mazmazz	c3703cfc24	Comments	2018-08-14 14:57:58 -04:00
mazmazz	1921cc485e	Fix issue where player cannot destroy the NiGHTS Capsule if they have not transformed to NiGHTS	2018-08-14 14:18:18 -04:00
mazmazz	efdf684770	Fix Capsule Entrance exec firing repeatedly	2018-08-14 12:48:00 -04:00
mazmazz	3f312ce114	Make Bonus Time Start executor into a general Egg Capsule Touch executor ... * Entrance/exit flags * Enough/not-enough-rings flags (with "doesn't matter" line option)	2018-08-14 12:00:37 -04:00
mazmazz	8c57218027	Alternate take on pre-blowup: Do it on first touching tic, instead of first ring pop ... * Use MT_EGGCAPSULE extravalue2 for tic timer	2018-08-14 11:41:10 -04:00
mazmazz	1cb68a615e	Make LE Ring triggers accept spheres for NiGHTS levels	2018-08-14 11:10:10 -04:00
mazmazz	62a6fe845d	Add ML_BOUNCY flag to Bonus Time executor to execute BEFORE the capsule is destroyed and player has enough spheres	2018-08-14 10:48:50 -04:00
mazmazz	d53582596f	Preproc comment out Y_SetLinkBonus because unused	2018-08-14 10:20:56 -04:00
mazmazz	841c31a6ba	Attach fade_t thinker to proper control sector upon savegame load	2018-08-13 22:17:58 -04:00
mazmazz	004cbe6a3d	Whitespace	2018-08-13 22:10:16 -04:00
mazmazz	ca84e7265e	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof	2018-08-13 14:47:57 -04:00
mazmazz	d8c565407c	MaxBonusLives level header option for # of lives in score tally	2018-08-13 14:17:38 -04:00
mazmazz	f1fc205b31	Deduct marescore when player hits ground ... * ~~For speedrunning~~: Land on the Drone, keep your points!	2018-08-13 11:12:53 -04:00
mazmazz	00cadfee3a	Merge branch 'nights-dronebox' into nights-ideyaspawn-dronebox	2018-08-13 09:51:14 -04:00
mazmazz	6585ca3df3	Make Drone visual elements react to height change	2018-08-13 09:50:50 -04:00
mazmazz	1bc5976534	Correct hitboxradius value; proper sparkle->z when moving x/y	2018-08-13 04:49:32 -04:00
mazmazz	9f67ee1a89	MT_IDEYAANCHOR: Use type 1714 instead of 1717	2018-08-13 03:18:23 -04:00
mazmazz	bec3a6884c	Make anchoring non-specific to Ideya states (now anchor anything!) ... # Conflicts: # src/p_inter.c	2018-08-13 02:19:53 -04:00
mazmazz	06bbafec2f	Ideya anchoring optimization	2018-08-13 02:17:29 -04:00
mazmazz	54cb7ddf32	Anchor Ideya logic ... # Conflicts: # src/p_enemy.c # src/p_inter.c	2018-08-13 02:17:07 -04:00
mazmazz	6b8c8d5a3e	Merge branch 'nights-dronebox' into nights-ideyaspawn-dronebox	2018-08-13 02:09:52 -04:00
mazmazz	67ee9d082d	A_OrbitNights: Move donotrescale to bit 19 ... * For compat with `nights-ideyaspawn`	2018-08-13 02:09:00 -04:00
mazmazz	4642c75025	MT_IDEYAANCHOR info and spawn logic	2018-08-13 02:03:36 -04:00
mazmazz	c3e0267029	Fix attraction bug on non-NiGHTS and Nightopian Helper ... * Switch from mo->movecount to mo->movefactor for type compat * Adjust timings for regular and paraloop attraction	2018-08-12 23:03:12 -04:00
mazmazz	296d527993	Merge nightsplus-laplogic	2018-08-12 21:20:14 -04:00
mazmazz	d3001db9dc	Merge from nights-score and use Lap Bonus instead of Link Bonus ... * One BONUSTYPE = NIGHTS option instead of several * Use NiGHTS Bonus for special stages, not Link Bonus	2018-08-12 20:56:57 -04:00
mazmazz	54343bc05f	Change special stage bonus to NiGHTS in-level score, per MB	2018-08-12 20:36:53 -04:00
mazmazz	89f57cb111	Have just one NiGHTS bonus option: NIGHTS and LINK together	2018-08-12 20:25:35 -04:00
mazmazz	fcd6b16646	Make lap bonus more valuable	2018-08-12 20:08:40 -04:00
mazmazz	30fa526f6f	Merge branch 'nightsplus-laplogic' into nights-score-lap	2018-08-12 19:59:58 -04:00
mazmazz	0c8e2ffd78	Totalmarescore typo	2018-08-12 19:59:41 -04:00
mazmazz	ec8d264029	totalmarescore player variable for NiGHTS scoring ... # Conflicts: # src/p_setup.c	2018-08-12 19:59:34 -04:00
mazmazz	5938a57970	totalmarelap and totalmarebonuslap player variables	2018-08-12 19:57:33 -04:00
mazmazz	fe904b0eb2	NiGHTS lap score bonus	2018-08-12 19:48:45 -04:00
mazmazz	0c0a403bb3	Merge branch 'nightsplus-laplogic' into nights-score-lap ... # Conflicts: # src/p_setup.c	2018-08-12 19:39:31 -04:00
mazmazz	feadcbfc94	BONUSTYPE typo; bonus alignment	2018-08-12 19:32:11 -04:00
mazmazz	372fc540bc	Totalmarescore typo	2018-08-12 19:26:18 -04:00
mazmazz	30d57eac79	NiGHTS bonus implementation	2018-08-12 19:25:21 -04:00
mazmazz	61999100e5	totalmarescore player variable for NiGHTS scoring	2018-08-12 19:21:55 -04:00
mazmazz	4e02171c23	Add lapbegunat and lapstartedtime player variables ... There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.	2018-08-12 14:21:26 -04:00
mazmazz	ce0b23a576	Set Drone hitbox radius by upmost 4 bits of Angle	2018-08-12 13:34:27 -04:00
mazmazz	02d5e4e902	MT_FLICKY_CENTER flag adjustments	2018-08-12 12:49:23 -04:00
Monster Iestyn	0da21244c0	Added "Tutorialmap" MainCfg option for SOC	2018-08-12 14:30:49 +01:00
mazmazz	8f50fbeb4f	For safety, clear MF_SLIDEME and MF_GRENADEBOUNCE flags before using	2018-08-12 09:28:04 -04:00
mazmazz	2f6c0d7e4e	Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1	2018-08-12 09:23:50 -04:00
Nev3r	f19b7bfacf	Merge branch 'horizon-line-hom-fix' into 'master' ... Horizon line HOM fix See merge request STJr/SRB2Internal!152	2018-08-12 03:48:20 -04:00
mazmazz	f4a813891f	Decouple Flicky Thing logic from spawnpoint variables; use mobj variables	2018-08-12 02:34:37 -04:00
mazmazz	43b790c26f	A_OrbitNights make actor scale to target ... * Added `donotrescale` input to disable this behavior * Reverted previous commit changes for scaling Ideya because unneeded	2018-08-12 01:07:26 -04:00
mazmazz	aecabb246d	Scale Ideyas when moving to/from NIGHTSDRONE and scaling changes to NIGHTSDRONE	2018-08-11 23:53:07 -04:00
mazmazz	9bc9f96e09	NIGHTSDRONE sync visual elements when changing mobj flags	2018-08-11 23:32:12 -04:00
mazmazz	0c8e1aa10a	When NIGHTSDRONE z changes, change DRONEMAN z as well	2018-08-11 23:15:28 -04:00
mazmazz	79c042ca09	NIGHTSDRONE visual element positioning now works with scaling	2018-08-11 22:41:58 -04:00
mazmazz	4f9231b7a5	Fix orbiting Ideya bug, now player gets them back again on exit	2018-08-11 22:13:33 -04:00
mazmazz	a4e3f8cbcf	NIGHTSDRONE visual element position syncing: XYZ and OBJECTFLIP	2018-08-11 21:38:44 -04:00
mazmazz	72b592888f	Line fixes for visual element positioning ... # Conflicts: # src/p_mobj.c	2018-08-11 20:50:53 -04:00
Monster Iestyn	51b8d6e01a	Make "Tutorial" warp directly to MAPZ0 (not configurable yet)	2018-08-11 21:17:52 +01:00
mazmazz	2c4f9d4776	Don't need this line	2018-08-11 15:54:39 -04:00
mazmazz	c99258b2e2	Make Drone hitbox height and player Z alignment configurable ... * Default hitbox height is 80 * Drone Thing parameter sets height to multiples of 32 * Player aligns by default to bottom+24 of hitbox (offsetted) * `MTF_OBJECTSPECIAL` aligns player to hitbox top * `MTF_EXTRA` aligns to hitbox center * `MTF_OBJECTSPECIAL|MTF_EXTRA` aligns to real bottom of hitbox * Goalpost and sparkle Z alignment is changed to reflect configurableness	2018-08-11 15:52:42 -04:00
Monster Iestyn	0b88c364bc	Add "Tutorial" to the 1P menu, above "Start Game". It doesn't actually do anything yet, mind! ... Also, change said menu's def to start at "Start Game" when entering it for the first time.	2018-08-11 18:01:54 +01:00
mazmazz	0fe41e06ff	Remove A_OrbitNights additional input offset on current target Z, don't need it	2018-08-11 12:06:50 -04:00
mazmazz	c8dcb57e83	Remove ORBIDYA CENTER states, we don't need 'em	2018-08-11 12:06:17 -04:00
mazmazz	d0f0f475ce	* Bounce Droneman within hitbox instead of floorz ... * Correct Droneman hiding so he always stays within hitbox even when invisible	2018-08-11 02:03:44 -04:00
mazmazz	d1a8e0baa0	Scale player to Drone's scale on Nightserize, and reset scale on De-Nightserize ... * Also correct player's position to Z center of Drone hitbox on Nightserize	2018-08-11 02:02:56 -04:00
mazmazz	480c4f890d	player->oldscale var for pre-Nightserize scale	2018-08-11 00:49:28 -04:00
mazmazz	8154578fb6	Switch Ideya orbiting state to centered offset states when orbiting around Drone	2018-08-11 00:09:02 -04:00
mazmazz	b97037f644	A_OrbitNights height offset by target height implementation	2018-08-11 00:07:26 -04:00
mazmazz	c9c0219393	ORBITEM CENTER states for A_OrbitNights target height offset	2018-08-10 23:49:02 -04:00
mazmazz	7c0186bc97	Drone de-coupling implementation ... * Visual elements and hitbox work as expected with scaling and OBJECTFLIP	2018-08-10 22:11:48 -04:00
mazmazz	32c17b1454	Basic implementation for player position correction to Drone center ... * player->drone mobj variable * P_MoveNiGHTSToDrone, will change later	2018-08-10 19:25:49 -04:00
Steel Titanium	d9c7334dea	Fix white being treated as transparent.	2018-08-10 19:02:03 -04:00
mazmazz	e0e77d873b	Nights Drone mobj and state entries ... * New entries: NIGHTSDRONE_MAN, NIGHTSDRONE_SPARKLING * NIGHTSGOAL renamed to NIGHTSDRONE_GOAL * MT_NIGHTSDRONE repurposed as an invisble, no-gravity hitbox	2018-08-10 18:24:31 -04:00
mazmazz	c72e724122	Merge branch 'nightsplus-laplogic' into nightsplus-le ... # Conflicts: # src/p_map.c # src/p_setup.c	2018-08-10 17:24:12 -04:00
mazmazz	872761e258	Add lapbegunat and lapstartedtime player variables ... There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.	2018-08-10 17:12:26 -04:00
Alam Ed Arias	3479310546	SDL: update IMG_xpm.c	2018-08-10 17:09:11 -04:00
mazmazz	18b5b70822	Add lastmarelap and lastmarebonuslap player variables	2018-08-10 16:30:49 -04:00
mazmazz	d58445fdf3	Set player->finishedrings upon new mare ... (Forgot this line from the player->spheres merge, so let's straggle here)	2018-08-10 16:17:28 -04:00
mazmazz	f69f102531	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le ... # Conflicts: # src/p_map.c # src/p_setup.c	2018-08-10 15:51:20 -04:00
Monster Iestyn	30e4d2cd51	Merge branch 'polyobj-sky-plane-crash-fix' into 'master' ... Polyobject sky plane crash fix See merge request STJr/SRB2Internal!146	2018-08-10 15:40:43 -04:00
mazmazz	1b922b8ba5	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic ... # Conflicts: # src/p_map.c # src/p_setup.c	2018-08-10 15:10:26 -04:00
Monster Iestyn	a5510cab5d	Merge branch 'master' into polyobj-sky-plane-crash-fix	2018-08-10 20:06:12 +01:00
Monster Iestyn	8d0a44899a	Merge branch 'master' into change-colormap-ldef	2018-08-10 20:05:04 +01:00
Monster Iestyn	d7830dfff4	Merge branch 'master' into horizon-line-hom-fix	2018-08-10 20:04:39 +01:00
mazmazz	7f4e2a6164	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop	2018-08-10 15:04:14 -04:00
Monster Iestyn	55fd60b29b	Merge branch 'master' into leveltitle-tinkering ... # Conflicts: # src/hu_stuff.h	2018-08-10 20:03:59 +01:00
mazmazz	b8eb282367	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof-remove-storedthinker	2018-08-10 15:03:07 -04:00
mazmazz	508e1a2595	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof	2018-08-10 15:02:43 -04:00
mazmazz	d405bdfd9b	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nights-inufixes	2018-08-10 15:00:41 -04:00
mazmazz	07c882139b	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into flicky-things	2018-08-10 14:58:27 -04:00
Monster Iestyn	fa382c0233	Merge branch 'public_next'	2018-08-10 19:36:51 +01:00
Monster Iestyn	7ee9c5b0f4	Merge branch 'master' into next	2018-08-10 19:31:15 +01:00
Digiku	a439dce584	Merge branch 'hardcoding-nights-spheredamage' into 'master' ... NiGHTS: Handle sphere damage correctly upon timeout * Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP * Handle player->spheres and player->rings consistently See merge request STJr/SRB2Internal!157	2018-08-10 13:50:57 -04:00
Digiku	ed99f3a425	Merge branch 'nights-invertloopfix' into 'master' ... NiGHTS fix lap detection on inverted axis See merge request STJr/SRB2Internal!138	2018-08-10 13:49:42 -04:00
mazmazz	d97c25f6dd	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le ... # Conflicts: # src/p_setup.c # src/p_user.c	2018-08-10 13:44:47 -04:00
mazmazz	487c62fe31	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic ... # Conflicts: # src/p_setup.c	2018-08-10 13:35:59 -04:00
mazmazz	672e196aa4	Pandora's Box support for player->spheres ... Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.	2018-08-10 13:15:54 -04:00
MascaraSnake	04063ba3a2	Merge branch 'hardcoding-time-again' into 'master' ... Hardcoding time again See merge request STJr/SRB2Internal!130	2018-08-10 13:14:53 -04:00
mazmazz	4cb7036f51	SETSPHERES console command for debugging/cheating ... Fixed sphere spill bug where no spheres spill if player->rings is 0	2018-08-10 13:06:53 -04:00