stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-05 17:31:06 +00:00
Code Issues Projects Releases Packages Wiki Activity
5520 commits 60 branches 11 tags 94 MiB
Commit graph

385 commits

Author SHA1 Message Date
Digiku
8d56c2f486 Merge branch 'addons-backport' into '2122-version' 
Addons Menu backport to vanilla

See merge request STJr/SRB2!384
 2018-12-23 18:08:06 -05:00
Latapostrophe
b7d7472a88 Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01:00
Latapostrophe
1b61e15b1b Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
Latapostrophe
c7060aa5ad Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message. 2018-12-22 16:44:58 +01:00
Digiku
28c8ad3dbb Merge branch 'jump-spin-axes' into 'next' 
Feature: Jump/Spin axes

See merge request STJr/SRB2!389
 2018-12-20 16:57:05 -05:00
mazmazz
7f8d16d3cd Add DEVELOP build flag to version string 2018-12-20 02:27:30 -05:00
Latapostrophe
a31b85e124 Some messages relevant to discussions now go in the chat. 2018-12-19 16:44:57 +01:00
TehRealSalt
c69cfefb6d 2.2 backport of jump/spin axes 
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
 2018-12-16 17:45:49 -05:00
Latapostrophe
25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
mazmazz
f0967520ed Compile fixes; enable PK3 support in addons menu 
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
 2018-12-15 21:44:39 -05:00
mazmazz
37950341ec Merge remote-tracking branch 'public-gitlab/next' into addons-backport 2018-12-15 20:52:46 -05:00
mazmazz
b32f50648d Merge branch 'addons_menu' into 'master' 
Addons menu

See merge request KartKrew/Kart!8
 2018-12-15 20:46:42 -05:00
mazmazz
df89781623 Windows string adjustment 2018-12-06 15:42:58 -05:00
mazmazz
ba60989c00 Adjust version strings 2018-12-06 15:39:19 -05:00
mazmazz
f0c7848e50 Use proper DD define for use_joystick 2018-12-06 06:50:18 -05:00
mazmazz
9055c9aeab Hex instead of octal colors 2018-12-05 13:08:25 -05:00
mazmazz
c5b349ddc4 More concise bitness check 2018-12-05 13:06:56 -05:00
mazmazz
1ea2fa447a Make the ifdefs cleaner 2018-12-05 13:00:42 -05:00
mazmazz
389c2d4ea1 _WINDOWS instead of _WIN32 for DD 2018-12-05 12:55:05 -05:00
mazmazz
a6dcd5555e Add various flags to version string 2018-12-05 11:43:33 -05:00
Monster Iestyn
ae14fd2f85 Fix motd being broken for admins 
It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands
 2018-12-04 21:09:28 +00:00
Monster Iestyn
e353e2ef70 Merge branch 'next' into 21-version 2018-12-04 17:19:36 +00:00
Monster Iestyn
f2b0db5a1c Merge branch 'master' into next 2018-12-04 17:18:19 +00:00
mazmazz
c799584f3d Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart) 2018-12-03 23:36:36 -05:00
TehRealSalt
919667ed39 Just do MapChange hook on G_InitNew 
Everything that's supposed to call it also calls this...
 2018-12-03 00:33:35 -05:00
TehRealSalt
aa16edec1d Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-03 00:31:23 -05:00
Monster Iestyn
33c1ac33f5 Merge branch 'next' into 21-version 
# Conflicts:
#	src/d_netcmd.c
 2018-12-02 15:45:07 +00:00
Jimita
6d7689c1a7
Merge branch 'next' into lua_mapchange 2018-11-30 15:10:59 -02:00
MPC
54cae84849 Change MapChange so Lua returns the map number you change 2018-11-30 14:01:40 -03:00
TehRealSalt
d3ecdeb364 Do 800 instead 2018-11-30 03:36:44 -05:00
Sal
ce14755156 Merge branch 'rename-cmds' into 'master' 
Rename "giveadmin" and "removeadmin" to "promote" and "demote"

See merge request KartKrew/Kart!117
 2018-11-29 11:18:57 -05:00
wolfy852
f2072b973b Rename "giveadmin" and "removeadmin" to "promote" and "demote" 2018-11-29 07:58:26 -06:00
TehRealSalt
5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
wolfy852
c517862f7e I must be some kind of idiot. 2018-11-29 07:34:05 -06:00
Wolfy
b59718d3ad Remove hardcoded limit on admins 
# Conflicts:
#	src/d_netcmd.c
 2018-11-29 07:05:49 -06:00
Wolfy
b8ce51bff2 Multiple admins 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
 2018-11-29 06:46:59 -06:00
toaster
2c8855cd5f Upper-bound restrict the setting of numlaps for sectionrace levels mid-game 2018-11-28 16:45:45 +00:00
Sal
28488cc0dc Merge branch 'netcode-vars-strict' into 'master' 
Make netcode var defaults stricter, add Advanced Server Options

See merge request KartKrew/Kart!110
 2018-11-27 12:27:47 -05:00
