stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 12:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
15737 commits 171 branches 41 tags 312 MiB
Commit graph

408 commits

Author SHA1 Message Date
spherallic
52092782f2 Tweak NiGHTS text colors 2023-09-29 00:22:05 +02:00
spherallic
9f2a6cde8a NiGHTS text changes: 
- Add lastmaretime to players, used to show time at mare/end results
- Replace textvar numbers with an enum (NTV_)
 2023-09-28 22:22:29 +02:00
Hannu Hanhi
a47e1fb272 Merge tag 'SRB2_release_2.2.13' into ogl-palette-rendering-merge13 
SRB2 release v2.2.13
 2023-09-23 19:38:27 +03:00
spherallic
8d14a08cdc Replace capsule angle checks with arg1 checks 2023-09-23 15:21:44 +02:00
Lactozilla
69df136e2b Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color 2023-09-12 19:17:07 -03:00
spherallic
6c416c61b1 Final 2.2.12 skincolor changes: 
- Replaced Mercury & Pumpkin with Ocean & Tangerine
- Renamed Crystal to Siberite & Meteorite to Moonstone
- Tiny tweaks to color ordering and NiGHTS link colors
 2023-08-24 13:33:38 +02:00
Gustaf Alhäll
3d14d155e0
Fix segfault when spectating on an Emerald Hunt map 2023-08-12 12:31:59 +02:00
Lactozilla
3377fa986a Remember the player's color after a team gametype 2023-08-07 13:37:07 -03:00
Mari0shi
84f7b0cf1d Display HUD Icon for Fire Flower 2023-08-05 09:07:25 -04:00
Sally Coolatta
84e448eb63 Improve handling of team lives labels 
The lives counter check is now always run, and team name is displayed in its place when its false.
 2023-07-24 06:09:50 -04:00
Shane Ellis
a9d0630b15 Add lives check to Team name HUD 2023-07-24 05:18:55 -04:00
spherallic
867a5e0d47 Correct misplaced comment on NiGHTS link colors 2023-06-20 21:48:26 +02:00
spherallic
b97f0a8643 Fix MT_NIGHTSCORE color cycling, using link colors 2023-06-20 20:06:43 +02:00
spherallic
1bd593d173 Use extra colors for very high NiGHTS links, plus: 
- Replaced Mindaro with Goldenrod
- Changed Topaz, and fixed inconsistency with its placement
- Small tweaks to Kiwi, Seafoam, Noble and Sangria
- Changed other NiGHTS link colors a little (& removed old iterations)
 2023-06-20 20:06:43 +02:00
spherallic
7073c3c8d0 Allow input view outside of record attack 2023-06-13 12:10:59 +02:00
sphere
f7af77b932 Merge branch 'netgame-gamedata' into 'next' 
[SUGOI] Multiplayer emblems

See merge request STJr/SRB2!1756
 2023-06-12 22:48:25 +00:00
sphere
65e1f88c75 Merge branch 'nightspowerhud' into 'next' 
Add HUD icons for timed NiGHTS powerups

See merge request STJr/SRB2!1949
 2023-06-09 11:34:25 +00:00
Sally Coolatta
e06956a53b Fix skin-only emblems on emblem radar 2023-06-02 16:06:51 -04:00
Sally Coolatta
bc00b13358 Fix Emblem Radar detecting already collected emblems 2023-06-02 16:06:47 -04:00
Sally Coolatta
87e468f365 Allow emerald hunt radar to function if emblem radar is on but all emblems have been collected. 2023-06-02 16:06:46 -04:00
Sally Coolatta
303d636f8e Individual emblems mode 2023-06-02 16:06:43 -04:00
Sally Coolatta
49fa46d80e Online emblems 
Currently, emblems share with everyone. Will add an option to toggle this.
 2023-06-02 16:06:43 -04:00
spherallic
c61594931d Fix titlecard hook being inconsistent on map load 2023-04-14 00:28:14 +02:00
spherallic
34abe808e4 Merge branch 'next' into font_drawer 2023-04-13 10:43:39 +02:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
spherallic
b184067048 Add HUD icons for timed NiGHTS powerups 2023-03-14 14:19:53 +01:00
spherallic
8228275cf8 Merge branch 'next' into font_drawer 2023-03-05 22:27:22 +01:00
Eidolon
f1a7494a31 Handle splitscreen lua hud lists separately 
Fixes STJr/SRB2#935 by ensuring each drawlist is drawn separately while
stplyr is set correctly.
 2023-01-26 08:59:51 -06:00
