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
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