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
e353e2ef70
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
f2b0db5a1c
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
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
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
6d7689c1a7
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
54cae84849
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03:00
c517862f7e
I must be some kind of idiot.
2018-11-29 07:34:05 -06:00
b59718d3ad
Remove hardcoded limit on admins
...
# Conflicts:
# src/d_netcmd.c
2018-11-29 07:05:49 -06:00
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
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
9a042cd5e2
Merge branch 'master' into next
2018-11-26 19:49:19 -05:00
b53cd70201
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
930835f1a2
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
2018-11-25 21:47:56 -05:00
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
6f5e3d42ff
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
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
17ff7e69a0
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
d4cb81cb28
Merge branch 'master' into next
2018-11-14 15:45:29 -05:00
772c072064
Merge branch 'master' into analog-flipcam-synch-fix
2018-11-14 19:36:39 +00:00
17223aa520
Merge branch 'master' into next
2018-11-09 16:09:49 +00:00
b52158eb48
Merge branch 'master' into analog-flipcam-synch-fix
2018-10-29 19:52:08 +01:00
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
d57c54f93b
Merge branch 'master' into next
2018-10-20 14:13:13 +01:00
b3faed190b
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
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
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 701cc5a7dd1dfead87a42ec7558c9fa6a1deb193)
2018-09-14 10:23:37 -04:00
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
0f5d685d1f
Only do this if the admin player isn't the server host also.
2018-08-30 18:32:26 -04:00
02d2b61866
Merge branch 'master' into next
2018-08-06 15:15:35 +01:00
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
e5236c3137
Merge branch 'master' into next
2018-07-05 21:09:39 +01:00
c389c0b3dc
xd
2018-06-04 22:30:27 +02:00
91081a3e53
Disable admin password by default
2018-06-04 22:14:01 +02:00
99552c2ba2
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
5adfdf9516
cv_playername already has a valid default value of "Sonic". We do NOT need to expose things like this.
2018-01-30 22:48:53 +00:00
f1b8e122a2
Fix missing semicolon
2018-01-12 20:05:09 +00:00
602701d6dd
G_DoPlayDemo: prepend srb2home to the demo name (if an external file) so that demos in custom home paths can be loaded
2018-01-11 16:55:42 +00:00
afcdb5cd1e
Merge branch 'restartaudio' into 'master'
...
Add command to restart the audio system
Closes #27
See merge request STJr/SRB2!214
2017-12-27 16:47:50 -05:00
875446295b
Remove redundant !dedicated check
2017-12-27 16:36:57 -05:00
3856165623
Indentation cleanup
2017-12-27 13:18:20 -05:00
d576453b56
Command_Addfile: add "too many files" and already-loaded checks and respective error messages
...
No more shall the server be kicked from their own servers for re-adding a wad by accident!
2017-12-18 21:17:37 +00:00
e61549d81f
Opps, forgot to change this.
2017-11-08 14:50:27 -05:00
55c86f3e15
Successful attempt at restarting the music
2017-11-08 14:48:05 -05:00
c1405137ec
Extra tab space to make the compiler happy
2017-11-07 23:48:03 -05:00
4f8b91c770
Attempt to restart music
2017-11-07 16:26:45 -05:00
97445f941a
Add command to restart the audio system
2017-10-29 01:09:34 -04:00
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
11d57fba1b
Merge branch 'master' into next
2017-05-26 23:02:06 +01:00
Monster Iestyn