mazmazz
5e6e0d539b
Use proper DD define for use_joystick
2018-12-06 06:50:18 -05:00
mazmazz
41ca8bb24a
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
mazmazz
e30832216f
More concise bitness check
2018-12-05 13:06:56 -05:00
mazmazz
a0938bdd24
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
mazmazz
d576ed31e0
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
mazmazz
b03da28390
Add various flags to version string
2018-12-05 11:43:33 -05:00
Monster Iestyn
c642015b81
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
b32f5830ed
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
Monster Iestyn
dfdba01591
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
mazmazz
872227f211
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
94ad0b880f
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
Jimita
a32fb94e09
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
MPC
e745cb60fc
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03:00
wolfy852
beb58c55ac
I must be some kind of idiot.
2018-11-29 07:34:05 -06:00
Wolfy
42fc67a639
Remove hardcoded limit on admins
...
# Conflicts:
# src/d_netcmd.c
2018-11-29 07:05:49 -06:00
Wolfy
cabe9871e3
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
Monster Iestyn
a6a4b74692
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
fc5e97dba9
Merge branch 'master' into next
2018-11-26 19:49:19 -05:00
MonsterIestyn
d158d7e011
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
mazmazz
e6be735a08
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
2018-11-25 21:47:56 -05:00
Monster Iestyn
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Nev3r
34c472dfb7
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
Nev3r
623c7097f1
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
823b75797e
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
Alam Ed Arias
aef0d9a421
Merge branch 'master' into next
2018-11-14 15:45:29 -05:00
MonsterIestyn
44646db6af
Merge branch 'master' into analog-flipcam-synch-fix
2018-11-14 19:36:39 +00:00
Monster Iestyn
32a2c6dc3c
Merge branch 'master' into next
2018-11-09 16:09:49 +00:00
LJSonik
3a8ee79cb1
Merge branch 'master' into analog-flipcam-synch-fix
2018-10-29 19:52:08 +01:00
Louis-Antoine
2dc6a102bb
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
a44b368ee0
Merge branch 'master' into next
2018-10-20 14:13:13 +01:00
Steel Titanium
9b8b5ea57c
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
mazmazz
c64d52c1f9
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
1ca6ac1c67
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
Monster Iestyn
6774933263
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
277bec55c2
Only do this if the admin player isn't the server host also.
2018-08-30 18:32:26 -04:00
Monster Iestyn
9812df00d6
Merge branch 'master' into next
2018-08-06 15:15:35 +01:00
Monster Iestyn
ed6f6e3a75
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
Monster Iestyn
15812dfb30
Merge branch 'master' into next
2018-07-05 21:09:39 +01:00
Louis-Antoine
65e9bed30f
xd
2018-06-04 22:30:27 +02:00
Louis-Antoine
8aa92d5894
Disable admin password by default
2018-06-04 22:14:01 +02:00
Alam Ed Arias
8722b369a3
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
toasterbabe
c444a460a3
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
Monster Iestyn
19e93c8394
Fix missing semicolon
2018-01-12 20:05:09 +00:00
Monster Iestyn
00fe750722
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
Monster Iestyn
a9bc7158d6
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
Steel Titanium
875446295b
Remove redundant !dedicated check
2017-12-27 16:36:57 -05:00
Steel Titanium
3856165623
Indentation cleanup
2017-12-27 13:18:20 -05:00
Monster Iestyn
caf56a04eb
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
Steel Titanium
e61549d81f
Opps, forgot to change this.
2017-11-08 14:50:27 -05:00