spherallic
77f7374b98 Merge branch 'next' into font_drawer 2023-01-11 22:59:06 +01:00
Eidolon
46603d607e Clear and draw all game hud hook calls to 1 list 
Fixes splitscreen issues with lua hud hooks
 2022-10-28 23:04:05 -05:00
Eidolon
e3fd3dfa65 Only play emerald hunt sounds on new tics 2022-05-04 20:40:45 -05:00
Eidolon
82310e0ae2 Add Lua HUD drawlists 
Buffers draw calls between tics to ensure hooks
run at the originally intended rate.
 2022-04-30 01:55:10 -05:00
Sally Coolatta
f2a19b29d9 Put interpdebug stuff in perfstats instead 2022-04-27 18:37:45 -05:00
Sally Coolatta
c83d1be21f Add interpdebug 2022-04-27 18:37:45 -05:00
spherallic
79fb15f00e Merge branch 'next' into font_drawer 2022-03-07 21:09:50 +01:00
Hannu Hanhi
2b4cf27292 Merge tag 'SRB2_release_2.2.10' into ogl-palette-rendering-merge 
SRB2 release v2.2.10
 2022-03-07 02:39:02 +02:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
spherallic
908fb8b026 Add fontdef_t struct, move the width and height variables there. 2022-02-03 13:41:24 +01:00
spherallic
7b3c89c989 Separate scale into pscale and vscale. 2022-02-03 12:03:44 +01:00
Hannu Hanhi
8b83348216 Merge remote-tracking branch 'upstream/next' into ogl-palette-rendering-merge 2022-01-29 04:32:43 +02:00
spherallic
1630364775 Turn the old string drawing functions into defines. 2022-01-27 16:52:44 +01:00
spherallic
4d1fb04327 Update playstyle names on the input display 2021-12-29 19:29:41 +01:00
katsy
effcb948ad Don't count bots in playersforexit 2021-12-29 09:59:54 +00:00
spherallic
6a6b292c73 Fix Flame Shield interactions in old-style special stages. 2021-11-27 14:22:21 +01:00
Zwip-Zwap Zapony
cade6f3cf6 Fix Ringslinger weapon ring penalty missplitment 2021-11-09 16:59:49 +01:00
Jaime Ita Passos
655b48b52e Refactor and optimize translation caching 2021-08-10 00:46:36 -03:00
Jaime Ita Passos
2aa9bb59ef Memory management fixes 
Date:      Mon Aug 9 15:57:07 2021 -0300
 2021-08-09 15:57:35 -03:00
lachablock
f9723a567c Merge remote-tracking branch 'origin/next' into raise-skin-limit 2021-08-09 14:19:09 +10:00
James R
b4fa98d2fb Refactor hudlib hooks to hooklib 
HUD hooks now meet the standard of hooklib. HUD registry
magic numbers are gone.

HUD hooks may also be added using addHook.

    addHook('HUD', fn[, type])

hud.add still exists, but the intention is to remove it
eventually.
 2021-07-07 00:23:51 -07:00
sphere
ae9e0e7f08 Merge branch 'text-loops' into 'next' 
Custom title card bruh moments

See merge request STJr/SRB2!1501
 2021-05-31 08:25:43 -04:00
Hannu Hanhi
ac1b5ae546 OpenGL palette rendering and related things 2021-05-22 17:40:34 +03:00
Sally Coolatta
8e8881b534 Fix custom title card text not looping properly 2021-05-07 14:14:31 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Jaime Ita Passos
f93b1b8d7b Raise the skin limit to 256. 2021-04-19 04:01:49 -03:00
katsy
876daa7d6e fix ctf flag garbage 2021-04-07 04:57:18 -05:00
LJ Sonic
09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot" 
This reverts commit 75633bde50.
 2021-02-13 17:45:20 +01:00
James R
75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
e55d842d7f Kill SEENAMES 2020-12-12 02:11:23 -08:00
James R
4ab667c6a0 Merge branch 'spritestuff2-fixes' into 'next' 
Some fixes for spritestuff2

See merge request STJr/SRB2!1264
 2020-11-25 19:26:49 -05:00
Jaime Ita Passos
5293c52bca Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
James R
6d6eb79226 Merge branch 'uncap-palettes' into 'next' 
Uncap palette lump palettes & allow flashpal palettes to display during pause

See merge request STJr/SRB2!1255
 2020-11-22 17:16:21 -05:00
lachwright
5454068843 Uncap palette lump palettes & allow flashpal palettes to display during pause 2020-11-16 17:37:12 +11:00
Jaime Passos
b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
Jaime Passos
dcaad758f4 Improved memory management for patches 2020-09-07 02:23:07 -03:00
Zwip-Zwap Zapony
d87c0eeaf1 Fix Ringslinger weapon ring penalty missnapment 2020-08-18 11:42:35 +02:00
James R
3e8cf5ab06 Merge branch 'bt_spin' into 'next' 
Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request STJr/SRB2!982
 2020-08-09 21:03:17 -04:00
