stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-18 17:01:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
14192 commits 172 branches 41 tags 276 MiB
Commit graph

14192 commits

This branch
This branch
All branches
Author SHA1 Message Date
spherallic
867a5e0d47 Correct misplaced comment on NiGHTS link colors 2023-06-20 21:48:26 +02:00
spherallic
1a956667a7 Small tweak to Bubblegum 2023-06-20 20:06:43 +02:00
spherallic
b97f0a8643 Fix MT_NIGHTSCORE color cycling, using link colors 2023-06-20 20:06:43 +02:00
spherallic
73eb8fc358 A couple more changes: 
- Swapped invcolors of new character skincolors
- Renamed Stone to Meteorite & changed text color to gray
- Tweaked some colors' invshades
 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
70b69552f9 Add toggle for invcolor background, plus: 
- Renamed Amethyst to Crystal
- Moved some of the new colors
- Tweaked a couple of invshades
 2023-06-20 20:06:42 +02:00
spherallic
5e6850a7f7 Some more color tweaks: 
- Added 6 new colors to match Chaos Emeralds
- Changed Taffy & Sapphire (3rd emerald)
- Renamed old Emerald to Shamrock
 2023-06-20 20:06:42 +02:00
spherallic
853c9958d7 Remove unfinished sprite rotation 2023-06-20 20:06:42 +02:00
spherallic
c9b6693c76 Allow pausing & rotation of player sprites in player setup 2023-06-20 20:06:02 +02:00
spherallic
766c346df5 Add grid view for skincolors 2023-06-20 20:03:13 +02:00
spherallic
4cd85b5228 Support PgUp/PgDn for color select, similar to sound test & addons menu 2023-06-20 20:03:13 +02:00
spherallic
458b474645 Even more skincolor changes: 
- Changed Bronze
- Added Boulder & Volcanic
- Tweaked Galaxy
 2023-06-20 20:03:13 +02:00
Lach
647e6aac12 Simplify the way skincolors' invshades are used 2023-06-20 20:03:13 +02:00
spherallic
edbfb92b11 Correct tabs & spacing 2023-06-20 20:03:13 +02:00
spherallic
222e409cde More skincolor changes: 
- Tweaked Bubblegum
- Added 8 new colors by Alice
- Added 22 new colors by sphere
 2023-06-20 20:03:13 +02:00
Lach
bbe6c12323 Skincolor changes: 
- Tweaked Orange and Cobalt
- Added Pepper, Jade, Headlight, Master, Mauve, and Taffy
- Fixed Mario mode invincibility color cycle
(Opposite color shades are placeholder for now)
 2023-06-20 20:03:13 +02:00
sphere
f68006dbd3 Merge branch 'optimize-field-lookup' into 'next' 
Optimize field lookups in Lua metatables

See merge request STJr/SRB2!2024
 2023-06-19 22:41:36 +00:00
sphere
c1d3af0449 Merge branch 'fix-death-ghost-segfault' into 'next' 
Fix segfault when ghost dies from a death pit

Closes #999

See merge request STJr/SRB2!2026
 2023-06-19 22:31:55 +00:00
Gustaf Alhäll
17356f93bf
Fix segfault when ghost dies from a death pit 2023-06-19 22:19:39 +02:00
Gustaf Alhäll
2f2de7d3d3
Optimize field lookups in Lua metatables 2023-06-18 18:05:16 +02:00
sphere
331c81f32d Merge branch 'interpolate-models' into 'next' 
Interpolate Models when Scaling Mobjs

See merge request STJr/SRB2!2021
 2023-06-15 23:26:50 +00:00
Sally Coolatta
5c3f66dc36 Remove "singletics" code in F_WriteText 
This was added in 2.1 for whatever reason. All instances of F_WriteText are already capped to the framerate properly by other means; so this code being present just makes timing differences between different netgame clients / other inaccuracies cause the text speed to slow down more than intended.
 2023-06-13 21:26:40 -04:00
Zwip-Zwap Zapony
f921a9987d Interpolate models when scaling mobjs 2023-06-13 19:07:03 +02:00
Zwip-Zwap Zapony
4d4910c918 Use 99999999 instead of 86400, make "MIN" 0 
Nines might be more pleasing than an exact number for con_hudtime
It'd be bad to make "MIN" in an old config suddenly start displaying lines for con_hudlines
 2023-06-13 14:02:19 +02:00