Sal
cc8af2acdb Merge branch 'better-buffering' into 'master' 
Better vote level buffering

See merge request KartKrew/Kart!109
 2018-11-27 12:25:02 -05:00
TehRealSalt
f0b042a4b6 Advanced Server Options menu 
More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
 2018-11-27 12:10:46 -05:00
Monster Iestyn
cd57be640c Merge branch '21-controls' into 'next' 
Default control changes for 2.1.21

See merge request STJr/SRB2!343
 2018-11-27 11:50:42 -05:00
TehRealSalt
969801ef09 SEVERELY nerf jointimeout & resynchattempts, too 
All of these previous defaults are "this is an insane time to reach, by that point you might as well disconnect"
 2018-11-27 11:23:28 -05:00
Alam Ed Arias
9a042cd5e2 Merge branch 'master' into next 2018-11-26 19:49:19 -05:00
MonsterIestyn
b53cd70201
Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00:00
TehRealSalt
478f895ea0 Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap 
I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V

(Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
 2018-11-26 04:27:31 -05:00
mazmazz
930835f1a2 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00
Monster Iestyn
1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
92d5a6b8fb Quick patch-over to dedicated server husk bug 
Whenever a 16th player would join, it would wrap around and overwrite the dedicated server ghost host player. This is possibly a bug in vanilla as well, but it'd only occur at 32 players so it's no wonder no one figured that out. :V

As a quick patch, I just capped cv_maxplayers to MAXPLAYERS-1 in dedicated servers only. To fix this for real, we'd need to give dedicated servers their own player & node instead of clumping in into the start of the normal ones.
 2018-11-25 07:10:45 -05:00
Nev3r
6f5e3d42ff Merge branch 'PK3-Backport' into 'PK3-BackportNext' 
Pk3 backport

See merge request Nev3r/SRB2!1
 2018-11-24 06:02:19 -05:00
Nev3r
c548aaa347 Backported PK3 support to 2.1 
Hopefully I'm not missing anything.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-23 16:58:16 +01:00
TehRealSalt
c2c799c885 Change defaults of these 
nettimeout being 10 seconds is INSANITY, and maxping of 500 is when it starts being unplayable (I could also be bargained to raise it to 750 or 1000 though). Not sure if jointimeout causes any freezing, if it does then I'd also like to lower that
 2018-11-22 20:54:28 -05:00
mazmazz
17ff7e69a0 Add chasefreelook to separate third and first person mouselook 2018-11-22 17:05:24 -05:00
toaster
c6268253eb The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). 
Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out.

In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
 2018-11-22 17:10:36 +00:00
TehRealSalt
5c67e22c22 Random map buffer only gets added to when 
Needs another temporary buffer for the vote screen so that it doesn't roll dupes
 2018-11-20 00:13:08 -05:00
toaster
aa607ecf4c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again 
# Conflicts:
#	src/d_clisrv.c
#	src/m_misc.c
 2018-11-18 18:26:50 +00:00
TehRealSalt
7b142dbad1 Updated the one important modified game print that most people see to be more descriptive 
(I could've SWORN there were more...)
 2018-11-18 05:48:10 -05:00
TehRealSalt
0e3b225011 Remove duplicate/removed objects 
As well as other compile errors
 2018-11-18 03:43:33 -05:00
TehRealSalt
bd3f398a04 Fix cvar bugs 
- karteliminatelast uses CV_YesNo instead of CV_OnOff
- chatbacktint defaults to on
- soniccd defaults to off
 2018-11-17 20:47:11 -05:00
toaster
56ed67397d * Fix the in-game MS browser thinking gametypes are unknown. 
* Fix the website MS browser mapname output being incomplete.
* Hide hell maps on the website MS browser mapname output.
* (unrelated) tweak Command_Showmap_f's logic for a more accurate name.
 2018-11-17 15:48:10 +00:00
Alam Ed Arias
d4cb81cb28 Merge branch 'master' into next 2018-11-14 15:45:29 -05:00
MonsterIestyn
772c072064
Merge branch 'master' into analog-flipcam-synch-fix 2018-11-14 19:36:39 +00:00
Sryder
799efd5b31 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into nextmerge 2018-11-10 22:29:37 +00:00
toaster
aece934083 Fix not found 40833 2018-11-10 22:27:04 +00:00
Sryder
6af56273bf Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge 
# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
 2018-11-10 21:14:53 +00:00
toaster
e1a28bbe1c Three more CV_NOSHOWHELP's I missed the first time around. (Not making another exe for this, it'll show up the next time one is made... not that important.) 2018-11-10 18:50:19 +00:00
Sryder
a0165f1ac1 Merge branch 'com_cleanup_redo' into 'master' 
Improved "HELP" command

See merge request KartKrew/Kart!82
 2018-11-10 12:51:51 -05:00
