Sal
|
c5b1a9b3c4
|
Merge branch 'INTERNAL_netreplays' into 'v1'
Netreplays
See merge request KartKrew/Kart!146
|
2019-05-06 21:46:18 -04:00 |
|
Sal
|
8185077e50
|
Merge branch 'slight-grow-improvements' into 'v1'
Slight grow improvements (v1.1)
See merge request KartKrew/Kart!142
|
2019-05-06 21:29:17 -04:00 |
|
TehRealSalt
|
f48a08cd53
|
Merge v1
|
2019-05-06 21:23:29 -04:00 |
|
TehRealSalt
|
0958617ecb
|
Fix skybox bug
|
2019-05-06 21:17:32 -04:00 |
|
Sal
|
80226b3c39
|
Merge branch 'skins-fix' into 'v1'
Remove skin shit
See merge request KartKrew/Kart!145
|
2019-05-06 21:07:24 -04:00 |
|
wolfy852
|
f808072937
|
Merge remote-tracking branch 'remotes/pub/next' into v1
# Conflicts:
# src/hardware/hw_main.c
# src/hardware/hw_main.h
# src/m_menu.c
# src/r_main.c
# src/v_video.c
|
2019-05-06 14:26:09 -05:00 |
|
Sryder
|
70ff9be419
|
No sprite billboarding on papersprites
|
2019-05-06 20:24:26 +01:00 |
|
Sryder
|
7792b48ea3
|
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
|
4eb2a7d2eb
|
Merge remote-tracking branch 'remotes/pub/master' into next
|
2019-05-06 14:17:02 -05:00 |
|
wolfs
|
741f48132a
|
Merge branch 'newping' into 'master'
New ping command
See merge request KartKrew/Kart-Public!123
|
2019-05-06 15:12:56 -04:00 |
|
wolfs
|
17c96a9c3d
|
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
|
2869ccf557
|
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
|
a0e135f1b8
|
Merge branch 'master' into next
|
2019-05-06 19:38:53 +01:00 |
|
Nev3r
|
7a66fabf4f
|
Merge branch 'banip-command' into 'next'
Ban IP command
See merge request STJr/SRB2!460
|
2019-05-06 13:09:14 -04:00 |
|
Nev3r
|
9a43511cf6
|
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
|
809975b1ff
|
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
|
64fb7f90f0
|
Add a cvar for sprite billboarding, off by default.
|
2019-05-06 16:57:32 +01:00 |
|
Monster Iestyn
|
cbb20fc147
|
Merge branch 'master' into next
|
2019-05-03 16:40:13 +01:00 |
|
Monster Iestyn
|
5cd8ff01ba
|
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
|
57edf46531
|
Merge branch 'master' into next
|
2019-05-03 16:00:45 +01:00 |
|
mazmazz
|
d2236a32c3
|
Remove song_length tag search
Because songs without this tag will skiplag when loading.
|
2019-05-02 19:14:23 -04:00 |
|
mazmazz
|
7301140b10
|
Remove MP3 widechar tag searching
1. It's slow, 2. It's incorrect
|
2019-05-02 19:13:56 -04:00 |
|
TehRealSalt
|
9a1ae859bd
|
Don't allow custom gamedata to overwrite kart gamedata or replay folders
|
2019-05-02 12:58:02 -04:00 |
|
TehRealSalt
|
b679cfe5c5
|
Hide this debug message
|
2019-05-02 12:50:05 -04:00 |
|
TehRealSalt
|
2c49feeb9c
|
ENSURE viewcount slider is present for multiplayer demos
|
2019-05-02 12:42:29 -04:00 |
|
TehRealSalt
|
3fed6b6995
|
Disable rewind between demos, too.
|
2019-05-02 12:36:11 -04:00 |
|
TehRealSalt
|
50be0cdbee
|
Don't keep fast-forward enabled between demos
|
2019-05-02 12:31:50 -04:00 |
|
TehRealSalt
|
00a3ea58ee
|
Add message boxes for file add errors
|
2019-05-02 12:03:50 -04:00 |
|
TehRealSalt
|
3fdd51736b
|
HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects
|
2019-05-02 12:00:51 -04:00 |
|
Sal
|
71a302d993
|
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
|
7c0d0d4cb1
|
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
|
26159aae2a
|
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
|
55db2268bf
|
Merge branch 'anim-fix' into 'v1'
Fix wheel animations
See merge request KartKrew/Kart!144
|
2019-05-02 09:23:22 -04:00 |
|
Sal
|
5316e63a6d
|
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
|
833cf980b4
|
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
|
9314a0d9a9
|
Fix normalspeed
Alright fuck this branch it's misery
|
2019-05-02 02:58:34 -04:00 |
|
TehRealSalt
|
b67029d8f0
|
Merge branch 'anim-fix' into skins-fix
|
2019-05-02 02:52:38 -04:00 |
|
TehRealSalt
|
e954f0b410
|
Missed a spot
|
2019-05-02 02:52:22 -04:00 |
|
TehRealSalt
|
dfe873ca1f
|
Merge branch 'anim-fix' into skins-fix
|
2019-05-02 02:51:17 -04:00 |
|
TehRealSalt
|
ab7e747648
|
Fix warnings
Remove entries from dehacked, remove P_DoJump, remove debug stuff
|
2019-05-02 02:51:13 -04:00 |
|
TehRealSalt
|
2d9ae1abfd
|
Dumbass typo
|
2019-05-02 02:13:44 -04:00 |
|
Sal
|
1c0d470cd5
|
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
|
953c1f9089
|
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
|
243265ffc0
|
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
|
f1f664e9b1
|
Merge v1
|
2019-05-02 01:36:19 -04:00 |
|
TehRealSalt
|
032a755ef7
|
Remove unique version number
|
2019-05-02 01:34:25 -04:00 |
|
TehRealSalt
|
fe28094c0c
|
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
|
5a1fc6f9f4
|
Remove outdated comment
|
2019-05-02 00:49:36 -04:00 |
|
TehRealSalt
|
8a1ff31d1d
|
Remove bad +1
|
2019-05-02 00:49:05 -04:00 |
|
TehRealSalt
|
804cde8861
|
Fix polyobj angle delta
|
2019-05-02 00:48:01 -04:00 |
|