spherallic
37223f13f1 Remove debug print on generic item circle spawn 2023-06-13 10:38:44 +02:00
sphere
8c08eb1676 Merge branch 'bbox-tweaks' into 'bbox' 
Add interpolation to hitbox viewer, tweak hitbox colors

See merge request STJr/SRB2!1927
 2023-06-13 00:05:58 +00:00
sphere
b8a25ae53c Add interpolation to hitbox viewer, tweak hitbox colors 2023-06-13 00:05:58 +00:00
spherallic
d8dd988451 Don't cancel P_LinedefExecute early 2023-06-13 02:01:11 +02:00
spherallic
d9937953ad Fix linedef type 319/320 again 2023-06-13 01:54:49 +02:00
spherallic
99f0933986 Change how SR_MainMenu is initialized. 2023-06-13 01:53:50 +02:00
spherallic
1cc870485d Increase unlockable limits: 
- MAXUNLOCKABLES from 32 to 80
- MAXEXTRAEMBLEMS from 16 to 48
- COMPAT_GAMEDATA_ID is used to account for the old values to prevent
losing records.
- Also fixes linedef actions 319/320.
 2023-06-13 01:53:50 +02:00
sphere
f1106236ad Merge branch 'sphere-fix' into 'next' 
Fix Flung Spheres not using the Blue Sphere collection effect

See merge request STJr/SRB2!1995
 2023-06-12 23:46:05 +00:00
sphere
9d0389811b Merge branch 'camrea-fiz' into 'next' 
Fix Camera Interpolation Never Being Reset (Resolves #1026 and #976)

Closes #976 and #1026

See merge request STJr/SRB2!2008
 2023-06-12 23:44:33 +00:00
sphere
c2c27bf356 Merge branch 'ipv6' into 'next' 
Fix IPv6

See merge request STJr/SRB2!1612
 2023-06-12 23:43:46 +00:00
sphere
5307c1635d Merge branch 'interpolate-maria' into 'next' 
Interpolate Shadows when Scaling Mobjs

See merge request STJr/SRB2!1986
 2023-06-12 23:39:23 +00:00
sphere
d5a3f10a4d Merge branch 'checksector-refactor' into 'next' 
Refactor P_CheckSector

Closes #870

See merge request STJr/SRB2!1946
 2023-06-12 23:36:48 +00:00
sphere
0dea372336 Merge branch 'the_elder_skyscroll' into 'next' 
Rewrite F_SkyScroll to fix overflows

Closes #1008

See merge request STJr/SRB2!1985
 2023-06-12 23:36:37 +00:00
sphere
62bdb7174b Merge branch 'lua-optimized-constants' into 'next' 
Hannu's "LUA_EnumLib optimizations for constant value access" with fixed merge conflict

See merge request STJr/SRB2!2017
 2023-06-12 23:03:51 +00: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
katsy
ca11180976 Merge remote-tracking branch 'stjr/next' into lua-optimized-constants 2023-06-11 12:36:08 -05:00
sphere
363faed8d7 Merge branch 'sucky-steps' into 'next' 
Port increment_move radius clamps from Ring Racers

See merge request STJr/SRB2!2013
 2023-06-09 13:07:07 +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
sphere
cd1b57a901 Merge branch 'textcolortweaks' into 'next' 
Small text colormap tweaks

See merge request STJr/SRB2!1971
 2023-06-09 11:33:26 +00:00
Sally Coolatta
7fa7653494 Port increment_move radius clamps from Ring Racers 
Fixes inconsistencies with thin players, like with Liftoff Gantry's scale section, and with large characters colliding with steep slopes instead of going up them.
 2023-06-05 13:54:09 -04:00
SMS Alfredo
aa43aa7c8c Call P_ResetCamera Upon Switching To/From an Away View Camera 2023-06-03 15:43:58 -05:00
SMS Alfredo
35b676e313 Fix Camera Interpolation Not Being Reset 2023-06-02 19:52:03 -05:00
Sally Coolatta
e06956a53b Fix skin-only emblems on emblem radar 2023-06-02 16:06:51 -04:00
Sally Coolatta
cf228757a1 Emblems disappear on collection again, only for SP 2023-06-02 16:06:50 -04:00
Sally Coolatta
645dd7d662 Stop endlessly chasing NIGHTSPULL emblems 2023-06-02 16:06:50 -04:00
Sally Coolatta
c1e641be43 Improve emblem sharing conditions 2023-06-02 16:06:50 -04:00