Commit graph

6720 commits

Author SHA1 Message Date
Sryder
1f1d67cd7e Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
# Conflicts:
#	src/p_user.c
2019-05-06 20:20:57 +01:00
wolfy852
535b386f8e Merge remote-tracking branch 'remotes/pub/master' into next 2019-05-06 14:17:02 -05:00
wolfs
58c5979a1e Merge branch 'newping' into 'master'
New ping command

See merge request KartKrew/Kart-Public!123
2019-05-06 15:12:56 -04:00
wolfs
62140e1481 Merge branch 'autofocus' into 'master'
Grab mouse focus whenever the window is focused

See merge request KartKrew/Kart-Public!120
2019-05-06 15:12:48 -04:00
wolfs
b2a8e555bb Merge branch 'ms-connectionfail-bandaid' into 'master'
Don't try operating on a closed socket

See merge request KartKrew/Kart-Public!133
2019-05-06 15:12:39 -04:00
Monster Iestyn
406c3619d7 Merge branch 'master' into next 2019-05-06 19:38:53 +01:00
Nev3r
aab2f55aec Merge branch 'banip-command' into 'next'
Ban IP command

See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
Nev3r
ae25e8ea07 Merge branch 'console-wait-fix' into 'master'
Don't count down wait timer when executing a command line

See merge request STJr/SRB2!483
2019-05-06 12:56:07 -04:00
Nev3r
8b8e165d19 Merge branch 'opengl-sprite-billboarding' into 'master'
OpenGL Sprite Billboarding

See merge request STJr/SRB2!485
2019-05-06 12:45:53 -04:00
Sryder
8273534967 Add a cvar for sprite billboarding, off by default. 2019-05-06 16:57:32 +01:00
Monster Iestyn
454306cf86 Merge branch 'master' into next 2019-05-03 16:40:13 +01:00
Monster Iestyn
a5dfbe7eff add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason
not making a merge request because this is so laughably stupidly simple
2019-05-03 16:38:59 +01:00
Monster Iestyn
d4ab2837bb Merge branch 'master' into next 2019-05-03 16:00:45 +01:00
wolfs
1f2d720363 Merge branch 'nonet-upnp' into 'master'
Don't enable UPnP support if NONET is defined.

See merge request STJr/SRB2!484
2019-05-03 06:40:22 -04:00
mazmazz
904b00e921 Remove song_length tag search
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
3e5b0c4531 Remove MP3 widechar tag searching
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
TehRealSalt
98dbdd7db5 Don't allow custom gamedata to overwrite kart gamedata or replay folders 2019-05-02 12:58:02 -04:00
TehRealSalt
489032f734 Hide this debug message 2019-05-02 12:50:05 -04:00
TehRealSalt
25f277e185 ENSURE viewcount slider is present for multiplayer demos 2019-05-02 12:42:29 -04:00
TehRealSalt
3f730e03ec Disable rewind between demos, too. 2019-05-02 12:36:11 -04:00
TehRealSalt
34eb4bd14d Don't keep fast-forward enabled between demos 2019-05-02 12:31:50 -04:00
TehRealSalt
86dfd70c6f Add message boxes for file add errors 2019-05-02 12:03:50 -04:00
TehRealSalt
73e152a01c HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects 2019-05-02 12:00:51 -04:00
Sal
0ee1cd6cbf Merge branch 'alias-argh' into 'master'
Allow argument substitution in aliases

See merge request KartKrew/Kart-Public!124
2019-05-02 10:05:30 -04:00
Sal
a12fb1c81d Merge branch 'save-d_clisrv-cvars' into 'master'
Register showjoinaddress after the config loads and match some other cvars to its behavior

See merge request KartKrew/Kart-Public!135
2019-05-02 10:04:45 -04:00
Sal
0cd815cb44 Merge branch 'deadzone-bullshit' into 'v1'
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5

See merge request KartKrew/Kart!147
2019-05-02 09:25:07 -04:00
Sal
071b335d57 Merge branch 'anim-fix' into 'v1'
Fix wheel animations

See merge request KartKrew/Kart!144
2019-05-02 09:23:22 -04:00
Sal
3d71a0aac7 Merge branch 'next-colors' into 'v1'
Final colors for v1.1

See merge request KartKrew/Kart!143
2019-05-02 09:23:10 -04:00
TehRealSalt
4d967bcc8e Finish this
Now that I was told that the spinout slowdown bug was caused by this I was 100% convinced that we need to remove all of this bullshit ASAP
2019-05-02 09:20:49 -04:00
TehRealSalt
7bfc394792 Fix normalspeed
Alright fuck this branch it's misery
2019-05-02 02:58:34 -04:00
TehRealSalt
1e9257c012 Merge branch 'anim-fix' into skins-fix 2019-05-02 02:52:38 -04:00
TehRealSalt
e772a750a8 Missed a spot 2019-05-02 02:52:22 -04:00
TehRealSalt
e314aeb1ab Merge branch 'anim-fix' into skins-fix 2019-05-02 02:51:17 -04:00
TehRealSalt
9e15486926 Fix warnings
Remove entries from dehacked, remove P_DoJump, remove debug stuff
2019-05-02 02:51:13 -04:00
TehRealSalt
fd148ec207 Dumbass typo 2019-05-02 02:13:44 -04:00
Sal
738c5be37b Merge branch 'expose-numlaps' into 'next'
Expose cv_numlaps.value as global variable

See merge request KartKrew/Kart-Public!134
2019-05-02 01:41:41 -04:00
Sal
f615ffab30 Merge branch 'port-param' into 'next'
New -port command line parameter

See merge request KartKrew/Kart-Public!137
2019-05-02 01:40:31 -04:00
Sal
b0b6390998 Merge branch 'when_i_say_encore_you_say_how_high' into 'master'
When I say Encore you say how high

See merge request KartKrew/Kart-Public!136
2019-05-02 01:40:12 -04:00
Sal
dee068a7ff Merge branch 'respawn-flash' into 'v1'
Flashing tics on respawn

See merge request KartKrew/Kart!138
2019-05-02 01:39:31 -04:00
TehRealSalt
201466b1c1 Merge v1 2019-05-02 01:36:19 -04:00
TehRealSalt
4638722632 Remove unique version number 2019-05-02 01:34:25 -04:00
TehRealSalt
285ab9c9b9 Menu fix-up
- Use center menu style for the tiny extras menu
- Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 01:33:11 -04:00
TehRealSalt
37de59cdfd Remove outdated comment 2019-05-02 00:49:36 -04:00
TehRealSalt
17de62894a Remove bad +1 2019-05-02 00:49:05 -04:00
TehRealSalt
913fc8660f Fix polyobj angle delta 2019-05-02 00:48:01 -04:00
TehRealSalt
f99a5a6a8b Fix wheel animations 2019-05-02 00:44:04 -04:00
TehRealSalt
5dc30cdac8 Fix skin shit 2019-05-02 00:39:49 -04:00
Sal
b410b216a4 Merge branch 'default-md2' into 'v1'
Add option to turn off the PLAY default md2

See merge request KartKrew/Kart!140
2019-05-02 00:03:18 -04:00
TehRealSalt
2d8461a59d Port over double-press Grow cancel from internal 2019-05-01 23:56:12 -04:00
TehRealSalt
54af8f5fc0 Slight Grow improvements for public
- Using Grow while Shrunk will make you normal-size, instead of giant.
- Baked in a Shrink/Grow noise into K_RemoveGrowShrink, whenever you have either
2019-05-01 23:50:18 -04:00