Commit graph

19170 commits

Author SHA1 Message Date
toaster
1a53836d6a Compilation warning in D_PickVote 2022-08-28 18:34:33 +01:00
toaster
ac1fb8301d Chose the wrong version of makefile in merge conflict resolution
Partial revert of faulty commit 3f53d768d1
2022-08-28 17:48:33 +01:00
toaster
5abd6b6b44 Rework how the intro behaves in interpolated time
The old way was a mishmash... now the one scene transition is handled in F_IntroTicker alongside all other timed events.

Done in this branch because it uses the v1 version of interpolation as a primary reference.
2022-08-28 17:43:14 +01:00
toaster
1a814885da Interpolate the Phantom Ruby floating animation.
A recommit and not a cherry-pick because the other current uses won't be relevant in new-menus.
2022-08-28 17:27:37 +01:00
JugadorXEI
f17f6b7525 banishing hell map forcing
# Conflicts:
#	src/d_netcmd.c
#	src/y_inter.c
2022-08-28 17:11:19 +01:00
toaster
8931522627 If the client has caught up to the server -- say, during a wipe -- make GetLag return a ping of zero
Should fix the momentarily large ping bug.
2022-08-28 16:59:52 +01:00
James R
c9035c3f91 Send ASKINFO packet after hole punching
Time spent in I_NetRequestHolePunch no longer counts
toward ping measurement in the server list.

# Conflicts:
#	src/d_clisrv.c
2022-08-28 16:59:23 +01:00
James R
295880351a Do not query DNS for holepunchserver more than once per tic 2022-08-28 16:57:36 +01:00
toaster
0c1e311331 Fail loudly when config isn't writable
Forwardport of Kart/Kart-Public/!279 because it had JUST enough inexplicable conflicts to discourage cherry-picking
2022-08-28 16:57:06 +01:00
Ashnal
243bc67e5b Increase Mobj Freeslot limit to 1024 from 512 2022-08-28 16:47:55 +01:00
Ashnal
3887a47dc3 Upgrades P_PatchInfoTables to use 4 digit tempnames, suppoing up to 9999 freeslots 2022-08-28 16:47:31 +01:00
Ashnal
45a357bea0 Small logging improvements for addon loading
Adds back the "Loading file" message when a file is loaded
Adds individual file errors for things loaded with W_InitMultipleFiles (-file param)
Errors for a given file will now appear between "Loading file" and
the "Added file" or "not adding file" messages, making troubleshooting easier

# Conflicts:
#	src/w_wad.c
2022-08-28 16:46:56 +01:00
Ashnal
5227d3f8c4 Switched checking files mode to use a progress bar
Changed the confirmation prompt use MB if >=10MB
Changed the ovearall progress bar to use MB if >=10MB
2022-08-28 16:43:05 +01:00
Ashnal
47ce32cfc9 Properly detach rocket sneakers when the player dies
This includes both death pits and spectating
2022-08-28 16:42:06 +01:00
Ashnal
a58ae6c472 Discord joins now force menu close and title demo stop
This prevents wierdness from ahving the menu open on teh connection screen
It also prevents the connect command from erroring due to being in a demo
2022-08-28 16:41:26 +01:00
JugadorXEI
904f1703c5 Fix duplicated matchgenericflags (was causing crash)
# Conflicts:
#	src/p_mobj.c
2022-08-28 16:40:50 +01:00
JugadorXEI
aa505823f5 Simply return address, don't allow self_ip to be possibly written as something else 2022-08-28 16:36:23 +01:00
JugadorXEI
3f53d768d1 Discord Invite Fixes
# Conflicts:
#	src/Makefile
2022-08-28 16:36:08 +01:00
Hannu Hanhi
f7389e74d3 Fix unnecessary texture reloads on respawn in opengl by removing unneeded V_SetPalette calls 2022-08-28 16:31:03 +01:00
Sally Coolatta
d3a4a6ca81 Remove unused variables 2022-08-28 03:09:13 -04:00
Sally Coolatta
559222f991 Stuff for Ivo's texture crunching
- Flats no longer get applied entirely, they are FULLY DEPRECATED NOW
- Uses AASMELLY instead of REDWALL for missing textures
2022-08-28 00:03:22 -04:00
Sal
aced12b2b2 Merge branch 'more-makefile-changes' into 'master'
Nifty makefile changes  for exe naming

