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
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
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
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
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
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
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
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
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
TehRealSalt
b8a752e40a
Merge master
2019-09-18 21:47:11 -04:00
TehRealSalt
97b09ba9c1
Grease part 2
2019-09-12 14:23:45 -04:00
TehRealSalt
d3f1b4f82c
Greased horizontals
2019-09-12 02:01:30 -04:00
James R
374af9a322
Merge remote-tracking branch 'pub/master' into public-master
2019-07-17 12:33:20 -07:00
James R
78bd39acd5
Someone doesn't know how pointers or WRITE macros work...
...
Fixes SIGSEGV when saving a replay.
2019-06-25 00:44:12 -07:00
TehRealSalt
31534fe96b
Merge branch 'master' into versus-record
2019-05-29 22:23:17 -04:00
TehRealSalt
e8edfb03fb
Merge branch 'master' into rings
2019-05-29 22:15:05 -04:00
TehRealSalt
792b41c406
Merge branch 'v1' into master
2019-05-29 21:50:14 -04:00
James R
2b79547512
Fix XCode compiler errors
...
I'm faily certain this also fixes broken logic (g_game.c).
2019-05-28 19:04:27 -07:00
Latapostrophe
ccd0ec96a4
let angle be changed while spun out and boosting
2019-05-25 13:08:38 +02:00
TehRealSalt
bb6fe9fc54
Merge branch 'master' into rings
2019-05-14 22:26:22 -04:00
TehRealSalt
ce39456a24
Merge branch 'v1' into new-palette
2019-05-14 21:01:32 -04:00
wolfy852
4f3fbb8da5
Fix viewpoint being reset on boost when spectating
2019-05-12 16:38:50 -05:00
TehRealSalt
dc41fe3d8d
Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff
2019-05-12 17:19:49 -04:00
wolfy852
ed55a63b58
Fix rewind previews not showing for player 1
2019-05-12 14:42:39 -05: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
26adea3234
Battle, not Match
2019-05-07 01:34:49 -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
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
Sal
80226b3c39
Merge branch 'skins-fix' into 'v1'
...
Remove skin shit
See merge request KartKrew/Kart!145
2019-05-06 21:07:24 -04:00
TehRealSalt
8f4d93995b
Merge v1
2019-05-02 17:51:54 -04:00
TehRealSalt
b679cfe5c5
Hide this debug message
2019-05-02 12:50:05 -04:00
TehRealSalt
3fed6b6995
Disable rewind between demos, too.
2019-05-02 12:36:11 -04:00
TehRealSalt
50be0cdbee
Don't keep fast-forward enabled between demos
2019-05-02 12:31:50 -04:00
TehRealSalt
00a3ea58ee
Add message boxes for file add errors
2019-05-02 12:03:50 -04:00
Sal
26159aae2a
Merge branch 'deadzone-bullshit' into 'v1'
...
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
See merge request KartKrew/Kart!147
2019-05-02 09:25:07 -04:00
TehRealSalt
833cf980b4
Finish this
...
Now that I was told that the spinout slowdown bug was caused by this I was 100% convinced that we need to remove all of this bullshit ASAP
2019-05-02 09:20:49 -04:00
TehRealSalt
dfe873ca1f
Merge branch 'anim-fix' into skins-fix
2019-05-02 02:51:17 -04:00