4531 commits

Author	SHA1	Message	Date
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
TehRealSalt	0a00a0cebb	Revert "Add player taunt functions to Lua" ... This reverts commit 09e9e2ba4d.	2018-12-04 11:39:45 -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
TehRealSalt	09e9e2ba4d	Add player taunt functions to Lua ... People have REALLY wanted these for their scripts	2018-12-03 20:28:07 -05:00
TehRealSalt	188c0164b6	Buff item hitbox size ... I was gonna hold off for v2 to do this, but frankly... this is too good to have. Honestly I think this is a big buff for karma items... people unable to hit as bombs will have a LOT less trouble as item.	2018-12-03 17:30:27 -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
TehRealSalt	919667ed39	Just do MapChange hook on G_InitNew ... Everything that's supposed to call it also calls this...	2018-12-03 00:33:35 -05:00
TehRealSalt	aa16edec1d	Merge remote-tracking branch 'srb2public/next' into merge-next	2018-12-03 00:31:23 -05:00
TehRealSalt	9659369ae1	Update the patch.kart hash. Again.	2018-12-03 00:21:11 -05:00
wolfy852	3ec0afc09d	AXISBRAKE, take out GameController stuff for now	2018-12-02 19:33:09 -06: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
wolfy852	d1a0df09a5	Merge remote-tracking branch 'remotes/origin/master' into unfuck-gamepads	2018-12-02 02:01:51 -06:00
wolfy852	aba7711c39	Potentially fix spectators floating when inputting right on the analog stick.	2018-12-02 02:01:06 -06:00
TehRealSalt	d9fa45d850	Back to numstarposts/2	2018-12-02 02:29:47 -05:00
TehRealSalt	d125f7cc2d	Wrong color for UFO fireworks	2018-12-01 23:08:42 -05:00
TehRealSalt	15b05f6e75	Fireworks carry momentum, UFOs spawn fireworks	2018-12-01 20:48:19 -05:00
Steel Titanium	0f11116e7b	Fix up controller menu support	2018-12-01 20:13:14 -05:00
TehRealSalt	ac64290cc7	Forgotten include	2018-11-30 17:07:30 -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
TehRealSalt	5d8a63da64	Add TC_ to dehacked	2018-11-30 03:43:16 -05:00
TehRealSalt	d3ecdeb364	Do 800 instead	2018-11-30 03:36:44 -05:00
TehRealSalt	9598995150	Un-nerf Mines on activation tic	2018-11-30 03:09:49 -05:00
TehRealSalt	b7ff6d56d2	Colormap crash fix	2018-11-30 03:09:01 -05:00
TehRealSalt	f2a87356d0	Update GPL notice	2018-11-30 00:15:14 -05:00
TehRealSalt	aa9b36ac04	Fix this memory freeing	2018-11-29 22:31:20 -05: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
Sal	ce14755156	Merge branch 'rename-cmds' into 'master' ... Rename "giveadmin" and "removeadmin" to "promote" and "demote" See merge request KartKrew/Kart!117	2018-11-29 11:18:57 -05:00
TehRealSalt	4cfaf746bb	Reimplement png warning	2018-11-29 11:16:40 -05:00
TehRealSalt	d9654bcc1a	Merge remote-tracking branch 'srb2public/next' into merge-next	2018-11-29 10:26:38 -05:00
TehRealSalt	6bdbc45ffe	Enable pk3 in addons menu	2018-11-29 10:07:53 -05:00
TehRealSalt	46571fbda2	Fixes to merge process	2018-11-29 10:07:35 -05:00
TehRealSalt	936bd43266	Merge branch 'master' into merge-next	2018-11-29 09:46:46 -05: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	f2072b973b	Rename "giveadmin" and "removeadmin" to "promote" and "demote"	2018-11-29 07:58:26 -06:00
TehRealSalt	5534017954	Merge remote-tracking branch 'srb2public/next' into merge-next	2018-11-29 08:49:50 -05: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
Sal	aa56911b2e	Merge branch 'version-prep' into 'master' ... Update version to v1.0.2 See merge request KartKrew/Kart!111	2018-11-29 08:05:24 -05:00
TehRealSalt	7ed6fb8483	Update patch.kart hash	2018-11-29 08:04:41 -05:00
TehRealSalt	a32b3bf07b	Remove in death pits	2018-11-29 07:50:58 -05:00
TehRealSalt	be4fb2bcfb	Set indirectitemcooldown for SPB/Shrink drops	2018-11-29 07:49:34 -05:00
Wolfy	b8ce51bff2	Multiple admins ... # Conflicts: # src/d_netcmd.c # src/d_netcmd.h	2018-11-29 06:46:59 -06:00
Sal	e88dbedbc4	Merge branch 'mobjdamage-hook' into 'master' ... Lua "damage" hooks See merge request KartKrew/Kart!115	2018-11-29 07:16:22 -05:00
TehRealSalt	5f3abae81b	Merge branch 'possibly-better-turn'	2018-11-29 07:13:24 -05:00
TehRealSalt	1a4648b6e9	Update credits for bonuschars	2018-11-29 06:54:36 -05:00
TehRealSalt	97f0dc3875	Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart	2018-11-29 05:36:45 -05:00
TehRealSalt	2789e76683	...Welp, I mixed up my commit names :V ... THIS commit's the MT_FIREDITEM fix, the LAST commit was me making sure the size of translationtablecache was correct.	2018-11-29 05:36:40 -05:00
TehRealSalt	576617ec71	MT_FIREDITEM crash fix	2018-11-29 05:34:57 -05:00
Latapostrophe	54a7e65ff6	Moved (void)inflictor;s below and put scoremultiply at the top of all the damage funcs	2018-11-28 19:50:30 +01:00
Latapostrophe	5660e3fccd	Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s	2018-11-28 19:41:01 +01:00
Sal	8cfa05471f	Merge branch 'sectionspawn' into 'master' ... Respawn on intermediate finish line + cap numlaps cvar in sectionraces See merge request KartKrew/Kart!113	2018-11-28 13:16:37 -05:00
toaster	0133bf275a	Definitively fix the MS thinking that Battle servers are playing on Tag, and KEEP it that way even when we exceed 2.1's version number eventually...	2018-11-28 17:37:36 +00:00
toaster	2c8855cd5f	Upper-bound restrict the setting of numlaps for sectionrace levels mid-game	2018-11-28 16:45:45 +00:00
toaster	d8955f1f87	LF_SECTIONRACE now has a secondary function! ... * Sets the player respawn coords on the finish line, so dying in the short interval between crossing an intermediate finish line and hitting a checkpoint doesn't send you all the way back to the beginning.	2018-11-28 16:33:52 +00:00
TehRealSalt	79359a3672	Multiply turn values by realtics	2018-11-28 03:10:36 -05:00
TehRealSalt	ecba6a0cb4	Nerf activation range of Mines, keep explosion radius	2018-11-28 02:31:16 -05:00
TehRealSalt	7b475d0f91	Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua	2018-11-28 00:45:33 -05:00
Sal	29410bb93d	Merge branch 'stricter-checkpoints' into 'master' ... Require 3/5ths of checkpoints instead of 1/2 for a lap See merge request KartKrew/Kart!112	2018-11-27 19:18:43 -05:00
TehRealSalt	3206ce716f	I like working on Kart...	2018-11-27 19:00:48 -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
TehRealSalt	e2a9aeb34c	Require 3/5ths of checkpoints instead of 1/2 ... This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.	2018-11-27 14:28:11 -05:00
Sal	28488cc0dc	Merge branch 'netcode-vars-strict' into 'master' ... Make netcode var defaults stricter, add Advanced Server Options See merge request KartKrew/Kart!110	2018-11-27 12:27:47 -05:00
Latapostrophe	ed4477705d	Separated the damage hooks into multiple more precise hooks for players.	2018-11-27 18:27:43 +01:00
Sal	a2ab230bfa	Merge branch '102-gameplay' into 'master' ... v1.0.2 gameplay See merge request KartKrew/Kart!107	2018-11-27 12:25:37 -05:00
Sal	cc8af2acdb	Merge branch 'better-buffering' into 'master' ... Better vote level buffering See merge request KartKrew/Kart!109	2018-11-27 12:25:02 -05:00
Sal	59f59c8042	Merge branch 'rotate-the-md2' into 'master' ... Rotate the MD2 See merge request KartKrew/Kart!108	2018-11-27 12:23:48 -05:00
TehRealSalt	f0b042a4b6	Advanced Server Options menu ... More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter	2018-11-27 12:10:46 -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
TehRealSalt	969801ef09	SEVERELY nerf jointimeout & resynchattempts, too ... All of these previous defaults are "this is an insane time to reach, by that point you might as well disconnect"	2018-11-27 11:23:28 -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
TehRealSalt	92225748e5	Fix order so the new sound can actually play	2018-11-26 23:34:43 -05: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
Sryder	ab5dc3226b	Revert change to P_SlopeLaunch ... Don't call slopelaunch just from object z difference if the slope has no physics.	2018-11-26 23:10:24 +00: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
Latapostrophe	ec279da272	classic lat forgot whitespaces meme	2018-11-26 21:24:57 +01:00
Latapostrophe	0175e5b6a5	Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players.	2018-11-26 21:23:41 +01:00
MonsterIestyn	b53cd70201	Merge branch 'next' into PK3-BackportNext	2018-11-26 18:56:51 +00:00
TehRealSalt	732e0447a5	Merge branch 'master' into 102-gameplay	2018-11-26 10:14:41 -05:00
TehRealSalt	38ebc4d838	Update version to v1.0.2	2018-11-26 09:34:15 -05: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
Sal	fcba636616	Merge branch 'deadtweaks' into 'master' ... Update HUD anim counters when dead. Closes #49 See merge request KartKrew/Kart!106	2018-11-26 08:03:17 -05:00
Sal	159d8040b8	Merge branch 'sounddistfix' into 'master' ... Sound volume distance indication now scales with mapheader scale. See merge request KartKrew/Kart!105	2018-11-26 08:02:26 -05:00
TehRealSalt	1c907667fc	Slow down animation	2018-11-26 07:43:05 -05:00
TehRealSalt	4ad32b23d9	Find bestrank for 7 sec limit enforcement	2018-11-26 07:18:21 -05:00
TehRealSalt	5dbd747237	Flush map buffer early, again ... Now it's directly in G_AddMapToBuffer	2018-11-26 06:09:26 -05:00
TehRealSalt	4bd6ae3f04	Calculate buffer size manually ... (Yes, I checked; this always outputs "3" for its current usage.)	2018-11-26 05:09:56 -05:00
TehRealSalt	494fa55390	Accidental removal	2018-11-26 04:42:14 -05:00
TehRealSalt	e59a675eb3	Mistakes	2018-11-26 04:28:39 -05:00
TehRealSalt	478f895ea0	Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap ... I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V (Shouldn't FLUSHMAPBUFFEREARLY be on now...?)	2018-11-26 04:27:31 -05:00
TehRealSalt	62b9754407	This sound doesn't exist yet, but I'm defining it anyway	2018-11-26 03:19:31 -05:00
TehRealSalt	2a573c2072	Merge branch 'master' into 102-gameplay	2018-11-26 03:13:17 -05:00
TehRealSalt	ba28f1c65f	Add confirmation to reset controls	2018-11-26 03:12:22 -05:00
TehRealSalt	b5bf8e09c3	Karma fireworks ... Additionally: - FZ boom no longer has that weird smoke bit before it spawns the smoke column - Item blinking color is brighter	2018-11-26 02:17:14 -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
TehRealSalt	b68a58d5b2	Make sure spbplace is set better during SEEKING	2018-11-25 20:24:47 -05:00
TehRealSalt	e82c7cb230	Make the WAIT phase work better with SPB rush	2018-11-25 20:23:09 -05:00
TehRealSalt	0f1206af6f	Shrink no longer causes old-style wipeout, getting squished reduces the timer on it. ... Maybe this might help some of the desyncing, too! Mainly done for gameplay reasons, though :p	2018-11-25 20:14:01 -05:00
Sryder	683ebec120	Rotate All MD2s to match their standing slopes ... Needs to be tested in gravity flip Also flips the normal on linedef based slopes so that it's facing the correct direction Also makes it so slopelaunch doesn't always remove the standingslope (going down some slopes would cause it to be constantly unset and reset)	2018-11-26 00:17:34 +00:00
Monster Iestyn	1b2aea81dc	Merge branch 'master' into next	2018-11-25 20:39:17 +00: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
toaster	3c480277aa	Update HUD anim counters when dead. ... * Split out the HUD-related counters from K_KartPlayerThink() into their own function. * Called this function in P_DeathThink().	2018-11-25 13:48:46 +00:00
toaster	e5fef95d94	Sound volume distance indication now scales with mapheader scale.	2018-11-25 13:30:43 +00: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
TehRealSalt	680f95bb57	Merge branch 'master' into 102-gameplay	2018-11-25 07:12:36 -05:00
TehRealSalt	92d5a6b8fb	Quick patch-over to dedicated server husk bug ... Whenever a 16th player would join, it would wrap around and overwrite the dedicated server ghost host player. This is possibly a bug in vanilla as well, but it'd only occur at 32 players so it's no wonder no one figured that out. :V As a quick patch, I just capped cv_maxplayers to MAXPLAYERS-1 in dedicated servers only. To fix this for real, we'd need to give dedicated servers their own player & node instead of clumping in into the start of the normal ones.	2018-11-25 07:10:45 -05:00
TehRealSalt	e35e00f94e	Mess with display offset for some Battle objects	2018-11-25 05:43:17 -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
TehRealSalt	01f5787e51	Unlock all secrets for dedicated ... If wanted we can just add dedicated checks to Encore & Hard Mode, but I figured this would be quicker and more future-proof.	2018-11-25 02:30:08 -05:00
TehRealSalt	c67e7f1709	Game saves when you use the cheat ... Because of other G_SaveGameData instances added in the last patch, this cheat can get saved anyway. Since this is just supposed to be convenience for server hosts, we might as well make it work like other console Kart racers and just make it save anyway!	2018-11-25 02:24:33 -05:00
Steel Titanium	f3ea628fea	Update server name instantly on change	2018-11-24 21:24:05 -05:00
TehRealSalt	7608055679	More in-depth countdown calculation ... Hooooopefully this makes sure time over doesn't happen prematurely at random	2018-11-24 20:59:22 -05:00
TehRealSalt	7dcc55951b	Make absolute sure spbplace is set in the right places	2018-11-24 20:48:21 -05:00
TehRealSalt	d467399480	Keep track of the place SPB is following ... This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.	2018-11-24 20:41:17 -05:00
TehRealSalt	fccdfc1bfd	Weaken slightly	2018-11-24 19:49:18 -05:00
TehRealSalt	f47c78832a	colorize arrow roulette	2018-11-24 18:00:27 -05:00
Alam Ed Arias	1113849f5c	Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext	2018-11-24 18:00:14 -05:00
TehRealSalt	a1f2b8f3f0	Merge branch 'master' into 102-gameplay	2018-11-24 17:44:20 -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
TehRealSalt	14d178ed4b	Infinite wall bump fix(?) ... Couldn't replicate it at all after this change, but I also have trouble replicating it before it :v	2018-11-24 17:28:53 -05:00
TehRealSalt	31aa96ecdc	Wrong var here	2018-11-24 17:27:48 -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
toaster	2b91e42410	Fix a bug where zoomtubes could cause ridiculous acceleration (ie, because PF_SPINNING was applied, causing ridiculously low friction, and then no mechanism was able to remove it)	2018-11-24 18:22:01 +00: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
TehRealSalt	d3a737f8c1	More SPB tweaks ... - SPB can switch off if its target if that person lost the lead for 7 seconds - Make sure lastlook gets reset when going back to SEEKING	2018-11-24 03:42:25 -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
TehRealSalt	4fdaf448f2	Change how SPB rush works ... Instead of enabling Frantic for the person in 2nd, it doubles the gap between them. Now it's 2nd's job to catch up and ruin 1st's day.	2018-11-24 02:56:39 -05: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
TehRealSalt	e265d910d3	Item roulette fun-times ... - Colorize items, Combi-Catcher style, while the roulette is still going. Nice Chaotix reference, and tells you when the game's just lagged. - Items blink when you first get them! They blink white when you wait out the whole roulette, red when you mash, or rainbow for enhanced items! Blinking prevents items from being stolen too, so items can't be literally stolen before you even have a chance to see what it was. - New item roulette sound for mashing - Fix TC_ limits in Lua	2018-11-23 19:15:14 -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
TehRealSalt	9e09dd7563	Don't show "Attack or Protect" for spectators	2018-11-23 16:00:21 -05: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
TehRealSalt	9c444b64a9	Fix divide by 0 bug	2018-11-23 15:45:46 -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
wolfy852	e51ed406ac	Swap out SDL_INIT_JOYSTICK for SDL_INIT_GAMECONTROLLER ... First step in improving controller support.	2018-11-23 00:01:20 -06:00
TehRealSalt	3f35ffd7c6	Franticized items for 2nd place VS SPB'd 1st	2018-11-22 23:38:54 -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
TehRealSalt	c4335a5524	Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart	2018-11-22 22:56:33 -05:00
TehRealSalt	00fc67ba36	Reset to defaults option in controls	2018-11-22 22:50:40 -05:00
Steel Titanium	6020abab94	Fix the not found errors on DLLs	2018-11-22 22:44:47 -05:00
TehRealSalt	c2c799c885	Change defaults of these ... nettimeout being 10 seconds is INSANITY, and maxping of 500 is when it starts being unplayable (I could also be bargained to raise it to 750 or 1000 though). Not sure if jointimeout causes any freezing, if it does then I'd also like to lower that	2018-11-22 20:54:28 -05:00
Sal	fe6832f559	Merge branch 'medal_unlocks' into 'master' ... Immediate Time Medal Unlock Fix See merge request KartKrew/Kart!104	2018-11-22 20:52:30 -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
Monster Iestyn	f7eea7ade3	Fix compiler errors	2018-11-22 20:08:57 +00: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
toaster	de02c0bca9	Turns out your unlocks are delayed a little bit! The medals are saved, but the unlocks due to the medals aren't immediate... which is a problem for Hell Attack, since there's no indication you need to play another level for it all to work!!!	2018-11-22 18:28:27 +00:00
toaster	c6268253eb	The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). ... Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out. In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.	2018-11-22 17:10:36 +00:00
mazmazz	2a5ae054f9	Make movement controls consistent with 2.2	2018-11-22 10:41:21 -05:00
TehRealSalt	3832ffcc42	Make SPB slightly fairer on conveyors ... It is possible to outrun SPB on gramet now	2018-11-21 22:26:33 -05:00
TehRealSalt	8f2210fb2f	Allow turning while respawning ... This makes rubber-burn turning even more useless, but I don't think there's a way to fix the rubber-burn turn without breaking demo playback, so let's just do the part that is needed for now. I kinda want to redo how that mechanic works anyway.	2018-11-21 20:29:21 -05:00
Steel Titanium	ff9c41ca5f	Merge branch 'master' into cmake-use-internal-libs	2018-11-21 20:05:08 -05:00
TehRealSalt	1cb602aec6	Fix squishing on mobj scale maps	2018-11-21 19:40:56 -05:00
TehRealSalt	a30563da22	Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately	2018-11-21 19:30:00 -05:00
TehRealSalt	f65a8796df	SPB retargets the same person after death	2018-11-21 19:22:28 -05:00
TehRealSalt	e07e89055d	Remove drift & pogo spring on hit and a few other places	2018-11-21 19:00:14 -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
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
TehRealSalt	b03d87c80a	Be more consistent with how we lock kartspeed/kartweight ... - The skin values are now locked between 1 and 9. - kartspeed & kartweight are no longer locked on skin-switch. Combined with the above, this results in no gameplay change, other than the character select showing the proper value. - Values used for the engine sounds are locked. No longer can overflow into character voices or freeslotted sounds. - Removed the overzealous weight locking when in offroad. If we want to ACTUALLY lock speed/weight for Lua too then we should do that in the Lua stuff.	2018-11-20 02:59:10 -05:00
TehRealSalt	5c67e22c22	Random map buffer only gets added to when ... Needs another temporary buffer for the vote screen so that it doesn't roll dupes	2018-11-20 00:13:08 -05:00
TehRealSalt	9a4ebb916a	Allow yeah in splitscreen	2018-11-20 00:10:54 -05:00
TehRealSalt	9b1c2b8dc0	Make Map Hell a 1% chance	2018-11-19 23:41:15 -05:00
TehRealSalt	9b7eea408d	Change "player" to "user" to make it easier to read	2018-11-19 23:13:09 -05:00
TehRealSalt	0a3183aa82	Don't shrink spectators ... Another typo here	2018-11-19 23:07:53 -05:00
TehRealSalt	c6053c8265	Don't do wipeout dust for spectators	2018-11-19 23:06:31 -05:00
TehRealSalt	555deddb6a	Offroad effect fixes ... - Make dust retain some of your speed so it's more visible - Only play effect when moving and on the ground	2018-11-19 22:45:12 -05:00
TehRealSalt	4590d5c5cf	Fix SKINCOLOR_ prefix not registering in Lua	2018-11-19 22:38:54 -05:00
TehRealSalt	39e644a7f5	Move countdown setting to P_CheckRacers ... This fixes two bugs: - Makes it so that the countdown happens when all the winners are ACTUALLY in instead of the first loser, because exiting timer wasn't set for the last winner in the place this was down before - Means that the countdown timer can be set on disconnect	2018-11-19 22:37:24 -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
TehRealSalt	20ac8ed126	Mistake	2018-11-18 23:31:36 -05: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
TehRealSalt	b58cbd2c08	Move Shrink out of P_DamageMobj	2018-11-18 17:51:49 -05:00
TehRealSalt	a3211df748	Apply banana drag effect to offroad	2018-11-18 17:01:43 -05:00
Sal	22b3a29d12	Merge branch 'countdown-on-all-win' into 'master' ... Finish countdown only starts when all winners are declared See merge request KartKrew/Kart!99	2018-11-18 16:09:09 -05:00
Sal	ddff42d9e0	Merge branch 'avoid_fixing_manual' into 'master' ... Avoid Modifying Default Controller Layout Manual Page See merge request KartKrew/Kart!102	2018-11-18 16:07:33 -05:00
Sal	b47d10645a	Merge branch 'show16playersinrankings' into 'master' ... Fix the player in 16th not being visible in rankings See merge request KartKrew/Kart!103	2018-11-18 16:02:32 -05:00
Sal	0aa251b18a	Merge branch 'nextmerge_again' into 'master' ... Nextmerge again See merge request KartKrew/Kart!101	2018-11-18 16:01:09 -05:00
toaster	ffcb6eb6ab	Merge branch 'fix-memory-leak' into 'master' ... Fix the Memory Leak See merge request KartKrew/Kart!100	2018-11-18 15:11:49 -05:00
toaster	a6d48f0ef4	Fix the player in 16th not being visible in rankings	2018-11-18 20:05:17 +00:00
toaster	cdeeac6ba1	Swap gc_lookback and gc_brake's default binded keys on controllers. (see the first issue in http://mb.srb2.org/showpost.php?p=802758&postcount=30)	2018-11-18 19:31:07 +00:00
toaster	c5a6460e18	Update ASSET_HASH_PATCH_KART for the latest patch.kart	2018-11-18 18:28:46 +00:00
toaster	aa607ecf4c	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again ... # Conflicts: # src/d_clisrv.c # src/m_misc.c	2018-11-18 18:26:50 +00:00
Monster Iestyn	8c71cd0b90	Merge branch 'master' into next	2018-11-18 17:11:57 +00:00
Sryder	4ee48194c4	Fix the Memory Leak ... The Kart Minimap heads I believe should use GTC_CACHE as they're shown in level, only(?) Not using it causes the memory to keep creeping up as more colourmaps are loaded but not freed, while OpenGL by extention endlessly keeps making new textures for the "new" colourmaps.	2018-11-18 14:43:31 +00:00
toaster	0720264bc2	Negate (netgame || multiplayer) condition for countdown to use defaultvalue instead of value per the specifics of the previous implementation	2018-11-18 09:10:26 -05: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
Sryder	24a551238d	Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git	2018-11-18 12:33:27 +00:00
Sryder	dac8a4ab93	Move the player 3 and 4 CMD defines to the correct place.	2018-11-18 12:32:59 +00:00
TehRealSalt	9acd0ffe8b	Fix for waiting player screen animation	2018-11-18 06:34:29 -05:00
TehRealSalt	12ee59bdfa	Finish countdown only starts when all winners are declared ... Still removing/changing crusty vanilla holdovers, one at a time. :shitsfree:	2018-11-18 06:17:42 -05:00
Sryder	9ffcc79288	Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git	2018-11-18 11:05:20 +00:00
Sryder	5a96a0d0a4	Fix potential warning from string truncation ... Also the MS seems to just throw the entire char array into the website and ignore null terminators, so I'm memsetting maptitle all to 0 before we do anything with it.	2018-11-18 11:05:05 +00:00
TehRealSalt	7b142dbad1	Updated the one important modified game print that most people see to be more descriptive ... (I could've SWORN there were more...)	2018-11-18 05:48:10 -05:00
TehRealSalt	fb3d0da38f	v1.0.1 prep ... Enable patch.kart, up version number	2018-11-18 04:00:05 -05:00
TehRealSalt	0e3b225011	Remove duplicate/removed objects ... As well as other compile errors	2018-11-18 03:43:33 -05:00
Sal	b20d76719b	Merge branch 'fix-opengl-screentexture-hack' into 'master' ... Fix textures in GL being wacky with the screen. See merge request KartKrew/Kart!91	2018-11-17 20:58:52 -05:00
TehRealSalt	516cda90ec	Default gr_md2 to on	2018-11-17 20:55:12 -05:00
TehRealSalt	bd3f398a04	Fix cvar bugs ... - karteliminatelast uses CV_YesNo instead of CV_OnOff - chatbacktint defaults to on - soniccd defaults to off	2018-11-17 20:47:11 -05:00
Sal	c419d973a3	Merge branch 'chat-changes' into 'master' ... Fix capslock wonkyness See merge request KartKrew/Kart!98	2018-11-17 16:54:56 -05:00
Sal	52e0379398	Merge branch 'introfadefix' into 'master' ... Make level white fade use timeinmap instead of leveltime See merge request KartKrew/Kart!93	2018-11-17 16:54:19 -05:00
Sal	b27a44e79b	Merge branch 'serverinfo_fix' into 'master' ... Serverinfo Fixes Closes #33 and #31 See merge request KartKrew/Kart!92	2018-11-17 16:54:08 -05:00
Sal	37596d445c	Merge branch 'savedata_fixes' into 'master' ... Gamedata fixes Closes #35 See merge request KartKrew/Kart!97	2018-11-17 16:53:56 -05:00
Sal	f17f5d08f5	Merge branch 'fix-splitscreen-join' into 'master' ... Prevent more local players than the server maxplayers limit joining Closes #30 See merge request KartKrew/Kart!90	2018-11-17 16:29:11 -05:00
Sal	8981093c85	Merge branch 'dedicated-battle-fix' into 'master' ... Fix Battle Causing the game to crash in dedicated servers Closes #36 See merge request KartKrew/Kart!88	2018-11-17 16:27:15 -05:00
Sal	e4cb1bc430	Merge branch 'shrinkegg_fix' into 'master' ... Fix Eggman shrink bug Closes #38 See merge request KartKrew/Kart!89	2018-11-17 16:24:40 -05:00
Latapostrophe	477400020d	forgot whitespaces....	2018-11-17 22:23:23 +01:00
Latapostrophe	e9767df4ff	Fix capslock not working outside of chat/console and shifting non letter characters	2018-11-17 22:21:10 +01:00
toaster	4abb03a231	Two tweaks to gamedata saving: ... * Save gamedata in Y_UpdateRecordReplays(), so that you never unfairly lose out on your spoils by setting modifiedgame before the game ends. * Always save your matchesplayed/totalplaytime increase at the successful completion of a level.	2018-11-17 20:16:27 +00:00
toaster	176dc6e5ca	Fix the first digit of all exiting players in positions 10 or worse flashing the first-place rainbow.	2018-11-17 18:02:04 +00:00
toaster	69228715fe	Make level white fade use timeinmap instead of leveltime	2018-11-17 16:54:56 +00:00
toaster	56ed67397d	* Fix the in-game MS browser thinking gametypes are unknown. ... * Fix the website MS browser mapname output being incomplete. * Hide hell maps on the website MS browser mapname output. * (unrelated) tweak Command_Showmap_f's logic for a more accurate name.	2018-11-17 15:48:10 +00:00
Sryder	c46efa7c41	Set the screen textures to use max higher texture IDs ... This should hopefully alleviate the issue where textures overwrite the screen, or the screen overwrites the texture for now. THIS IS NOT A FULL SOLUTION TO THE PROBLEM, but I highly doubt we'll ever be loading 4 billion textures at once, ever.	2018-11-17 15:23:12 +00:00
Sryder	5d991b6f2a	Prevent more local players than the server maxplayers limit joining	2018-11-17 15:00:15 +00:00
toaster	8735dcd24b	Fix Eggman shrink bug. ... Specifically: removed K_StripOther calls from touching fakes: No, none of these things need to be stripped! Also, poke K_StripOther just in case it eventually becomes relevant to have it.	2018-11-17 14:41:08 +00:00
Sryder	8845043d31	Fix Battle Causing the game to crash in dedicated servers ... Check that the displayplayer mo exists before trying to use it for scaling on Player Arrow	2018-11-16 23:07:27 +00:00
TehRealSalt	e85e621d2c	Minor credits issues	2018-11-16 12:05:57 -05:00
TehRealSalt	0de2d52bfd	add TOL_TV to dehacked	2018-11-16 12:04:24 -05:00
TehRealSalt	cb8bbf8e4c	Ensure MS packets are sent correctly	2018-11-16 12:01:57 -05:00
TehRealSalt	692ea23a42	Final credits	2018-11-15 22:55:01 -05:00
TehRealSalt	879267a709	Don't allow kart files to be downloaded	2018-11-15 19:18:04 -05:00
TehRealSalt	6b772aab59	Add Kart files to Makefile	2018-11-15 19:17:49 -05:00
TehRealSalt	82f353be61	Remove music.dta from loading ... We've replaced/changed out all vanilla songs, so we no longer need it.	2018-11-15 19:17:06 -05:00
toaster	5d6e15f8af	More cinematic title demos (hide most HUD elements, show a title logo in the bottom right hand corner).	2018-11-15 14:30:11 +00: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
Sryder	b8477b4067	Squash various warnings ... Shadowed declarations Unsuffixed float constants There's an unsuffixed float constant I can't fix because the define is outside of SRB2. We could have our own copy of Pi if we really wanted.	2018-11-14 21:53:57 +00: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
TehRealSalt	ad79b4b83b	Add S_StopSoundByID to Lua ... It was brought up to me in another server that character creators might want to have unique engine sounds. While I don't want to support that ourselves, as we have consistent engines for gameplay reasons, this gives people the ability to script around it if they so choose. Plus, it's just generally useful and I'm surprised vanilla hasn't added it, even though they have the function to stop ALL sounds on an object.	2018-11-14 15:35:16 -05:00
TehRealSalt	514cd0794b	This effect assumed that it was spawned at base scale anyway...	2018-11-14 14:48:16 -05:00
TehRealSalt	2d5551ca5b	Double spectator movement speed to keep up with action better, scale it with map size	2018-11-14 14:41:28 -05:00
TehRealSalt	1201acce4b	Slightly less duplication	2018-11-14 14:39:37 -05:00
MonsterIestyn	772c072064	Merge branch 'master' into analog-flipcam-synch-fix	2018-11-14 19:36:39 +00:00
TehRealSalt	887f4150c1	Hide unlockables with ???s	2018-11-14 14:15:24 -05: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
toaster	3b48bf0079	Hide SMK Cup until you've unlocked the Chao Cup on EXTRAS unless you've unlocked the Chao Cup. Fits with our modus operandi of minimising Mario exposure, while still having it for the committed.	2018-11-14 15:29:32 +00:00
toaster	d9b1d33d89	Bugfixes: ... * Use CV_NOSHOWHELP as an obstacle for CV_CompleteVar (so the hidden variables don't show up and ruin our party or anything). * Hack around the karteliminatelast thing so we don't have to hex-edit the netids, and can release with current assets (but a different executable, of course, to get the credits). * Fix M_HandleConnectIP not saving your current position on the menu if you use it while it's empty.	2018-11-14 15:28:17 +00: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
TehRealSalt	ba9818c8ca	Skip errors for staff ghosts	2018-11-14 05:20:51 -05:00
TehRealSalt	6afcde4aa5	More lenient balloon color setting	2018-11-14 04:45:40 -05:00
TehRealSalt	9119191b43	maps.kart quick patch	2018-11-14 04:16:13 -05:00
TehRealSalt	106d8c6d3f	Remove "Kart" in front of the version number ... Just looks silly :V	2018-11-14 01:12:58 -05:00
Sal	f10e7bade4	Merge branch 'disable-develop' into 'master' ... Disable DEVELOP mode See merge request KartKrew/Kart!85	2018-11-14 00:52:00 -05:00
TehRealSalt	682599def8	Update hashes ... NO MORE FILE EDITING FOR V1!!	2018-11-14 00:51:36 -05:00
TehRealSalt	f859139353	Final title screen	2018-11-14 00:30:51 -05:00
Marco Z	0b97b2a76c	Missed #ifdef HAVE_LIBGME in win_snd	2018-11-13 22:50:08 -05:00
TehRealSalt	7c2535808f	Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart	2018-11-13 21:02:49 -05:00
TehRealSalt	1ab5ac58a7	Title demos don't interrupt the music	2018-11-13 21:01:59 -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
toaster	6fb45fa2a9	replacement quit sounds per sal	2018-11-14 01:30:26 +00:00
toaster	5d2e638e8a	final menu tweaks before i fall asleep in my chair	2018-11-14 01:27:01 +00:00
Steel Titanium	d0b64222f7	Merge branch 'master' into cmake-use-internal-libs	2018-11-13 19:46:43 -05:00
TehRealSalt	5a06ae76ea	Switch Chao Cup & SMK Cup	2018-11-13 18:34:37 -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
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
TehRealSalt	d09fd4b861	Carry over old explosion sfx flags	2018-11-13 01:09:36 -05:00
TehRealSalt	29c9448148	Fix clash sound flags not being carried over	2018-11-13 01:06:13 -05:00
TehRealSalt	b009bddd3b	Lowered volume of drift sparks, made local	2018-11-12 17:18:39 -05:00
TehRealSalt	13b51823ba	Some tweaking ... - Swap order of Silver & Gold, for menu appearances & bug fixing - Ensure that totalplaytime and matchesplayed aren't kept when M_ClearSecrets getss called in M_EraseDataResponse - Set sensible defaults for emblem sprite/color	2018-11-12 17:09:37 -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
TehRealSalt	faaea8abe3	Final emblem setup ... - Added silver time medals for the new maps - Added gold dev time medals for all maps - Added 4 more matches played milestone medals - Changed requirements for most silver time medals to be easier, especially in the early game - Made all unlockable requirements higher, in both medals & matches, to balance out with the additional medals and make sure stuff is unlocked further into the first release week	2018-11-12 14:42:52 -05: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
TehRealSalt	d0f21ca415	Merge branch 'sfx-clean'	2018-11-12 04:26:02 -05:00
TehRealSalt	91ae26e213	Use S2 rips on the title screen	2018-11-11 19:22:15 -05:00
TehRealSalt	93ab9850a3	Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots ... - Replaced eggitem landing sfx - Replaced banana landing sfx - Replaced item tossing sfx - Replaced item clashing sfx - Added sfx for drift spark tier changing - Added sfx for brake drifting - Reverted Mario Mode sound replacement back to vanilla	2018-11-11 17:30:30 -05:00
toaster	71c72bf0c5	Realign YOU ARE THIS PLAYER highlight on non-green-res voting	2018-11-11 14:36:24 +00:00
Sryder	799efd5b31	Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into nextmerge	2018-11-10 22:29:37 +00:00
toaster	aece934083	Fix not found 40833	2018-11-10 22:27:04 +00:00
Sryder	6af56273bf	Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge ... # Conflicts: # src/d_main.c # src/d_main.h # src/d_netcmd.c # src/doomtype.h # src/hardware/hw_md2.h # src/p_user.c # src/r_splats.h # src/s_sound.c # src/s_sound.h # src/screen.c # src/sdl/i_system.c	2018-11-10 21:14:53 +00:00
MPC	eb4a72440a	Render the skies correctly on splitscreen in OpenGL mode	2018-11-10 16:19:41 -03: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
toaster	e1a28bbe1c	Three more CV_NOSHOWHELP's I missed the first time around. (Not making another exe for this, it'll show up the next time one is made... not that important.)	2018-11-10 18:50:19 +00:00
toaster	45fc2c46e9	Merge branch 'fof-slope-skew-backport' of https://git.magicalgirl.moe/STJr/SRB2.git	2018-11-10 18:27:13 +00:00
Sryder	a0165f1ac1	Merge branch 'com_cleanup_redo' into 'master' ... Improved "HELP" command See merge request KartKrew/Kart!82	2018-11-10 12:51:51 -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
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
toaster	5b286d89a8	Hide the numlaps change message in record attack. (It plays every time you load a demo of a map with a differing quantity of laps to the default value...)	2018-11-10 12:34:04 +00:00
toaster	a0badacd22	* Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first. ... * Apply the "YOU ARE THIS PERSON" highlight to all non-splitscreen circumstances that use the tiny player icons. (New locations: Tab rankings, intermission, completed votes.)	2018-11-10 12:31:41 +00:00
TehRealSalt	fa989f2f7f	Shorter Karma sticker	2018-11-10 01:03:34 -05:00
TehRealSalt	0f01e9513a	Use Silver for brake drift effect	2018-11-10 00:02:21 -05:00
TehRealSalt	571ef7173e	Ranking face highlights	2018-11-10 00:01:44 -05:00
TehRealSalt	60dcd3470b	Separate grow & invincibility alarms, donated by VAda	2018-11-09 21:47:36 -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
TehRealSalt	ad625296c2	Buff the fuck out of item drop speed ... no, dude, don't turn right back around and pick your shit right back up, stop	2018-11-09 15:37:33 -05:00
TehRealSalt	2f5e8ceee2	Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart	2018-11-09 15:34:59 -05:00
toaster	b0246d6cba	Prevent using kartdebug cvars in Time Attack. ... (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)	2018-11-09 20:16:12 +00: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
TehRealSalt	6c5acd6e0d	A few mobj_scale fixes I missed on signposts	2018-11-08 20:39:18 -05:00
TehRealSalt	3ad8d1c4ce	Lap emblem gets replaced with a stopwatch in Record Attack	2018-11-08 19:36:05 -05:00
TehRealSalt	68d2d00a07	Log "Speeding off to level..." ... It's not disruptive, but it looks a bit goofy since the "Map is now x" print is no longer directly printed either, so it's the only thing sticking around in the console :V	2018-11-08 17:56:26 -05:00
TehRealSalt	1e4d196e5e	Merge remote-tracking branch 'srb2public/next'	2018-11-08 17:37:05 -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
TehRealSalt	0feb1d557d	Foolish typo	2018-11-08 16:04:26 -05: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
TehRealSalt	11595a501a	Fix connecting w/ -splitscreen set	2018-11-08 15:24:10 -05:00
TehRealSalt	df3c6051e8	Make K_FindJawzTarget and K_GetKartDriftSparkValue HUD safe	2018-11-08 15:11:22 -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
TehRealSalt	03bf72bf9e	This fake Lua function is probably no longer needed, now.	2018-11-08 15:02:19 -05:00
TehRealSalt	f5a45534fa	Make the texture stuff completely integer-based again, but expose R_TextureNumForName ... Decided that being able to set a string and then have it return an integer when retrieving would ultimately be confusing, so let's just let the user handle the string functions.	2018-11-08 14:58:31 -05:00
TehRealSalt	ed1c108992	Merge branch 'master' into lua-improvement	2018-11-08 14:50:30 -05:00
TehRealSalt	94066638bc	Merge branch 'master' into lua-improvement	2018-11-08 14:49:56 -05:00
TehRealSalt	69287984db	Merge branch 'master' into staff_names	2018-11-08 14:47:38 -05:00
Sal	c32d0df6c2	Merge branch 'lua-hudlib' into 'master' ... Small Lua hud library improvements See merge request KartKrew/Kart!73	2018-11-08 14:43:58 -05:00
TehRealSalt	393fee317e	Fix for the Y_FollowIntermission change hurting Record Attack ... Should probably be ported to vanilla	2018-11-08 14:43:06 -05: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
TehRealSalt	aa3ad733af	Textures' string bits are now optional. ... I thought about just exposing R_TextureNumForName and leaving it to the user, since that makes it obvious that this is still an integer field, but I also liked being able to just specify a string and be done with it. I'm not picky either way.	2018-11-07 22:01:57 -05:00
TehRealSalt	bc7e865e6b	Serious deep-cleaning to most of the kartstuff ... More optional fields, more careful eye placed on return values and other checks	2018-11-07 21:04:57 -05:00
TehRealSalt	2b9b1e3bff	These are integers, whoops	2018-11-07 18:37:06 -05:00
TehRealSalt	95a1637437	Add Kart globals	2018-11-07 18:31:07 -05:00
TehRealSalt	b9161871a1	typo	2018-11-07 18:24:44 -05:00
TehRealSalt	7ad0347ab0	Add missing K_ functions	2018-11-07 18:23:28 -05:00
TehRealSalt	868118d0cd	IsPlayerAdmin support, since admin was removed	2018-11-07 18:07:34 -05:00
TehRealSalt	68c46cdca3	toptexture, bottomtexture, and midtexture use strings instead of magic numbers	2018-11-07 17:53:49 -05:00
toaster	c8c7b63be6	Fix disabling music on the menu.	2018-11-07 22:18:46 +00:00
toaster	e1d46e0122	Merge branch 'master' into 'lua-hudlib' ... # Conflicts: # src/lua_hudlib.c	2018-11-07 16:57:11 -05: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
toaster	8e6ecb5e98	* Add numbers to the staff name strings as Sryder requested. ... * Make the maximum number of staff ghosts 99 instead of 100. It's a minor thing, and insignificant in the grand scheme of things, but it fixes a bugbear I haven't been able to get out of my head since originally starting to maintain this code. (In the case of 100, it'd do S00, which'd have some fucky effects on ordering. If we WANTED to start with S00, we shoulda used that slot in the first place.)	2018-11-07 21:42:10 +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
TehRealSalt	9a18b83c2a	Disable DEVELOP mode	2018-11-07 16:19:02 -05:00
TehRealSalt	499faec555	Merge remote-tracking branch 'srb2public/next' ... (Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)	2018-11-07 16:15:14 -05: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
TehRealSalt	e63099f3de	Log this	2018-11-07 14:56:36 -05:00
Sal	a09d7489d8	Merge branch 'info_tidy' into 'master' ... Murder the fancharacters and associated See merge request KartKrew/Kart!83	2018-11-07 14:50:10 -05:00
toaster	cf16959ad5	Clean but quick: Rename all user-facing things that say "emblem" to say "medal" instead. Don't touch SOC, don't touch code, otherwise we'll be here all year.	2018-11-07 18:05:29 +00:00
GoldenTails	a3bc7ddfa0	Add Lua Ultimate Mode global variable so people can use it.	2018-11-06 18:09:45 -06:00
toaster	7866e88292	No-show of debug stuff, and make karteliminatelast into a debug to justify its hiding.	2018-11-06 18:54:00 +00:00
toaster	390d2b4114	Fix replaying guest demos	2018-11-06 13:38:53 +00:00
toaster	935c0da7d2	Fix startbumps. ... A more detailed explanation: * P_CheckPosition is the function which determines collisions. * In Vanilla, collisions do not happen between players unless tailspickup is off (which it basically never is). * Even with tailspickup off, on-spawn player collisions do not affect momentum. * However, in kart, player collisions cause the player to get bumped. * It would succeed at the P_CheckPosition call because players aren't *solid* solid, even though they cause bumps. * It would fail at the K_CheckPlayersRespawnColliding call, but that would be too late, *as the player already has been bumped.* * The player would therefore be moved to a new location, but still retain bump momentum, and the bump sound would have played for both players. * Therefore, the obvious solution is to swap P_CheckPosition and K_CheckPlayersRespawnColliding, so that it checks for players BEFORE it performs object collisions at that spot. * The reason we didn't see this MUCH before is that it can only ever happen in the case of ties. I could've easily done this into master, but obviously I figure yalls'd at least like to check this first.	2018-11-06 13:33:27 +00:00
toaster	5ccfc111e8	Disable attempt at preventing replays with the same staff member back to back, based on Discord discussion. If the RNG does this to you, you're on your own.	2018-11-05 23:18:34 +00:00
toaster	e958dfc909	MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone.	2018-11-05 23:06:28 +00:00
MPC	1cc8619c9e	Minor remote viewpoint bugfixes.	2018-11-05 20:40:51 -02:00
toaster	77d6e578f5	Blank out the fancharacters as requested, but don't remove them from the info lists... a fun thing for TCRF to look at eventually, maybe, and I don't want to have to do a from-scratch build at this stage in the game or risk any instability that could arise from sweeping info cleanups. ... In fact, the only reason I even considered doing this is that the sprites had to be removed, leaving these actively causing errors when placed.	2018-11-05 19:58:20 +00:00
toaster	bb251c4fbf	* Re-add support for command "help" (ie, basically no help at all). ... * Rename "suicide" command to "respawn" so the game doesn't tell you to kill yourself when you try to get help for it. * Add a "manual" command to open the manual.	2018-11-05 19:02:34 +00:00
toaster	f2e9186c7b	You were right, Sal, "%s ran out of time." should've died back when you were working on the branch to remove all the prints.	2018-11-05 14:33:39 +00:00
toaster	7be7c600bf	Cleaner code logic. Should make no real difference to exe, so not gonna upload another.	2018-11-05 14:28:32 +00:00
toaster	0d0eaf5f99	Fix "laststaff" setting	2018-11-05 14:03:09 +00:00
toaster	a0c3283303	Merge branch 'master' into staff_names	2018-11-05 13:46:10 +00:00
toaster	75d08f2048	TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!! ... Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).	2018-11-05 13:45:40 +00:00
toaster	9eafb61fd3	Black out the background around the GAMEQUIT picture, since we removed the automatic doing of that for non-green resolutions.	2018-11-05 12:52:15 +00:00
toaster	8d4ce113e4	Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1.	2018-11-05 12:49:28 +00:00
toaster	263b29a4a6	Merge branch 'fix-mixed-declarations' into 'master' ... Literally a single compiler warning. See merge request KartKrew/Kart!80	2018-11-04 16:49:45 -05:00
toaster	3a53d6d3b9	Properly support widescreen in Y_IntermissionDrawer (I meant to do this in charscleanup but forgot).	2018-11-04 21:48:47 +00:00
Sryder	6c0fae421c	Literally a single compiler warning.	2018-11-04 17:37:18 +00:00
toaster	b8446effe8	Correctly disable OGL-only menus/options in software.	2018-11-04 14:41:24 +00:00
toaster	e2f57e5ca0	Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. ... https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png	2018-11-04 12:15:13 +00:00
TehRealSalt	34baa5ae74	Mixed up validity check...	2018-11-03 22:53:12 -04:00
toaster	6604d0181c	Staff attack ghost names on the REPLAY... menu. ... Also: Remove playercolor being set to the replay's color. No need to kill your settings, seeing as it makes no tangible effect on your replay (doesn't even lose colour when you die, so I don't even know...)	2018-11-04 01:00:17 +00:00
TehRealSalt	d3944fe29b	Battle arrow fixes and cleanup	2018-11-03 17:45:38 -04:00
Latapostrophe	4cbc270b6d	Merge branch 'master' into lua-hudlib	2018-11-03 22:25:33 +01:00
Latapostrophe	e7f35307c9	Remove indents on #ifdefs and take K_drawInput in the hud_position check	2018-11-03 22:24:45 +01:00
toaster	f9ad07da5f	Fix 2p ("wide") splitscreen having an incorrect FINISH arrangement (drawn at wrong scale, moved across screen at wrong speed...)	2018-11-03 13:20:02 +00: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
TehRealSalt	0d79cbdd27	Keep the old y offsets, though.	2018-11-03 03:38:41 -04:00
TehRealSalt	cb1380ae51	Changed this randomly changed instance back to vanilla, due to compile errors ... https://i.imgur.com/SEdmZpC.png	2018-11-03 03:29:06 -04:00
TehRealSalt	69faf1cbc7	Remove NOFOURPLAYER from Makefile ... Seems that someone already removed it from the other code anyway...?	2018-11-03 03:21:08 -04:00
TehRealSalt	9de7a9d5cc	Add textures.kart, re-define DEVELOP mode, ... Disabling DEVELOP can be another branch; this means this can get in master quicker	2018-11-03 03:17:20 -04:00
TehRealSalt	0eab0c5a14	Merge branch 'master' into update-version	2018-11-02 23:57:28 -04:00
TehRealSalt	9ae9e7ec3a	Check for valid source in A_JawzChase, change 1 target rule	2018-11-02 23:51:06 -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
TehRealSalt	cb699c1770	fullbright points	2018-11-02 15:06:56 -04:00
TehRealSalt	6bb33b9d16	Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart	2018-11-02 14:59:48 -04:00
TehRealSalt	ba67c7aa70	Fix for "became a spectator" text repeating	2018-11-02 14:59:26 -04:00
Sal	87dd8cd0ce	Merge branch 'all_hardcode' into 'master' ... Truly all-hardcode See merge request KartKrew/Kart!71	2018-11-02 14:54:09 -04:00
TehRealSalt	399bccd2c7	use gfx.kart	2018-11-02 14:52:08 -04: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
TehRealSalt	8d5fb13111	wrong var fix	2018-11-02 14:01:29 -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
TehRealSalt	37893cc523	Merge branch 'master' into all_hardcode	2018-11-02 02:30:36 -04:00
TehRealSalt	1bdaad3f06	quick merge fix	2018-11-02 02:28:34 -04:00
TehRealSalt	5c1cc6e1df	Merge branch 'master' into all_hardcode	2018-11-02 01:42:34 -04:00
TehRealSalt	667e636631	Use chars.kart	2018-11-02 01:22:52 -04:00
TehRealSalt	6fd0f3f0ba	Fix ghost rankings issue	2018-11-02 01:19:25 -04:00
TehRealSalt	89276b739f	Merge branch 'master' into chars_cleanup	2018-11-01 23:48:22 -04:00
TehRealSalt	950bca1217	Actually lets just do this now, like how its done below	2018-11-01 21:05:52 -04:00
TehRealSalt	78299c5fee	0xFFFF to 0xFFFFFFFF ... I'll implement proper bit-setting later, just gotta see if it works first	2018-11-01 20:50:19 -04:00
TehRealSalt	67dd962fb9	Change out the hex used for hnext/hprev consistancy	2018-11-01 20:46:20 -04:00
TehRealSalt	e758e0f8fd	Merge branch 'master' into resync	2018-11-01 20:39:50 -04:00
TehRealSalt	5c7de75592	Fix random crash on squishing ... Why does this cause a crash? I dunno, beats me, but this seemed to fix it.	2018-11-01 19:50:31 -04:00
TehRealSalt	0c2a5cf9d3	Merge branch 'master' into more-fixes	2018-11-01 18:10:53 -04:00
TehRealSalt	7e103be393	Change default brake color from Yellow to White	2018-11-01 17:37:59 -04:00
TehRealSalt	6a31959381	Merge branch 'master' into brake-drift	2018-11-01 17:37:10 -04:00
TehRealSalt	03d64cbced	Merge branch 'master' into brake-drift	2018-11-01 17:35:45 -04:00
TehRealSalt	deb51d1eb4	Merge branch 'master' into battle-visuals	2018-11-01 17:35:01 -04:00
TehRealSalt	a2da81243e	Double length of msg	2018-11-01 17:08:30 -04:00
TehRealSalt	43d72d72f9	Properly center this	2018-11-01 17:06:10 -04:00
TehRealSalt	7e9300c420	Lap hands touch-up	2018-11-01 16:15:25 -04:00
Steel Titanium	5a0cfc10f4	Update copyright info on some files	2018-11-01 14:47:19 -04:00
TehRealSalt	4cf9476510	First frame lasts longer	2018-11-01 13:44:09 -04:00
TehRealSalt	7891a11fba	Battle points are visible	2018-11-01 00:57:38 -04:00
TehRealSalt	a193a4adf2	YOU GOT EM ... Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.	2018-10-31 23:34:13 -04:00
TehRealSalt	6c557407d5	Added judging hands (if'd out)	2018-10-31 23:10:38 -04:00
TehRealSalt	4369917912	Fix offsets, add colormapping	2018-10-31 22:38:43 -04:00
TehRealSalt	ea4ca2eb1f	Brake drfit effect	2018-10-31 21:35:17 -04:00
toaster	659e6fa617	That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. ... * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.	2018-11-01 00:10:34 +00: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
TehRealSalt	2999c45d05	Item distribution experiments based on my experience in netgames ... Needs tested tonight. - Grow & Rocket Sneakers are slightly more in the back - Sneaker x3 gets handed out more in the back-middle - Removed 5% from Ballhog towards the front - Removed 5% from Shrink in the forward-most column it was in	2018-10-31 15:14:53 -04:00
toaster	007ef084c6	Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode	2018-10-31 16:19:50 +00:00
toaster	668acad8a7	Order of state enums was different to that of info table, so corrected.	2018-10-31 16:18:44 +00:00
Latapostrophe	1928dd86f1	I forgot a }, you may slap me.	2018-10-31 17:14:32 +01:00
toaster	8370064706	Merge branch 'wolfs_hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode ... # Conflicts: # src/dehacked.c # src/info.c # src/info.h	2018-10-31 15:19:39 +00:00
Latapostrophe	7a04fd1097	Resolved merge conflict and renamed gamerankings to minirankings	2018-10-31 15:18:05 +01:00
TehRealSalt	80b8aefdb2	Nerfed squishing ... After fixing flashing tics not being set properly, 2 seconds of being fully stopped and then another 1.5 seconds minimum of being unable to be hit just feels like an eternity :V	2018-10-31 05:35:06 -04:00
TehRealSalt	e76da7d5ca	No item usage while squished or respawning	2018-10-31 05:32:59 -04:00
TehRealSalt	54f71d3dbf	Use frameangle for rocket sneakers so they rotate around you when you spinout	2018-10-31 05:28:39 -04:00
TehRealSalt	6da700629f	Fix incorrect scale of player arrows in non-splitscreen ... whoops	2018-10-31 04:55:00 -04:00
TehRealSalt	66a7adfc34	Push fakes away from other items ... Prevents stupid item stacking in Battle (you can still do it with bananas, but THOSE are removable, and don't have a similar sprite)	2018-10-31 04:46:24 -04:00
TehRealSalt	cc5d248c90	Time over cam & signposts support mobjscale	2018-10-31 03:13:56 -04:00
TehRealSalt	20d86f01c7	Cancel pogo spring when bumping a wall ... Prevents instances where you can use it to stick in one spot in Battle	2018-10-31 03:07:33 -04:00
TehRealSalt	db731209e5	Fix ENTER GAME option not working	2018-10-31 03:06:36 -04:00
TehRealSalt	69354856b7	"Joined with" kicks display in the chat instead of console	2018-10-31 02:46:16 -04:00
wolfy852	932f1f929a	SOC_CHAO hardcode ... TODO: fix comment alignment	2018-10-30 20:35:33 -05: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
TehRealSalt	aea453f6f2	Set stats to what we want them to be for R2 anyway ... (Eggman's will need updating in the wad)	2018-10-30 20:11:15 -04:00
toaster	26241d32ce	Have HU_DrawRankings and K_drawKartPositionFaces learn a thing or two from each other, considering the latter was originally copypasted code from the former but then diverged a bit. ... Hopefully this solves our disconnect woes.	2018-10-30 23:01:17 +00:00
toaster	fe177975ca	Fix ping alignment.	2018-10-30 22:44:05 +00:00
TehRealSalt	f1ea725319	Clean up for player->mo resyncing ... Make most of the order match the struct, make sure proper type conversions are used when needed	2018-10-30 18:20:56 -04:00
Latapostrophe	f2eea0b31a	I'm a genius and forgot to rename the stuff correctly	2018-10-30 23:10:56 +01:00
toaster	ad78c75430	Make the horizontal line at the bottom of the tab rankings use the duptweaks.	2018-10-30 22:09:04 +00:00
Latapostrophe	b6b19c8250	Removed some useless stuff	2018-10-30 23:08:58 +01:00
toaster	f36d58dd09	Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup	2018-10-30 22:08:17 +00:00
toaster	6c020aab2e	Some adjustments to the position faces. (Currently untested, but I need to merge master in and accidentially did this before that and I still have to compile from scratch for this branch, so...)	2018-10-30 22:07:35 +00: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
TehRealSalt	f9d559b03c	Fuck it, add back in the old vars ... If we want a smaller resync packet, let's actually remove these FOR REAL	2018-10-30 17:03:11 -04:00
TehRealSalt	7fbfed535b	Add hnext/hprev to consistancy, add marescore to resynchend	2018-10-30 16:24:27 -04:00
Latapostrophe	a0495142df	Small hud library additions	2018-10-30 19:40:59 +01:00
Latapostrophe	232a19edf4	A few additions to the hud library	2018-10-30 18:24:03 +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
toaster	98f9d73ca8	No fucking wonder these weren't showing up, I set their duration to 1 tic instead of -1 tic ... (The Volcanic Valley issue is because the most recent Volcanic Valley update in maps.kart lost all the Objectspecial flags from mapthing 2018)	2018-10-30 11:08:53 +00:00
TehRealSalt	48a400c347	Clean up resync pak	2018-10-30 01:23:21 -04:00
toaster	7f24836d00	Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode	2018-10-29 21:47:34 +00:00
TehRealSalt	08144b96f1	Fix SMK RR thwomps casuing bounce-up	2018-10-29 17:45:59 -04:00
toaster	52523fc4b4	Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode	2018-10-29 21:37:06 +00:00
toaster	f1a6e1e6cd	Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode ... # Conflicts: # src/info.c # src/info.h # src/p_mobj.c	2018-10-29 21:36:39 +00:00
LJSonik	b52158eb48	Merge branch 'master' into analog-flipcam-synch-fix	2018-10-29 19:52:08 +01:00
toaster	318d692c3c	Make dropped floatingitems not carry player momentum (sorry for leaving this so long, Oni!)	2018-10-29 14:43:21 +00: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
toaster	1e4207c1de	Merge branch 'master' into 'toast_pokes' ... # Conflicts: # src/hu_stuff.c	2018-10-29 07:04:35 -04:00
toaster	e2399c1638	Fix Sonic's minimap icon not being properly initialised. (Experimenting with the online editor, since I'm low on time, but this is 100% correct and I'll make a new exe later.)	2018-10-29 06:57:45 -04:00
toaster	adcf5a9a4e	Merge branch 'master' into 'chars_cleanup' ... # Conflicts: # src/hu_stuff.c	2018-10-29 06:48:18 -04:00
Sal	07a31c20d6	Merge branch 'grow-shrink-fixes' into 'master' ... Invincibility item & Shrink fixes See merge request KartKrew/Kart!68	2018-10-29 05:32:20 -04:00
Sal	292a18804a	Merge branch 'splitscreen-tuneup' into 'master' ... Splitscreen tuneup See merge request KartKrew/Kart!67	2018-10-29 05:30:49 -04:00
Sal	8dbb636b2f	Merge branch 'div-sounds' into 'master' ... Divide sound with number of local players See merge request KartKrew/Kart!66	2018-10-29 05:26:51 -04:00
TehRealSalt	f8d87c8f08	Preface with splitscreen checks	2018-10-29 05:26:17 -04:00
TehRealSalt	14fcda0eca	Make shadows more consistent on slopes for non-players	2018-10-29 05:21:47 -04:00
TehRealSalt	9f18164ad4	The motherload: all of my Lua is hardcoded ... This took like 6 straight hours of work, never ask me for anything ever again	2018-10-29 05:00:08 -04: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
TehRealSalt	9630e01616	Camera crash fixes ... UNRELATED, but they made this branch a pain in the ass to test so I needed to fix this here :V	2018-10-28 17:31:59 -04:00
TehRealSalt	b83286b532	Use k_itemtype as the additional check instead of pw_shield	2018-10-28 14:45:01 -04:00
TehRealSalt	9d6563fcf7	Fix kartspeed/kartweight writes	2018-10-28 14:43:58 -04:00
toaster	75efd3e2c5	Ping offset fixed even more	2018-10-28 18:06:21 +00:00
TehRealSalt	a23c62e60e	Move lap animation up slightly ... (I'm not gonna remember to do this later either)	2018-10-28 13:52:25 -04:00
toaster	49e25abb60	fix ping drawing offset (this won't be in the exe I uploaded before I disappear for a bit)	2018-10-28 16:34:02 +00:00
toaster	fe00f34562	unused variable [screams]	2018-10-28 16:29:56 +00:00
toaster	a9b4a56d23	Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. ... * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.	2018-10-28 16:27:55 +00:00
TehRealSalt	a885f340ae	Use V_ORANGEMAP for blinking WANTED text in Battle splitscreen	2018-10-28 01:50:27 -04:00
TehRealSalt	84c9dbfcce	Even better: base it off how much timer is left ... So instead of prioritizing a specific track, the person who activated their powerup the latest gets their music. That should be a nicer solution for when multiple players are activating their powerups at the same time.	2018-10-28 01:38:01 -04:00
TehRealSalt	67a8ee178d	More smoothly decide which invincibility music to use ... Less P_RestoreMusic conflicts in splitscreen, just see the Toxic Palace video for an example :V	2018-10-28 01:22:26 -04:00
TehRealSalt	b6d8c3ea7d	This didn't commit with for some reason...	2018-10-28 01:02:49 -04:00
TehRealSalt	93e989cf61	Fix invincibility item cap ... It was supposed to be capped at 2 invincibility items at a time, not 3. (may consider scaling with number of players, just not for R1)	2018-10-28 01:02:30 -04:00
TehRealSalt	5a719afbc1	Fix up respawning so that it takes respawning with Shrink into account	2018-10-28 00:58:49 -04:00
TehRealSalt	8d78ee7458	No more rescaling gfx for countdown/finish	2018-10-27 23:14:11 -04:00
TehRealSalt	e9515294e8	Show LOSE/COOL in splitscreen again ... Looked goofy offline, with 1 WIN and 3 LOSEs, but now that there's COOL and online splitscreen I thought it should come back	2018-10-27 22:43:57 -04:00
TehRealSalt	d0a50ae247	This bothers me, so I might as well do it while I'm in here.	2018-10-27 21:48:50 -04:00
TehRealSalt	dc5a738f7f	"if !splitscreen" instances that SHOULD be "if netgame"	2018-10-27 21:45:04 -04:00
TehRealSalt	f1f8f91aea	Higher default scale, WANTED indicator scales properly	2018-10-27 20:56:11 -04:00
TehRealSalt	339a857cba	Reduce camspeed in splitscreen	2018-10-27 20:44:05 -04:00
toaster	4c7f083d13	toaster: not good at stuff (signpost z offset fix)	2018-10-27 22:23:44 +01:00
toaster	e8410b2575	Fix and then subsequently disable the zoom tube angle setting stuff.	2018-10-27 22:05:15 +01:00
toaster	3d760271e3	Fix the issue with sliding I identified this morning. ... Also, apply it to being in a zoom tube, too! For extra forwards compatibility with all the terrible SRB2 Riders ports that are almost an inevitability.	2018-10-27 21:41:45 +01:00
toaster	119c9f34ae	Minor correction - Jeck initially got it wrong, but informed me after lots of testin's.	2018-10-27 21:30:41 +01:00
toaster	8b382d2e40	As requested by Jeck: ... * gr_md2 on the menu. * Disable interpolerated model option completely for now. Also, tweaked the GL menus a bit to suck less, since I was ferreting around in that area.	2018-10-27 21:16:19 +01:00
toaster	68da56671e	Make it so hitting enter on the ipv4 option doesn't close all menus with the warning, only if you start trying to connect.	2018-10-27 20:44:18 +01:00
toaster	88b6e9e1bd	Minor things that annoyed me to NO GOOD END. ... * Tweak the demo info layout (holding tab while demoplayback) to better match the Viewpoint text in MP. * Make the tab rankings view support widescreen better, including the spectator ticker (but not the player name layout). * Make the tab rankings view always have a darkened background, to get around the fact we can't darken it based on player state for battle. * Remove FREE PLAY from tab rankings.	2018-10-27 20:43:33 +01:00
toaster	564cfb33b4	Fade stuff! ... * Make the white intro fade always drawn, rather than potentially disable-able through tab or HUD disable. * Slightly increase the darkness of the intermission fade, since its current value had a negative effect on SKINCOLOR_SAPPHIRE.	2018-10-27 20:39:41 +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
toaster	bd36816b39	dumbass who forgot to stage most of the actual changes because she actually deleted all the changes and then remade them by accident	2018-10-27 16:25:25 +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