stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-23 17:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity
14161 commits 176 branches 42 tags 280 MiB
Commit graph

575 commits

Author SHA1 Message Date
spherallic
ff7a24df09 Rename Kiwi skincolor to Pear 2023-07-05 12:10:30 +02:00
spherallic
1a956667a7 Small tweak to Bubblegum 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
458b474645 Even more skincolor changes: 
- Changed Bronze
- Added Boulder & Volcanic
- Tweaked Galaxy
 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
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
Eidolon
c42ef9f1be Fix IT and ctf flag sign interpolation 2023-02-27 18:28:34 -06:00
MIDIManNoah
98d544b459 Make some fixes for Metal Sonic's boss fight 2022-12-23 22:19:09 -05:00
Eidolon
805941a98f Merge public next into uncappedrevengeance 
This is to capture the UDMF merges and make the later code review
easier.
 2022-05-03 14:45:14 -05:00
Monster Iestyn
d719e081dc Adjust 1up monitor icon z offsets 
Fixes interpolation issues with 1up monitors.
 2022-04-26 20:56:35 -05:00
MascaraSnake
54640a8664 Merge branch 'udmf-executor-triggers' into udmf-thing-types 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_things.cfg
 2022-04-20 20:59:55 +02:00
MascaraSnake
39b7fb9ff8 Merge commit 'd624ee25' into udmf-thing-types 
# Conflicts:
#	src/p_mobj.c
#	src/p_spec.c
 2022-04-20 20:41:46 +02:00
MascaraSnake
f76b104c4a Merge commit 'c7050671' into udmf-thing-types 2022-04-20 19:42:03 +02:00
sphere
1cd46c2208 Merge branch 'shadowscream' into 'next' 
Remove drop shadow from badnik explosions, give drop shadows to Metal and flickies

Closes #218

See merge request STJr/SRB2!1761
 2022-03-21 21:58:32 +00:00
sphere
7b6e4eb5fc Merge branch 'fullbright-ivsp' into 'next' 
Make S_IVSP and  S_THUNDERCOIN_SPARK fullbright

See merge request STJr/SRB2!1755
 2022-03-21 21:58:14 +00:00
spherallic
6ef7221e38 A few drop shadow-related additions: 
- Added A_SetShadowScale
- Added A_ShadowScream which combines the above with A_Scream, used for 
badnik explosions
- Gave flickies drop shadows
 2022-03-09 00:49:24 +01:00
sphere
7e26377264 Merge branch 'state-changes' into 'next' 
Update Nightopians & other state changes

See merge request STJr/SRB2!1744
 2022-03-06 15:45:59 +00:00
sphere
ab711128c7 Merge branch 'tutorial-scenery' into 'next' 
Tutorial scenery

See merge request STJr/SRB2!1722
 2022-03-06 15:45:53 +00:00
aiire
6040f97dd5 added FF_FULLBRIGHT to S_THUNDERCOIN_SPARK 2022-03-04 23:25:25 +00:00
aiire
8c1991d674 added FF_FULLBRIGHT to S_IVSP 2022-03-04 02:57:45 +00:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
sphere
a57a0985ee Merge branch 'mt_ray' into 'next' 
Move MT_RAY to the very end of the mobj list

See merge request STJr/SRB2!1747
 2022-02-28 15:13:09 +00:00
spherallic
d624ee2541 Revert "minor spike optimisations" 
This reverts commit b2d693a547.
 2022-02-28 14:30:01 +01:00
spherallic
a6c52f5bad Move MT_RAY to the very end of the mobj list. 2022-02-22 15:49:16 +01:00
spherallic
fcc28d0714 Update seaweed state to utilize new features & sprites. 2022-02-21 16:00:21 +01:00
spherallic
946100939a Update editor configurations & increase Nightopians' hitbox height. 2022-02-19 22:19:39 +01:00
sphere
d532546e46 Merge branch 'mt-null-spawning' into 'next' 
Remove MT_NULL hacks

Closes #721

See merge request STJr/SRB2!1729
 2022-02-19 20:24:34 +00:00
sphere
249a3dfa25 Merge branch 'eggman-hitboxes' into 'next' 
Increase Eggman's hitboxes

See merge request STJr/SRB2!1706
 2022-02-19 20:24:20 +00:00
sphere
7218060a7a :lachyes: 2022-02-19 01:49:19 +00:00
spherallic
bb84ae1793 Decrease hitbox sizes to prevent collision with thin air. 2022-02-10 13:10:56 +01:00
spherallic
6e105a23f6 Update Nightopian states for the new sprites & fix another bug 2022-02-02 14:43:22 +01:00
spherallic
e301327dee Avoid using old explosion states for Jetty-Syn/Skim mines. 2022-02-02 12:15:14 +01:00
James R
518de0ce10 Add P_CheckMove 
Checks if P_TryMove would succeed without actually moving.
 2022-02-01 03:37:03 -08:00
spherallic
be7f628e2c Add new plant object for the revamped tutorial. 2022-01-23 20:13:26 +01:00
spherallic
af5173c90f Increase Eggman's hitboxes to actually match the current sprites. 2022-01-10 21:38:30 +01:00
spherallic
8651123463 Fix errors with the hardcoded Nightopians from Dream Hill. 2022-01-08 19:47:00 +01:00
MascaraSnake
95248dc80f Merge branch 'next' into udmf-thing-types 
# Conflicts:
#	src/p_mobj.c
 2021-12-29 09:35:25 +01:00
MascaraSnake
a091b7d16d Adapt bosses to UDMF and remove now-unused mapthing flags 2021-12-28 22:52:24 +01:00
MascaraSnake
1cff7a161a Adapt ambient sound effects to UDMF 2021-12-28 09:58:45 +01:00
MascaraSnake
06bbee50bf Adapt boss IDs and trigger tags to UDMF 2021-12-27 15:07:37 +01:00
MascaraSnake
72e2c24fdb Adapt some reserved tags to UDMF 2021-12-20 23:28:18 +01:00
sphere
b092374e1a Merge branch 'lagspikes' into 'next' 
Minor spike optimisations

See merge request STJr/SRB2!1669
 2021-12-20 12:33:13 +00:00
MascaraSnake
ebf692f143 Adapt push/pull point to UDMF 2021-12-16 07:00:30 +01:00
spherallic
e7a7a3b213 Prevent Pyrefly fire from warping up nearby ledges. 2021-12-13 15:20:43 +01:00
katsy
b2d693a547 minor spike optimisations 2021-12-05 02:13:09 -06:00