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)
183e75ff
Final v1 colors
9629fb32
Modify the first shade of Byzantium
39bea80b
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
f99a5a6a
Fix wheel animations
fd148ec2
Dumbass typo
e772a750
Missed a spot
3d71a0aa
Merge branch 'next-colors' into 'v1'
071b335d
Merge branch 'anim-fix' into 'v1'
0cd815cb
Merge branch 'deadzone-bullshit' into 'v1'
30c19caa Update version number
8f07ed77 Update patch.kart hash
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
Sryder
8273534967
Add a cvar for sprite billboarding, off by default.
2019-05-06 16:57:32 +01:00
Monster Iestyn
454306cf86
Merge branch 'master' into next
2019-05-03 16:40:13 +01:00
Monster Iestyn
a5dfbe7eff
add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason
...
not making a merge request because this is so laughably stupidly simple
2019-05-03 16:38:59 +01:00
Monster Iestyn
d4ab2837bb
Merge branch 'master' into next
2019-05-03 16:00:45 +01:00
mazmazz
904b00e921
Remove song_length tag search
...
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
3e5b0c4531
Remove MP3 widechar tag searching
...
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
TehRealSalt
98dbdd7db5
Don't allow custom gamedata to overwrite kart gamedata or replay folders
2019-05-02 12:58:02 -04:00
TehRealSalt
489032f734
Hide this debug message
2019-05-02 12:50:05 -04:00
TehRealSalt
25f277e185
ENSURE viewcount slider is present for multiplayer demos
2019-05-02 12:42:29 -04:00
TehRealSalt
3f730e03ec
Disable rewind between demos, too.
2019-05-02 12:36:11 -04:00
TehRealSalt
34eb4bd14d
Don't keep fast-forward enabled between demos
2019-05-02 12:31:50 -04:00
TehRealSalt
86dfd70c6f
Add message boxes for file add errors
2019-05-02 12:03:50 -04:00
TehRealSalt
73e152a01c
HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects
2019-05-02 12:00:51 -04:00
Sal
0ee1cd6cbf
Merge branch 'alias-argh' into 'master'
...
Allow argument substitution in aliases
See merge request KartKrew/Kart-Public!124
2019-05-02 10:05:30 -04:00
Sal
a12fb1c81d
Merge branch 'save-d_clisrv-cvars' into 'master'
...
Register showjoinaddress after the config loads and match some other cvars to its behavior
See merge request KartKrew/Kart-Public!135
2019-05-02 10:04:45 -04:00
Sal
0cd815cb44
Merge branch 'deadzone-bullshit' into 'v1'
...
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
See merge request KartKrew/Kart!147
2019-05-02 09:25:07 -04:00
Sal
071b335d57
Merge branch 'anim-fix' into 'v1'
...
Fix wheel animations
See merge request KartKrew/Kart!144
2019-05-02 09:23:22 -04:00
Sal
3d71a0aac7
Merge branch 'next-colors' into 'v1'
...
Final colors for v1.1
See merge request KartKrew/Kart!143
2019-05-02 09:23:10 -04:00
TehRealSalt
4d967bcc8e
Finish this
...
Now that I was told that the spinout slowdown bug was caused by this I was 100% convinced that we need to remove all of this bullshit ASAP
2019-05-02 09:20:49 -04:00
TehRealSalt
7bfc394792
Fix normalspeed
...
Alright fuck this branch it's misery
2019-05-02 02:58:34 -04:00
TehRealSalt
1e9257c012
Merge branch 'anim-fix' into skins-fix
2019-05-02 02:52:38 -04:00
TehRealSalt
e772a750a8
Missed a spot
2019-05-02 02:52:22 -04:00
TehRealSalt
e314aeb1ab
Merge branch 'anim-fix' into skins-fix
2019-05-02 02:51:17 -04:00
TehRealSalt
9e15486926
Fix warnings
...
Remove entries from dehacked, remove P_DoJump, remove debug stuff
2019-05-02 02:51:13 -04:00
TehRealSalt
fd148ec207
Dumbass typo
2019-05-02 02:13:44 -04:00
Sal
738c5be37b
Merge branch 'expose-numlaps' into 'next'
...
Expose cv_numlaps.value as global variable
See merge request KartKrew/Kart-Public!134
2019-05-02 01:41:41 -04:00
Sal
f615ffab30
Merge branch 'port-param' into 'next'
...
New -port command line parameter
See merge request KartKrew/Kart-Public!137
2019-05-02 01:40:31 -04:00
Sal
dee068a7ff
Merge branch 'respawn-flash' into 'v1'
...
Flashing tics on respawn
See merge request KartKrew/Kart!138
2019-05-02 01:39:31 -04:00
TehRealSalt
201466b1c1
Merge v1
2019-05-02 01:36:19 -04:00
TehRealSalt
4638722632
Remove unique version number
2019-05-02 01:34:25 -04:00
TehRealSalt
285ab9c9b9
Menu fix-up
...
- Use center menu style for the tiny extras menu
- Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 01:33:11 -04:00
TehRealSalt
37de59cdfd
Remove outdated comment
2019-05-02 00:49:36 -04:00
TehRealSalt
17de62894a
Remove bad +1
2019-05-02 00:49:05 -04:00
TehRealSalt
913fc8660f
Fix polyobj angle delta
2019-05-02 00:48:01 -04:00
TehRealSalt
f99a5a6a8b
Fix wheel animations
2019-05-02 00:44:04 -04:00
TehRealSalt
5dc30cdac8
Fix skin shit
2019-05-02 00:39:49 -04:00
Sal
b410b216a4
Merge branch 'default-md2' into 'v1'
...
Add option to turn off the PLAY default md2
See merge request KartKrew/Kart!140
2019-05-02 00:03:18 -04:00
TehRealSalt
2d8461a59d
Port over double-press Grow cancel from internal
2019-05-01 23:56:12 -04:00
TehRealSalt
54af8f5fc0
Slight Grow improvements for public
...
- Using Grow while Shrunk will make you normal-size, instead of giant.
- Baked in a Shrink/Grow noise into K_RemoveGrowShrink, whenever you have either
2019-05-01 23:50:18 -04:00
TehRealSalt
39bea80b9e
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
2019-05-01 23:30:53 -04:00
Jaime Passos
0bc8d2a49d
01052019
2019-05-01 19:37:42 -03:00
Sryder
4d77ed925e
OpenGL sprite billboarding
...
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
2019-05-01 20:15:00 +01:00
Jaime Passos
2ff4a3ca75
Match Kart-Public's next since it got merged anyway
...
and fix something else
2019-04-30 20:59:32 -03:00
James R
103e67bbaa
Fix differing signedness compare
2019-04-30 13:03:13 -07:00
wolfs
a0b1fce139
Merge branch 'md3-vanilla-kart' into 'next'
...
MD2/MD3 support rewritten + optimizations [GCC port]
See merge request KartKrew/Kart-Public!19
2019-04-30 15:22:30 -04:00
Steel Titanium
0128643043
Prettyify code.
2019-04-28 22:02:25 -04:00
Steel Titanium
72e402c1aa
Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into port-param
2019-04-28 21:56:33 -04:00
Steel Titanium
1c21a4ed6f
New -port param
2019-04-28 21:53:36 -04:00
toaster
031ffbf304
Completely untested -encore parameter for the map command; inverts cvar value.
2019-04-28 19:26:11 +01:00
Steel Titanium
5461f860f9
Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into expose-numlaps
2019-04-27 22:34:53 -04:00
James R
848bb10c36
Move some cvars out of D_ClientServerInit and save them
2019-04-27 17:30:39 -07:00
TehRealSalt
9629fb3216
Modify the first shade of Byzantium
2019-04-26 22:32:31 -04:00
wolfy852
db2935d45a
Fix boost -> drift -> release sliptides not showing the effect when turning right
2019-04-26 19:26:22 -05:00
wolfy852
50b00d37e0
Merge remote-tracking branch 'remotes/pub/next' into v1
2019-04-26 18:27:41 -05:00
wolfs
38770282d4
Merge branch 'intermission-think' into 'next'
...
New intermission Hook for Y_Ticker
See merge request KartKrew/Kart-Public!131
2019-04-26 19:25:18 -04:00
TehRealSalt
183e75ff53
Final v1 colors
...
- 11 new colors: Skunk, Artichoke, Pigeon, Walnut, Cinnamon, Lemonade, Quarry, Crocodile, Azure, Thunder, & Wristwatch
- Updated Dawn, Sunset, Cream, Gold, Olive, Vomit, Lime, Plague, & Caribbean
- Updated opposite colors for Bubblegum & Camouflage in response to the new colors
2019-04-26 18:18:53 -04:00
James R
fc8ebe83fc
Force of habit
2019-04-26 13:08:35 -07:00
James R
aa4ce2b2d1
Check error on select
2019-04-26 13:06:26 -07:00
James R
4d739fe7a5
Unfuck MS connecting and error reporting
...
Reconnect if the socket is closed.
Report the proper error from SO_ERROR and report an error from getsockopt.
2019-04-26 12:59:21 -07:00
wolfy852
096bed6a4d
Merge remote-tracking branch 'remotes/pub/next' into v1
2019-04-26 05:53:26 -05:00
wolfs
235426153f
Merge branch 'forceskin-by-name' into 'next'
...
Allow names to be used with forceskin
See merge request KartKrew/Kart-Public!102
2019-04-26 06:42:09 -04:00
wolfs
8d0b185d96
Merge branch 'add-value-command' into 'next'
...
Add a command to increment cvars
See merge request KartKrew/Kart-Public!128
2019-04-26 06:41:52 -04:00
wolfy852
690a495d9b
Merge remote-tracking branch 'remotes/pub/master' into next
2019-04-26 05:42:27 -05:00
wolfs
f2ec722b12
Merge branch 'room-list-first' into 'master'
...
Show room list instead of server list if you haven't selected a room yet
See merge request KartKrew/Kart-Public!127
2019-04-26 06:39:31 -04:00
wolfs
4dff8b4a11
Merge branch 'no-audio-option' into 'master'
...
`-noaudio` option to cover `-nomusic` and `-nosound`
See merge request KartKrew/Kart-Public!129
2019-04-26 06:37:02 -04:00
wolfs
e6ba65bac9
Merge branch 'save-showjoinaddress' into 'master'
...
Save showjoinaddress to config
See merge request KartKrew/Kart-Public!132
2019-04-25 23:17:07 -04:00
Steel Titanium
21e8a2c537
Save showjoinaddress to config
2019-04-25 23:13:09 -04:00
Latapostrophe
2350405ad3
Terminology changes
2019-04-23 23:49:46 +02:00
Sal
35c954ecc4
Merge branch 'spb-stuff' into 'v1'
...
Fix SPB being way too fast in current sections where the player has no control
See merge request KartKrew/Kart!141
2019-04-22 22:00:06 -04:00
Latapostrophe
5619e63e39
Fix SPB being way too fast in current sections where the player has no control
2019-04-22 20:40:17 -05:00
wolfy852
85a15847e5
Don't cut off flashing tics when using sneakers, don't allow stealing bumpers while intangible
2019-04-22 20:18:15 -05:00
Steel Titanium
e62fcc8148
Fix mangled comment
2019-04-22 19:27:42 -04:00
Latapostrophe
0f43546ada
Add option to turn off the PLAY default md2
2019-04-22 11:29:44 +02:00
Steel Titanium
445bb0b99b
New IntermissionThinker hook
2019-04-22 00:29:47 -04:00
wolfy852
d987c8ba07
Flashing tics on respawn
2019-04-21 07:52:01 -05:00
Sal
e76d33f9ba
Merge branch 'under_the_weather' into 'master'
...
Under the weather
See merge request KartKrew/Kart-Public!125
2019-04-19 16:40:25 -04:00
James R
387a701db5
Add a "-noaudio" parm to cover "-nomusic" and "-nosound"
2019-04-18 23:50:29 -07:00
James R
3db1244849
Add a command to increment cvars
2019-04-18 23:42:28 -07:00
James R
4b05199b9f
Show rooms list in server browser initially
...
If you haven't selected a room yet, you're
shown the room list instead of server list.
2019-04-18 22:41:50 -07:00
TehRealSalt
a187656a8f
Fix up more stuff
...
Now in a mergable state
2019-04-18 12:20:13 -04:00
TehRealSalt
1f61397545
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
fickleheart
ac53d4bbb3
Show when we're waiting for the full wadlist
2019-04-18 00:39:54 -05:00
fickleheart
014f916040
Read the file list properly
2019-04-18 00:37:08 -05:00
fickleheart
b59645e1b1
Send the rest of the file list
2019-04-18 00:30:28 -05:00
fickleheart
0e2bef3f1a
Wait, we don't need pages, just first file index...
2019-04-17 23:51:15 -05:00
fickleheart
a36700e176
Some stuff toward reading those files
2019-04-17 23:42:49 -05:00
fickleheart
6c5ac8e942
Paginate PutFileNeeded
2019-04-17 23:29:27 -05:00
fickleheart
430831423c
Strip out things that limit wad files added by filename
2019-04-17 23:09:10 -05:00
Steel Titanium
26fdee8217
Don't enable UPnP support if NONET is defined.
2019-04-16 15:05:09 -04:00
fickleheart
c67c598df0
Show player names on the bottom in 4p
...
Also adjust margins to better match other HUD stuff
2019-04-14 23:52:03 -05:00
fickleheart
9e3ee274fb
Keep playback menu bar on the top in non-green reses
2019-04-14 23:22:24 -05:00
fickleheart
ad52f80627
Add scroll bar to replay hut
2019-04-14 23:17:12 -05:00
James R
d7e964bd54
Support splitscreen PLAYERINFO and don't expose clients' IP addresses
2019-04-14 21:14:01 -07:00
Jaime Passos
6b6485159f
Add "Software Perspective" toggle on the "GPU Options" menu
2019-04-14 19:44:56 -03:00
James R
36e678b292
Don't count down wait timer when executing a command
2019-04-14 15:17:47 -07:00
Jaime Passos
d1b1edcf39
More Softwarification
2019-04-14 19:08:59 -03:00
fickleheart
b1001d1808
Fix writing corrupt standings that break replay hut
2019-04-14 17:08:04 -05:00
Monster Iestyn
797ca99f42
Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a
.
...
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)
2019-04-14 16:39:14 +01:00
toaster
972e6e9cf5
Precipitation being drawn at infinite distance when set to zero is incorrect behaviour. This is likely the consequence of a bad merge, but I don't care enough to check for certain.
2019-04-14 14:41:39 +01:00
Jaime Passos
a8165a2ce9
fix skyboxes AGAIN
2019-04-13 18:47:09 -03:00
Jaime Passos
5689fca892
fix includes
2019-04-13 18:14:55 -03:00
fickleheart
5ec6517a54
Temporarily disable Extra Options menu
2019-04-13 15:23:31 -05:00
fickleheart
295b53801d
Change color of active playback items
2019-04-13 15:23:23 -05:00
fickleheart
10d70f5447
Playback menu improvements
2019-04-13 14:42:15 -05:00
fickleheart
eb9c9885a9
Fix being able to carry rewind state where it shouldn't be
2019-04-13 14:22:48 -05:00
fickleheart
451ff30a7a
Preserve quote and etc in aliases
2019-04-13 10:25:56 -05:00
fickleheart
3286d9ac93
Use strchr?
2019-04-13 10:16:54 -05:00
Jaime Passos
f5516a121c
cleanup?
2019-04-12 16:35:28 -03:00
fickleheart
fe7220bb20
Allow argument substitution in aliases
2019-04-12 00:48:37 -05:00
wolfy852
052104999f
Generic model terminology
2019-04-12 00:35:35 -05:00
Steel Titanium
588d3a8c6e
Merge branch 'next' into forceskin-by-name
2019-04-11 21:01:14 -04:00
Sal
db18492836
Merge branch 'clear-all-controls' into 'master'
...
Clear P3 and P4 controls too when clearing all controls
See merge request KartKrew/Kart-Public!117
2019-04-11 12:20:48 -04:00
Sal
b128f44986
Merge branch 'fix-function-typo' into 'next'
...
Lua: fix K_PlayPowerGloatSound mistype
See merge request KartKrew/Kart-Public!122
2019-04-11 12:06:33 -04:00
Sal
ecdfb1ddcc
Merge branch 'patch-1' into 'next'
...
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()
See merge request KartKrew/Kart-Public!119
2019-04-11 12:05:59 -04:00
fickleheart
5fcafb643b
Proposal: VHS effect over the replay hut background?
2019-04-10 09:10:09 -05:00
Lachlan Wright
4f1a329ef2
Update k_kart.c
2019-04-10 03:16:46 -04:00
fickleheart
40d065a024
Fix thrown items desyncing during frame advance
2019-04-09 23:55:25 -05:00
fickleheart
d6e77fc12e
Merge remote-tracking branch 'remotes/internal/INTERNAL_netreplays' into INTERNAL_netreplays
2019-04-09 23:00:42 -05:00
fickleheart
15bb586c57
Only calculate vfx every other row to try to improve performance
2019-04-09 23:00:39 -05:00
Sryder
824381d281
Z_Free not free.
2019-04-09 20:15:35 +01:00
Sryder
d579ee36bf
Turn the INT8's into SINT8's
2019-04-09 19:34:34 +01:00
fickleheart
fe3cd967d1
Unused var
2019-04-09 01:18:10 -05:00
fickleheart
56c1f05217
Potentially apply VHS distortion semi-transparently?
...
Pros: fuckin SMOOTH effect especially for 256-color sw
Cons: might lose the intended color distortion, maybe
not a great idea for FPS
Conclusion: put it behind an ifdef for now
2019-04-09 01:09:13 -05:00
fickleheart
ae473585b7
Add VHS pause/rewind effect
2019-04-08 23:21:11 -05:00
James R
e746e54075
Replace ping command with a condensed and sorted version
2019-04-08 15:57:23 -07:00
James R
42d47a10f3
"NEWPING" might as well be the only ping
2019-04-08 15:48:20 -07:00
fickleheart
9a049f5a0d
Support RA time comparisons in new format
...
I don't care enough about supporting old replays, and
they're old anyway. Force-overwrite them. :)
2019-04-08 00:45:19 -05:00
fickleheart
c0af0fb59e
Support new-format ghosts or some bullshit like that
...
maybe future fickle will add support for multiple ghosts
from one replay for some sick memery but idgaf right now
2019-04-08 00:30:04 -05:00
fickleheart
45390f2c35
Fix record attack not recording + staff names load for all replay types
2019-04-07 18:51:42 -05:00
fickleheart
ac3b1516cd
Record demos consistently and also other stuff
2019-04-07 17:59:32 -05:00
Jaime Passos
98f4e98b85
Remove dup_ variables
2019-04-07 14:27:52 -03:00
Jaime Passos
23a8fea598
fix fog
2019-04-07 01:25:55 -03:00
Steel Titanium
d59fb7f80c
Expose cv_numlaps as global variable
2019-04-06 23:42:02 -04:00
Jaime Passos
4ea1dd3525
The player should be able to toggle shaders
2019-04-07 00:09:53 -03:00
Jaime Passos
fa7f627c88
stuff
2019-04-06 23:33:34 -03:00
Steel Titanium
f8fec8e625
Lua: fix K_PlayPowerGloatSound mistype
2019-04-06 21:59:58 -04:00
fickleheart
f38d56d4a6
Support playback menu for record attack replays too
2019-04-06 18:59:11 -05:00
fickleheart
1eff7bfbe8
Fix title menu not working if you leave a replay early
2019-04-06 18:17:56 -05:00
fickleheart
aaa6418981
Various fixes and tweaks to rewinds
2019-04-06 18:06:02 -05:00
fickleheart
1f2adee119
Allow backwards frame advance while paused
2019-04-06 15:36:53 -05:00
fickleheart
6267986c72
Add demo rewinding
...
Preview is fairly basic, and only shows players
rewinding. Full state is restored via reloading
the replay and jumping to the timestamp once
the rewind is done.
2019-04-06 14:51:00 -05:00
fickleheart
d9bcb43d0b
Support non-green resolutions in the replay hut
2019-04-06 11:16:19 -05:00
fickleheart
16091bcae9
Reference graphics for menu and other stuff
2019-04-06 02:17:30 -05:00
fickleheart
e948b8ba48
Begin work on playback menu
2019-04-05 02:38:48 -05:00
James R
ab17769f89
Let dedicated servers end vote time too!
2019-04-04 16:13:31 -07:00
Monster Iestyn
ab0fe6b164
Merge branch 'master' into next
2019-04-02 15:47:07 +01:00
fickleheart
6a92335e1c
something something character placeholders im tired
2019-04-01 23:34:53 -05:00
fickleheart
c1a3f17896
Draw placeholder when no standings are available
2019-04-01 20:30:24 -05:00
fickleheart
03653ef85e
Fix encore stage rendering on replay hut
2019-04-01 20:17:36 -05:00
fickleheart
a01a3544f5
Fix old replays not loading
2019-04-01 17:14:45 -05:00
fickleheart
944838dc7d
Read and write standings to replays
2019-04-01 15:07:27 -05:00
fickleheart
11586a1091
[FORMAT CHANGE] Add space for extrainfo pointer
2019-04-01 13:10:35 -05:00
fickleheart
b3ef039d87
Show non-default lap count on replay screen too
2019-04-01 12:56:23 -05:00
fickleheart
4b9562f72f
Fix normal speed replays showing as easy speed
2019-04-01 12:28:01 -05:00
fickleheart
2fcb087d50
Draw icons for directories
2019-04-01 12:25:12 -05:00
fickleheart
b177673195
Don't draw options menu entry above replay infobox
2019-03-31 19:29:05 -05:00
fickleheart
266a590a14
Return to replay hut after watching a replay
2019-03-31 19:26:53 -05:00
fickleheart
704ce59761
Add subscreen to confirm replay watching
...
This will have other goodies on it later!
2019-03-31 17:29:41 -05:00
fickleheart
a8023adfdf
Don't pause while the menu's up during replays
2019-03-31 16:28:29 -05:00
fickleheart
f54f08e6b5
Support directory navigation properly
2019-03-31 16:28:18 -05:00
James R
42d25f67ca
Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes
2019-03-31 12:29:55 -07:00
fickleheart
940d2b9803
Add replay options screen
2019-03-31 13:50:29 -05:00
fickleheart
ac0ad5f32b
Enable exiting and playing demos from replay hut properly
2019-03-31 13:50:20 -05:00
fickleheart
2fbb0ca5f4
Show music credit for credits
2019-03-31 13:09:49 -05:00
fickleheart
cbcb288296
Display infobox for the currently-selected replay
2019-03-31 02:54:09 -05:00
fickleheart
48dcfab7f6
List demos by title in the replay hut
2019-03-31 01:22:41 -05:00
fickleheart
b434eabf56
Alternate variant of ugly probably-bad hack
2019-03-30 23:15:11 -05:00
fickleheart
0911ec79d1
Try to fix hangs caused by PT_CLIENTJOIN with a non-zero ack
2019-03-30 22:48:55 -05:00
fickleheart
1602b0e3d9
Start on the replay hut menu!
2019-03-30 20:57:53 -05:00
fickleheart
6cc875bb50
Move menu options around
...
1 Player now goes directly to Time Attack, and Extras
is now a submenu with Unlockables, Statistics, and a
currently-dummied option for Replay Hut.
2019-03-30 17:25:54 -05:00
James R
ff15a9896c
Grab mouse on window focus
...
Window focus does not necessarily imply mouse movement.
2019-03-29 22:00:47 -07:00
Steel Titanium
ae74b5cb9d
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name
2019-03-27 19:18:51 -04:00
Lachlan Wright
a4722aded8
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()
2019-03-27 03:23:32 -04:00
James R
917edf720d
Don't close console when starting title screen
2019-03-26 13:05:19 -07:00
James R
9a350eb879
Don't close console when changing map
2019-03-26 13:04:11 -07:00
James R
69d7e98f34
Remove redundant CON_ClearHUD calls
2019-03-26 12:59:13 -07:00
James R
e8071e66e4
Resize console upon resolution change
...
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
2019-03-26 12:30:02 -07:00
jameds
b9b36a44a8
Keep color across wrapped lines
...
And this works by inserting the same color code on each wrapped line.
2019-03-26 12:07:11 -07:00
jameds
587586f4bb
Scroll console immediately upon pressing PageUp
2019-03-26 12:05:23 -07:00
Alam Arias
7d98adf6dc
Merge commit 'upstream/master~1'
2019-03-26 09:48:13 -04:00
Monster Iestyn
a01a0a3dc3
Merge branch 'master' into next
2019-03-26 13:46:15 +00:00
Monster Iestyn
9ef98471a4
Merge branch 'buildbot' into 'master'
...
Buildbot changes
See merge request STJr/SRB2!477
2019-03-26 09:44:56 -04:00
Monster Iestyn
8e78369f83
Merge branch 'dedicated-server-credits-fix' into 'master'
...
Dedicated server credits fix
See merge request STJr/SRB2!476
2019-03-26 09:44:21 -04:00
Monster Iestyn
67874180b2
Merge branch 'gametype-strings-backport' into 'next'
...
Gametype strings backport
See merge request STJr/SRB2!473
2019-03-26 09:42:52 -04:00
fickleheart
9bc3acd17a
Fix compile issues
2019-03-26 08:26:41 -05:00
fickleheart
7090cf16b4
Unclose a node if it sends PT_CLIENTJOIN..? fuck it, why not
2019-03-26 01:36:12 -05:00
fickleheart
ca2979c1af
Free nodes properly in cleanupnodes
...
Hopefully the other changes herein have rendered
cleanupnodes obsolete, but I'm not too sure of
that.....
2019-03-26 01:10:00 -05:00
fickleheart
6cf7cc0276
Is this useful in any way?
2019-03-26 00:09:23 -05:00
fickleheart
204a6d5c20
Let's try some sanity checks on the resync code...
2019-03-25 23:58:44 -05:00
fickleheart
29f460a21f
pbbbbt fix compile error
2019-03-25 22:52:42 -05:00
fickleheart
0485b4cf5c
Make sure clients never have local_resynchinprogress on when joining a game...
2019-03-25 22:49:37 -05:00
fickleheart
3455791054
More attempts that may fix things?
...
I'm uncommenting a bunch of LJ code that was never
committed uncommented, so I might be breaking something
horribly here....
2019-03-25 22:44:34 -05:00
fickleheart
a35e9d5abd
Don't force-close connection when getting a join request!
...
We need to send the ackret, first of all!
2019-03-25 22:23:35 -05:00
fickleheart
8c56f1aa0b
Wacky attempt at not reopening nodes for D/Ced ackreting clients
2019-03-25 22:22:25 -05:00
Monster Iestyn
8c1c0875a2
Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
2019-03-25 21:35:04 +00:00
Alam Ed Arias
fe22fdc5a3
P_SuperDamage() is too big for inlining
2019-03-25 15:30:25 -04:00
Monster Iestyn
147221cf6e
R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.
2019-03-25 18:54:47 +00:00
Monster Iestyn
7441dd7d9b
Merge branch 'master' into next
2019-03-25 18:08:36 +00:00
fickleheart
2a9dd8e1f9
Allow entering a title for replays on save
2019-03-24 22:40:52 -05:00
fickleheart
b2cbe3ed6d
Refactor replay saving handler for later use
2019-03-24 21:55:08 -05:00
fickleheart
4b7d2aea84
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
fickleheart
ccefc48af3
Use demo title as filename for multiplayer replays
2019-03-24 20:36:22 -05:00
fickleheart
0940be1633
Move save replay prompt into the upper-right corner
2019-03-24 19:57:11 -05:00
fickleheart
8906718fb8
Use skin with closest stats if the expected one wasn't found
...
This allows people to watch replays without the characters loaded,
without making everyone be Sonic.
2019-03-24 19:41:25 -05:00
fickleheart
402796b3c6
Add some checks against invalid replays
2019-03-24 19:19:57 -05:00
fickleheart
b135c46d60
Clean up demo header read/write code
2019-03-24 19:14:34 -05:00
fickleheart
c7109c0ae4
Add title to netreplays and do some format cleanup
2019-03-24 18:48:14 -05:00
fickleheart
7af0554aba
Prepare for a demo format upgrade!
2019-03-24 17:47:24 -05:00
fickleheart
ca37b467e0
Clear P3 and P4 controls too when clearing all controls
2019-03-24 17:31:04 -05:00
fickleheart
d5f27c8339
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
2019-03-24 17:23:49 -05:00
Alam Arias
32fd6dc834
Merge remote-tracking branch 'upstream/master'
2019-03-23 15:08:45 -04:00
Alam Arias
544f806f92
Merge commit 'upstream/master~1'
2019-03-22 10:18:10 -04:00
Jaime Passos
e1f1e63cc9
fix postprocessor
2019-03-21 18:33:03 -03:00
Jaime Passos
76967e46bb
destroy hw_glide.h because no modern GPU supports such API
2019-03-21 18:23:40 -03:00
wolfy852
7911fa24d0
Fix Visual Studio compiling
2019-03-21 00:32:27 -05:00
James R
ed0f8fd967
Actually allow connecting to "localhost"
...
Because IPv6 doesn't seem to work anyway.
2019-03-20 20:37:00 -07:00
James R
f139ffd1dc
Let localhost connections
2019-03-20 20:37:00 -07:00
wolfy852
6b743d383b
Merge branch 'next' into md3-vanilla-kart
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05:00
Monster Iestyn
ecb6322a52
Merge branch 'sdl-noxinput-nohidapi' into 'master'
...
-noxinput and -nohidapi command line parameters.
See merge request STJr/SRB2!468
2019-03-20 17:33:04 -04:00
fickleheart
4f8d1383b0
Self-reminder...
2019-03-19 23:45:45 -05:00
fickleheart
3d36f531b9
Merge remote-tracking branch 'remotes/james/netreplays-dedicated-sigsegv-fix' into new_netreplays
2019-03-19 23:44:39 -05:00
fickleheart
f6797e285b
Merge remote-tracking branch 'remotes/james/netreplays-resetview-sigsegv-fix' into new_netreplays
2019-03-19 23:44:22 -05:00
fickleheart
29c6dae776
Add command to lower netreplay sync frequency
...
This makes for smaller replay files while keeping
sync checks in place!
2019-03-19 23:39:04 -05:00
fickleheart
64ceb441e3
Fix MAXMOM being above the max value GZT_MOM* could store
...
This caused a lot of """desyncs""" when players were moving
between 128-255 FU/T, which was exacerbated by this next commit...
2019-03-19 23:38:26 -05:00
fickleheart
65ac9b7b0b
Rename recordmultiplayerdemos to netdemo_record
...
Begins the process of namespacing demo recording commands.
2019-03-19 23:08:32 -05:00
fickleheart
d676dd5a1e
Keep record attack replays base-game-compatible for now
2019-03-19 23:02:17 -05:00
fickleheart
438cabcd24
Don't resync position until off for two tics in a row
...
This patches over a few trouble spots, like Misty Maze, causing
consistent resyncs and screwing up playback.
2019-03-19 22:59:27 -05:00
fickleheart
7fc1f02b07
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/doomdef.h
# src/g_game.c
# src/p_user.c
2019-03-19 22:17:25 -05:00