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