Wolfy
c40f1bf60d
Shut the compiler up
2020-04-21 19:25:18 -05:00
Ashnal
abc17c9448
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
3e24c604c9
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
b8942a5e68
SRB2APPLICATION: this is jart!
2020-04-20 20:22:17 -07:00
James R
6eae2b5243
Make the PACKETVERSION rule easier
...
(cherry picked from commit 4214397679c70a7910c82126783b434f0d10343e)
2020-04-20 20:22:04 -07:00
James R
6fd3d2641c
Remove adminplayer from SERVERINFO (PACKETVERSION 2)
...
(cherry picked from commit 339ceafdf03a54cb562d70079f15587acd639619)
2020-04-20 20:22:01 -07:00
James R
2111cc2be6
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
fb0e699aec
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
8a4cde70ee
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
146164f1b7
Make the deployer use the new version format
2020-04-18 23:18:39 -05:00
colette
d04a244cad
FOV fixes
...
# Conflicts:
# src/r_main.c
2020-04-18 23:13:54 -05:00
Steel Titanium
87c7f1f797
Show more descriptive error on failed downloads
2020-04-19 00:13:30 -04:00
wolfs
43944d29b4
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
ebdb28242f
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
8b89fe7b6c
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
f87e82ca66
Fuck acks!!!!
2020-04-18 18:47:57 -07:00
James R
5febf5b2d7
Don't strip directory before removing failed http download
2020-04-18 18:47:20 -07:00
James R
98478d6712
Request a download after completing the join challenge
2020-04-18 18:45:50 -07:00
Steel Titanium
71f21dd81b
Fix compile errors
2020-04-13 23:07:38 -04:00
James R
f7c726dd71
7176aaf3 also fixed the http downloader not considering checksum mismatched files
2020-04-13 17:48:10 -07:00
James R
f61e916ab6
Whoops I fucked that up
2020-04-13 17:45:02 -07:00
James R
ffd120f597
Don't send httpsource in SERVERINFO if join password is set
2020-04-13 17:40:48 -07:00
James R
7176aaf36f
Reorder join process so password is authenticated before attempting to download
2020-04-13 17:30:42 -07:00
Sally Cochenour
53784f9940
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
e1ab32a459
oops
2020-04-12 22:47:22 -05:00
Wolfy
9d31786c8c
Fix off by one error in http downloader
2020-04-12 21:14:33 -05:00
Wolfy
30f5e928dd
Prep stuff
...
pending asset hash changes
2020-04-12 20:48:11 -05:00
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
