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

5022 commits

Author SHA1 Message Date
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
Steel Titanium
e62fcc8148 Fix mangled comment 2019-04-22 19:27:42 -04:00
Steel Titanium
445bb0b99b New IntermissionThinker hook 2019-04-22 00:29:47 -04: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
Steel Titanium
26fdee8217 Don't enable UPnP support if NONET is defined. 2019-04-16 15:05:09 -04:00
James R
d7e964bd54 Support splitscreen PLAYERINFO and don't expose clients' IP addresses 2019-04-14 21:14:01 -07:00
James R
36e678b292 Don't count down wait timer when executing a command 2019-04-14 15:17:47 -07: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
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
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
Lachlan Wright
4f1a329ef2 Update k_kart.c 2019-04-10 03:16:46 -04: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
Steel Titanium
d59fb7f80c Expose cv_numlaps as global variable 2019-04-06 23:42:02 -04:00
Steel Titanium
f8fec8e625 Lua: fix K_PlayPowerGloatSound mistype 2019-04-06 21:59:58 -04:00
Wolfy
4007fa75d5 Make this compile again 2019-04-06 13:52:34 -05:00
Wolfy
97eb011a58 Merge remote-tracking branch 'remotes/public/master' into followme 2019-04-06 13:48:46 -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
James R
42d25f67ca Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes 2019-03-31 12:29:55 -07: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
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
ca37b467e0 Clear P3 and P4 controls too when clearing all controls 2019-03-24 17:31:04 -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
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
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
af17038cfb LAT 2019-03-17 21:44:11 -05:00
fickleheart
ca68042d95 Merge remote-tracking branch 'remotes/james/move-changeviewpoint' into version-prep 2019-03-17 16:37:01 -05:00
fickleheart
f909a055d8 Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep 2019-03-17 16:36:52 -05:00
James R
70f40d54cb Resume sounds on unpausing after a window re-focus 2019-03-16 15:50:16 -07:00
James R
5057c37dfb Move change viewpoint control checking so it doesn't take precedence 
Notably over chat.
 2019-03-16 15:42:18 -07:00
fickleheart
4b71ac7b6b Merge branch 'netarchive-fix' into version-prep 2019-03-16 15:00:02 -05:00
fickleheart
b9ae148af6 Merge branch 'colormap-caching-workaround' into version-prep 2019-03-16 14:59:55 -05:00
fickleheart
50c0ed0f07 Fix bad merge in map data archiving code 2019-03-16 14:56:56 -05:00
fickleheart
875506e6cc Don't free this cached colormap! 2019-03-16 12:22:11 -05:00
fickleheart
f18d2a684b Merge branch 'lua-ticcmd-latency' into version-prep 2019-03-16 02:41:19 -05:00
fickleheart
d727492c87 Merge branch 'colormap-caching-workaround' into version-prep 2019-03-16 02:41:14 -05:00
fickleheart
0b1cc92f1a Allow reading ticcmd latency 2019-03-16 02:19:43 -05:00
fickleheart
ebe76f7a1b Remove dumb special case 2019-03-16 01:29:13 -05:00
fickleheart
cd4fc40b9e Cache colormaps everywhere to avoid memory leaks 2019-03-16 00:39:52 -05:00
fickleheart
abc479980c Update patch.kart hash again 2019-03-16 00:35:13 -05:00
fickleheart
fd12ff9163 Merge branch 'kartstuff-fix' into version-prep 2019-03-16 00:02:40 -05:00
Steel Titanium
6d751ff302 Remove the define. 2019-03-15 18:46:25 -04:00
Steel Titanium
5a170b9e4e Merge branch 'master' into errorifpng 2019-03-15 16:40:47 -04:00
Steel Titanium
67a80ba311 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command 2019-03-15 16:13:31 -04:00
mazmazz
6b93ca9221 Intermission: Don't fade out level music when using win32 midi volume hack 2019-03-15 01:26:13 -04:00
mazmazz
6cf05a4613 Implement MUSICINTERFADEOUT level header 2019-03-15 01:05:52 -04:00
mazmazz
bd9e42ce6e Merge branch 'public-gl-next' into public-musicplus-inter 2019-03-14 23:42:16 -04:00
mazmazz
fdde5f13c5 When resetting volume on same music, make it fade instead of a hard change 2019-03-13 23:55:30 -04:00
mazmazz
67e2857303 When changing to same music, reset the internal volume 2019-03-13 23:41:35 -04:00
mazmazz
c021e29835 Restore MUSIC_RELOADRESET if block in g_game 2019-03-13 21:18:23 -04:00
mazmazz
2c75d4da69 Fix custom fade source bug for Change Music linedef 2019-03-13 19:53:16 -04:00
mazmazz
aea18f36ba Remove MP3 warning 2019-03-13 19:51:45 -04:00
mazmazz
93626c2293 Merge remote-tracking branch 'public-gl/next' into public-musicplus-core 2019-03-13 19:45:07 -04:00
fickleheart
bae86bbca4 Oh, this was already here... 2019-03-12 08:39:25 -05:00
fickleheart
ee3580098b Add missing deh entry for k_starpostflip 2019-03-12 07:34:47 -05:00
fickleheart
3aa1e78345 Update version and patch hash 2019-03-11 22:40:15 -05:00
fickleheart
9ff8b73936 Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD 
# Conflicts:
#	src/k_kart.c
#	src/p_mobj.c
 2019-03-11 21:59:45 -05:00
fickleheart
c30c3f7a3a Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00
fickleheart
fcf072cbeb Merge remote-tracking branch 'remotes/upstream/master' into HEAD 2019-03-11 21:53:47 -05:00
fickleheart
1975a9b885 Prevent music changes from playing when unfocused 2019-03-11 21:48:29 -05:00
Steel Titanium
d6046088a0
Change array size from MAXSKINS+1 to MAXSKINS+2 
Also Set the values to 0/NULl, it will be overwritten later when a skin is assigned to the slot.
 2019-03-11 22:11:36 -04:00
Steel Titanium
b6572eceae
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name 2019-03-11 21:54:53 -04:00
wolfs
24b5079f20 Merge branch 'color-flip' into 'next' 
Fix color enums more

See merge request KartKrew/Kart-Public!112
 2019-03-11 19:28:24 -04:00
wolfs
af67c7abf5 Merge branch 'maxskins-bump' into 'next' 
Bump MAXSKINS to 128 + Clean up skin struct

See merge request KartKrew/Kart-Public!82
 2019-03-11 19:28:16 -04:00
wolfy852
8c40f2a10e Remove disableSpeedAdjust 2019-03-11 17:23:41 -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
Latapostrophe
0e6083cf02 Fix what was discussed, minus the rocksneaker math which is still shady, but let's not break what currently works 2019-03-11 18:53:23 +01:00