Commit graph

292 commits

Author SHA1 Message Date
toaster
571daa256a Always pretend cv_playersforexit is 4 in co-op special stages. 2019-09-19 18:44:55 +01:00
toaster
667dcd5bca Continue screen! With aaaaaall the new assets to go with it.
* https://cdn.discordapp.com/attachments/428262628893261828/621129794045870108/srb20077.gif
* https://cdn.discordapp.com/attachments/428262628893261828/621129785124585502/srb20078.gif
* I will be accepting no further questions at this time.
2019-09-11 00:50:51 +01:00
Jaime Passos
398b320aec initial stuff 2019-09-08 18:27:35 -03:00
mazmazz
c6dcb853e1 Merge remote-tracking branch 'origin/master' into newmenus 2019-09-07 22:25:47 -04:00
toaster
135a6636a7 Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!) 2019-09-07 12:10:50 +01:00
toaster
ffec691023 Bunch of fixes for dying in MP special stages.
* Don't allow the stage to be reloaded in G_DoReborn.
* If you do ANY spawn after the very beginning moment, you're forced to be a spectator.
* Have the "%d player%s remaining" Co-op exiting count visible at the same time as spectator controls.
2019-09-04 15:51:14 +01:00
toaster
b5ddea4827 Seperate "Game" and "Over" assets, per Sev's request and design.
https://cdn.discordapp.com/attachments/428262628893261828/618812279127015475/srb20069.gif
2019-09-04 15:21:00 +01:00
Jaime Passos
c72f3cbc69 Merge remote-tracking branch 'origin/master' into newmenus 2019-09-02 23:34:25 -03:00
toaster
0700ad229f Lots of death stuff.
* Genesis-style love and attention to the death event.
	* Only visibly decrement lives/rings when you're respawning (or game over, see below).
	* Faster no-button-press respawn.
* Game Over specific love.
	* Animation of Level Title font coming in from the sides.
	* https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif
	* Change gameovertics to 10 seconds instead of 15.
	* Make the minimum time before you can force going to the Continue screen longer.
* Accomodate death in MP special stages as a form of exit.
	* Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits.
* Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn.

Also, two not-quite death things which nonetheless were relevant to change:

* Fix quitting a special stage having some of the shared spheres/rings disappear into the aether.
* Fix a warning during compilation for the Ring Penalty print.
2019-09-01 15:55:23 +01:00
James R
d51b516446 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
Steel Titanium
41d24cc5c7 Work on new title card
Even though it's not complete there's an issue where it would stop breifly during a fade.
2019-08-23 00:21:12 -04:00
Jaime Passos
518bb32ecb did The Thing 2019-08-19 14:23:03 -03:00
toaster
dec517f224 Merge branch 'ending' into 'master'
ENDINGS

See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00
toaster
06a7d0d8d2 Add a condition to bail on the HUD's ring counting down calculation if nummaprings is 0 or -1. 2019-08-03 12:25:46 +01:00
toaster
293c5dacf5 Add rings to old/MP special stage HUD + make both them and spheres (in old special stage only) count down rather than up, to match s3k 2019-08-02 23:51:22 +01:00
toaster
be14e062e8 Make MANIASPHERES' #define'd away stuff also recreatable with SOC, since I want to release it publically if the team don't want it. 2019-07-29 21:06:17 +01:00
toaster
74c32c1b2b A good and bad ending cutscene now exist.
Also:
* SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in).
* Minor oversights in SPR2 support corrected.
* Better evaluation, featuring ending assets.
* Intro has warping-in blackrock, reusing ending assets.
* Cutscene text now supports lowercase (intro and custom).
* Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.)
* Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)

