Commit graph

736 commits

Author SHA1 Message Date
Sryder
da2f1fc972 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/k_kart.c
2020-03-21 23:27:55 +00:00
Sal
bda7dc9ddf Merge branch 'colors-yet-again' into 'master'
Another round of small color tweaks

See merge request KartKrew/Kart!208
2020-03-21 19:03:27 -04:00
Sally Cochenour
040865b589 Merge branch 'master' into new-items 2020-03-17 19:31:47 -04:00
Sally Cochenour
fa34e4eee4 Merge branch 'master' into sal-waypoints 2020-03-15 20:21:17 -04:00
Latapostrophe
6fe54eafba Fix Lua crashes when loading without addons 2020-03-12 16:03:12 +01:00
Latapostrophe
1f5bbb2c3d Merge branch 'push-more-lua' into awful-mix 2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
Latapostrophe
b7702f5ff5 Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix 2020-03-10 21:46:12 +01:00
Latapostrophe
4dfb47dff6 Merge branch 'record-attack-changes' into v1.2-frankeinstein 2020-03-10 20:27:00 +01:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
Sal
4b5b2462b5 Merge branch 'gentlemen' into 'master'
Gentlemen's ping agreement

See merge request KartKrew/Kart!197
2020-03-06 00:10:06 -05:00
fickleheart
cf11f1ef6e SUPER EXPERIMENTAL FREEZE-B-GONE 2020-03-05 22:19:39 -06:00
Latapostrophe
3a8e984e44 Merge branch 'fickle-replay-v1' into replay-freecam-rewind 2020-03-05 21:08:20 +01:00
TehRealSalt
7d32f9b6c3 Replay playback changes:
- Store level state periodically
- Load the closest usable level state when done rewinding for
  quicker resumes
- Make playback menu fade out after 5 seconds of no activity
  (but not while paused)
- Remove wrapping from replay hut (original wrapping was broken
  at some point before 1.1 and it's not necessary anyway)
- Allow holding enter on frame advance for noisy slow-mo

from fickleheart
2020-03-05 21:04:56 +01:00
Sally Cochenour
48ff9ddf85 Move overtime stuff to k_battle.c 2020-03-01 15:58:00 -05:00
Sally Cochenour
3633dc341a Merge branch 'master' into targets 2020-03-01 15:42:49 -05:00
Sally Cochenour
6956e1d24e Store random states in mobjinfo instead of precipprops
My reasoning is that it wouldn't make much sense to have a weather type that has snow, but doesn't randomize the sprite it uses, so we don't need to copy-paste the same "randomstates" for each weather type.
2020-03-01 13:13:59 -05:00
James R
0c814ce42d Sync look back
Also fixes look back applying to the first
player in parties instead of locally.
2020-02-23 23:21:20 -08:00
James R
7961ac9d95 Fix moving while viewing another player not resetting the viewpoint 2020-02-23 23:21:20 -08:00
James R
4f40edaf01 Maybe localdisplayplayers is a bad idea 2020-02-23 23:21:20 -08:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
James R
352d576979 Don't turn off lagless at map start; draw LAGLESS in intermission 2020-02-23 23:07:57 -08:00
TehRealSalt
80bb59031c Blizzard weather option + much more sane workflow for adding new precipitation options
"precipprops" lets you create a new precipitation type by picking a mobj type to use, how many random states it has, and flags for effects such as thunder/lightning. Seesound on the mobj type sets an ambient sound (like rain drops) and mass sets the sound's frequency in tics. This could open up the possibility for SOC/Lua Weather options later.
2019-11-14 04:26:41 -05:00
TehRealSalt
eacd3e2749 Merge branch 'master' into sal-waypoints 2019-10-28 20:22:01 -04:00
Sal
897014d94e Merge branch 'gamedata-param' into 'master'
Custom gamedata parameter

See merge request KartKrew/Kart!186
2019-10-28 15:56:59 -04:00
James R
7c0ca5bf7c Move gamedata param to cover -resetdata 2019-10-27 10:35:31 -07: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
James
83c4017993 Another round of small color tweaks 2019-10-21 08:35:17 -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
fa09c0420f Custom gamedata parameter 2019-10-05 13:15:36 -07:00
TehRealSalt
d10e4aebac Fix a few messups due to the merged cvars 2019-10-03 11:22:58 -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
7433becd7a Move map loaded failure error from the deleted backwards compat code 2019-10-02 12:07:37 -04:00
TehRealSalt
bc3f0568ee Merge master 2019-09-27 23:09:54 -04:00
TehRealSalt
d907158b12 Revert this 2019-09-27 15:12:55 -04:00
TehRealSalt
06d27ae36e Merge branch 'master' into fortnite 2019-09-27 06:36:11 -04:00
TehRealSalt
22796b7633 Merge master 2019-09-27 03:44:37 -04:00
Sal
a313e4c33e Merge branch 'world-tour' into 'master'
Flush random map pool after all but 3 are played

See merge request KartKrew/Kart!170
2019-09-27 03:07:04 -04:00
TehRealSalt
9cb834b004 Capsule counter, map change when spawning capsules mid-game 2019-09-24 11:24:01 -04:00
TehRealSalt
e84c618da8 Rudimentary Record Attack support 2019-09-24 07:17:05 -04:00
TehRealSalt
53848bd5fa commit throwdir fix
I did a bunch of other demo-related cleanup in this branch so I'm throwing it in here too
2019-09-23 08:51:49 -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
77aeb4663b Merge branch 'master' into versus-record 2019-09-23 07:03:56 -04:00
TehRealSalt
932f8a1f61 Update demos to save power levels 2019-09-23 07:03:00 -04:00