Latapostrophe
e84cac7933
Merge branch 'awful-mix' of git.magicalgirl.moe:SinnamonLat/Kart-Public into awful-mix
2020-04-28 16:58:48 +02:00
James R
8f3820db66
Wait for threads before SDL_Quit (lol)
2020-04-27 18:03:10 -07:00
James R
bdddeb9ecf
Create cond if it doesn't exist when signaling
2020-04-27 18:01:27 -07:00
wolfs
99ac81bae5
Merge branch 'sal-lighting-port' into 'awful-mix'
...
'sal-lighting' code ports from v2
See merge request SinnamonLat/Kart-Public!14
2020-04-27 04:52:58 -04:00
James R
88bcac0168
Use malloc for hms
2020-04-26 21:56:59 -07:00
James R
1484f0484f
Match MAXSERVERLIST to MAXNETNODES, increase MAXNETNODES
...
Each server in the server list requires a node. It's also MAXNETNODES-1 because
the first node is yourself.
2020-04-26 20:46:33 -07:00
Steel Titanium
ba989dce10
Support for http downloads
...
(cherry picked from commit 6fcc06bf72
)
(cherry picked just the libcurl stuff)
2020-04-26 20:01:15 -07:00
James R
c96506dd3b
Make mod update, room list and server list multithreaded
...
This took fucking ages and it still fails sometimes in edge cases, but I
don't give a FUCK right now.
2020-04-26 19:46:35 -07:00
James R
273b20d81d
Download mismatched md5sum with http
...
This is from b25acfa7
2020-04-26 01:29:40 -07:00
James R
974f9e667b
Fallback you doofus!
2020-04-26 01:28:01 -07:00
Wolfy
fcea81e018
Revert basically every attempted join passwords fix
2020-04-26 01:20:46 -07:00
James R
b3247b48a1
Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked
2020-04-26 01:16:27 -07:00
James R
bb3dcf7d5f
Revert "Reorder join process so password is authenticated before attempting to download"
...
This reverts commit b25acfa782
.
2020-04-26 01:12:40 -07:00
James R
10582beb2a
Revert "Don't send httpsource in SERVERINFO if join password is set"
...
This reverts commit abd15288b4
.
2020-04-26 01:12:39 -07:00
James R
ccb6da9ab7
Revert "Request a download after completing the join challenge"
...
This reverts commit d5ca4d3f42
.
2020-04-26 01:11:25 -07:00
Sally Cochenour
792d1a5f35
Forgotten / TICRATE
2020-04-25 21:33:34 -04:00
Sally Cochenour
b2aebb81ec
'sal-lighting' code ports from v2
2020-04-25 20:56:50 -04:00
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
wolfs
b0c3cffb6d
Merge branch 'text-fixes-that-bother-me' into 'awful-mix'
...
Text fixes that bother me
See merge request SinnamonLat/Kart-Public!13
2020-04-22 03:28:41 -04: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
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
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
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