mazmazz
b68fb6ec4e
F_GetTextPromptTutorialTag implementation
2018-11-12 22:47:20 -05:00
TehRealSalt
e9a432f7d0
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
TehRealSalt
dbff5e96cf
Use S2 rips on the title screen
2018-11-11 19:22:15 -05:00
Sryder
9350721d12
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
mazmazz
8b434072a9
Stub netgame support; ignore bots on linedef special
2018-11-10 15:34:56 -05:00
mazmazz
4f2f5c7e6d
Let triggering splitscreen player control the text prompt
2018-11-10 14:47:30 -05:00
mazmazz
9c8a3818ef
Splitscreen "support" (one prompt only, both players freeze controls)
2018-11-10 14:30:59 -05:00
Monster Iestyn
4c3bfe81bd
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/doomtype.h
# src/hardware/hw_clip.c
# src/hardware/hw_main.c
# src/sdl12/sdl_sound.c
2018-11-10 19:18:34 +00:00
Monster Iestyn
f3d129e1a6
Merge branch 'master' into next
2018-11-10 19:05:33 +00:00
mazmazz
b45fe054cb
Pictoloop zero-based fix
2018-11-10 12:54:59 -05:00
mazmazz
58c9232210
Implemented GFX for text prompts
...
* PicMode SOC
* PicToLoop SOC
2018-11-10 12:42:13 -05:00
mazmazz
c607991f16
Implement music switching for prompts
2018-11-10 11:05:33 -05:00
mazmazz
b1bfc35ad7
Hardcode tutorial prompt offset index
2018-11-10 10:15:16 -05:00
mazmazz
9660c0e3c8
Prompt page string field length adjustment; check empty named tag before prompt search
2018-11-10 09:38:32 -05:00
mazmazz
3174969755
Added page tags and find page by tag
...
* Added tutorial mode defines to this branch
2018-11-10 09:32:53 -05:00
mazmazz
bf9b5c5d5b
Prompt HUD hiding implementation
2018-11-10 01:00:18 -05:00
mazmazz
aaf0a0a3df
Merge branch 'text-prompts' into text-prompts-hidehud
2018-11-10 00:10:42 -05:00
mazmazz
19dd2b500b
Actually fix empty prompt text crash
2018-11-10 00:10:16 -05:00
mazmazz
b25cf9e0d9
Text prompt Hide HUD dehacked
2018-11-09 23:50:25 -05:00
mazmazz
b7af1e385b
Set up separate background color for prompts vs. console
2018-11-09 22:38:55 -05:00
mazmazz
90c83962d1
Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start
2018-11-09 22:07:32 -05:00
mazmazz
6c785cff56
Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES
2018-11-09 21:55:14 -05:00
TehRealSalt
ab1faaeec5
Merge branch 'master' into staff_names
2018-11-08 14:47:38 -05:00
Monster Iestyn
b34e8c5390
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +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
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
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
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
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
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
568d87f254
Lowercase font for body text; added ICONFLIP parameter
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
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
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
Monster Iestyn
55a3e4c81f
Merge branch 'endgame-code-refactor-backport' into 'next'
...
Endgame code refactor
See merge request STJr/SRB2!297
2018-10-19 17:31:19 -04:00
toaster
1142fddc71
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
Monster Iestyn
3c981c913a
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2018-10-11 21:24:53 +01:00
Monster Iestyn
34728b3031
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
toaster
76a2079671
Include srb2.org in the credits per Rob's wishes.
2018-10-01 21:23:00 +01:00
toaster
585ee5ba06
Some credits tweaks (alphabetical ordering plus new names, plus slight downwards adjustment of TYLER52)
2018-09-28 20:10:22 +01:00
Sal
1d1705d4e7
Merge branch 'new-voices' into 'master'
...
New voices
See merge request KartKrew/Kart!15
2018-09-22 20:22:59 -04:00
mazmazz
32c48af258
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
TehRealSalt
9ff5e2d2e2
New voices
...
- Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?)
- Win/lose quotes are played at full volume for the person who said it.
- A new sound effect plays when you hit someone with voices disabled.
- Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions
- Added our skin sound constants to the dehacked list.
- Unrelated: finish line sfx plays in splitscreen
2018-08-28 16:29:50 -04:00
Monster Iestyn
6c85af79f6
Merge branch 'master' into hud-n-menu-tidbits
...
# Conflicts:
# src/m_menu.c
# src/screen.c
# src/st_stuff.c
2018-08-28 20:51:46 +01:00
