wolfy852
|
54d61b188c
|
Have "None" work as an alias for -1
|
2019-05-12 03:07:17 -05:00 |
|
wolfy852
|
7dff052a64
|
Expose followerready, match d_player.h organization
|
2019-05-11 02:13:31 -05:00 |
|
wolfy852
|
e4af44956b
|
Merge remote-tracking branch 'remotes/pub/next' into followme
# Conflicts:
# src/r_things.h
|
2019-05-11 02:05:58 -05:00 |
|
Alam Arias
|
b422ad46c9
|
Merge branch 'master' into next
|
2019-05-09 23:12:38 -04:00 |
|
Alam Arias
|
51312b628d
|
fix the array-bounds warning by setting a upper limit
|
2019-05-09 23:11:26 -04:00 |
|
Alam Arias
|
d44a5d1013
|
fix the array-bounds warning by setting a upper limit
|
2019-05-09 23:10:23 -04:00 |
|
Alam Arias
|
9163a05192
|
fix up misleading indentation of a if statement
|
2019-05-09 23:03:32 -04:00 |
|
Sal
|
a54e2edbfa
|
Merge branch 'upstream-merge' into 'next'
Upstream merge of next
See merge request KartKrew/Kart-Public!139
|
2019-05-09 19:13:58 -04:00 |
|
wolfy852
|
ed64cd4dac
|
Default billboarding to "On"
|
2019-05-08 00:17:21 -05:00 |
|
wolfy852
|
1136d88bd6
|
Merge remote-tracking branch 'remotes/srb2pub/next' into upstream-merge
|
2019-05-07 21:43:12 -05:00 |
|
wolfs
|
10b47550a4
|
Merge branch 'public-musicplus-tagfix' into 'next'
Fix music load lag by reverting tag changes
See merge request STJr/SRB2!486
|
2019-05-07 22:42:13 -04:00 |
|
wolfy852
|
1b7d7cabdf
|
Correct a merge mistake
|
2019-05-07 02:06:59 -05:00 |
|
wolfy852
|
26adea3234
|
Battle, not Match
|
2019-05-07 01:34:49 -05:00 |
|
wolfy852
|
2222738e1c
|
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
|
2019-05-06 22:40:12 -05:00 |
|
Monster Iestyn
|
693b4e3dcf
|
Merge branch 'public_flatsprite' into 'public_flatsprite'
Merge in next and don't billboard papersprites in GL
See merge request STJr/SRB2!488
|
2019-05-06 15:34:35 -04: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 |
|
wolfs
|
3d24bf11af
|
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
|
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 |
|
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
|
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
|
a20f3822a1
|
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 |
|
Sryder
|
913d5dd595
|
OpenGL sprite billboarding
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
|
2019-05-01 20:15:00 +01:00 |
|
James R
|
70566c8088
|
Fix differing signedness compare
|
2019-04-30 13:03:13 -07:00 |
|
wolfs
|
ab8006ea1d
|
Merge branch 'md3-vanilla-kart' into 'next'
MD2/MD3 support rewritten + optimizations [GCC port]
See merge request KartKrew/Kart-Public!19
|
2019-04-30 15:22:30 -04:00 |
|
Steel Titanium
|
db34bcbdbf
|
Prettyify code.
|
2019-04-28 22:02:25 -04:00 |
|
Steel Titanium
|
2ebd98b89f
|
Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into port-param
|
2019-04-28 21:56:33 -04:00 |
|
Steel Titanium
|
353a5b1b61
|
New -port param
|
2019-04-28 21:53:36 -04:00 |
|
toaster
|
9e24d4aba7
|
Completely untested -encore parameter for the map command; inverts cvar value.
|
2019-04-28 19:26:11 +01:00 |
|
Steel Titanium
|
f7ab7f08dd
|
Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into expose-numlaps
|
2019-04-27 22:34:53 -04:00 |
|
James R
|
fd251ed29f
|
Move some cvars out of D_ClientServerInit and save them
|
2019-04-27 17:30:39 -07:00 |
|
wolfs
|
a7e6589ce7
|
Merge branch 'intermission-think' into 'next'
New intermission Hook for Y_Ticker
See merge request KartKrew/Kart-Public!131
|
2019-04-26 19:25:18 -04:00 |
|
James R
|
9f0887fafc
|
Force of habit
|
2019-04-26 13:08:35 -07:00 |
|
James R
|
1d77716d7e
|
Check error on select
|
2019-04-26 13:06:26 -07:00 |
|
James R
|
50ae248b84
|
Unfuck MS connecting and error reporting
Reconnect if the socket is closed.
Report the proper error from SO_ERROR and report an error from getsockopt.
|
2019-04-26 12:59:21 -07:00 |
|