Jaime Passos
91ed56ef40 Refactor patch loading 2020-08-08 05:16:47 -03:00
GoldenTails
457714e480 Remove 2 characters of whitespace 
This is what I get for using find+replace I guess lol
 2020-07-11 21:59:54 -05:00
GoldenTails
465ad1a7bc Replace all occurances of BT_USE with BT_SPIN (2.3?) 
I'd use `next-major` but it doesn't exist lol
 2020-07-11 21:59:54 -05:00
sphere
e95265a7fa Comment out unused border patch variables, so GFZFLR01 isn't required anymore. 2020-07-11 12:11:26 +02:00
LJ Sonic
98c657e703 Merge branch 'sf_nosupersprites' into 'next' 
Add SF_NOSUPERSPRITES

See merge request STJr/SRB2!1000
 2020-07-04 06:51:11 -04:00
James R
067d9b9a63 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
SteelT
bff6b19056 Merge branch 'marathonmode' into 'next' 
MARATHON RUN

See merge request STJr/SRB2!941
 2020-06-17 19:36:10 -04:00
lachwright
edfd64877c Add SF_NOSUPERSPRITES 2020-06-17 04:53:42 +08:00
SwitchKaze
46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
toaster
2aa542d2bf Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode 
# Conflicts:
#	src/doomdef.h
 2020-05-15 13:23:37 +01:00
toaster
d593e2e1bb Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) 
Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features.

Benefits include:
* An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending.
* Disable the console (pausing is still allowed, but the timer will still increment).
* Automatically skip intermissions as if you're holding down the spin button.
* Show centiseconds on HUD automatically, like record attack.
* "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout.
* "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port).
* Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them.
* Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext).
* Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for).
* Gorgeous new menu (no new assets required, unless you wanna give it a header later).

Changes which were required for the above but affect other areas of the game include:
* "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories).
* Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true).
* Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.)
* The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs).
* A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier.
* Minor m_menu.c touchups and refactorings here and there.

Built using feedback from the official server's #speedruns channel, among other places.
 2020-05-14 23:10:00 +01:00
sphere
0287c6956e Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
sphere
69c11a8220 Support act numbers up to 99 and draw both digits individually. 2020-05-12 17:17:24 +02:00
Zwip-Zwap Zapony
334ad93c56 Fix splitscreen Title Card act name regression 
This fixes act names not being shown on player 2's view
 2020-05-11 19:57:20 +02:00
Jaime Passos
39c5ab4e17 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
James R
b8d40a5783 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
Louis-Antoine
e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Jaime Passos
4e7b47440f G_CoopGametype, for all the GT_COOP cases 2020-02-29 00:57:22 -03:00
Jaime Passos
6fb5a6efb6 Consider hide-and-seek as GTR_HIDEFROZEN 2020-02-28 23:52:33 -03:00
Jaime Passos
d3ed5ad44f Race is Competition without the lives 2020-02-28 23:47:38 -03:00
Jaime Passos
b103a792c0 Let spectators decide where they spawn 
Also fixes some issues with tag gametypes
 2020-02-23 19:23:00 -03:00
Jaime Passos
678935f26a Turn players IT if they join the game after the hide time in tag gametypes 
Except in gametypes with hide time stasis, because they can't change team.
 2020-02-23 17:02:50 -03:00
SwitchKaze
6415e10216 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale
56b67a3b4f Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru
380b2f87bb Merge branch 'coloredtitlecard' into Tatsuru/SRB2-dye 2020-02-19 17:47:13 -03:00
James R
92f65fd822 Merge branch 'exitmove-tweaks' into 'next' 
Exitmove tweaks

See merge request STJr/SRB2!709
 2020-02-18 21:58:18 -05:00
fickleheart
19cdb002ab More fixes for titlecard option stuff 2020-02-09 17:53:50 -06:00
Jaime Passos
1774ba22b6 Fix title card not showing up at all if focus lost 2020-01-26 23:50:36 -03:00
Tatsuru
db22d503a4 HUD visual indicator + property fix 2020-01-19 21:55:08 -03:00
Tatsuru
e9a8c2d21a No more losing lives when finished 2020-01-19 14:30:05 -03:00
toaster
cbbc76b673 Fix snapping of extra multiplayer text. (Resolves #101) 2020-01-10 12:50:58 +00:00
fickleheart
f8a3e3b898 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00