393fee317e
Fix for the Y_FollowIntermission change hurting Record Attack
...
Should probably be ported to vanilla
2018-11-08 14:43:06 -05:00
c8c7b63be6
Fix disabling music on the menu.
2018-11-07 22:18:46 +00:00
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
e63099f3de
Log this
2018-11-07 14:56:36 -05:00
a09d7489d8
Merge branch 'info_tidy' into 'master'
...
Murder the fancharacters and associated
See merge request KartKrew/Kart!83
2018-11-07 14:50:10 -05:00
ef0ab3da24
Merge branch 'fix_startbumps' into 'master'
...
Fix startbumps.
See merge request KartKrew/Kart!84
2018-11-07 14:50:00 -05:00
935c0da7d2
Fix startbumps.
...
A more detailed explanation:
* P_CheckPosition is the function which determines collisions.
* In Vanilla, collisions do not happen between players unless tailspickup is off (which it basically never is).
* Even with tailspickup off, on-spawn player collisions do not affect momentum.
* However, in kart, player collisions cause the player to get bumped.
* It would succeed at the P_CheckPosition call because players aren't *solid* solid, even though they cause bumps.
* It would fail at the K_CheckPlayersRespawnColliding call, but that would be too late, *as the player already has been bumped.*
* The player would therefore be moved to a new location, but still retain bump momentum, and the bump sound would have played for both players.
* Therefore, the obvious solution is to swap P_CheckPosition and K_CheckPlayersRespawnColliding, so that it checks for players BEFORE it performs object collisions at that spot.
* The reason we didn't see this MUCH before is that it can only ever happen in the case of ties.
I could've easily done this into master, but obviously I figure yalls'd at least like to check this first.
2018-11-06 13:33:27 +00:00
e958dfc909
MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone.
2018-11-05 23:06:28 +00:00
77d6e578f5
Blank out the fancharacters as requested, but don't remove them from the info lists... a fun thing for TCRF to look at eventually, maybe, and I don't want to have to do a from-scratch build at this stage in the game or risk any instability that could arise from sweeping info cleanups.
...
In fact, the only reason I even considered doing this is that the sprites had to be removed, leaving these actively causing errors when placed.
2018-11-05 19:58:20 +00:00
f2e9186c7b
You were right, Sal, "%s ran out of time." should've died back when you were working on the branch to remove all the prints.
2018-11-05 14:33:39 +00:00
9eafb61fd3
Black out the background around the GAMEQUIT picture, since we removed the automatic doing of that for non-green resolutions.
2018-11-05 12:52:15 +00:00
263b29a4a6
Merge branch 'fix-mixed-declarations' into 'master'
...
Literally a single compiler warning.
See merge request KartKrew/Kart!80
2018-11-04 16:49:45 -05:00
3a53d6d3b9
Properly support widescreen in Y_IntermissionDrawer (I meant to do this in charscleanup but forgot).
2018-11-04 21:48:47 +00:00
6c0fae421c
Literally a single compiler warning.
2018-11-04 17:37:18 +00:00
b8446effe8
Correctly disable OGL-only menus/options in software.
2018-11-04 14:41:24 +00:00
34baa5ae74
Mixed up validity check...
2018-11-03 22:53:12 -04:00
a4129d22f9
Merge branch 'battle-arrow-fix' into 'master'
...
Battle arrow fixes and cleanup
See merge request KartKrew/Kart!78
2018-11-03 17:50:29 -04:00
d3944fe29b
Battle arrow fixes and cleanup
2018-11-03 17:45:38 -04:00
f9ad07da5f
Fix 2p ("wide") splitscreen having an incorrect FINISH arrangement (drawn at wrong scale, moved across screen at wrong speed...)
2018-11-03 13:20:02 +00:00
02b14959cc
Merge branch 'master' into next
2018-11-03 12:29:04 +00:00
924c3164b0
Merge branch 'soc-sanitising-the-sequel' into 'next'
...
SOC sanitising the sequel!
See merge request STJr/SRB2!308
2018-11-03 08:18:16 -04:00
d1b8b5d2f7
Merge branch 'update-version' into 'master'
...
v1 release prep
See merge request KartKrew/Kart!24
2018-11-03 03:39:02 -04:00
0d79cbdd27
Keep the old y offsets, though.
2018-11-03 03:38:41 -04:00
cb1380ae51
Changed this randomly changed instance back to vanilla, due to compile errors
...
https://i.imgur.com/SEdmZpC.png
2018-11-03 03:29:06 -04:00
69faf1cbc7
Remove NOFOURPLAYER from Makefile
...
Seems that someone already removed it from the other code anyway...?
2018-11-03 03:21:08 -04:00
9de7a9d5cc
Add textures.kart, re-define DEVELOP mode,
...
Disabling DEVELOP can be another branch; this means this can get in master quicker
2018-11-03 03:17:20 -04:00
0eab0c5a14
Merge branch 'master' into update-version
2018-11-02 23:57:28 -04:00
9ae9e7ec3a
Check for valid source in A_JawzChase, change 1 target rule
2018-11-02 23:51:06 -04:00
86ad6de35b
Merge branch 'file-loading-hotfix' into 'master'
...
File loading hotfix
See merge request STJr/SRB2!310
2018-11-02 19:03:59 -04:00
0f37411e2b
Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason.
...
ESPECIALLY if the file is already loaded in SRB2, that's just silly.
2018-11-02 20:48:12 +00:00
cb699c1770
fullbright points
2018-11-02 15:06:56 -04:00
6bb33b9d16
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-02 14:59:48 -04:00
ba67c7aa70
Fix for "became a spectator" text repeating
2018-11-02 14:59:26 -04:00
87dd8cd0ce
Merge branch 'all_hardcode' into 'master'
...
Truly all-hardcode
See merge request KartKrew/Kart!71
2018-11-02 14:54:09 -04:00
399bccd2c7
use gfx.kart
2018-11-02 14:52:08 -04:00
7b268d15b1
Merge branch 'lua-hudlib-addition' into 'next'
...
Lua: hud.enabled and v.getLocalTransFlag()
See merge request STJr/SRB2!306
2018-11-02 14:29:02 -04:00
8d5fb13111
wrong var fix
2018-11-02 14:01:29 -04:00
f37a573834
Merge branch 'master' into next
2018-11-02 11:02:35 +00:00
ba5f5be3bb
Merge branch 'patch-offsets-fix' into 'master'
...
Patch offsets fix
See merge request STJr/SRB2!305
2018-11-02 07:00:37 -04:00
37893cc523
Merge branch 'master' into all_hardcode
2018-11-02 02:30:36 -04:00
1bdaad3f06
quick merge fix
2018-11-02 02:28:34 -04:00
5c1cc6e1df
Merge branch 'master' into all_hardcode
2018-11-02 01:42:34 -04:00
0154ef1d01
Merge branch 'chars_cleanup' into 'master'
...
Chars cleanup
See merge request KartKrew/Kart!64
2018-11-02 01:32:52 -04:00
667e636631
Use chars.kart
2018-11-02 01:22:52 -04:00
6fd0f3f0ba
Fix ghost rankings issue
2018-11-02 01:19:25 -04:00
89276b739f
Merge branch 'master' into chars_cleanup
2018-11-01 23:48:22 -04:00
cdabbdddd3
Merge branch 'resync' into 'master'
...
Resync fixes
See merge request KartKrew/Kart!69
2018-11-01 23:38:17 -04:00
950bca1217
Actually lets just do this now, like how its done below
2018-11-01 21:05:52 -04:00
78299c5fee
0xFFFF to 0xFFFFFFFF
...
I'll implement proper bit-setting later, just gotta see if it works first
2018-11-01 20:50:19 -04:00
67dd962fb9
Change out the hex used for hnext/hprev consistancy
2018-11-01 20:46:20 -04:00
TehRealSalt
