Commit graph

14505 commits

Author SHA1 Message Date
James R
f7c726dd71 7176aaf3 also fixed the http downloader not considering checksum mismatched files 2020-04-13 17:48:10 -07:00
James R
f61e916ab6 Whoops I fucked that up 2020-04-13 17:45:02 -07:00
James R
ffd120f597 Don't send httpsource in SERVERINFO if join password is set 2020-04-13 17:40:48 -07:00
James R
7176aaf36f Reorder join process so password is authenticated before attempting to download 2020-04-13 17:30:42 -07:00
sphere
e8a202e0a3 Make linedef type 461 able to set object angle, using the line's angle. 2020-04-13 17:10:25 +02:00
Nev3r
608f4b6e54 Remove now unused P_MobjReadyToMove(). 2020-04-13 16:00:58 +02:00
Nev3r
44426fd453 Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose. 2020-04-13 15:17:53 +02:00
Nev3r
8bbbd437c5 Refactor an unholy piece of code. 2020-04-13 14:31:19 +02:00
Sally Cochenour
53784f9940 No more modulo bullshit in VERSION
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision

# Conflicts:
#	src/doomdef.h
2020-04-12 23:32:15 -05:00
Sally Cochenour
da953c9dae No more modulo bullshit in VERSION
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision
2020-04-12 23:51:00 -04:00
Wolfy
e1ab32a459 oops 2020-04-12 22:47:22 -05:00
Wolfy
9d31786c8c Fix off by one error in http downloader 2020-04-12 21:14:33 -05:00
Wolfy
30f5e928dd Prep stuff
pending asset hash changes
2020-04-12 20:48:11 -05:00
wolfs
4a264ffba9 Merge branch 'http-downloads' into 'awful-mix'
Support for http downloads

See merge request SinnamonLat/Kart-Public!1
2020-04-12 21:38:33 -04:00
Sally Cochenour
371cc18bf6 Update ALL finish line distances & positions, separately, before player thinkers happen, ensuring it's never inaccurate 2020-04-12 21:04:07 -04:00
James R
76e93476de Make the PACKETVERSION rule easier 2020-04-12 17:05:18 -07:00
Steel Titanium
47d70e1ae6 Fix cmake using wrong libs if internal libs is turned on
Use '\0' instead, just in case
2020-04-12 17:56:12 -04:00
Steel Titanium
4bfb583e91 Remove some of these superfluous ifdef checks.
Allows compatibility with non-curl enabled builds.
2020-04-12 15:07:39 -04:00
Wolfy
bf3b00f43a Fix self-comparison in hw_main.c 2020-04-12 06:47:12 -05:00
Hannu Hanhi
4d5ff9fbe6 Backport from SRB2: Replace NextTexAvail with glGenTextures 2020-04-12 06:39:00 -05:00
wolfs
b14d0a977f Merge branch 'kill-these-please-12' into 'awful-mix'
Compiler errors, again, again

See merge request SinnamonLat/Kart-Public!5
2020-04-12 07:00:05 -04:00
James R
390042ffc5 Even the warning can die, give the programmer some credit
(cherry picked from commit 6d67b7c3269d2530cfcd7a93cfde401e09d04138)
2020-04-11 22:10:05 -07:00
James R
42dbe3d1a1 Also allocate mipmap for MD2
(cherry picked from commit 99cd5161becec131099c64dddd2be6beafb538cc)
2020-04-11 22:10:05 -07:00
James R
79d93b86ca Fix nonpacked to packed cast for OpenGL
(cherry picked from commit d2a7a87c7f39bd423fde7f8b4228082d12839583)
2020-04-11 22:10:05 -07:00
James R
4890397b6e Fix misaligned pointers
(cherry picked from commit ceb8d298c2ae9a6000fa4d22e381085c6bf77cd6)
2020-04-11 22:03:29 -07: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
Hannu Hanhi
6bf90fc441 Batching! 2020-04-12 03:09:07 +03:00
Hannu Hanhi
bba15645fb Don't destroy my config file 2020-04-12 02:18:12 +03:00
Hannu Hanhi
fb6ffd08c7 Fix comment 2020-04-11 13:27:18 -05:00
Hannu Hanhi
edc87fbed9 Don't repeatedly look for texture files that don't exist. This fixes performance issues with models. 2020-04-11 13:27:17 -05:00
Sal
71b6c44af0 Merge branch 'spb-shit' into 'master'
Fix item distances underflowing in rare instances due to order of operations

