68c46cdca3
toptexture, bottomtexture, and midtexture use strings instead of magic numbers
2018-11-07 17:53:49 -05:00
b8c4d7ddff
Merge pull request #321 from GoldenTails/next-add-a-lua-variable-to-ultimate-mode-so-people-can-check-it
...
Add Lua Ultimate Mode global variable so people can use it.
2018-11-07 17:53:20 -05:00
c8c7b63be6
Fix disabling music on the menu.
2018-11-07 22:18:46 +00:00
e1d46e0122
Merge branch 'master' into 'lua-hudlib'
...
# Conflicts:
# src/lua_hudlib.c
2018-11-07 16:57:11 -05:00
c47f0045d6
ST_Ticker also should not have FUNCMATH, as it also has side effects
2018-11-07 21:45:27 +00:00
8e6ecb5e98
* Add numbers to the staff name strings as Sryder requested.
...
* Make the maximum number of staff ghosts 99 instead of 100. It's a minor thing, and insignificant in the grand scheme of things, but it fixes a bugbear I haven't been able to get out of my head since originally starting to maintain this code. (In the case of 100, it'd do S00, which'd have some fucky effects on ordering. If we WANTED to start with S00, we shoulda used that slot in the first place.)
2018-11-07 21:42:10 +00:00
b3e8a1ed88
HU_Start should not have FUNCMATH, it has side effects
2018-11-07 21:37:42 +00:00
4a4e07e138
D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function.
2018-11-07 21:21:36 +00:00
9a18b83c2a
Disable DEVELOP mode
2018-11-07 16:19:02 -05: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
f66979ba1a
P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway)
2018-11-07 21:00:38 +00:00
1602904011
Merge branch 'master' into remote_view_fixes
2018-11-07 17:57:49 -02: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
cf16959ad5
Clean but quick: Rename all user-facing things that say "emblem" to say "medal" instead. Don't touch SOC, don't touch code, otherwise we'll be here all year.
2018-11-07 18:05:29 +00:00
a3bc7ddfa0
Add Lua Ultimate Mode global variable so people can use it.
2018-11-06 18:09:45 -06:00
7866e88292
No-show of debug stuff, and make karteliminatelast into a debug to justify its hiding.
2018-11-06 18:54:00 +00:00
390d2b4114
Fix replaying guest demos
2018-11-06 13:38:53 +00: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
5ccfc111e8
Disable attempt at preventing replays with the same staff member back to back, based on Discord discussion. If the RNG does this to you, you're on your own.
2018-11-05 23:18:34 +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
1cc8619c9e
Minor remote viewpoint bugfixes.
2018-11-05 20:40:51 -02: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
bb251c4fbf
* Re-add support for command "help" (ie, basically no help at all).
...
* Rename "suicide" command to "respawn" so the game doesn't tell you to kill yourself when you try to get help for it.
* Add a "manual" command to open the manual.
2018-11-05 19:02:34 +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
7be7c600bf
Cleaner code logic. Should make no real difference to exe, so not gonna upload another.
2018-11-05 14:28:32 +00:00
0d0eaf5f99
Fix "laststaff" setting
2018-11-05 14:03:09 +00:00
a0c3283303
Merge branch 'master' into staff_names
2018-11-05 13:46:10 +00:00
75d08f2048
TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!!
...
Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +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
8d4ce113e4
Redo the `help` command stuff, this time with much less impact on other areas of the code for sanity as we approach R1.
2018-11-05 12:49:28 +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
e2f57e5ca0
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things.
...
https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
34baa5ae74
Mixed up validity check...
2018-11-03 22:53:12 -04:00
6604d0181c
Staff attack ghost names on the `REPLAY...` menu.
...
Also: Remove playercolor being set to the replay's color. No need to kill your settings, seeing as it makes no tangible effect on your replay (doesn't even lose colour when you die, so I don't even know...)
2018-11-04 01:00:17 +00: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
4cbc270b6d
Merge branch 'master' into lua-hudlib
2018-11-03 22:25:33 +01:00
e7f35307c9
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 22:24:45 +01: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
TehRealSalt
