Commit graph

27187 commits

Author SHA1 Message Date
Alam Arias
899452e9bc 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
toaster
d1f6584c6a Fix disabling music on the menu. 2018-11-07 22:18:46 +00:00
toaster
f5bec0d2e5 Merge branch 'master' into 'lua-hudlib'
# Conflicts:
#   src/lua_hudlib.c
2018-11-07 16:57:11 -05:00
Monster Iestyn
6042ac0c78 ST_Ticker also should not have FUNCMATH, as it also has side effects 2018-11-07 21:45:27 +00:00
toaster
13dea76a81 * 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
Monster Iestyn
95c2d12d94 HU_Start should not have FUNCMATH, it has side effects 2018-11-07 21:37:42 +00:00
Monster Iestyn
7c0fb1702f 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
TehRealSalt
9a5d360a74 Disable DEVELOP mode 2018-11-07 16:19:02 -05:00
TehRealSalt
c7b0df8172 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
Monster Iestyn
856afe0708 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
TCLScrufflet
2c73512a23 Merge branch 'master' into remote_view_fixes 2018-11-07 17:57:49 -02:00
TehRealSalt
fbbddfff0a Log this 2018-11-07 14:56:36 -05:00
Sal
80de0a74f1 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
Sal
378202e2eb Merge branch 'fix_startbumps' into 'master'
Fix startbumps.

See merge request KartKrew/Kart!84
2018-11-07 14:50:00 -05:00
toaster
94cd2bb354 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
GoldenTails
71f97a4a92 Add Lua Ultimate Mode global variable so people can use it. 2018-11-06 18:09:45 -06:00
toaster
c89008518e No-show of debug stuff, and make karteliminatelast into a debug to justify its hiding. 2018-11-06 18:54:00 +00:00
toaster
424a62c3cc Fix replaying guest demos 2018-11-06 13:38:53 +00:00
toaster
2890e726c1 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
toaster
2282beec32 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
toaster
886613164f MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone. 2018-11-05 23:06:28 +00:00
MPC
eef8119123 Minor remote viewpoint bugfixes. 2018-11-05 20:40:51 -02:00
toaster
c2b790d14a 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
toaster
cffd674cb7 * 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
toaster
935607cfab 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
toaster
3a2249b1af Cleaner code logic. Should make no real difference to exe, so not gonna upload another. 2018-11-05 14:28:32 +00:00
toaster
06ab5cf099 Fix "laststaff" setting 2018-11-05 14:03:09 +00:00
toaster
1dfd7ab4e5 Merge branch 'master' into staff_names 2018-11-05 13:46:10 +00:00
toaster
4568753e4c 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
toaster
5f8e8f4ab2 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
toaster
94ea5b6c89 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
mazmazz
20f1eb6e8e Add exec to GoldMonitorPop; transfer Angle tag to mobj->lastlook for Lua compat 2018-11-05 07:41:02 -05:00
mazmazz
3d86cbc729 Close text prompt upon level load 2018-11-04 22:32:47 -05:00
mazmazz
0169847e06 Pause TextPrompt when game is paused 2018-11-04 22:32:47 -05:00
mazmazz
039b7b17cf Support underscores -> spaces in TextPrompt name 2018-11-04 22:32:47 -05:00
mazmazz
f8d64c93d7 Move Line 449 to Line 459; allow post exec tag by either Back X offset or line tag 2018-11-04 22:32:47 -05:00
mazmazz
568d87f254 Lowercase font for body text; added ICONFLIP parameter 2018-11-04 22:32:46 -05:00
mazmazz
7246b6e9a6 Changed Line 449 post exec tag to line tag 2018-11-04 22:32:46 -05:00
mazmazz
3e8238f745 Implemented auto-advancing TextPrompts
* Fixed TextSpeed
* New TimeToNext
* Other bugs
2018-11-04 22:32:46 -05:00
mazmazz
247580a168 Implemented progressive text printing for TextPrompt 2018-11-04 22:32:46 -05:00
Monster Iestyn
1831df3b2e added HWR_DrawTutorialBack for OpenGL 2018-11-04 22:32:46 -05:00
Monster Iestyn
5a8e256ca1 Fix errors found when compiling 2018-11-04 22:32:46 -05:00
mazmazz
6469efc661 EndTextPrompt: Fix tmthing crash with P_LinedefExecute 2018-11-04 22:32:46 -05:00
mazmazz
30dbb6a644 TextPrompt: Implement player blocked controls and post-close run line 2018-11-04 22:32:46 -05:00
mazmazz
8d812ab24e Fixes: MetaPage, AdvanceToNextPage, center/scale icons, button handling 2018-11-04 22:32:46 -05:00
mazmazz
c914be07ab Line 449 param rearranging 2018-11-04 22:32:46 -05:00
mazmazz
2b36943bf0 Basic TextPrompt line action implemented 2018-11-04 22:32:45 -05:00
mazmazz
77c5774e51 Moved TextPrompt logic to f_finale.c
* Added basic TextPrompt ticker and drawer functions
* Added chevron animation
2018-11-04 22:32:45 -05:00
mazmazz
d69cd4b9c6 Text prompt: Fix V_DrawFixedPatch call for non-green resos 2018-11-04 22:32:45 -05:00
mazmazz
0865497e66 Linedef Exec 449 Control Text Prompt - beginnings 2018-11-04 22:32:45 -05:00