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

5602 commits

Author SHA1 Message Date
Wolfy
82b5ce5495 Remove cv_grskydome 
This is how GL should've been handling skies all along, no point having an option
 2020-04-24 23:48:03 -05:00
Wolfy
0e78159ea1 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix 
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
 2020-04-24 18:10:25 -05:00
Hannu Hanhi
957768efd1 Fix mistake in previous commit 2020-04-22 23:50:50 +03:00
Hannu Hanhi
4e8349fccc Fix lighting breaking if trying to use unavailable shaders 2020-04-22 23:50:14 +03:00
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
Hannu Hanhi
ce1d017a73 Sky dome from SRB2 2020-04-22 00:18:58 +03:00
Hannu Hanhi
e45295f1ea Don't crash if shaders are unavailable 2020-04-21 23:45:48 +03:00
Hannu Hanhi
812cceb53f Remove sometimes harmful NetUpdate call from HWR_RenderFrame 2020-04-21 23:32:31 +03:00
Hannu Hanhi
2fdb7627b7 Fix wrong behaviour and lack of animation in ogl sky background 2020-04-21 23:24:32 +03:00
Hannu Hanhi
4309908999 Fix race results screen showing wrong image on maps with skyboxes 2020-04-21 23:23:03 +03:00
Hannu Hanhi
43be277ac7 Newer color tinting shaders ported from SRB2 shader branch 2020-04-21 23:15:44 +03:00
Hannu Hanhi
6cc1c5dd36 Make OpenGL texture filter config save 2020-04-21 22:38:46 +03:00
Hannu Hanhi
b5fb88922a Faster sprite sorting algorithm 2020-04-21 22:08:52 +03: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
Hannu Hanhi
628bd27b88 Fixed and faster transparency sorting for OGL. For easy comparison, check Ethereal Crystal in Abstraction Pack 2020-04-19 18:42:03 +03:00
Hannu Hanhi
ff98d3b28a Fix skywalls in ogl. Similar to c3f6f263 in master. 2020-04-19 18:19:16 +03: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
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
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
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
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
Hannu Hanhi
b9e008c8bf Chat drawing memory leak fix from SRB2 repo 2020-04-08 17:33:23 -04:00
James R
4b68b41a31 Fix lol xd compiler errors 2020-04-07 17:06:20 -07:00
Steel Titanium
061e483df1 Fix error with travis 2020-04-07 19:48:39 -04:00
Steel Titanium
f28c53ea82 Fix this mistake 2020-04-07 19:27:20 -04:00
Steel Titanium
f4002f076e Fix even more build errors 2020-04-07 19:14:27 -04:00
Steel Titanium
cb9004e4cf Fix some build errors 2020-04-07 19:07:39 -04:00
Steel Titanium
6fcc06bf72 Support for http downloads 2020-04-07 18:22:29 -04:00
Wolfy
8a1f40b90f Add PT_CLIENTCMD back to allowed packet types 
Fixes unexpected CLIENTCMD prints
 2020-04-07 07:09:51 -05:00
Wolfy
bbce134afa Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix 2020-04-07 06:41:54 -05:00
Wolfy
95e7e59179 Remove stupid dumbfuck #ifdefs 
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
 2020-04-07 05:24:38 -05:00
Wolfy
d4c69f137a Fix unterminated #ifdef 2020-04-07 04:25:11 -05:00
Wolfy
bcfffefe43 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
59df0c1187 Revert the removal of S_MusicExists 2020-04-07 02:56:45 -05:00
Wolfy
2406302911 Potentially fix join passwords 2020-04-05 18:57:47 -05:00
Wolfy
49a1037f6b Revert "PT_CLIENTCMD test" 
This reverts commit 78bc80fd49.
 2020-04-05 17:18:22 -05:00
Wolfy
78bc80fd49 PT_CLIENTCMD test 2020-04-05 17:01:40 -05:00
Wolfy
40f7d1b721 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix 2020-04-05 16:12:04 -05:00
Wolfy
cedc79fd4b Fix packet type desync 2020-04-05 16:11:30 -05:00
Wolfy
4d477d1aed Reimplement the MusicChange hook 
why the fuck was this removed
 2020-04-05 12:09:44 -05:00
Wolfy
49842c37cd Record attack only linedef exec 2020-04-05 14:12:12 +02:00
Latapostrophe
12bca93591 Merge branch 'v1-backwards-thrown-spikeballs' into awful-mix 2020-04-05 14:10:00 +02:00
Sally Cochenour
88a6b6b2f4 Slow down backwards spikeballs (again) 2020-04-05 14:09:04 +02:00
Wolfy
9395a0f5fc Record attack only linedef exec 2020-04-05 07:03:49 -05:00
Latapostrophe
b483e42d94 Merge branch 'v1-ignore-posthumous-ackret' into awful-mix 2020-04-05 11:23:49 +02:00
Latapostrophe
86986adf6e 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
732eb4cafa Merge branch 'fix-double-bombs' into awful-mix 2020-03-22 13:09:06 +01:00
Latapostrophe
549eabe9e4 I'm dumb, don't check for flashtics here... 2020-03-22 13:08:46 +01:00
Latapostrophe
4f24f1ae5b Merge branch 'spb-blockmap-fix' of git.magicalgirl.moe:KartKrew/Kart-Public into awful-mix 2020-03-13 22:38:20 +01:00
Latapostrophe
67eeb819cb Merge branch 'fix-double-bombs' into awful-mix 2020-03-13 13:52:37 +01:00
Latapostrophe
245ac55654 This flag shouldn't have been applied there 2020-03-13 13:50:22 +01:00
Latapostrophe
44f45d6d28 Fix Lua crashes when loading without addons 2020-03-12 16:03:12 +01:00
Latapostrophe
cbc7fe7b67 Fix Demo lua archive crash for real this time 2020-03-12 15:31:58 +01:00
Latapostrophe
b905f20cd4 Fix tiny conflict because I forgot to merge 2020-03-11 19:55:56 +01:00
Latapostrophe
0ee6426830 Remove debug prints 2020-03-11 19:53:52 +01:00
Latapostrophe
dabed0cd50 Attempt to fix replay loading crash 2020-03-11 19:33:22 +01:00
Latapostrophe
a3389b43a0 Merge branch 'too-many-files' into awful-mix 2020-03-11 12:34:54 +01:00
Latapostrophe
513c3d1c3f don't set MAX_WADFILES to 256, worst mistake of my life 2020-03-11 12:34:35 +01:00
Latapostrophe
43e5718851 Merge branch 'push-more-lua' into awful-mix 2020-03-11 07:37:47 +01:00
Latapostrophe
37c733b8c2 More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
Latapostrophe
ee2fdeaf21 Merge branch 'too-many-files' into awful-mix 2020-03-11 07:21:41 +01:00
Latapostrophe
168b8ac052 Bump MAX_WADFILES to 256 2020-03-11 07:20:11 +01:00