Commit graph

7623 commits

Author SHA1 Message Date
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
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
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
ccc746fbf4 Change netvars in replays 2020-04-09 17:21:30 -07:00
Sally Cochenour
d0a6c43c89 Minor things 2020-04-09 02:52:41 -04:00
Hannu Hanhi
2ac33942a2 Chat drawing memory leak fix from SRB2 repo 2020-04-08 17:33:23 -04:00
wolfs
eb5f731845 Merge branch 'awful-mix' into 'awful-mix'
Fix lol xd compiler errors

See merge request SinnamonLat/Kart-Public!2
2020-04-08 17:04:06 -04:00
James R
9f1c616817 Fix lol xd compiler errors 2020-04-07 17:06:20 -07:00
Steel Titanium
2d8a924369 Fix error with travis 2020-04-07 19:48:39 -04:00
Steel Titanium
829e63364d Fix this mistake 2020-04-07 19:27:20 -04:00
Steel Titanium
eafa6a53a7 Fix even more build errors 2020-04-07 19:14:27 -04:00
Steel Titanium
f25235d1eb Fix some build errors 2020-04-07 19:07:39 -04:00
Steel Titanium
5e0eca9fe9 Support for http downloads 2020-04-07 18:22:29 -04:00
Wolfy
7444dd34ab Add PT_CLIENTCMD back to allowed packet types
Fixes unexpected CLIENTCMD prints
2020-04-07 07:09:51 -05:00
Wolfy
e95fbba181 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix 2020-04-07 06:41:54 -05:00
Wolfy
1d1b1514b4 Remove stupid dumbfuck #ifdefs
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
2020-04-07 05:24:38 -05:00
Wolfy
8fabcc1228 Fix unterminated #ifdef 2020-04-07 04:25:11 -05:00
Wolfy
d96d86dc5d Merge remote-tracking branch 'remotes/digiku/public-musicplus-lua' into awful-mix
Reimplements removed MusicPlus functions.

# Conflicts:
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_script.h
2020-04-07 03:41:26 -05:00
Wolfy
ffc232f970 Revert the removal of S_MusicExists 2020-04-07 02:56:45 -05:00
Sally Cochenour
fe376a388b Slight adjustments 2020-04-07 00:53:43 -04:00
Sally Cochenour
3f639b4f8a Rubberbanding! 2020-04-07 00:40:44 -04:00
Wolfy
6ea0492008 Potentially fix join passwords 2020-04-05 18:57:47 -05:00
Wolfy
e6d7af623a Revert "PT_CLIENTCMD test"
This reverts commit e2feca3dc7.
2020-04-05 17:18:22 -05:00
Wolfy
e2feca3dc7 PT_CLIENTCMD test 2020-04-05 17:01:40 -05:00
Wolfy
b7c1bf1c93 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix 2020-04-05 16:12:04 -05:00
Wolfy
2c54c32eb3 Fix packet type desync 2020-04-05 16:11:30 -05:00
Wolfy
86ac41bb4a Record attack only linedef exec 2020-04-05 22:37:42 +02:00
Latapostrophe
1051b115b4 Merge branch 'v1-backwards-thrown-spikeballs' into awful-mix 2020-04-05 22:31:07 +02:00
Latapostrophe
297104f12d Merge branch 'fix-double-bombs' into awful-mix 2020-04-05 22:30:43 +02:00