stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 12:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
6500 commits 60 branches 11 tags 94 MiB
Commit graph

6500 commits

This branch
This branch
All branches
Author SHA1 Message Date
ThatAwesomeGuy173
c762472559 Use "addons" instead of "add-ons" for consistency 2020-04-22 01:24:59 -06:00
ThatAwesomeGuy173
3f587d3391 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into text-fixes-that-bother-me 2020-04-22 01:01:08 -06:00
Wolfy
eebd73d812 FUCKING- 2020-04-22 02:00:44 -05:00
ThatAwesomeGuy173
bdf67a369a Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into text-fixes-that-bother-me 2020-04-22 00:48:09 -06:00
Wolfy
e08fcc14bd ASHNAL 2020-04-22 01:31:55 -05:00
ThatAwesomeGuy173
296dfe8ffc Do the same for other messages too 2020-04-22 00:03:45 -06:00
ThatAwesomeGuy173
4ddebca778 Capitalize "record attack" as "Record Attack" and spell "addons" as "add-ons" in the replay hut 2020-04-22 00:01:03 -06:00
Wolfy
c52ce92016 Shut the compiler up 2020-04-21 19:25:18 -05:00
Ashnal
e33e15d87f 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
96d1946c8d Merge branch 'packetversion-112' into 'awful-mix' 
1.2 end game: PACKETVERSION support

See merge request SinnamonLat/Kart-Public!12
 2020-04-20 23:55:39 -04:00
James R
820d4a5f8b SRB2APPLICATION: this is jart! 2020-04-20 20:22:17 -07:00
James R
bb6bdac111 Make the PACKETVERSION rule easier 
(cherry picked from commit 4214397679c70a7910c82126783b434f0d10343e)
 2020-04-20 20:22:04 -07:00
James R
f13f0e3e11 Remove adminplayer from SERVERINFO (PACKETVERSION 2) 
(cherry picked from commit 339ceafdf03a54cb562d70079f15587acd639619)
 2020-04-20 20:22:01 -07:00
James R
4ed99c60bb More fine tuned versioning 
You get a PACKETVERSION, for when some packets change format.

You get SRB2APPLICATION, for when you have big fucking mod.

(cherry picked from commit 6bd383621eee92b215f86c9c4b483934d7e60daa)
 2020-04-20 19:59:42 -07:00
wolfs
f9dad05242 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
wolfs
0150200949 Merge branch 'more-descriptive-error' into 'awful-mix' 
Show more descriptive error on failed downloads

See merge request SinnamonLat/Kart-Public!10
 2020-04-19 00:27:56 -04:00
Wolfy
be2cb38a3d Make the deployer use the new version format 2020-04-18 23:18:39 -05:00
colette
38cd01b1d3 FOV fixes 
# Conflicts:
#	src/r_main.c
 2020-04-18 23:13:54 -05:00
Steel Titanium
437863717a Show more descriptive error on failed downloads 2020-04-19 00:13:30 -04:00
wolfs
bf1060f7ac Merge branch 'remove-download-file' into 'awful-mix' 
Remove the correct file when http download fails

See merge request SinnamonLat/Kart-Public!9
 2020-04-18 23:35:21 -04:00
wolfs
783a1c78bd Merge branch 'awful-mix-httpfixes' into 'awful-mix' 
Fix super lol compile errors

See merge request SinnamonLat/Kart-Public!7
 2020-04-18 23:34:41 -04:00
wolfs
80c6f5e6be Merge branch 'awful-mix' into 'awful-mix' 
Require join password authentication to download, also hide http source behind PT_DOWNLOADFILESOKAY

See merge request SinnamonLat/Kart-Public!6
 2020-04-18 23:33:41 -04:00
James R
b341b87a92 Fuck acks!!!! 2020-04-18 18:47:57 -07:00
James R
b30426bccd Don't strip directory before removing failed http download 2020-04-18 18:47:20 -07:00
James R
d5ca4d3f42 Request a download after completing the join challenge 2020-04-18 18:45:50 -07:00
Steel Titanium
be94fa3200 Fix compile errors 2020-04-13 23:07:38 -04:00
James R
312fb87937 b25acfa7 also fixed the http downloader not considering checksum mismatched files 2020-04-13 17:48:10 -07:00
James R
8c9e5fc644 Whoops I fucked that up 2020-04-13 17:45:02 -07:00
James R
abd15288b4 Don't send httpsource in SERVERINFO if join password is set 2020-04-13 17:40:48 -07:00
James R
b25acfa782 Reorder join process so password is authenticated before attempting to download 2020-04-13 17:30:42 -07:00
Sally Cochenour
1fac0505a4 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
Wolfy
0a50317e49 oops 2020-04-12 22:47:22 -05:00
Wolfy
c68e1c53f3 Fix off by one error in http downloader 2020-04-12 21:14:33 -05:00
Wolfy
bceeaf78bc Prep stuff 
pending asset hash changes
 2020-04-12 20:48:11 -05:00
wolfs
dcfaba2cc6 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
9293c6cb32 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
2dd7854a9b Remove some of these superfluous ifdef checks. 
Allows compatibility with non-curl enabled builds.
 2020-04-12 15:07:39 -04:00
Wolfy
9c727992a4 Fix self-comparison in hw_main.c 2020-04-12 06:47:12 -05:00
Hannu Hanhi
f3bdcb4ec3 Backport from SRB2: Replace NextTexAvail with glGenTextures 2020-04-12 06:39:00 -05:00
wolfs
ee0bba26f4 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
60a38cbec3 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
6d3f5ef163 Also allocate mipmap for MD2 
(cherry picked from commit 99cd5161becec131099c64dddd2be6beafb538cc)
 2020-04-11 22:10:05 -07:00
James R
4ad360155f Fix nonpacked to packed cast for OpenGL 
(cherry picked from commit d2a7a87c7f39bd423fde7f8b4228082d12839583)
 2020-04-11 22:10:05 -07:00
James R
437f7aa16d Fix misaligned pointers 
(cherry picked from commit ceb8d298c2ae9a6000fa4d22e381085c6bf77cd6)
 2020-04-11 22:03:29 -07:00
Wolfy
da2a640c6c 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
8001bb4154 Batching! 2020-04-12 03:09:07 +03:00
Hannu Hanhi
1efa95bb33 Don't destroy my config file 2020-04-12 02:18:12 +03:00
Hannu Hanhi
3a654bb7d9 Fix comment 2020-04-11 13:27:18 -05:00
Hannu Hanhi
7bac42f9b2 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
516a4994f5 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