See merge request KartKrew/Kart!235
2020-04-10 13:51:27 -04:00
wolfs
b6ca16a723 Merge branch 'fix-chat-draw-leak' into 'awful-mix'
Chat drawing memory leak fix from SRB2 repo

See merge request SinnamonLat/Kart-Public!4
2020-04-10 09:28:08 -04:00
Sally Cochenour
8b5bd645ca See if cleaning the pointer here fixes shrink/eggbox syncbombs 2020-04-09 22:57:05 -04:00
Sally Cochenour
9b4e10d5d7 Item dropping code cleanup 2020-04-09 22:56:31 -04:00
fickleheart
1844aa1445 Make a separate function instead of clogging up IdentifyVersion 2020-04-09 20:56:27 -05:00
fickleheart
8001511b7c Make chdir usage consistent with other source usage 2020-04-09 20:52:23 -05:00
fickleheart
4db9ceca03 Merge remote-tracking branch 'upstream/master' into netgame-urls 2020-04-09 20:48:52 -05:00
James R
8de2bab4a9 Merge branch 'pk3-xtra-comm-fix' into 'next'
PK3: Proper ignorance for file comments/extra data

See merge request STJr/SRB2!761
2020-04-09 21:25:11 -04:00
James R
8335a44864 Merge branch 'md2-rollangle' into 'master'
Fix MD2 rollangle in reverse gravity

See merge request STJr/SRB2!818
2020-04-09 21:25:02 -04:00
James R
d3a4647c3b Merge branch 'hw-horizon' into 'master'
OGL horizon lines

See merge request STJr/SRB2!861
2020-04-09 21:24:41 -04:00
James R
0596dbd137 Merge branch 'execcfg-fixes' into 'master'
ExecCfg fixes

See merge request STJr/SRB2!821
2020-04-09 21:24:12 -04:00
Sally Cochenour
c8da95cbda Revert "Fix being able to hold items to get them as early as possible"
This reverts commit 43732b386d.
2020-04-09 21:05:46 -04:00
Sally Cochenour
43732b386d Fix being able to hold items to get them as early as possible
(Doesn't matter in v2 because it'd waste your rings to do it, but y'know how it is. Maybe port for v1.2 if it works?)
2020-04-09 20:57:21 -04:00
Sally Cochenour
1618d61bfc Fix potential overflow 2020-04-09 20:56:15 -04:00
James R
45abbb0be6 You don't need to push the value twice, it's only used once 2020-04-09 17:30:53 -07:00
James R
ccc746fbf4 Change netvars in replays 2020-04-09 17:21:30 -07:00
James R
81a01041e8 Merge remote-tracking branch 'origin/master' into next 2020-04-09 17:04:04 -07:00
James R
aff934a5b5 Merge branch 'hide-useless-1p-menu-options' into 'master'
Hide record & NiGHTS attack options if there are no available maps for them.

See merge request STJr/SRB2!868
2020-04-09 19:57:27 -04:00
James R
1bbb4d1f95 Merge branch 'ra-emblemhints' into 'master'
Allow emblem hints (and radar) in record attack.

See merge request STJr/SRB2!820
2020-04-09 19:56:17 -04:00
James R
b6b617cab7 Merge branch 'fix-256-brightness' into 'master'
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.

See merge request STJr/SRB2!840
2020-04-09 19:53:40 -04:00