106 commits

Author	SHA1	Message	Date
Latapostrophe	1b61e15b1b	Merge branch 'master' into SRB2-CHAT	2018-12-23 10:26:08 +01:00
Latapostrophe	c7060aa5ad	Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message.	2018-12-22 16:44:58 +01:00
mazmazz	7f8d16d3cd	Add DEVELOP build flag to version string	2018-12-20 02:27:30 -05:00
Latapostrophe	a31b85e124	Some messages relevant to discussions now go in the chat.	2018-12-19 16:44:57 +01:00
Latapostrophe	25e6d5388c	merge conflict	2018-12-16 16:48:15 +01:00
mazmazz	df89781623	Windows string adjustment	2018-12-06 15:42:58 -05:00
mazmazz	ba60989c00	Adjust version strings	2018-12-06 15:39:19 -05:00
mazmazz	f0c7848e50	Use proper DD define for use_joystick	2018-12-06 06:50:18 -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	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	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
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
Monster Iestyn	33c1ac33f5	Merge branch 'next' into 21-version ... # Conflicts: # src/d_netcmd.c	2018-12-02 15:45:07 +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
wolfy852	c517862f7e	I must be some kind of idiot.	2018-11-29 07:34:05 -06:00
Wolfy	b59718d3ad	Remove hardcoded limit on admins ... # Conflicts: # src/d_netcmd.c	2018-11-29 07:05:49 -06:00
Wolfy	b8ce51bff2	Multiple admins ... # Conflicts: # src/d_netcmd.c # src/d_netcmd.h	2018-11-29 06:46:59 -06:00
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
Alam Ed Arias	9a042cd5e2	Merge branch 'master' into next	2018-11-26 19:49:19 -05:00
MonsterIestyn	b53cd70201	Merge branch 'next' into PK3-BackportNext	2018-11-26 18:56:51 +00: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
Monster Iestyn	1b2aea81dc	Merge branch 'master' into next	2018-11-25 20:39:17 +00:00
mazmazz	ea7162a76a	Update source copyrights to 2018	2018-11-25 07:35:38 -05:00
Nev3r	6f5e3d42ff	Merge branch 'PK3-Backport' into 'PK3-BackportNext' ... Pk3 backport See merge request Nev3r/SRB2!1	2018-11-24 06:02:19 -05:00
Nev3r	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
mazmazz	17ff7e69a0	Add chasefreelook to separate third and first person mouselook	2018-11-22 17:05:24 -05:00
Alam Ed Arias	d4cb81cb28	Merge branch 'master' into next	2018-11-14 15:45:29 -05:00
MonsterIestyn	772c072064	Merge branch 'master' into analog-flipcam-synch-fix	2018-11-14 19:36:39 +00:00
Monster Iestyn	17223aa520	Merge branch 'master' into next	2018-11-09 16:09:49 +00:00
LJSonik	b52158eb48	Merge branch 'master' into analog-flipcam-synch-fix	2018-10-29 19:52:08 +01:00
Louis-Antoine	3d0daf2202	Fix desynch when toggling analog mode or flipcam ... Special thanks to Lat' for asking weird questions	2018-10-29 00:49:23 +01:00
Monster Iestyn	d57c54f93b	Merge branch 'master' into next	2018-10-20 14:13:13 +01:00
Steel Titanium	b3faed190b	Move commands and console variable into s_sound.c	2018-10-11 16:29:43 -04:00
mazmazz	b330dc2394	Don't call I_StartupSound in SFX toggle ... * Mixer: make I_StartupSound return early if already set up * Restartaudio: Add StopSFX call	2018-09-14 16:39:10 -04:00
mazmazz	a7ed7b2c90	Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method ... * In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables * Simplified Dig/MidiMusicDisabled in s_sound * Method reordering (cherry picked from commit 701cc5a7dd)	2018-09-14 10:23:37 -04:00
Monster Iestyn	38ac999d77	Merge branch 'addfile-verify-fix' into 'next' ... Addfile command verify fix. See merge request STJr/SRB2!272	2018-09-03 17:17:46 -04:00
Steel Titanium	0f5d685d1f	Only do this if the admin player isn't the server host also.	2018-08-30 18:32:26 -04:00
Latapostrophe	8747a8529d	Changed chat position, ... Added chat back tint Fixed word wrapping glitches	2018-08-19 10:58:29 +02:00
Monster Iestyn	02d2b61866	Merge branch 'master' into next	2018-08-06 15:15:35 +01:00
Monster Iestyn	8d622ff6f8	Quick fix for LJ's password fix: don't check if password is set until we've confirmed that the receiving player is the server!	2018-08-05 20:17:30 +01:00
Latapostrophe	ac7c249fd2	SRB2chat test rework	2018-07-31 11:10:02 +02:00
Monster Iestyn	e5236c3137	Merge branch 'master' into next	2018-07-05 21:09:39 +01:00
Louis-Antoine	c389c0b3dc	xd	2018-06-04 22:30:27 +02:00
Louis-Antoine	91081a3e53	Disable admin password by default	2018-06-04 22:14:01 +02:00