2101 commits

Author	SHA1	Message	Date
Latapostrophe	9f17039e2e	Merge branch 'srb2chat' into 'SRB2-CHAT' ... fix my fucking code See merge request SinnamonLat/SRB2!1	2018-12-18 11:51:18 -05:00
mazmazz	1fcf607b41	Fix strncpy nodenum length overflow	2018-12-17 21:31:00 -05:00
mazmazz	876ddd48f1	Change int to INT32	2018-12-17 19:09:05 -05:00
mazmazz	bf21b7c483	Mixed D&C fixes for HU_DrawTeamTabRankings	2018-12-17 19:03:09 -05:00
mazmazz	7a92c9d3d0	Mixed D&C fixes; replace a couple int's with INT32	2018-12-17 19:02:22 -05:00
mazmazz	245a125551	Fix compile errors	2018-12-17 18:55:21 -05:00
MPC	ca4329bcb6	fix the fucking warning	2018-12-17 18:09:29 -03:00
MPC	82601e881b	fix my fucking code	2018-12-17 17:57:53 -03:00
Latapostrophe	2fdf27c507	make sure to change p_dispy and not y for /pm list. Also make MPC happy.	2018-12-17 21:39:49 +01:00
Latapostrophe	ff957baae3	Don't overlap ringslinger HUD	2018-12-17 21:31:31 +01:00
Latapostrophe	45aba493c7	2.1.21 and all of the kart additions. Woo.	2018-12-17 20:43:59 +01:00
Latapostrophe	25e6d5388c	merge conflict	2018-12-16 16:48:15 +01:00
Monster Iestyn	880c017f8f	Merge branch 'cfg-srb2home-fix' into 'master' ... Apply srb2home path to EXEC, SAVECONFIG, and debugfile See merge request STJr/SRB2!379	2018-12-13 16:16:52 -05:00
mazmazz	d18b2cda59	Apply srb2home to saveconfig ONLY if srb2home isn't already there	2018-12-13 13:32:38 -05:00
mazmazz	93f7f0a8df	Apply srb2home to debugfile	2018-12-13 13:23:09 -05:00
mazmazz	b1641aa8e9	Apply srb2home to SAVECONFIG	2018-12-13 13:17:56 -05:00
mazmazz	93eda4e7c9	EXEC: Search for CFG by file path	2018-12-13 13:11:25 -05:00
mazmazz	b84470ec51	Fix savegamename being improperly built due to missing null char after copying timeattackfolder	2018-12-13 12:01:07 -05:00
mazmazz	df89781623	Windows string adjustment	2018-12-06 15:42:58 -05:00
mazmazz	ba60989c00	Adjust version strings	2018-12-06 15:39:19 -05:00
Digiku	17e9188c89	Merge branch 'execversion' into '21-version' ... Block previous versions' config defaults with EXECVERSION consvar See merge request STJr/SRB2!371	2018-12-06 12:41:20 -05:00
mazmazz	3ceeb6a205	Register execversion and remove CV_SAVE because we write manually	2018-12-06 12:28:30 -05:00
mazmazz	0be61e8830	a stray if block	2018-12-06 12:03:53 -05:00
mazmazz	a5eb62b73e	alwaysfreelook -> alwaysmlook string	2018-12-06 12:02:45 -05:00
mazmazz	70aa4ce18e	Add alwaysfreelook2 and mousemove2 to config versioning ... * Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)	2018-12-06 11:59:34 -05:00
mazmazz	f0c7848e50	Use proper DD define for use_joystick	2018-12-06 06:50:18 -05:00
mazmazz	5b3a1e0c55	Implement EXECVERSION consvar to invalidate previous versions' default config values	2018-12-06 06:28:34 -05:00
mazmazz	a802069313	Move joyaxis_fire default to right trigger	2018-12-06 05:55:56 -05:00
mazmazz	aaf5d2e1dc	Change 2p controller defaults	2018-12-06 05:26:28 -05:00
mazmazz	9055c9aeab	Hex instead of octal colors	2018-12-05 13:08:25 -05:00
mazmazz	c5b349ddc4	More concise bitness check	2018-12-05 13:06:56 -05:00
mazmazz	1ea2fa447a	Make the ifdefs cleaner	2018-12-05 13:00:42 -05:00
mazmazz	389c2d4ea1	_WINDOWS instead of _WIN32 for DD	2018-12-05 12:55:05 -05:00
mazmazz	6d9fb0d3fd	Merge remote-tracking branch 'public-gitlab/21-version' into versionflags	2018-12-05 12:49:21 -05:00
Monster Iestyn	aee8dcdff8	Fix 64-bit build-using admins not being able to kick players besides themselves, by not checking sendingsavegame[] code at all if not the server ... it turns out playernode[pn] is typically 255 in the above situation, so sendingsavegame[playernode[pn]] goes out of bounds ...but goodness knows why 32-bit builds didn't suffer the same bug, seems to have been pure luck	2018-12-05 17:39:02 +00:00
mazmazz	a6dcd5555e	Add various flags to version string	2018-12-05 11:43:33 -05:00
Monster Iestyn	ae14fd2f85	Fix motd being broken for admins ... It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands	2018-12-04 21:09:28 +00:00
Monster Iestyn	b4b82e681c	Fix the game being basically broken due to multi-admin, by porting over some missing changes from Kart	2018-12-04 18:54:36 +00:00
Monster Iestyn	e353e2ef70	Merge branch 'next' into 21-version	2018-12-04 17:19:36 +00:00
Monster Iestyn	f2b0db5a1c	Merge branch 'master' into next	2018-12-04 17:18:19 +00:00
Digiku	e6e5856fd8	Merge branch 'auto-joystick' into 'master' ... Use Joystick 1 and Joystick 2 by default if plugged in See merge request STJr/SRB2!364	2018-12-04 11:53:58 -05:00
Digiku	631f6ed406	Merge branch 'joystick-juggling' into 'master' ... Joystick juggling See merge request STJr/SRB2!355	2018-12-04 11:51:55 -05:00
Monster Iestyn	d1a8e3acdb	Merge branch 'tiny-makefile-fix' into 'master' ... Tiny Makefile Fix See merge request STJr/SRB2!289	2018-12-04 08:09:27 -05:00
mazmazz	c799584f3d	Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart)	2018-12-03 23:36:36 -05:00
mazmazz	60feae1014	Update OSX icon	2018-12-03 23:09:54 -05:00
Digiku	ba81e26f71	Merge branch 'controller-menu-touchup' into 'master' ... Controller select menu improvements. See merge request STJr/SRB2!354	2018-12-03 23:00:36 -05:00
Digiku	42cb597731	Merge branch 'joystick-juggling-two' into 'next' ... Joystick additions for menu, axis defaults, and vertical look toggle See merge request STJr/SRB2!359	2018-12-03 22:59:19 -05:00
Steel Titanium	fbb2cde800	Make this be consistent with non-CMake builds	2018-12-03 15:42:37 -05:00
Steel Titanium	168647275c	One small change	2018-12-03 13:32:24 -05:00
mazmazz	6ca1130551	Hardcode Screenshot, GIF, and Viewpoint to their F keys	2018-12-03 13:21:16 -05:00