wolfy852
|
b98f8f7504
|
Battle, not Match
|
2019-05-07 01:34:49 -05:00 |
|
wolfy852
|
2c363c4e1e
|
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
|
360a6ff89a
|
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
|
b304b268c8
|
No sprite billboarding on papersprites
|
2019-05-06 20:24:26 +01:00 |
|
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 |
|
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
|
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 |
|
Sryder
|
4d77ed925e
|
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
|
103e67bbaa
|
Fix differing signedness compare
|
2019-04-30 13:03:13 -07:00 |
|
wolfs
|
a0b1fce139
|
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
|
0128643043
|
Prettyify code.
|
2019-04-28 22:02:25 -04:00 |
|
Steel Titanium
|
72e402c1aa
|
Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into port-param
|
2019-04-28 21:56:33 -04:00 |
|
Steel Titanium
|
1c21a4ed6f
|
New -port param
|
2019-04-28 21:53:36 -04:00 |
|
toaster
|
031ffbf304
|
Completely untested -encore parameter for the map command; inverts cvar value.
|
2019-04-28 19:26:11 +01:00 |
|
Steel Titanium
|
5461f860f9
|
Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into expose-numlaps
|
2019-04-27 22:34:53 -04:00 |
|
James R
|
848bb10c36
|
Move some cvars out of D_ClientServerInit and save them
|
2019-04-27 17:30:39 -07:00 |
|
wolfs
|
38770282d4
|
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
|
fc8ebe83fc
|
Force of habit
|
2019-04-26 13:08:35 -07:00 |
|
James R
|
aa4ce2b2d1
|
Check error on select
|
2019-04-26 13:06:26 -07:00 |
|
James R
|
4d739fe7a5
|
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 |
|
wolfs
|
235426153f
|
Merge branch 'forceskin-by-name' into 'next'
Allow names to be used with forceskin
See merge request KartKrew/Kart-Public!102
|
2019-04-26 06:42:09 -04:00 |
|
wolfs
|
8d0b185d96
|
Merge branch 'add-value-command' into 'next'
Add a command to increment cvars
See merge request KartKrew/Kart-Public!128
|
2019-04-26 06:41:52 -04:00 |
|
wolfy852
|
690a495d9b
|
Merge remote-tracking branch 'remotes/pub/master' into next
|
2019-04-26 05:42:27 -05:00 |
|
wolfs
|
f2ec722b12
|
Merge branch 'room-list-first' into 'master'
Show room list instead of server list if you haven't selected a room yet
See merge request KartKrew/Kart-Public!127
|
2019-04-26 06:39:31 -04:00 |
|
wolfs
|
4dff8b4a11
|
Merge branch 'no-audio-option' into 'master'
`-noaudio` option to cover `-nomusic` and `-nosound`
See merge request KartKrew/Kart-Public!129
|
2019-04-26 06:37:02 -04:00 |
|
wolfs
|
e6ba65bac9
|
Merge branch 'save-showjoinaddress' into 'master'
Save showjoinaddress to config
See merge request KartKrew/Kart-Public!132
|
2019-04-25 23:17:07 -04:00 |
|
Steel Titanium
|
21e8a2c537
|
Save showjoinaddress to config
|
2019-04-25 23:13:09 -04:00 |
|
Steel Titanium
|
e62fcc8148
|
Fix mangled comment
|
2019-04-22 19:27:42 -04:00 |
|
Steel Titanium
|
445bb0b99b
|
New IntermissionThinker hook
|
2019-04-22 00:29:47 -04:00 |
|
Sal
|
e76d33f9ba
|
Merge branch 'under_the_weather' into 'master'
Under the weather
See merge request KartKrew/Kart-Public!125
|
2019-04-19 16:40:25 -04:00 |
|
Sal
|
96b7d94eb8
|
Merge branch 'd_clisrv-shitsprinkles' into 'master'
Support splitscreen PLAYERINFO and don't expose clients' IP addresses
See merge request KartKrew/Kart-Public!126
|
2019-04-19 16:40:12 -04:00 |
|
James R
|
387a701db5
|
Add a "-noaudio" parm to cover "-nomusic" and "-nosound"
|
2019-04-18 23:50:29 -07:00 |
|
James R
|
3db1244849
|
Add a command to increment cvars
|
2019-04-18 23:42:28 -07:00 |
|
James R
|
4b05199b9f
|
Show rooms list in server browser initially
If you haven't selected a room yet, you're
shown the room list instead of server list.
|
2019-04-18 22:41:50 -07:00 |
|