8d56c2f486
Merge branch 'addons-backport' into '2122-version'
...
Addons Menu backport to vanilla
See merge request STJr/SRB2!384
2018-12-23 18:08:06 -05:00
b7d7472a88
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
1b61e15b1b
Merge branch 'master' into SRB2-CHAT
2018-12-23 10:26:08 +01:00
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
28c8ad3dbb
Merge branch 'jump-spin-axes' into 'next'
...
Feature: Jump/Spin axes
See merge request STJr/SRB2!389
2018-12-20 16:57:05 -05:00
7f8d16d3cd
Add DEVELOP build flag to version string
2018-12-20 02:27:30 -05:00
a31b85e124
Some messages relevant to discussions now go in the chat.
2018-12-19 16:44:57 +01:00
c69cfefb6d
2.2 backport of jump/spin axes
...
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
2018-12-16 17:45:49 -05:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
f0967520ed
Compile fixes; enable PK3 support in addons menu
...
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
2018-12-15 21:44:39 -05:00
37950341ec
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
b32f50648d
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
df89781623
Windows string adjustment
2018-12-06 15:42:58 -05:00
ba60989c00
Adjust version strings
2018-12-06 15:39:19 -05:00
f0c7848e50
Use proper DD define for use_joystick
2018-12-06 06:50:18 -05:00
9055c9aeab
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
c5b349ddc4
More concise bitness check
2018-12-05 13:06:56 -05:00
1ea2fa447a
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
389c2d4ea1
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
a6dcd5555e
Add various flags to version string
2018-12-05 11:43:33 -05:00
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
Digiku