sphere
ee96ed12a4
Merge branch 'more-sprite2' into 'next'
...
Add 'sprite2' field to states
See merge request STJr/SRB2!2211
2024-03-07 12:06:48 +00:00
Logan Aerl Arias
ba35849b5a
Merge branch SRB2:next into shield-button-touchups
2024-03-03 16:17:08 +00:00
spherallic
dbc1fe8c0e
Merge branch 'next' into more-sprite2
2024-02-27 12:23:14 +01:00
Zwip-Zwap Zapony
34afebfc06
Revert P_SuperReady to a boolean transform type
2024-02-24 15:41:51 +01:00
Zwip-Zwap Zapony
90958614f3
Shield button touchups
2024-02-24 15:41:36 +01:00
spherallic
7fc554bd4e
Merge branch 'showinput' of git.do.srb2.org:STJr/SRB2 into showinput
2024-02-08 23:12:03 +01:00
Logan Aerl Arias
a3b79056e9
Merge branch 'translations' into 'next'
...
ZDoom translations
See merge request STJr/SRB2!2190
2024-01-17 03:24:54 +00:00
Lactozilla
0ffcf89c85
Merge branch 'next' into more-sprite2
2024-01-08 02:55:19 -03:00
Logan Aerl Arias
845df8f1df
Merge branch 'sector-portals' into 'next'
...
Sector portals
See merge request STJr/SRB2!2139
2024-01-08 03:28:43 +00: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
Lactozilla
b6e4771085
Merge branch 'next' into translations
2024-01-02 22:06:14 -03:00
Logan Aerl Arias
07b0df0fba
Merge branch 'next' into sector-portals
2023-12-31 11:56:34 -05:00
Logan Aerl Arias
6d7549476b
Merge branch 'next' into showinput
2023-12-31 11:47:14 -05: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
8e331f86bd
Merge branch 'next' into sector-portals
2023-11-30 19:01:54 -03:00
Lactozilla
5f21befb09
Merge branch 'next' into translations
2023-11-30 18:54:36 -03:00
Lactozilla
badc122286
Merge branch 'next' into more-sprite2
2023-11-26 22:36:01 -03:00
SMS Alfredo
e50993861e
Dedicated Shield / Super Transformation Button
2023-11-26 20:38:49 +00:00
Lactozilla
962150c252
Add SPR2F_ enum to INT_CONST
2023-11-13 12:02:36 -03:00
Lactozilla
879ac8dcd5
Merge remote-tracking branch 'stjr/next' into translations
2023-11-06 22:58:25 -03:00
Lactozilla
0731272fab
Add A_SetTranslation and load TRNSLATE before SOC and Lua scripts
2023-10-30 20:52:28 -03: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
Alam Ed Arias
1403f93176
Merge branch 'next' into showinput
2023-10-25 14:24:17 -04:00
Alam Ed Arias
0fb1c64338
Merge branch 'next' into sector-portals
2023-10-25 14:11:58 -04:00
LJ Sonic
2a896538d9
Merge branch 'netcode-rerefactor' into 'next'
...
Re-delete netcode
See merge request STJr/SRB2!2083
2023-09-18 16:47:28 +00:00
Lactozilla
0377d9e881
Merge remote-tracking branch 'stjr/next' into sector-portals
2023-09-08 14:09:54 -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
Lactozilla
5b387ec94a
Make linedef type 6 closer to ZDoom's Sector_SetPortal
2023-08-23 15:04:50 -03:00
sphere
13ac83a208
Floor portal test, ported
...
Co-authored-by: Lactozilla <jp6781615@gmail.com>
2023-08-23 02:58:38 -03:00
sphere
b533594a33
Merge branch 'udmf-absolutez' into 'next'
...
Add absolute Z height flag for mapthings in UDMF
See merge request STJr/SRB2!2015
2023-08-20 17:16:02 +00:00
LJ Sonic
df0c8e0557
Merge remote-tracking branch 'origin/next' into netcode-rerefactor
2023-08-01 19:00:52 +02:00
Gustaf Alhäll
ddc5cc6e48
Fix wrong SSF_* values in Lua due to missing entries
2023-07-31 22:51:50 +02:00
LJ Sonic
07bc922273
Delete netcode
...
Just kidding, I just deleted NONET
2023-07-27 15:34:05 +02:00
Sal
b238a6db50
Merge branch 'shockwave-action' into 'next'
...
Add a standalone action for shockwaves
See merge request STJr/SRB2!1777
2023-07-24 11:01:41 +00:00
SteelT
1d263842df
Add input display HUD item to HUDITEM_LIST
2023-07-08 17:34:13 -04:00
sphere
d7a84b967c
Merge branch 'strongpower' into 'next'
...
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately
See merge request STJr/SRB2!1366
2023-07-05 17:05:47 +00:00
katsy
f261b9f0e1
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately
2023-07-05 17:05:47 +00:00
spherallic
ff7a24df09
Rename Kiwi skincolor to Pear
2023-07-05 12:10:30 +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
f416c6a98d
Add absolute Z flag to MAPTHINGFLAG_LIST
2023-06-14 13:19:47 +02:00
sphere
2df3fb53da
Merge branch 'strong-lua-command-restrictions' into 'next'
...
Fix up Lua command/cvar safety
See merge request STJr/SRB2!1943
2023-04-12 17:50:01 +00:00