toaster
5b286d89a8 Hide the numlaps change message in record attack. (It plays every time you load a demo of a map with a differing quantity of laps to the default value...) 2018-11-10 12:34:04 +00:00
Monster Iestyn
17223aa520 Merge branch 'master' into next 2018-11-09 16:09:49 +00:00
TehRealSalt
68d2d00a07 Log "Speeding off to level..." 
It's not disruptive, but it looks a bit goofy since the "Map is now x" print is no longer directly printed either, so it's the only thing sticking around in the console :V
 2018-11-08 17:56:26 -05:00
TehRealSalt
69287984db Merge branch 'master' into staff_names 2018-11-08 14:47:38 -05:00
TehRealSalt
499faec555 Merge remote-tracking branch 'srb2public/next' 
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
 2018-11-07 16:15:14 -05:00
toaster
cf16959ad5 Clean but quick: Rename all user-facing things that say "emblem" to say "medal" instead. Don't touch SOC, don't touch code, otherwise we'll be here all year. 2018-11-07 18:05:29 +00:00
toaster
7866e88292 No-show of debug stuff, and make karteliminatelast into a debug to justify its hiding. 2018-11-06 18:54:00 +00:00
toaster
bb251c4fbf * Re-add support for command "help" (ie, basically no help at all). 
* Rename "suicide" command to "respawn" so the game doesn't tell you to kill yourself when you try to get help for it.
* Add a "manual" command to open the manual.
 2018-11-05 19:02:34 +00:00
toaster
8d4ce113e4 Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1. 2018-11-05 12:49:28 +00:00
TehRealSalt
ba67c7aa70 Fix for "became a spectator" text repeating 2018-11-02 14:59:26 -04:00
TehRealSalt
db731209e5 Fix ENTER GAME option not working 2018-10-31 03:06:36 -04:00
LJSonik
b52158eb48
Merge branch 'master' into analog-flipcam-synch-fix 2018-10-29 19:52:08 +01:00
Louis-Antoine
3d0daf2202 Fix desynch when toggling analog mode or flipcam 
Special thanks to Lat' for asking weird questions
 2018-10-29 00:49:23 +01:00
Latapostrophe
e5d4020f3e Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill 2018-10-25 13:21:44 +02:00
Latapostrophe
26093de2e9 Merge branch 'master' into chat-changes 2018-10-25 11:14:49 +02:00
TehRealSalt
40b9644e0c Use COM_ImmedExecute("restartaudio") instead of duplicated code 2018-10-22 16:32:06 -04:00
toaster
791dc079ec Merge branch 'master' into 'chat-changes' 
# Conflicts:
#   src/hu_stuff.c
 2018-10-21 08:27:28 -04:00
Monster Iestyn
d57c54f93b Merge branch 'master' into next 2018-10-20 14:13:13 +01:00
TehRealSalt
553066b48b Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
Sal
adb2fad43c Merge branch 'sp_fixes' into 'master' 
Singleplayer fixes (no, not record attack, the *other* one)

See merge request KartKrew/Kart!46
 2018-10-19 15:50:06 -04:00
Sal
d6cf424aed Merge branch 'unlock-hard' into 'master' 
Hard Mode is an unlockable

See merge request KartKrew/Kart!40
 2018-10-19 15:49:32 -04:00
Sal
524ab75a6a Merge branch 'remove-prints' into 'master' 
Remove most gameplay prints

See merge request KartKrew/Kart!42
 2018-10-19 15:49:01 -04:00
toaster
ce443712b2 Some token efforts to make singleplayer mode (accessible only via -warp and map mapxx -force) not COMPLETELY broken. 
* Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now).
* Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only.
* Made retries cause a mapchange, per the above.
* Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
 2018-10-17 13:40:17 +01:00
toaster
41b684e63e Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen 2018-10-16 22:13:45 +01:00
TehRealSalt
d89fb8fcf7 remove all hit msgs & cv_hazardlog 2018-10-15 17:40:25 -04:00
TehRealSalt
e23da397e4 Remove most gameplay prints 
A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
 2018-10-14 17:45:28 -04:00
toaster
a1e1aa81b5 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/g_game.c
#	src/p_floor.c
#	src/p_user.c
#	src/r_data.c
#	src/r_data.h
#	src/v_video.c
 2018-10-14 21:52:05 +01:00
TehRealSalt
001e2aa42c Hard Mode is an unlockable 
Unlocks at 30 emblems, or 100 matches played
 2018-10-13 17:54:53 -04:00
Steel Titanium
b3faed190b Move commands and console variable into s_sound.c 2018-10-11 16:29:43 -04:00
Latapostrophe
49f2c62b5d More stuff goes in HU_AddChatText, fixed /pm list not having the correct coords if kartspeedometer was on. 2018-10-11 21:39:19 +02:00
Latapostrophe
346c6bce96 HU_AddChatText cleanup for future use + chat mode Window (Hidden) added. 2018-10-10 21:24:55 +02:00
TehRealSalt
7900af2a0a Merge branch 'master' into net-screen 2018-10-09 15:43:38 -04:00
TehRealSalt
640e0e09c6 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -04:00