sphere
|
1b060d2b34
|
Merge branch 'fruits-clipper' into 'next'
NiGHTS text improvements
Closes #1121
See merge request STJr/SRB2!2165
|
2024-03-13 13:03:33 +00:00 |
|
sphere
|
a3165cbbee
|
Merge branch 'maretimers' into 'next'
Allow per-mare time limits in NiGHTS
See merge request STJr/SRB2!2137
|
2024-03-13 13:03:29 +00:00 |
|
sphere
|
4faa429f43
|
Merge branch 'issue1040' into 'next'
Fixes Issue #1040
See merge request STJr/SRB2!2377
|
2024-03-07 12:09:12 +00:00 |
|
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
|
d2a068d158
|
Merge branch SRB2:next into issue1040
|
2024-03-04 17:21:35 +00:00 |
|
sphere
|
261e2d4347
|
bruh
# Conflicts:
# src/doomstat.h
|
2024-03-04 14:23:45 +00:00 |
|
spherallic
|
6768bc7178
|
Merge branch 'next' into maretimers
|
2024-03-04 15:17:04 +01: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
|
5dd82cb7db
|
Merge branch 'next' into more-sprite2
|
2024-03-03 11:16:35 -05:00 |
|
Logan Aerl Arias
|
93a191efa9
|
Merge branch SRB2:next into instant-setscale
|
2024-03-03 16:15:59 +00:00 |
|
Logan Aerl Arias
|
68599b7bfb
|
Merge branch 'next' into fruits-clipper
|
2024-03-03 11:14:30 -05:00 |
|
Alam Ed Arias
|
a9ef21aa50
|
Clang: clean up conditional-uninitialized warnings
|
2024-03-01 19:35:04 +00:00 |
|
spherallic
|
dbc1fe8c0e
|
Merge branch 'next' into more-sprite2
|
2024-02-27 12:23:14 +01:00 |
|
Arthur
|
9ef194fed4
|
min/max for cam_dist and cam_height
|
2024-02-25 23:08:18 -05: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 |
|
Logan Aerl Arias
|
52f53f03b7
|
Merge branch 'next' into instant-setscale
|
2024-02-24 11:42:27 -05:00 |
|
Logan Aerl Arias
|
d7086168b8
|
Merge branch 'next' into fruits-clipper
|
2024-02-24 11:18:12 -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 |
|
spherallic
|
b312377800
|
Clean up overzealous time check
|
2024-02-15 16:36:05 +01:00 |
|
spherallic
|
f4588d50b0
|
Merge branch 'next' into fruits-clipper
|
2024-02-13 19:14:26 +01: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 |
|
spherallic
|
243fdd1a82
|
Merge branch 'next' into fruits-clipper
|
2024-02-04 22:43:48 +01:00 |
|
spherallic
|
8f2f70aeec
|
Merge branch 'next' into maretimers
|
2024-02-04 22:39:25 +01: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 |
|
Lactozilla
|
0ffcf89c85
|
Merge branch 'next' into more-sprite2
|
2024-01-08 02:55:19 -03: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
|
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
|
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
|
057a3efe7f
|
Merge branch 'next' into fruits-clipper
|
2023-12-31 12:04:16 -05:00 |
|