James R
3162a203be
Merge remote-tracking branch 'pub/master' into wtf
2020-06-03 15:57:09 -07:00
Sryder
8e39dfa5c6
D_ModifierKeyResponder is unused now so remove it.
2020-05-20 11:37:38 +01:00
Monster Iestyn
389e7d415d
make savegamename in doomdef.h an extern, put the actual definition in d_main.c
...
(cherry picked from commit 89cd756cd83e4a03a34d1f16da18142d8167d889)
2020-05-15 09:52:16 -07:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
Sally Coolatta
95a077b4dd
C'mon git merge everything, not just most of it |:V
2020-05-12 03:16:35 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
James R
6613b19220
Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked
2020-04-26 01:16:27 -07:00
Wolfy
5b7ce81809
FUCKING-
2020-04-22 02:00:44 -05:00
Wolfy
17236595e4
ASHNAL
2020-04-22 01:31:55 -05:00
Ashnal
abc17c9448
Fix dedicated servers not waiting for client wipes.
...
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05:00
wolfs
fb0e699aec
Merge branch 'fixsignalhandler-resurrection' into 'awful-mix'
...
2.2 signal handler
See merge request SinnamonLat/Kart-Public!11
2020-04-20 22:42:59 -04:00
Sally Cochenour
96d69785bf
Merge branch 'master' into pet-robo
2020-04-18 01:18:22 -04:00
Steel Titanium
71f21dd81b
Fix compile errors
2020-04-13 23:07:38 -04:00
Wolfy
5e4ec61d82
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
2020-04-11 23:47:25 -05:00
James R
4a3a4c0801
This won't be needed
2020-03-31 15:50:39 -07:00
James R
e4094bc2a9
Remove some redundant code
2020-03-31 15:26:22 -07:00
James R
735dd26dc6
Put downloads in addons/downloads instead of DOWNLOAD
2020-03-31 15:23:24 -07:00
Sally Cochenour
9e2c119b56
Merge branch 'master' into pet-robo
2020-03-29 20:44:13 -04:00
Sal
eb9144338a
Merge branch 'logs-port' into 'master'
...
2.2 directory structure and log files port
See merge request KartKrew/Kart!224
2020-03-28 22:16:50 -04:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
Steel Titanium
e9110b660c
Better directory structure
...
(cherry picked from commit 8ee0a9309b289a1a3d1a7260a44a43c776180686)
# Conflicts:
# src/m_menu.c
# src/m_menu.h
# src/m_misc.h
2020-03-24 15:36:44 -07:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
James R
d46c6dc384
Kill trailing whitespace
2020-03-21 17:37:33 -07:00
James R
310a9cd09c
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 17:22:57 -07: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
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
5b960672e9
Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place
2019-12-16 19:27:54 -08: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
d10e4aebac
Fix a few messups due to the merged cvars
2019-10-03 11:22:58 -04:00
Sal
eb7f662654
Merge branch 'genesis-wipe' into 'master'
...
Genesis-style wipes
See merge request KartKrew/Kart!164
2019-10-03 01:10:33 -04:00
Sal
dca76c3f08
Merge branch 'whitespace' into 'master'
...
Remove trailing whitespace
See merge request KartKrew/Kart!175
2019-09-27 14:37:40 -04:00
TehRealSalt
92022be254
Don't crash if you can't find a pwad or it's already loaded or etc
2019-09-27 06:28:26 -04:00
James R
1d59d8305d
Remove trailing whitespace
2019-09-26 14:39:23 -07:00
TehRealSalt
26e34a1fa1
Use maps.pk3
2019-09-16 03:04:26 -04:00
Latapostrophe
1d66d8e213
replay freecam + enhancements
2019-09-05 23:24:23 +02:00
TehRealSalt
5da84b78a2
Encore wiggle
2019-08-10 01:59:23 -04:00
TehRealSalt
aad0dbd076
Encore invert fade
2019-08-10 00:54:16 -04:00
TehRealSalt
36e4f25cc9
Uses pre-defined colormap lumps now
...
Works much faster now. I'd like to clean up this code some though
2019-08-07 02:21:04 -04:00
Latapostrophe
ec1272dd14
remove join passwords
2019-08-04 11:26:26 +02:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
Monster Iestyn
c8e3748a1c
Merge branch 'master' into next
2019-05-13 16:07:30 +01:00
Steel Titanium
2c4555493d
Merge branch 'perpetual-modifier-updates' into 'master'
...
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
TehRealSalt
da7e79ac83
Adjust file loading
...
Many files converted to pk3, and we now have a distinct IWAD
2019-05-12 20:58:26 -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
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
3e93180d3d
Don't cover chat with pause effect
2019-05-06 22:39:20 -04:00
TehRealSalt
d82fa7eb60
Merge branch 'v1' into no-limits
2019-05-06 21:55:33 -04:00
