Commit Graph

5915 Commits

Author SHA1 Message Date
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
Sal 96b7d94eb8 Merge branch 'd_clisrv-shitsprinkles' into 'master'
Support splitscreen PLAYERINFO and don't expose clients' IP addresses

See merge request KartKrew/Kart-Public!126
2019-04-19 16:40:12 -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 5079dbbc3b Merge branch 'dedicated-end-vote-fix' into 'master'
Fix dedicated servers not ending the vote

See merge request KartKrew/Kart-Public!121
2019-04-11 12:20:08 -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
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
Nev3r 6d95f3ceb2 Merge branch 'less-obtuse-console-fixes' into 'master'
Console quality of life changes

See merge request STJr/SRB2!479
2019-03-31 16:15:05 -04:00
James R 42d25f67ca Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes 2019-03-31 12:29:55 -07:00
Nev3r 2966c99fd8 Merge branch 'do-not-disturb-console' into 'master'
Keep console open in certain instances

See merge request STJr/SRB2!480
2019-03-31 05:54:11 -04: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
Alam Arias a3284df681 Merge remote-tracking branch 'upstream/master' 2019-03-27 19:13:41 -04:00
Alam Ed Arias c9cee39745 Merge branch 'master' into next 2019-03-27 19:03:36 -04:00
Alam Ed Arias 4d34841a53 CircleCI: use libpng-dev 2019-03-27 18:51:20 -04:00
Alam Ed Arias e6c6f048e4 CircleCI: Debian Jessie is dead, long live Debian Stretch 2019-03-27 18:23:03 -04:00
Lachlan Wright a4722aded8 Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite() 2019-03-27 03:23:32 -04:00
Alam Arias 7ad1b3ac6f TravisCI: remove xcode7.3 on DPL mac build 2019-03-26 21:20:17 -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 14cd6c1b48 mistype in merge of TavisCI config 2019-03-26 11:54:54 -04:00
Alam Arias 68ee8737e8 Merge commit 'upstream/master~0' 2019-03-26 10:50:36 -04: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 7758b28164 Merge branch 'mi-side-discolor-fix' into 'master'
MI's side discolor fix

See merge request STJr/SRB2!475
2019-03-26 09:43:20 -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