TehRealSalt
90b4ce8e58
Merge branch 'master' into sal-waypoints
2019-10-25 23:36:02 -04:00
TehRealSalt
addb0d0a66
Fix time limit
2019-10-25 23:35:31 -04:00
TehRealSalt
b69d105af3
Add respawn animation
...
This commit also fixes MF_NOCLIP not working properly on players. Sink now spawns an SPB explosion on successful hit, since dying is no longer a harsh punishment.
2019-10-24 16:35:39 -04:00
TehRealSalt
674c0aec17
Merge branch 'master' into new-items
2019-10-24 10:08:37 -04:00
TehRealSalt
4feed0decc
Merge branch 'master' into sal-waypoints
2019-10-22 17:06:38 -04:00
TehRealSalt
c963a49542
Try fixing Auto causing desyncs
...
- Move K_SetPowerLevelScrambles to G_DoCompleted
- Fix wrong gamespeed being displayed in strings
- Add defines for kartspeed values
- Disable Easy scrambles again
- Corrupt gamedata if pwrlv is in invalid range (gets corrected in-game, and doesn't really matter to anyone who knows what you're doing, but it'll stop at least the most basic script kiddie)
Replay menu will still display wrong speed name, but it's fine in the replay itself.
2019-10-17 23:43:06 -04:00
TehRealSalt
e7d0fde5fd
Merge branch 'master' into sal-waypoints
2019-10-15 21:34:41 -04:00
TehRealSalt
d1c20c2a5a
Don't allow finish lines to be hit multiple times per tic
2019-10-15 21:30:23 -04:00
James R
22cb7451e9
...Also remove kartdebugamount
2019-10-07 13:35:07 -07:00
James R
803884c55a
Remove kartdebugitem
2019-10-07 13:12:22 -07:00
James R
392aec38f8
Rename kartdebug_giveitem to kartallowgiveitem
2019-10-07 13:11:14 -07:00
James R
833c8e2bed
Give item command
2019-10-07 12:42:08 -07:00
James R
15dc57c4ba
Allow name in kartdebugitem
2019-10-07 12:41:49 -07:00
TehRealSalt
d10e4aebac
Fix a few messups due to the merged cvars
2019-10-03 11:22:58 -04:00
TehRealSalt
3d5676d4d6
atoi
2019-10-03 10:16:10 -04:00
TehRealSalt
a5ea6a9799
Merge speed/encore scrambles into the normal cvars as an "auto" option
2019-10-03 01:48:16 -04:00
TehRealSalt
c6566ec31a
Merge branch 'master' into versus-record
2019-10-03 01:32:59 -04:00
TehRealSalt
9072f233eb
Remove a few more magic numbers
2019-09-23 08:31:36 -04:00
TehRealSalt
38bb44e732
Separate into k_pwrlv.c, add defines to reduce amount of magic numbers
2019-09-23 08:26:42 -04:00
TehRealSalt
9e587f4d0d
Put prints behind CONS_Debug
2019-09-23 07:26:36 -04:00
TehRealSalt
77aeb4663b
Merge branch 'master' into versus-record
2019-09-23 07:03:56 -04:00
TehRealSalt
b8a752e40a
Merge master
2019-09-18 21:47:11 -04:00
TehRealSalt
1ef09699d1
Functional gameplay
...
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score
Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
2019-09-15 20:19:48 -04:00
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
James R
374af9a322
Merge remote-tracking branch 'pub/master' into public-master
2019-07-17 12:33:20 -07: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
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
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
