vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,244 Commits 50 Branches 7 Tags 75 MiB
Commit Graph

6244 Commits

Author SHA1 Message Date
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
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
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
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
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 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
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
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 73fa35baf0 TravisCI: use stock sdl2_mixer for prebuild bottle 2019-03-25 16:59:47 -04:00
Alam Ed Arias fd284f232e travisCI: add sdl2_mixer from mazmazz's srb2 tap 2019-03-25 16:43:33 -04:00
Alam Ed Arias 9de5055d7f TravisCI: install deps on sdl2_mixer 2019-03-25 16:30:02 -04:00
Alam Ed Arias ec0afaf6c9 TravisCI: try updating homebew 2019-03-25 16:02:30 -04:00
Alam Ed Arias 3472bf857c TravisCI: build custom sdl2_mixer build 2019-03-25 15:51:13 -04:00
Alam Ed Arias 594c906376 use default osx image 2019-03-25 15:48:33 -04:00
Alam Ed Arias 3ab0f675ec TravisCI: move homebrew packages for all mac builds 2019-03-25 15:44:33 -04:00
Alam Ed Arias a8681a5b72 CircleCI: rebuild depend file with BLUA 2019-03-25 15:34:25 -04:00
Alam Ed Arias fe22fdc5a3 P_SuperDamage() is too big for inlining 2019-03-25 15:30:25 -04:00
Alam Ed Arias c4e8a60112 CircleCI: also test compiling without BLUA support 2019-03-25 15:21:52 -04:00
Alam Ed Arias 9a8d36b822 Travis-CI: use a new version of xcode and use homebrew add-on to install packages 2019-03-25 15:16:43 -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