Wolfy
ec60fb0aff
HWR_CreateBlendedTexture optimizations
...
By Hannu_Hanhi
2020-05-11 17:47:24 -05:00
wolfs
869234d9f1
Merge branch 'default-manifest' into 'awful-mix'
...
Add a default manifest file.
See merge request SinnamonLat/Kart-Public!16
2020-05-10 02:08:19 -04:00
wolfs
b9a3524cc7
Merge branch 'fallback-refusal' into 'awful-mix'
...
Display refusal message if there is no HTTP source and internal downloads are disabled
See merge request SinnamonLat/Kart-Public!17
2020-05-10 02:07:59 -04:00
Wolfy
d24c4bab44
Update hash again
2020-05-09 10:52:23 -05:00
Wolfy
a4502f6ffb
Forgot to update date modified
2020-05-09 09:15:17 -05:00
ThatAwesomeGuy173
6519da0d9f
Display refusal message if there is no HTTP source and internal downloads are disabled
2020-05-09 06:06:21 -06:00
Wolfy
09efbb3e8e
Update patch.kart hash
2020-05-09 03:16:46 -05:00
Wolfy
d80981ab22
Minor credits updates
2020-05-09 01:17:10 -05:00
Steel Titanium
c54a311a30
Add a default manifest file.
...
The tldr is that it fixes opengl not working on systems with broken drivers, which is usually older intel GPUs
2020-05-08 22:59:19 -04:00
wolfs
29bc6489db
Merge branch 'large-server-list' into 'awful-mix'
...
Increase MAXNETNODES so the server list can be larger
See merge request SinnamonLat/Kart-Public!15
2020-05-06 02:57:28 -04:00
Wolfy
dad80d8db1
Fix the RA only linedef
...
I forgot some stuff.
2020-05-05 10:25:40 -05:00
Wolfy
1e81924f9a
Don't use models for signposts
...
based james
2020-05-03 23:51:30 -05:00
Latapostrophe
a3e74a1305
Add back viewpoint names & fix console inputs in replays
2020-04-30 15:50:30 +02:00
Wolfy
af0a93ea53
Merge remote-tracking branch 'remotes/james/awful-mix-fucked' into awful-mix
2020-04-30 04:40:11 -05:00
Wolfy
885d949cf9
Shader batching additions
2020-04-29 00:03:02 -05:00
James R
0cdfaaa56c
Merge remote-tracking branch 'lat/awful-mix' into awful-mix-fucked
2020-04-28 21:56:35 -07:00
James R
e2733600cd
Oops a debug condition snuck in there
2020-04-28 14:35:03 -07:00
Latapostrophe
aad2401ba5
Cam lockon, allow viewpoint change during freecam
2020-04-28 23:24:48 +02:00
James R
a1aa2a5e12
Fix switching the master server
2020-04-28 14:21:57 -07:00
James R
e950efa5fc
Put some mutex on CONS_Printf etc. hahaha
2020-04-28 13:08:43 -07:00
James R
e20dccafd4
Fucking multithreading in the server registration
...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-04-28 12:33:50 -07:00
Latapostrophe
cf64a468f5
Add lua toggle for check hud
2020-04-28 17:24:33 +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
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
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
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
James R
c472a9f50d
Multithreading in my SRB2???
2020-04-17 20:05:29 -07:00
James R
7b714a225b
WHY THE FUCK DID I DO THIS
2020-04-15 22:04:55 -07:00
James R
60bc61ef70
Oops
2020-04-14 19:41:32 -07:00
James R
30b5ec14fd
Handle NULL hms buffer
2020-04-14 16:55:14 -07:00
James R
7488991ecd
Compiler errors: won't stop, can't stop
2020-04-13 23:31:26 -07:00
James R
a0de059235
masterserver_update_rate cvar determines wait between updates in minutes
...
The new default is 15 minutes as well. And if you think that's too long, I have
confirmed that the Master Server delists inactive servers after a whopping 40
minutes, at least.
2020-04-13 23:10:06 -07:00
James R
ee6de3800e
Don't try to update right after registering
2020-04-13 22:54:58 -07:00
James R
2c5566b013
Add a hack so the 'All' room isn't display for hosting
2020-04-13 22:31:11 -07:00
James R
1201e89132
Kill the old mserv, long live HMS!
2020-04-13 22:23:01 -07:00
James R
7255d360e1
Clean up header text
2020-04-13 21:20:29 -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
James R
032adadd86
HTTP update alert
2020-04-12 20:37:46 -07: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
James R
48b2112af7
Fix some goofs
2020-04-12 18:33:53 -07:00
James R
03caf27d92
Bruh
2020-04-12 18:27:01 -07:00
James R
269746fe01
Clean up a bunch of stuff and follow the Master Server API more closely
2020-04-12 18:25:59 -07:00
James R
3f4224ed37
Windows certs do work, thanks Steel!
2020-04-12 17:51:30 -07:00
James R
969fe0b28e
Handle more errors
2020-04-12 17:51:05 -07:00
James R
ef71bef6f3
Kill masterserver_token
2020-04-12 17:15:39 -07: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
James R
f0cc851b29
This will be the Master Server in 2020
2020-03-20 20:37:26 -07: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
Latapostrophe
6da057167d
Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix
2020-03-10 21:46:12 +01:00
Latapostrophe
99905a443e
Merge branch 'damned-springpads' into v1.2-frankeinstein
2020-03-10 20:39:35 +01:00
Latapostrophe
b85a588e01
Merge branch 'push-more-lua' into v1.2-frankeinstein
2020-03-10 20:35:29 +01:00
Latapostrophe
7cd3221be8
Merge branch 'fix-orbit-shield' into v1.2-frankeinstein
2020-03-10 20:35:19 +01:00
Latapostrophe
d993bce8b6
Merge branch 'fix-double-bombs' into v1.2-frankeinstein
2020-03-10 20:34:47 +01:00
Latapostrophe
1a0d148a7c
Merge branch 'no-cheese' into v1.2-frankeinstein
2020-03-10 20:34:38 +01:00
Latapostrophe
d43ed7f74c
Merge branch 'gl-qol' into v1.2-frankeinstein
2020-03-10 20:34:20 +01:00
Latapostrophe
3b2907865f
Merge branch 'stack-draw-flags' into v1.2-frankeinstein
2020-03-10 20:27:52 +01:00
Latapostrophe
81ad772a8b
Merge branch 'record-attack-changes' into v1.2-frankeinstein
2020-03-10 20:27:00 +01:00
Latapostrophe
5202a4f0fd
VoteThinker Hook for Lua
2020-03-10 18:58:44 +01:00
Latapostrophe
63eadaf83c
Expose CV_FindVar to Lua
2020-03-10 18:12:20 +01:00
Latapostrophe
2e5608d33b
Push race countdowns and functions to set them
2020-03-10 12:57:30 +01:00
Latapostrophe
8c00331c2b
Push consoleplayer and displayplayers to Lua
2020-03-10 11:53:28 +01:00
Latapostrophe
428dc42e2d
Remove debug print
2020-03-10 10:21:47 +01:00
fickleheart
11cba9bd6a
I'M GONNA PISS MYSELF OF LAUGHER anyway fixed syncbombs
2020-03-07 12:40:45 -06:00
fickleheart
b8e4af3f8d
SUPER EXPERIMENTAL FREEZE-B-GONE
2020-03-05 22:19:39 -06:00
Latapostrophe
bb1c320236
Merge branch 'fickle-replay-v1' into replay-freecam-rewind
2020-03-05 21:08:20 +01:00
TehRealSalt
190b0d4660
Replay playback changes:
...
- Store level state periodically
- Load the closest usable level state when done rewinding for
quicker resumes
- Make playback menu fade out after 5 seconds of no activity
(but not while paused)
- Remove wrapping from replay hut (original wrapping was broken
at some point before 1.1 and it's not necessary anyway)
- Allow holding enter on frame advance for noisy slow-mo
from fickleheart
2020-03-05 21:04:56 +01:00
James R
3f9f07af84
Use https because my web server redirects
2020-03-01 12:31:49 -08:00
James R
56fac10b14
strtok can return NULL
2020-03-01 12:15:48 -08:00
James R
9d42a5ad5e
This time I fucked up
2020-03-01 11:59:54 -08:00
James R
aca2e97c84
Windows gaysed: the sequel
2020-03-01 11:54:21 -08:00
James R
ceb332e580
Windows is weird
2020-03-01 11:46:02 -08:00
James R
32a34cc1b2
masterserver_debug to set CURLOPT_VERBOSE
2020-03-01 11:39:27 -08:00
James R
1959a9b107
Don't show "All" room when hosting
2020-03-01 11:19:59 -08:00
James R
8756ef15a2
I don't even know my own website
2020-03-01 11:17:56 -08:00
James R
47a5f9ef94
lol
2020-03-01 10:59:25 -08:00
James R
e2507f390f
The big bad HTTP master server
...
Cvars:
http_masterserver is the url to the master server's API.
masterserver_token may be an authentication token.
2020-03-01 02:36:56 -08:00
Latapostrophe
ba8dff544a
How can you look at yourself in the mirror?
2020-01-29 22:33:00 +01:00
James R
2a016332c4
Handle log file in parent properly
2019-12-16 19:28:42 -08:00
James R
f460e83846
Add this back for Windoodoo because I'm an idiot
2019-12-16 19:27:55 -08:00
James R
d0c41a8d55
Rename signal caught message to be more obvious
2019-12-16 19:27:55 -08:00
James R
a0d6dc30cb
Fix signal handler setup error reporting
2019-12-16 19:27:55 -08:00
James R
b83f41e089
Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place
2019-12-16 19:27:54 -08:00
James R
a64dbe1016
Kill child when wait fails, so I_Error exits both
2019-12-16 19:27:54 -08:00
James R
c9830e5ab1
Fix idiot mistake
2019-12-16 19:27:54 -08:00
James R
9efe4d8445
Move everything to i_system.c
...
This also simplifies things; SDL isn't initialized in the parent process.
2019-12-16 19:27:53 -08:00
James R
2b837726eb
nix: Fork before game code and wait to catch signals and coredumps
...
Ditched signal_handler to avoid worrying about async-signal-safe functions.
D_QuitNetGame is not called, so players whose programs are interrupted by a
signal will time out from the server. Because the game runs in a child process,
the window can close before the "Signal Caught" text box appears.
"(core dumped)" is also included in the message if core dumping could be
determined.
2019-12-16 19:27:35 -08:00
fickleheart
92d320be72
Fix dereferencing uninitialized pointer
2019-12-01 16:16:27 -06:00
fickleheart
35a8944f88
Remove (redundant?) skywalls that seemed to drop performance
2019-12-01 15:39:30 -06:00
fickleheart
e8d2ca1f63
Fix kart HUD fadein
2019-12-01 12:38:05 -06:00
fickleheart
6131b80f03
I don't like your sprite clipping fix, so here's mine
2019-12-01 12:34:25 -06:00
fickleheart
9ecc48d0e4
Merge remote-tracking branch '[remote name redacted]/jimita-shaders'
...
# Conflicts:
# src/hardware/hw_main.c
2019-12-01 11:58:24 -06:00
Latapostrophe
272f3fbb53
fix conflict
2019-11-12 00:41:26 +01:00
Latapostrophe
aab87012df
dontencoreremap flag + colormaps
2019-11-12 00:40:25 +01:00
Latapostrophe
abcb1e9981
Merge branch 'gl-encore' into gl-qol
2019-11-12 00:23:56 +01:00
Jaime Passos
994f9492e8
Recreate the CLUT when the palette changes
2019-11-12 00:23:38 +01:00
Jaime Passos
f22e767380
fix conflict
2019-11-12 00:23:26 +01:00
Latapostrophe
3bd62175f6
fix encore for ogl
2019-11-12 00:21:37 +01:00
Latapostrophe
ff7a706976
fix orbiting items not protecting you against your own items
2019-11-11 00:24:06 +01:00
James R
44e59e2688
Don't hide HUD with hu_showscores in single player/Record Attack
...
This also makes Lua game HUD consistent with the Kart HUD.
2019-10-19 14:11:24 -07:00
James R
fdb54d8e80
Apply BMBOUNDFIX to A_MineExplode
2019-10-15 23:29:02 -07:00
James R
1d6020883c
Forgot includes
2019-10-07 18:10:33 -07:00
James R
abaefa05b1
ferror does not return errno, are you stupid?
...
Use M_FileError to return the proper error description, or "end-of-file".
2019-10-07 17:55:31 -07:00
James R
5e9082fb77
Also apply HUD translucency to FREE PLAY
2019-09-19 20:29:51 -07:00
Latapostrophe
90a272489e
it's cam, not thiscam
2019-09-18 14:04:23 +02:00
Latapostrophe
9a1bfb3a92
camera checks to avoid crashes
2019-09-17 00:04:32 +02:00
James R
3801f93181
Let first person camera work in demos
2019-09-15 00:32:01 -07:00
Latapostrophe
ef279ac5fe
i am a retard
2019-09-13 23:42:51 +02:00
filpAM
fe4cbd7ba1
Fix "NOMIXER" flag compiling
2019-09-13 13:20:44 -04:00
Latapostrophe
ca2f6685e4
forgot to reset variables on demo stop
2019-09-11 21:30:11 +02:00
Latapostrophe
cea0ffab60
forgot to add back 'void' after undoing experiments
2019-09-10 13:52:32 +02:00
Latapostrophe
2205246f0c
get replays to save player lua vars
2019-09-10 11:59:17 +02:00
Latapostrophe
bee60709ec
I'm an idiot and forgot to let you download files
2019-09-09 22:26:09 +02:00
Latapostrophe
18c8f47f9a
fix rewind, fix sound local sound playing in freecam
2019-09-09 22:15:50 +02:00
Latapostrophe
e3393d6323
let mfe_drawonlyfor flags stack
2019-09-09 20:20:40 +02:00
Latapostrophe
45b62aa8a4
replay freecam + enhancements
2019-09-05 23:24:23 +02:00
Latapostrophe
eb8cef41e4
shorten RA intro & allow to restart with pause
2019-09-01 23:04:07 +02:00
James R
3838700f2c
Save bans when cleared too
...
(Why doesn't it work for I_Quit?)
2019-08-22 15:18:14 -07:00
Latapostrophe
9cdd8d85c8
Fix bombs exploding twice in the same frame
2019-08-12 00:14:01 +02:00
Latapostrophe
61d7fc8b48
remove join passwords
2019-08-04 11:26:26 +02:00
Sryder
eb8cb12b8f
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next
2019-07-17 21:29:35 +01:00
Latapostrophe
f15adb64cb
fix thrust on spring pads for shrink and the likes
2019-07-13 14:07:57 +02:00
Sryder
3cd5b3a33e
Merge branch 'fix-port-connect' into 'master'
...
Don't use client port as default peer port
See merge request KartKrew/Kart-Public!152
2019-07-05 11:54:28 -04:00
James R
14be24dfb6
Support adding to CV_FLOAT cvars with the Add command
2019-07-04 17:48:17 -07:00
James R
0a2eac682b
Don't use client port as default peer port
2019-07-04 16:38:00 -07:00
Sryder
e276faf819
Merge branch 'opengl_match_software_wallclip' into 'master'
...
OpenGL: Try and Match Software Wallclipping Better
See merge request KartKrew/Kart-Public!150
2019-07-02 14:08:10 -04:00
Sryder
815f237b22
Merge branch 'revert-mserv' into 'master'
...
Revert mserv
See merge request KartKrew/Kart-Public!144
2019-06-30 15:56:17 -04:00
James R
141ffd5c94
Send the old GT_MATCH only for specific versions
...
These version numbers were gathered from the Master Server's PHP code.
2019-06-30 10:47:08 -07:00
Sryder
56ad1340a2
Merge branch 'replay-code-sucks' into 'master'
...
Fix SIGSEGV when saving replays and invalid extrainfo offset
See merge request KartKrew/Kart-Public!149
2019-06-30 05:51:21 -04:00
Sryder
bcae3898dd
Merge branch 'lemme-outa-room-menu' into 'master'
...
Don't get stuck in room menu in a modified game
See merge request KartKrew/Kart-Public!145
2019-06-27 14:16:37 -04:00
Sryder
c3f6f263d4
Update Skywall handling
...
I've tried to make this so it almost never under-compensates, and over-compensates very little where possible.
I don't think it's 1:1 to software's current behaviour, and probably never will be due to software being very strange.
2019-06-26 23:17:45 +01:00
James R
59bbab1fff
Someone doesn't know how pointers or WRITE macros work...
...
Fixes SIGSEGV when saving a replay.
2019-06-25 00:44:12 -07:00
Sryder
414eee58ba
checkforemptylines can be static
2019-06-24 20:50:37 +01:00
Sryder
d67ea859e3
Match CheckClip to software's clipping check in R_AddLine
...
Has the added benefit of fixing noclip camera for opengl
Unfortunately SkyWalls are kinda broken with this. I'll be looking into them shortly.
2019-06-24 20:21:30 +01:00
Latapostrophe
e219645577
handle clipping like literally every hw renderer ever
2019-06-24 12:51:18 +02:00
Latapostrophe
998ee7b6b2
fix splitscreen, fix thok barriers, better fog settings
2019-06-24 10:39:16 +02:00
Latapostrophe
1556e1d027
Remove cyan pixels for now
2019-06-23 18:35:57 +02:00
Latapostrophe
1b60524e42
Fix framedrops with 'dual-thok-barriers'
2019-06-23 14:08:17 +02:00
James R
5f4f10fdbe
Spell it "forward"
2019-06-22 21:40:20 -07:00
James R
bbee4a2554
Cover edge case of WRITESTRINGN
2019-06-20 15:29:55 -07:00
James R
d5e1c1af42
Add a comment by Sryder's request
2019-06-20 15:24:50 -07:00
James R
7f99ebc692
Also count terminating byte in fileneeded filename
2019-06-20 15:16:23 -07:00
James R
ec369e8d21
Don't get stuck in room menu in a modified game
2019-06-19 14:32:11 -07:00
Sryder
db24665856
Merge branch 'print-correct-view' into 'master'
...
Print the correct player for the view command
See merge request KartKrew/Kart-Public!141
2019-06-19 16:58:11 -04:00
Sryder
1b46553d43
Integer comparison warning
2019-06-19 21:54:11 +01:00
Sryder
11c94d3312
Stop OpenGL having infinite precipitation draw distance
2019-06-19 20:05:20 +01:00
Sryder
935fec1e15
Fix compatibility with the MS (Specifically Doomseeker)
...
Send back 32 players worth of playerinfo regardless of MAXPLAYERS. Fill the extra with unconnected nodes.
2019-06-17 21:04:48 +01:00
Latapostrophe
b9b76e739c
change default fog settings, put sprite billboarding in menus and attempt to make colormaps look nicer still
2019-06-17 21:27:31 +02:00
Latapostrophe
b58478a685
Merge branch 'jimita-shaders' of git.magicalgirl.moe:Jimita/Kart-Public into jimita-shaders
2019-06-14 12:19:17 +02:00
Latapostrophe
a49c4349a4
Don't remap boosters and springpads in encore + no horizon line in GL
2019-06-14 12:18:44 +02:00
Jaime Passos
0b3a02bfcc
Update r_opengl.c
2019-06-13 21:27:19 -03:00
Jaime Passos
5e14fd4ae4
software is better
2019-06-13 21:10:01 -03:00
Latapostrophe
bf13726c1e
encore colormaps, fixups + flat align
2019-06-13 10:14:07 +02:00
Jaime Passos
a0ff5c6b25
Update hw_main.c
2019-06-12 23:31:55 -03:00
Jaime Passos
df789e1d67
Open Graphics Library (OpenGL) is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics. The API is
...
typically used to interact with a graphics processing unit (GPU), to achieve hardware-accelerated rendering.
2019-06-12 23:01:18 -03:00
Latapostrophe
53df420546
Fix stuff and reimplement the kart features that went poof
2019-06-12 21:36:47 +02:00
Latapostrophe
ff04e0c103
chaos conflict
2019-06-11 17:02:47 +02:00
James R
91c707d6fd
Index displayplayers correctly
2019-06-10 14:24:11 -07:00
Jaime Passos
e251f9c230
Update r_opengl.c
2019-06-10 16:53:03 -03:00
Jaime Passos
de5e44cfbc
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
James R
3ffc520a2c
Merge remote-tracking branch 'james/ms-connectionfail-fix' into HEAD
2019-06-09 14:22:32 -07:00
James R
8589a1ec07
Revert "Unfuck MS connecting and error reporting"
...
This reverts commit 4d739fe7a5
2019-06-09 14:21:04 -07:00
James R
0561a5374c
Revert "Check error on select"
...
This reverts commit aa4ce2b2d1
2019-06-09 14:20:33 -07:00
James R
33b7459c1b
Revert "Force of habit"
...
This reverts commit fc8ebe83fc
2019-06-09 14:20:32 -07:00
Monster Iestyn
f5d883bd12
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
Alam Ed Arias
ea08ba3fba
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
Alam Ed Arias
83b8a98df4
Merge branch 'gme-msvc' into 'master'
...
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
2019-06-07 18:06:51 -04:00
Steel Titanium
c0c1e5416f
Merge branch 'next' into 2.1.24-prep
2019-06-07 18:02:09 -04:00
Steel Titanium
3c08ee1313
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
Steel Titanium
eb99ad0437
Merge branch 'more-limits' into 2.1.24-prep
2019-06-07 11:28:43 -04:00
Monster Iestyn
6f6d912fa6
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
Steel Titanium
d4dac52766
Upped freeslots limit
2019-06-03 15:23:48 -04:00
James R
b15cea53e6
Fix XCode compiler errors
...
I'm faily certain this also fixes broken logic (g_game.c).
2019-05-28 19:04:27 -07:00
James R
6d4cdfaab7
Fix compiler errors
...
The truncation handling in this one spot is okay, but the compiler isn't smart
enough for it. I'm leaving it as a warning because I'd like to make a dedicated
function for handling snprintf truncation in the future.
2019-05-28 15:11:37 -07:00
James R
71e3ec55bf
Revert "Revert "Fix Post Processing in 64-bit Software 3P/4P""
...
This reverts commit 995edfb1e8
2019-05-28 15:09:29 -07:00
James R
cf36490ca6
Merge remote-tracking branch 'origin/v1' into v1
2019-05-28 14:24:52 -07:00
wolfs
4743e4bac8
Merge branch 'v1-lua-stuff' into 'v1'
...
V1 lua stuff
See merge request KartKrew/Kart!155
2019-05-28 07:59:45 -04:00
wolfy852
c28e1702eb
Don't guard the return
2019-05-28 06:56:35 -05:00
wolfy852
e266f72a1c
Update patch.kart hash
...
THIS SHOULD BE THE LAST TIME I SWEAR
2019-05-28 06:33:38 -05:00
Sryder
ab7246d1f7
Fix Heatwave Post-processing Effect in 3P/4P
2019-05-27 22:59:58 +01:00
James R
995edfb1e8
Revert "Fix Post Processing in 64-bit Software 3P/4P"
...
This reverts commit a2a63c5e7f
2019-05-27 14:20:12 -07:00
James R
06ddf55709
wip
2019-05-27 14:20:07 -07:00
Sryder
a2a63c5e7f
Fix Post Processing in 64-bit Software 3P/4P
...
Vid_BlitLinearScreen didn't make sure that it was actually meant to be copying the entire screen rows before doing it properly.
2019-05-27 22:03:17 +01:00
wolfs
65763b8745
Merge branch 'spinout-angle' into 'v1'
...
Spinout angle change when boosting
See merge request KartKrew/Kart!153
2019-05-26 20:10:56 -04:00
Latapostrophe
a7917cb4b9
Lua fixes + new drawOnMinimap function
2019-05-26 15:05:10 +02:00
Latapostrophe
cb74228469
fix banana's SpinPlayer using the wrong inflictor
2019-05-26 11:19:26 +02:00
Latapostrophe
55815eb829
Merge branch 'lua-battlefullscreen-expose' into v1-lua-stuff
2019-05-26 11:18:00 +02:00
Steel Titanium
dc273d3f23
Merge branch 'next' into jimita-flashpals-on-screenshots
2019-05-25 19:37:17 -04:00
Latapostrophe
e42e567489
Move the friction change out of the offroad check
2019-05-25 14:13:35 +02:00
Latapostrophe
93740dc854
add k_booostangle to dehacked
2019-05-25 14:11:26 +02:00
Latapostrophe
d4d794ceac
give friction to brakes
2019-05-25 13:51:19 +02:00
Latapostrophe
78c2c54a87
let angle be changed while spun out and boosting
2019-05-25 13:08:38 +02:00
James R
2fb4dd73fc
Move FOV option out of OGL options
2019-05-22 23:16:20 -07:00
James R
05dde43423
Acknowledge fallback models as an OGL option indeed
...
(You may also be able to actually read that code too.)
2019-05-22 23:15:46 -07:00
Jaime Passos
d3dfd77ae7
Hardware mode y-shearing matches software mode mouselook
2019-05-17 17:49:04 -03:00
Jaime Passos
315f941573
dude how do I co-author in Git?
2019-05-17 13:18:33 -03:00
wolfy852
59ca91a825
Fix the permanent instashield bug
2019-05-17 08:06:18 -05:00
wolfy852
ea90778c32
More credits updates
2019-05-17 03:55:51 -05:00
Latapostrophe
a40ff75025
SPB intangibility
2019-05-17 03:55:23 -05:00
wolfy852
66439fe812
Update bonuschars credits
2019-05-13 12:49:44 -05:00
Monster Iestyn
600a373739
Merge branch 'master' into next
2019-05-13 16:07:30 +01:00
Monster Iestyn
2a9019c15e
Merge branch 'archiveworld-sigsegv-fix' into 'next'
...
Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.
See merge request STJr/SRB2!490
2019-05-13 07:02:48 -04:00
Alam Ed Arias
addf2bb3c4
Fix NONET build
2019-05-13 01:51:36 -04:00
Steel Titanium
8a14427420
Merge branch 'perpetual-modifier-updates' into 'master'
...
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
Steel Titanium
06961a8f5e
Merge branch 'no-frameskip' into 'next'
...
Don't skip frames when connecting or paused
See merge request STJr/SRB2!489
2019-05-13 00:35:11 -04:00
Steel Titanium
cad65ad5e9
Properly fix crash due to duplicated lines.
2019-05-13 00:23:43 -04:00
Steel Titanium
4e0cc2505a
Revert "Check that lumps are okay"
...
This reverts commit 7ac0a8b4d2
2019-05-13 00:20:39 -04:00
wolfy852
7cc5fddbd8
Fix viewpoint being reset on boost when spectating
2019-05-12 16:38:50 -05:00
wolfy852
68ad2a9932
Fix rewind previews not showing for player 1
2019-05-12 14:42:39 -05:00
wolfy852
334056a77d
whoops
...
Fixes stupid obvious mistakes and changes the prefcolor reset to item.
2019-05-12 04:22:34 -05:00
wolfy852
f61f7f4411
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852
90e4a45aa4
Have Look Back reset your color to prefcolor
2019-05-12 03:21:46 -05:00
Alam Arias
38f33027a0
fix the array-bounds warning by setting a upper limit
2019-05-09 23:10:23 -04:00
Alam Arias
571e9be7d8
fix up misleading indentation of a if statement
2019-05-09 23:03:32 -04:00
James R
7ac0a8b4d2
Check that lumps are okay
2019-05-08 20:30:19 -04:00
Monster Iestyn
f0e16cad32
Merge branch 'master' into next
2019-05-08 16:31:05 +01:00
Monster Iestyn
8ea9d0e95c
Merge branch 'alias_recursion_hotfix_2' into 'master'
...
Alias recursion hotfix 2
See merge request STJr/SRB2!482
2019-05-08 11:25:15 -04:00
wolfy852
8f05d75926
Don't skip frames when connecting or paused
2019-05-08 09:39:45 -05:00
wolfy852
9df84082e9
Default billboarding to "On"
2019-05-08 00:17:21 -05:00
wolfy852
a357a38ae1
Merge remote-tracking branch 'remotes/srb2pub/next' into upstream-merge
2019-05-07 21:43:12 -05:00
wolfs
e394f41c52
Merge branch 'public-musicplus-tagfix' into 'next'
...
Fix music load lag by reverting tag changes
See merge request STJr/SRB2!486
2019-05-07 22:42:13 -04:00
wolfy852
777f1675fc
Correct a merge mistake
2019-05-07 02:06:59 -05:00
wolfy852
b98f8f7504
Battle, not Match
2019-05-07 01:34:49 -05:00
wolfy852
2c363c4e1e
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
167f0bfe8b
Forgot to update date
2019-05-06 22:54:47 -04:00
TehRealSalt
4308d3b681
Don't cover chat with pause effect
2019-05-06 22:39:20 -04:00
Sal
5022cde443
Merge branch 'version-prep' into 'master'
...
Version prep
See merge request KartKrew/Kart!148
(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)
183e75ff9629fb3239bea80bf99a5a6afd148ec2e772a7503d71a0aa071b335d0cd815cb
2019-05-06 22:05:56 -04:00
TehRealSalt
47484c5b6b
Merge branch 'v1' into no-limits
2019-05-06 21:55:33 -04:00
Sal
f3f74388e6
Merge branch 'INTERNAL_netreplays' into 'v1'
...
Netreplays
See merge request KartKrew/Kart!146
2019-05-06 21:46:18 -04:00
Sal
43b55d4f7c
Merge branch 'slight-grow-improvements' into 'v1'
...
Slight grow improvements (v1.1)
See merge request KartKrew/Kart!142
2019-05-06 21:29:17 -04:00
TehRealSalt
f720dd3ddb
Merge v1
2019-05-06 21:23:29 -04:00
TehRealSalt
a7df73a35f
Fix skybox bug
2019-05-06 21:17:32 -04:00
Sal
2dc91d1723
Merge branch 'skins-fix' into 'v1'
...
Remove skin shit
See merge request KartKrew/Kart!145
2019-05-06 21:07:24 -04:00
wolfy852
97493fdfd7
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/hardware/hw_main.c
# src/hardware/hw_main.h
# src/m_menu.c
# src/r_main.c
# src/v_video.c
2019-05-06 14:26:09 -05:00
Sryder
b304b268c8
No sprite billboarding on papersprites
2019-05-06 20:24:26 +01:00
Sryder
1f1d67cd7e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
...
# Conflicts:
# src/p_user.c
2019-05-06 20:20:57 +01:00
wolfy852
535b386f8e
Merge remote-tracking branch 'remotes/pub/master' into next
2019-05-06 14:17:02 -05:00
wolfs
58c5979a1e
Merge branch 'newping' into 'master'
...
New ping command
See merge request KartKrew/Kart-Public!123
2019-05-06 15:12:56 -04:00
wolfs
62140e1481
Merge branch 'autofocus' into 'master'
...
Grab mouse focus whenever the window is focused
See merge request KartKrew/Kart-Public!120
2019-05-06 15:12:48 -04:00
wolfs
b2a8e555bb
Merge branch 'ms-connectionfail-bandaid' into 'master'
...
Don't try operating on a closed socket
See merge request KartKrew/Kart-Public!133
2019-05-06 15:12:39 -04:00
Monster Iestyn
406c3619d7
Merge branch 'master' into next
2019-05-06 19:38:53 +01:00
Nev3r
aab2f55aec
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
Nev3r
ae25e8ea07
Merge branch 'console-wait-fix' into 'master'
...
Don't count down wait timer when executing a command line
See merge request STJr/SRB2!483
2019-05-06 12:56:07 -04:00
Nev3r
8b8e165d19
Merge branch 'opengl-sprite-billboarding' into 'master'
...
OpenGL Sprite Billboarding
See merge request STJr/SRB2!485
2019-05-06 12:45:53 -04:00