Bugs:
* OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-28 00:32:57 +01:00
Jonas Sauer
b7c783223a Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-13 01:42:03 +02:00
toaster
e5cdfe998b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
# Conflicts:
#	src/p_mobj.c
2019-07-08 13:53:31 +01:00
MascaraSnake
9f666e125e Merge branch 'master' into thinkerlists
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
2019-07-02 23:08:37 +02:00
toaster
982d97a267 Do some minor HUD fixes.
* Move HUD text's anchoring to underneath STR instead of above Lives.
* Adjust chat position slightly, to take advantage of SRB2's HUD layout having less content towards the bottom (unlike Kart, where it has roughly equal).
* Fix Match emeralds not displaying while in tab rankings with all-seven invuln/shoes bonus active.
2019-06-22 16:53:38 +01:00
toaster
7cf70cf89c Add HUD icon for Pink shield. (Don't worry, this is my last expected commit in this branch. Gonna cherry pick everything unrelated to the Pink shield into a bunch of other branches now.) 2019-06-22 16:44:32 +01:00
toaster
597d56d151 Do some minor HUD fixes.
* Move HUD text's anchoring to underneath STR instead of above Lives.
* Adjust chat position slightly, to take advantage of SRB2's HUD layout having less content towards the bottom (unlike Kart, where it has roughly equal).
* Fix Match emeralds not displaying while in tab rankings with all-seven invuln/shoes bonus active.
2019-06-18 18:51:24 +01:00
Monster Iestyn
67392baae0 Merge branch 'public_next'
# Conflicts:
#	src/doomdef.h
#	src/hardware/hw_draw.c
#	src/m_misc.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
Nev3r
09ff071656 Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r
5a4eded7af Added a mobj-only list entry for mobj thinkers
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 23:29:20 +02:00
Nev3r
baeda5060c Basic multiple thinker list implementation
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02:00
mazmazz
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
Jimita the Cat
2cc6a22d12 Add support for flashpals in screenshots 2019-01-02 00:41:52 -03:00
mazmazz
cb4b46f4f8 Remove inline from ST_drawWeaponSelect() to fix 32-bit compile
large-function-growth limit reached
2018-12-24 01:26:22 -05:00
mazmazz
7e6ab56dde Unneeded input header in st_stuff 2018-12-03 12:36:42 -05:00
mazmazz
235b80894c Make F12 spectator string constant because of wrapping issues 2018-12-03 12:13:36 -05:00
mazmazz
16c7c98ef9 Change spectator string for "Press F12 to watch" 2018-12-03 12:11:03 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Digiku
24218532af Merge branch 'nov20-build-fixes' into 'master'
Nov20 build fixes

See merge request STJr/SRB2Internal!205
2018-11-21 17:23:20 -05:00
Digiku
989bdfb85e Merge branch 'debug_stuff' into 'master'
Debug tweaks

See merge request STJr/SRB2Internal!144
2018-11-21 16:41:51 -05:00
mazmazz
3bb75690c4 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-20 23:19:36 -05:00
Marco Z
633c28b28a VC build fixes 2018-11-20 21:54:20 -05:00
mazmazz
bf9b5c5d5b Prompt HUD hiding implementation 2018-11-10 01:00:18 -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
e0620d70b2 Text prompt features: Name, Icon, IconAlign, Lines 2018-11-04 22:32:42 -05:00
mazmazz
631a053e92 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
d60ade9f95 Merge branch 'master' into hud-n-menu-tidbits 2018-08-29 21:28:11 +01: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
Monster Iestyn
c22102b465 Rewrite seenames HUD code even more; use text color flags rather than the special text color chars 2018-08-23 23:00:15 +01:00
Monster Iestyn
62caadbf19 Make switch case for cv_seenames.value in ST_Drawer 2018-08-23 22:09:48 +01:00
Monster Iestyn
e37a6c767c Add quick macro for drawing the 1st person timer icons with timer string, add comments to ST_drawPowerupHUD 2018-08-23 22:00:37 +01:00
Monster Iestyn
bf5d0385d8 ST_drawNiGHTSHUD tweaks: Split NiGHTS link drawing into its own function, remove "minlink" hack and just do things properly 2018-08-23 21:13:45 +01:00
Monster Iestyn
2a307f4524 Make switch case for stplyr->textvar in ST_drawNightsRecords 2018-08-23 20:27:40 +01:00