See merge request KartKrew/Kart!651
2022-08-27 01:30:00 +00:00
Sally Coolatta
0fb26368cc Make drift boost bonus match drift spark rate 2022-08-26 20:55:24 -04:00
Sally Coolatta
4c6109f62d Fix redundant check from the optimization
The drawsegs x range already filters this case out, so this will never be reached.
2022-08-26 17:08:35 -04:00
James R
ad242cf9b9 Makefile: do not append master branch name 2022-08-26 10:46:02 -07:00
Sally Coolatta
d3cbf0cd6f Oops, properly scale for high-res/splitscreen
prboom-plus uses 320 here always, but that's because it handles high resolutions differently apparently.
2022-08-25 00:31:23 -04:00
Sal
7c5d066684 Merge branch 'clip-sprites-optimize' into 'master'
Sprites clipping against drawsegs optimized, from prboom-plus

See merge request KartKrew/Kart!650
2022-08-25 03:33:58 +00:00
Sally Coolatta
66f120c1b2 Merge branch 'master' into clip-sprites-optimize 2022-08-24 22:23:13 -04:00
Sally Coolatta
8494c30e08 Drawseg clipping optimized, from prboom-plus 2022-08-24 22:03:05 -04:00
Sal
66aa976cc2 Merge branch '14-expedited' into 'master'
Expedited 1.4+ fixes

See merge request KartKrew/Kart!649
2022-08-24 23:10:47 +00:00
James R
dc221caa9f Merge branch 'model-offset-fix' into 'master'
Fix offsets for models

See merge request KartKrew/Kart!647
2022-08-24 23:08:47 +00:00
toaster
851a2094cf Don't even attempt to advertise a non-netgame server.
This appears to be a long-time bug that exists upstream too, but nobody even knew about it before the MS rules alert made it clear this was actually happening!

# Conflicts:
#	src/m_menu.c
2022-08-24 23:54:38 +01:00
James R
41fa7fe14e Rename rendezvousserver to holepunchserver
# Conflicts:
#	src/mserv.c
2022-08-24 23:39:54 +01:00
James R
222b1b9422 Master server: use I_OutputMsg during startup
CONS_Printf calls CON_Drawer during startup, thread
collision stuff.
2022-08-24 23:33:34 +01:00
James R
09d48b00f8 Reset remotenode when discarding STUN/hole punch packet
Fixes some wild behavior when a lot of hole punching
requests are coming in.
2022-08-24 23:33:25 +01:00
toaster
1a6e54e673 Fix VHS effect speeding up with interpolation. 2022-08-24 23:33:08 +01:00
toaster
ede34864ac Fix changing gamespeed from the menu, for real
I originally wrote a ridiculous attempt at reimplementing the existing value rollaround. For one reason or another, that sidesteps net transmission. Let's just avoid all those hacks and limit our influence to changing the maximum allowed range.

# Conflicts:
#	src/command.c
2022-08-24 23:30:42 +01:00
Sal
57a3aef590 Merge branch 'egg-fast-drift' into 'master'
Give heavy-accel a bonus to drift boosts

See merge request KartKrew/Kart!648
2022-08-24 07:34:34 +00:00
Sally Coolatta
7f4b3e7c2a maybe fix lightning crash idk lol 2022-08-24 03:34:03 -04:00
Sally Coolatta
a4767323f2 Give heavy-accel a bonus to drift boosts 2022-08-24 01:38:50 -04:00
Sally Coolatta
0a7b437328 Fix offsets for models 2022-08-24 00:46:12 -04:00
Sal
0f61d1f064 Merge branch 'v1-rollup' into 'master'
V1 rollup

See merge request KartKrew/Kart!646
2022-08-24 03:34:32 +00:00
Sal
7f71775ae0 Merge branch 'big-boost' into 'master'
Big Boosts

See merge request KartKrew/Kart!643
2022-08-24 03:25:42 +00:00
Sally Coolatta
89367c809d Give first blood sliptiding 2022-08-23 23:12:24 -04:00
Eidolon
91a404c190 cmake: rename executable 2022-08-23 21:44:25 -05:00
Sally Coolatta
b28450313b Merge branch 'master' into big-boost 2022-08-23 22:34:14 -04:00
Eidolon
37d0857762 cmake: move debug strip to src/CMakeLists.txt 2022-08-23 21:32:29 -05:00
Sally Coolatta
eeb00dac22 Even bigger spindash speed 2022-08-23 22:29:12 -04:00
Eidolon
d3287c044d cmake: add objects CMakeLists.txt 2022-08-23 21:29:06 -05:00
Eidolon
17128dc8f7 cmake: add exchndl link on mingw32 2022-08-23 21:26:17 -05:00