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

603 commits

Author SHA1 Message Date
spherallic
dbc1fe8c0e Merge branch 'next' into more-sprite2 2024-02-27 12:23:14 +01:00
Logan Aerl Arias
ae88c01f6e Merge branch SRB2:next into nonightsever 2024-02-18 19:58:36 +00:00
Logan Aerl Arias
6d0fef8726 Merge branch SRB2:next into nonightsever 2024-02-12 04:53:51 +00:00
Sally Coolatta
d5c8fcac2b Match freeslot count with SRB2Kart 2024-02-10 08:52:32 -05:00
Lactozilla
0ffcf89c85 Merge branch 'next' into more-sprite2 2024-01-08 02:55:19 -03:00
Logan Aerl Arias
3992e83e8f Revert "Merge branch 'thokking-hell' into 'next'" 
This reverts merge request !1551
 2024-01-03 03:46:26 +00:00
Lactozilla
7fbd8f7025 Merge branch 'next' into more-sprite2 2024-01-02 22:09:17 -03:00
Logan Aerl Arias
091a874514 Merge branch 'thokking-hell' into 'next' 
New CA_THOK effect

See merge request STJr/SRB2!1551
 2023-12-31 14:16:27 +00:00
Lactozilla
4408f4462e Add 'sprite2' field to states 2023-11-12 21:46:49 -03:00
Alam Ed Arias
28e8ccbed7 Merge branch SRB2:next into nonightsever 2023-10-25 19:51:40 +00:00
Alam Ed Arias
f5859c3480 Merge branch SRB2:next into blue-spring-balls 2023-10-25 19:41:36 +00:00
Alam Ed Arias
d0cb7707e3 Merge branch SRB2:next into thokking-hell 2023-10-25 19:40:02 +00:00
spherallic
b98bec9a03 Final final 2.2.12 color tweaks (real) 
- Tweaked Aether, Midnight and Volcanic
- Credit Chrispy & Saneko for new skincolors
 2023-08-30 00:07:49 +02: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
sphere
8b7978ec35 Merge branch 'color-tweaks' into 'next' 
Small color tweaks

See merge request STJr/SRB2!2116
 2023-08-20 17:18:58 +00:00
spherallic
b52a36f04c Small tweaks to Foundation and Midnight 2023-08-20 18:38:14 +02:00
spherallic
50fc1abf9a Revert invcolor tweaks for Red/Rosy/Lavender 2023-08-20 18:30:30 +02:00
spherallic
73ded4787c Fix ammo/panel/emerald hitboxes, add shadows to thrown rings 2023-07-11 19:00:47 +02:00
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