Sryder
0f7a704444
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/p_spec.c
2019-08-10 11:41:49 +01:00
mazmazz
4ac4034eb9
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-08-04 21:33:13 -04:00
Latapostrophe
ec1272dd14
remove join passwords
2019-08-04 11:26:26 +02:00
James R
374af9a322
Merge remote-tracking branch 'pub/master' into public-master
2019-07-17 12:33:20 -07:00
James R
6fdfd3b90c
Don't send login final hashes to everyone
...
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.
P.S. The netcode is LOL XD by VincyTM -Telos
2019-07-15 16:14:00 -07:00
Jonas Sauer
b7c783223a
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
...
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-13 01:42:03 +02:00
MascaraSnake
9f666e125e
Merge branch 'master' into thinkerlists
...
# Conflicts:
# src/f_finale.c
# src/p_enemy.c
2019-07-02 23:08:37 +02:00
mazmazz
14df513db6
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
mazmazz
3a4b26a61c
Merge branch 'md3-vanilla' into internal-md3-vanilla
2019-06-29 15:02:50 -04:00
mazmazz
11955ba838
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
Monster Iestyn
0368689e27
Merge branch 'public_next'
2019-06-22 22:44:42 +01:00
Monster Iestyn
1e29d627f0
Merge branch 'make-credits-great-again' into 'next'
...
Prevent just anyone from skipping credits but allow admins
See merge request STJr/SRB2!478
2019-06-22 16:13:04 -04:00
James R
8faff03f31
Index displayplayers correctly
2019-06-10 14:24:11 -07:00
Sryder
622c2eac07
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/k_kart.c
2019-06-02 18:15:30 +01:00
TehRealSalt
31534fe96b
Merge branch 'master' into versus-record
2019-05-29 22:23:17 -04:00
Sryder
43936013f7
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/d_netcmd.h
# src/k_kart.c
# src/p_setup.c
2019-05-25 12:09:47 +01:00
TehRealSalt
480d56838f
Add cvars to prevent issues
2019-05-20 00:50:44 -04:00
TehRealSalt
5c3cac52e6
Merge branch 'master' into rings
2019-05-12 15:28:15 -04:00
wolfy852
9ac41cca73
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852
1b7d7cabdf
Correct a merge mistake
2019-05-07 02:06:59 -05:00
TehRealSalt
3d129ad4ca
Merge branch 'v1' into rings
2019-05-06 23:54:20 -04: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
TehRealSalt
d82fa7eb60
Merge branch 'v1' into no-limits
2019-05-06 21:55:33 -04:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -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
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
TehRealSalt
8f4d93995b
Merge v1
2019-05-02 17:51:54 -04:00
mazmazz
f9354289ba
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-02 17:43:40 -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
TehRealSalt
f1f664e9b1
Merge v1
2019-05-02 01:36:19 -04:00
TehRealSalt
3a707c093b
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
2019-05-01 23:30:53 -04:00
toaster
9e24d4aba7
Completely untested -encore parameter for the map command; inverts cvar value.
2019-04-28 19:26:11 +01:00
James R
fd251ed29f
Move some cvars out of D_ClientServerInit and save them
2019-04-27 17:30:39 -07:00
TehRealSalt
435862b29d
finished scrambles
2019-04-26 13:34:30 -04:00
TehRealSalt
6f6bc3333f
Put behind cvar
2019-04-23 01:10:16 -04:00
Nev3r
09ff071656
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
...
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r
345984a396
Fix mobj list iteration oversights.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 12:58:22 +02:00
Nev3r
baeda5060c
Basic multiple thinker list implementation
...
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02:00
TehRealSalt
ea2bcb3b99
Update from master
2019-04-19 20:14:06 -04:00
TehRealSalt
089be795a2
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
fickleheart
7253f0e499
Strip out things that limit wad files added by filename
2019-04-17 23:09:10 -05:00
fickleheart
25f55b6351
Add VHS pause/rewind effect
2019-04-08 23:21:11 -05:00
James R
03c27101df
"NEWPING" might as well be the only ping
2019-04-08 15:48:20 -07:00
TehRealSalt
2d92fcee46
Better speedometer
...
Better graphics, appears in Battle, and has a new percentage mode ala Sonic Drift 2
2019-04-08 16:39:06 -04:00
fickleheart
c466412902
Begin work on playback menu
2019-04-05 02:38:48 -05:00
Monster Iestyn
6827688575
Merge branch 'public_next'
2019-04-02 15:49:15 +01:00
Monster Iestyn
4f58d00eec
Merge branch 'master' into next
2019-04-02 15:47:07 +01:00
Steel Titanium
e47854880a
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name
2019-03-27 19:18:51 -04:00
James R
841daf940f
Don't close console when changing map
2019-03-26 13:04:11 -07:00
