MIDIMan
|
29378e7f94
|
Merge branch SRB2:next into mobj-alpha
|
2024-03-06 02:26:50 +00:00 |
|
Logan Aerl Arias
|
89620dbd9e
|
Merge branch 'shield-button-touchups' into 'next'
Shield Button Touchups
See merge request STJr/SRB2!2257
|
2024-03-03 23:37:05 +00:00 |
|
Logan Aerl Arias
|
ba35849b5a
|
Merge branch SRB2:next into shield-button-touchups
|
2024-03-03 16:17:08 +00:00 |
|
Logan Aerl Arias
|
93a191efa9
|
Merge branch SRB2:next into instant-setscale
|
2024-03-03 16:15:59 +00:00 |
|
MIDIMan
|
5668e02857
|
Merge branch SRB2:next into mobj-alpha
|
2024-03-01 21:34:40 +00:00 |
|
Alam Ed Arias
|
a9ef21aa50
|
Clang: clean up conditional-uninitialized warnings
|
2024-03-01 19:35:04 +00:00 |
|
MIDIMan
|
543004b5b6
|
Merge branch SRB2:next into mobj-alpha
|
2024-02-28 19:00:35 +00:00 |
|
sphere
|
1cc9e17efa
|
Merge branch 'nonightsever' into 'next'
Make NiGHTS super consistent with regular super (Closes #520 for real this time)
Closes #520
See merge request STJr/SRB2!1666
|
2024-02-25 13:55:44 +00:00 |
|
sphere
|
50bdc5f1a5
|
Merge branch 'whirlybird' into 'next'
Use PF_NOJUMPDAMAGE for whirlwind jump instead of removing jump flags (resolves #771)
Closes #771
See merge request STJr/SRB2!1740
|
2024-02-25 13:39:17 +00:00 |
|
katsy
|
6604f47931
|
Use PF_NOJUMPDAMAGE for whirlwind jump instead of removing jump flags (resolves #771)
|
2024-02-25 13:39:17 +00:00 |
|
MIDIMan
|
de8464cd2f
|
Add alpha support for mobjs
|
2024-02-24 20:13:13 -05:00 |
|
Logan Aerl Arias
|
52f53f03b7
|
Merge branch 'next' into instant-setscale
|
2024-02-24 11:42:27 -05: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 |
|
Logan Aerl Arias
|
b3c3a45a6c
|
Merge branch SRB2:next into fix-missing-mobjwasremoved-checks
|
2024-02-18 22:56:44 +00:00 |
|
Logan Aerl Arias
|
ae88c01f6e
|
Merge branch SRB2:next into nonightsever
|
2024-02-18 19:58:36 +00:00 |
|
Logan Aerl Arias
|
cf5520b275
|
Merge branch SRB2:next into instant-setscale
|
2024-02-17 03:25:41 +00:00 |
|
Logan Aerl Arias
|
2df90ec96b
|
Merge branch SRB2:next into emblemexitfix
|
2024-02-12 05:09:04 +00:00 |
|
Logan Aerl Arias
|
6d0fef8726
|
Merge branch SRB2:next into nonightsever
|
2024-02-12 04:53:51 +00:00 |
|
Gustaf Alhäll
|
1a53971c39
|
Fix various segfaults caused by missing P_MobjWasRemoved checks
|
2024-02-09 19:39:20 +01:00 |
|
sphere
|
41613d89a1
|
Merge branch 'blockmap-links' into 'next'
Make objects able to collide with others if they occupy multiple blockmap cells (resolves #592)
Closes #592
See merge request STJr/SRB2!2267
|
2024-02-08 23:16:59 +00:00 |
|
sphere
|
5a00859baa
|
Merge branch 'bouncy-nights-fixes' into 'next'
General NiGHTS Fixes
See merge request STJr/SRB2!2199
|
2024-01-29 13:55:25 +00:00 |
|
Lactozilla
|
1d2ea9b046
|
Fix #1177
|
2024-01-17 20:02:50 -03:00 |
|
Lactozilla
|
756e9d0d48
|
Link objects into multiple blockmap sectors
Ported from ZDoom
|
2024-01-17 19:10:19 -03: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 |
|
Logan Aerl Arias
|
154af01348
|
Merge branch 'theyseemerollingtheybraking' into 'next'
Fix roll braking assuming player angle is camera angle (resolves #1055)
Closes #1055
See merge request STJr/SRB2!2053
|
2024-01-08 03:13:57 +00:00 |
|
Zwip-Zwap Zapony
|
a4cb3960ce
|
Set old sprite scales and offsets for ghost mobjs
|
2024-01-03 14:04:40 +01:00 |
|
Zwip-Zwap Zapony
|
564d18b1ea
|
Add and use an "instant" parameter for P_SetScale
|
2024-01-03 14:04:40 +01: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
|
b6e4771085
|
Merge branch 'next' into translations
|
2024-01-02 22:06:14 -03:00 |
|
Logan Aerl Arias
|
4dd2415262
|
Merge branch 'exitfix' into 'next'
Only Consider ExitLevel a Cheat When Used to Cheat
See merge request STJr/SRB2!2159
|
2024-01-02 03:05:24 +00:00 |
|
Logan Aerl Arias
|
474d112ae4
|
Merge branch 'setflip' into 'next'
Add "allowflip" Parameter to P_DoJump
See merge request STJr/SRB2!2158
|
2024-01-02 02:38:19 +00:00 |
|
Logan Aerl Arias
|
487b0d22ed
|
Merge branch 'next' into raise-skin-limit
|
2024-01-01 16:55:04 -05:00 |
|
katsy
|
b52836e5f1
|
Move player friction reset after movement code for lua qol
|
2024-01-01 03:10:09 +00:00 |
|
Logan Aerl Arias
|
a0bd81d09a
|
Merge branch SRB2:next into bouncy-nights-fixes
|
2023-12-31 17:07:22 +00:00 |
|
Logan Aerl Arias
|
82f37ccadd
|
Merge branch SRB2:next into emblemexitfix
|
2023-12-31 17:03:43 +00:00 |
|
Logan Aerl Arias
|
8c3d590730
|
Merge branch SRB2:next into exitfix
|
2023-12-31 17:03:12 +00:00 |
|
Logan Aerl Arias
|
530c93c1e7
|
Merge branch SRB2:next into setflip
|
2023-12-31 17:02:58 +00:00 |
|
Logan Aerl Arias
|
987f6fbe2b
|
Merge branch SRB2:next into theyseemerollingtheybraking
|
2023-12-31 16:48:15 +00: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 |
|
Zwip-Zwap Zapony
|
c361b732db
|
General NiGHTS fixes
|
2023-12-29 16:04:03 +01:00 |
|
SMS Alfredo
|
e680277428
|
Merge branch 'next' into 'setflip'
# Conflicts:
# src/p_local.h
|
2023-12-29 03:30:15 +00:00 |
|
Logan Aerl Arias
|
64da1fada1
|
Merge branch 'handle-player-mobjsetstate' into 'next'
Handle player state is P_SetMobjState
See merge request STJr/SRB2!2239
|
2023-12-26 00:00:39 +00:00 |
|
Logan Aerl Arias
|
b5a4f227f6
|
Merge branch 'fix-segfault-removemobj-spawn' into 'next'
Fix segfaults when P_RemoveMobj is called from MobjSpawn hook
See merge request STJr/SRB2!1973
|
2023-12-25 23:58:26 +00:00 |
|
Gustaf Alhäll
|
ddba6e80f7
|
Handle player state is P_MobjSetState
|
2023-12-23 13:45:16 +01:00 |
|
Lactozilla
|
5f21befb09
|
Merge branch 'next' into translations
|
2023-11-30 18:54:36 -03:00 |
|
Lactozilla
|
0498c16cb6
|
Merge branch 'next' into raise-skin-limit
|
2023-11-26 23:08:13 -03:00 |
|
SMS Alfredo
|
e50993861e
|
Dedicated Shield / Super Transformation Button
|
2023-11-26 20:38:49 +00:00 |
|
Lactozilla
|
a3e6b5e0fb
|
Merge remote-tracking branch 'stjr/next' into raise-skin-limit
|
2023-11-23 13:48:18 -03:00 |
|
Lactozilla
|
879ac8dcd5
|
Merge remote-tracking branch 'stjr/next' into translations
|
2023-11-06 22:58:25 -03:00 |
|