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
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
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
spherallic
1470d099e3
Update copyright year & credits
2023-03-31 14:53:31 +02:00
James R
5d08bfd706
Rename CV_NOLUA to CV_ALLOWLUA, opt IN to Lua mutability
2023-03-15 16:40:21 -07:00
Eidolon
e5dea805fa
Revert "Merge branch 'gamepad-refactor' into next"
...
This reverts commit 696e2ab909
, reversing
changes made to d98d59494f
.
2023-01-26 19:26:28 -06:00
Eidolon
bbd4cff75c
Revert "Merge branch 'gamepadtweaks' into 'next'"
...
This reverts commit 96bfd8cea7
, reversing
changes made to 24f9ec4ec4
.
2023-01-26 19:24:21 -06:00
LJ Sonic
379cc4207a
Revert "Merge branch 'netcode-refactor' into merging"
...
This reverts merge request !1920
2023-01-15 17:57:23 +00:00
LJ Sonic
41fb0c8943
Merge branch 'netcode-refactor' into merging
2023-01-15 17:45:06 +01:00
LJ Sonic
05d232c029
Delete netcode
...
Just kidding, I just deleted NONET
2022-12-30 15:07:57 +01:00
spherallic
1964869c69
Remove redundant control axes & cleanup
2022-12-22 01:40:33 +01:00
Eidolon
696e2ab909
Merge branch 'gamepad-refactor' into next
...
Some hacks from the snake minigame patch have been removed as they are
no longer needed.
See STJr/SRB2!1870
# Conflicts:
# src/g_game.c
# src/g_input.c
2022-12-08 20:00:41 -06:00
LJ Sonic
28dba7f3c1
Add a separate control for switching to the previous viewpoint
2022-11-23 18:44:58 +01:00
Jaime Ita Passos
46f7fa406f
Refactor gamepad code
...
Implements the SDL Game Controller API, haptics, and axis bindings.
2022-11-14 00:37:08 -03:00
sphere
70161ff52e
Merge branch 'fancarry' into 'next'
...
Add carry type to fans (with fixed merge conflicts)
See merge request STJr/SRB2!1809
2022-09-30 13:07:19 +00:00
spherallic
2623649871
"That line shouldn't be there at all :v" -MascaraSnake
2022-09-28 22:57:34 +02:00
spherallic
612424e2e2
Merge branch 'next' into fancarry
2022-09-16 22:54:08 +02:00
MascaraSnake
8d4baace53
Add Lua backwards compatibility for FOF flags
2022-07-31 12:04:42 +02:00
MascaraSnake
5fbe5189ce
Merge branch 'udmf-sector-fields' into udmf-full
2022-04-20 21:01:52 +02:00
MascaraSnake
faa7d89e3e
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-04-20 21:01:16 +02: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
MascaraSnake
863b1e125a
Merge branch 'udmf-lighting' into udmf-linedef-executors
...
# Conflicts:
# src/p_spec.c
2022-04-19 22:31:57 +02:00
MascaraSnake
0b4bbacec0
Merge branch 'next' into udmf-fofs-mkii
2022-04-19 21:59:31 +02:00
spherallic
6a969c163b
Make boss 3's shockwave into a customizable action.
2022-04-06 15:31:25 +02:00
MascaraSnake
a78e4e553c
Merge branch 'next' into udmf-fofs-mkii
2022-03-18 07:29:02 +01: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
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
spherallic
a6c52f5bad
Move MT_RAY to the very end of the mobj list.
2022-02-22 15:49:16 +01:00
spherallic
6e105a23f6
Update Nightopian states for the new sprites & fix another bug
2022-02-02 14:43:22 +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
MascaraSnake
13b8d1cf7e
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-01-14 21:09:11 +01:00
MascaraSnake
0833f0bd4f
Merge branch 'udmf-executor-triggers' into udmf-thing-types
...
# Conflicts:
# src/p_setup.c
# src/p_spec.h
2022-01-14 21:01:39 +01:00
MascaraSnake
4b8f5bd7f3
Merge branch 'udmf-lighting' into udmf-linedef-executors
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/doomdata.h
# src/r_defs.h
2022-01-14 20:30:29 +01:00
MascaraSnake
6bb6dc88ca
Merge branch 'next' into udmf-fofs-mkii
...
# Conflicts:
# src/hardware/hw_main.c
# src/lua_maplib.c
# src/p_spec.c
# src/p_user.c
2022-01-14 07:24:05 +01:00
MascaraSnake
5f97047b96
Rename linedef flags
2022-01-05 18:40:02 +01:00