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 |
|
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 |
|
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 |
|
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 |
|
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
|
e9bbdb8cc3
|
Reimplement the MusicChange hook
why the fuck was this removed
|
2020-04-05 12:09:44 -05:00 |
|
Wolfy
|
e0fec734f2
|
Record attack only linedef exec
|
2020-04-05 14:12:12 +02:00 |
|
Latapostrophe
|
51b1430dd6
|
Merge branch 'v1-backwards-thrown-spikeballs' into awful-mix
|
2020-04-05 14:10:00 +02:00 |
|
Sally Cochenour
|
9495832106
|
Slow down backwards spikeballs (again)
|
2020-04-05 14:09:04 +02:00 |
|
Wolfy
|
e2aeabec1b
|
Record attack only linedef exec
|
2020-04-05 07:03:49 -05:00 |
|
Latapostrophe
|
29781688e8
|
Merge branch 'v1-ignore-posthumous-ackret' into awful-mix
|
2020-04-05 11:23:49 +02:00 |
|
Latapostrophe
|
dc00dbdeee
|
Merge branch 'ignore-posthumous-ackret' of git.magicalgirl.moe:KartKrew/Kart-Public into v1-ignore-posthumous-ackret
|
2020-04-05 11:23:29 +02:00 |
|
Latapostrophe
|
dc5284ecd0
|
Merge branch 'fix-double-bombs' into awful-mix
|
2020-03-22 13:09:06 +01:00 |
|
Latapostrophe
|
2cd0e1d615
|
I'm dumb, don't check for flashtics here...
|
2020-03-22 13:08:46 +01:00 |
|
Latapostrophe
|
b6bc575a70
|
Merge branch 'spb-blockmap-fix' of git.magicalgirl.moe:KartKrew/Kart-Public into awful-mix
|
2020-03-13 22:38:20 +01:00 |
|
Latapostrophe
|
f55f889fbd
|
Merge branch 'fix-double-bombs' into awful-mix
|
2020-03-13 13:52:37 +01:00 |
|
Latapostrophe
|
bcca38d014
|
This flag shouldn't have been applied there
|
2020-03-13 13:50:22 +01:00 |
|
Latapostrophe
|
d2f1b83a09
|
Merge branch 'awful-mix' of git.magicalgirl.moe:SinnamonLat/Kart-Public into awful-mix
|
2020-03-12 16:04:49 +01:00 |
|
Latapostrophe
|
6fe54eafba
|
Fix Lua crashes when loading without addons
|
2020-03-12 16:03:12 +01:00 |
|
Latapostrophe
|
9abbd2d1b3
|
Fix Demo lua archive crash for real this time
|
2020-03-12 15:31:58 +01:00 |
|