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
sphere
cef9a1ad18
Merge branch 'damagetype-fixes' into 'next'
...
A few damage type fixes
Closes #392
See merge request STJr/SRB2!1660
2021-12-02 10:10:19 +00:00
sphere
16251734ce
Merge branch 'hehballs' into 'next'
...
Fix Large Spike Balls not dealing spike damage
See merge request STJr/SRB2!1661
2021-12-01 10:06:01 +00:00
SMS Alfredo
aca0ba0f4b
wow
2021-11-30 22:46:51 -06:00
SMS Alfredo
a5e1167ad2
balls
2021-11-30 20:51:15 -06:00
spherallic
9bdfafc9dd
Add DMG_FIRE to Pyrefly fire and lavafall objects.
2021-11-29 19:25:30 +01:00
spherallic
49e6e7a80f
Fix retracting spikes dealing typeless damage instead of spike damage.
2021-11-27 16:19:04 +01:00
sphere
65350e59c9
Merge branch 'rollout-stuff' into 'next'
...
Rollout rock improvements
Closes #445 , #221 , and #532
See merge request STJr/SRB2!1401
2021-05-31 16:12:17 -04:00
Steel Titanium
a2667f4dc9
Merge branch 'master' into next
2021-05-11 20:08:44 -04:00
LJ Sonic
d325c7e6d3
The year is 2021
2021-05-07 17:45:56 +02:00
Mari0shi06
29704e141b
Change Raspberry's chat colormap to V_ROSYMAP
2021-03-28 17:29:24 -04:00
Mari0shi06
715a3661b5
Revert "Change Raspberry's chat color to V_ROSYMAP"
...
This reverts commit 192fa5cb4b
2021-03-28 21:27:46 +00:00
Mari0shi06
192fa5cb4b
Change Raspberry's chat color to V_ROSYMAP
2021-03-28 17:26:41 -04:00
Mari0shi06
424f67a74b
Revert "Change Raspberry's chat colormap to V_ROSYMAP"
...
This reverts commit 428ae3127e
2021-03-28 21:19:26 +00:00
Mari0shi06
428ae3127e
Change Raspberry's chat colormap to V_ROSYMAP
2021-03-28 17:12:58 -04:00
lachwright
cf389179e8
Rollout rock improvements:
...
- No longer struggles to start to accelerating at certain angles
- Carrying a player onto a rollout rock no longer leaves them in their ride state
- Changed dispoffset might alleviate some sorting issues
- Changes the player's camera angle when sprung horizontally
- Works better in reverse gravity
2021-02-15 01:11:03 +11:00