stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-07 10:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
5952 commits 60 branches 11 tags 94 MiB
Commit graph

403 commits

Author SHA1 Message Date
wolfy852
5d7b7afd17 Merge remote-tracking branch 'remotes/pub/next' into followme 
# Conflicts:
#	src/r_things.h
 2019-05-11 02:05:58 -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
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
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
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
wolfy852
052104999f Generic model terminology 2019-04-12 00:35:35 -05:00
James R
42d47a10f3 "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
Wolfy
97eb011a58 Merge remote-tracking branch 'remotes/public/master' into followme 2019-04-06 13:48:46 -05:00
Monster Iestyn
2fb569857a Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa 
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
 2019-03-18 22:00:23 +00:00
fickleheart
875506e6cc Don't free this cached colormap! 2019-03-16 12:22:11 -05:00
fickleheart
cd4fc40b9e Cache colormaps everywhere to avoid memory leaks 2019-03-16 00:39:52 -05:00
fickleheart
c30c3f7a3a Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00
James R
0f9648eac0 Miscellaneous window de-focus options 
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
 2019-03-11 14:57:11 -07:00
James R
bb187c1d27 Make "Focus lost" HUD overlay optional 2019-03-11 12:50:01 -07:00
fickleheart
3bb014ea42 Make password toggle only affect password fields 2019-03-09 17:03:52 -06:00
fickleheart
e4d99605eb Nudge lock over a tad 2019-03-09 15:27:23 -06:00
fickleheart
870a800d89 Toggle showing password with tab 2019-03-09 15:14:08 -06:00
fickleheart
1b6035e322 Add join password to server host menu 2019-03-09 15:00:48 -06:00
fickleheart
d5691b9289 Show kartspeed and password status on server browser 2019-03-09 14:30:04 -06:00
Latapostrophe
eaff7617a5 Add more customization options & fix some dumb things 2019-03-03 21:12:21 +01:00
Alam Arias
c6f494bbd2 fixed compiling for MSVC 2019-03-02 18:57:52 -05:00
Alam Arias
d22cb88bca follower_frame should be unsigned 2019-03-02 18:48:00 -05:00
Alam Arias
23909e9cf8 Merge branch 'next' into followme 2019-03-02 18:42:21 -05:00
Latapostrophe
1967ee2dd5 Fix splitscreen, offline and death 2019-03-02 22:39:42 +01:00
Sally Cochenour
c6be0c24d1 Merge branch 'master' into next 2019-02-27 01:22:18 -05:00
wolfy852
ab95b45e38 Merge remote-tracking branch 'remotes/pub/next' into followme 2019-02-26 17:12:51 -06:00
fickleheart
d6b9a75230 Move fov cvar out of OGL-specific code 2019-02-23 10:18:20 -06:00
Sal
5e9a11d467 Merge branch 'ping-stuff-take2' into 'next' 
Ping improvements

See merge request KartKrew/Kart-Public!68
 2019-02-22 19:13:49 -05:00
wolfs
5ff03d38f5 Merge branch 'fix_nonet' into 'master' 
Fix NONET

See merge request KartKrew/Kart-Public!60
 2019-02-16 06:11:43 -05:00
wolfy852
6054901c62 Ping kick changes + other quality of life improvements [REDO] 2019-02-15 20:51:44 -06:00
Latapostrophe
157e3197f3 Followers but they crash when you join netgames 2019-02-14 03:56:28 +01:00
Latapostrophe
fe3852f005 I needed to commit here so I could switch branches to fix magnet hand xd 2019-02-13 10:06:52 +01:00
Monster Iestyn
e6cb47e2f2 Merge branch 'fix_skins_overflow' into 'next' 
Fix skin overflow error

See merge request STJr/SRB2!455
 2019-02-11 15:05:00 -05:00
james
b331b51178 Use less confusing player sorting key names 2019-02-09 18:10:54 -08:00
toaster
f0d536b7ee Fix NONET. I thought I did this already during development, but I guess it got broken near the end. 2019-02-09 09:58:48 +00:00
toaster
06b3e265f5 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next 2019-02-02 21:12:49 +00:00
toaster
b332a3e163 Tweak incorrect capitalisation. 2019-02-01 18:51:15 -05:00
Sal
cf06f108ed Merge branch 'majormods' into 'next' 
Allow playing in Record Attack with minor add-ons

See merge request KartKrew/Kart-Public!31
 2019-01-29 23:19:57 -05:00
Steel Titanium
e118ec9399 Remove CV_HIDEN flag for serversort 2019-01-29 13:27:43 -05:00
toaster
ada4ce622f * Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution? 
* Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...)
* Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error.
* Minor tweaks to addons menu representing modded status.
 2019-01-28 16:32:07 +00:00
Steel Titanium
bce093fd06 Setup the tables even eariler. 
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
 2019-01-26 23:16:49 -05:00
ThatAwesomeGuy173
eb29063ef1 Use actual characters instead of ASCII codes as per Sryder's suggestion 2019-01-26 14:15:37 -07:00
toaster
1a21c5efbe Code cleanup as requested by Sal and Sryder. 
* majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one.
* Clean up comments in `dehacked.c`.
 2019-01-26 16:58:45 +00:00
ThatAwesomeGuy173
fb6570cade I accidentally the numpad 
also reduced the range of usable characters
 2019-01-26 02:41:05 -07:00
TehRealSalt
0d1c501664 Update the SP menu stuff to use MAXSKINS 
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
 2019-01-26 00:22:05 -05:00
ThatAwesomeGuy173
bcddbdbfbf Allow letters to be used in the "Specify IPv4 Address:" field 2019-01-25 21:50:58 -07:00
toaster
d045af07b1 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into majormods 2019-01-21 21:56:49 +00:00
toaster
d119c711e5 Improve readability of server browser add-ons message. 2019-01-18 14:11:59 +00:00
toaster
4b493b81a6 Add warning message when attempting to use the master server browser while modifiedgame is true. 
(We assume that if you're using an IP address connection, you're more of a power user.)
 2019-01-18 13:04:12 +00:00