sphere
|
620f1e55aa
|
Merge branch 'mpss-extratime' into 'next'
Make Extra Time powerup work in old-style special stages
See merge request STJr/SRB2!2292
|
2024-03-21 15:49:12 +00:00 |
|
sphere
|
31367e3e07
|
Merge branch 'mpss-mixnightscountdown' into 'next'
Support LF_MIXNIGHTSCOUNTDOWN for old-style special stages
See merge request STJr/SRB2!2291
|
2024-03-21 15:49:10 +00:00 |
|
sphere
|
7aa8477443
|
Merge branch 'fix-time-old-special-softlock' into 'next'
Fix softlock on old special stages when running out of time due to being hit
See merge request STJr/SRB2!2398
|
2024-03-21 15:46:26 +00:00 |
|
Alam Ed Arias
|
95457b8fe0
|
Fix stringop-truncation warnings for Debian Bookworm builds
|
2024-03-21 11:03:05 -04:00 |
|
Hanicef
|
d00c6a8ab9
|
Fix softlock on old special stages when running out of time due to being hit
|
2024-03-20 22:49:12 +01:00 |
|
sphere
|
940756ad62
|
Merge branch 'fix-1219' into 'next'
Fix #1219
Closes #1219
See merge request STJr/SRB2!2391
|
2024-03-14 11:41:13 +00:00 |
|
Lactozilla
|
7469a6271b
|
Fix #1219
|
2024-03-14 00:59:49 -03:00 |
|
sphere
|
4018a7fa0f
|
Merge branch 'udmf-nophysicsequation' into 'next'
Add sector flags to disable equation slope physics
See merge request STJr/SRB2!2028
|
2024-03-13 17:38:45 +00:00 |
|
sphere
|
70626a683f
|
Add sector flags to disable equation slope physics
|
2024-03-13 17:38:45 +00:00 |
|
spherallic
|
0f9ed1b822
|
Write colormap alpha to textmap in old range, for now
|
2024-03-13 14:57:37 +01:00 |
|
sphere
|
dedd80a0f0
|
Merge branch 'issue1195' into 'next'
Issue #1195 - Standing at a corner under steam, but far away enough to not be...
See merge request STJr/SRB2!2318
|
2024-03-13 13:49:49 +00:00 |
|
sphere
|
b750876f7e
|
Merge branch 'issue1150d' into 'next'
Fix Issue #1150 plus some small refactoring
See merge request STJr/SRB2!2357
|
2024-03-13 13:32:11 +00:00 |
|
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
|
fcd4c8334c
|
Merge branch 'playersetup-and-continue-lua' into 'next'
Add "continue" and "playersetup" Lua HUD hooks & draw followitems in the Player Setup menu
See merge request STJr/SRB2!2227
|
2024-03-13 11:11:36 +00:00 |
|
sphere
|
3aad3713cb
|
Merge branch 'fix-fang-death' into 'next'
Fix Fang's death sequence
See merge request STJr/SRB2!2388
|
2024-03-11 13:02:43 +00:00 |
|
MIDIMan
|
22d7f392d0
|
Move some stuff around in P_DoBoss5Death
|
2024-03-10 19:34:21 -04:00 |
|
MIDIMan
|
f354c0b2ea
|
Fix Fang's death sequence
|
2024-03-10 10:44:08 -04:00 |
|
sphere
|
df18cc0960
|
Merge branch 'font_drawer' into 'next'
Refactor string drawing functions
See merge request STJr/SRB2!1726
|
2024-03-10 12:48:59 +00:00 |
|
spherallic
|
31e58f1156
|
Rewrite aligned string drawing, using a modified version of strtok
|
2024-03-09 18:08:02 +01:00 |
|
spherallic
|
444cfc180f
|
Use alignment enum for drawing aligned font strings
|
2024-03-08 00:39:53 +01:00 |
|
spherallic
|
02f31a4922
|
Add character width to font definitions
Used for V_MONOSPACE and V_OLDSPACING instead of spacewidth*2
|
2024-03-07 21:36:59 +01:00 |
|
sphere
|
33a1776f97
|
Merge branch 'issue1211' into 'next'
Fixes Issue #1211 - cut the amplitude on OpenGL water wave effect
See merge request STJr/SRB2!2381
|
2024-03-07 12:50:14 +00:00 |
|
sphere
|
6adfe7a829
|
Merge branch 'forceshieldhp' into 'next'
Show extra Force Shield hits using text instead of stacking more icons
See merge request STJr/SRB2!2378
|
2024-03-07 12:22:35 +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
|
3c0761f8fe
|
Merge branch 'fix-players-idle-kick-cutscene' into 'next'
Fix players getting kicked by auto-kick during cutscenes
See merge request STJr/SRB2!2384
|
2024-03-07 12:08:13 +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 |
|
Logan Aerl Arias
|
084f7bc4f7
|
Merge branch SRB2:next into playersetup-and-continue-lua
|
2024-03-04 17:21:26 +00:00 |
|
spherallic
|
fdb23298f6
|
fix spacing that gitlab freaked out over
|
2024-03-04 15:25:25 +01: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 |
|
sphere
|
cf7adfc8ac
|
Merge branch 'fix-missing-hud-entry' into 'next'
Fix missing HUD item for Lua
See merge request STJr/SRB2!2383
|
2024-03-04 13:49:28 +00:00 |
|
Logan Aerl Arias
|
8cb18088b5
|
Merge branch SRB2:next into issue1150d
|
2024-03-04 13:35:11 +00:00 |
|
Logan Aerl Arias
|
33940e46bf
|
Merge branch 'remove-opengl-chromakey' into 'next'
Make the display of palette index 255 consistent between renderers
Closes #405
See merge request STJr/SRB2!2351
|
2024-03-04 13:31:23 +00:00 |
|
Logan Aerl Arias
|
f4b862068c
|
Merge branch 'texture-scaling-fixes' into 'next'
Fix various issues related to texture scaling
See merge request STJr/SRB2!2329
|
2024-03-04 13:30:11 +00:00 |
|
Logan Aerl Arias
|
4aee720bce
|
Merge branch 'issue1188' into 'next'
Fix #1188
Closes #1188
See merge request STJr/SRB2!2354
|
2024-03-03 23:55:18 +00:00 |
|
Logan Aerl Arias
|
add091bac4
|
Merge branch 'substitute-null-with-ray' into 'next'
Substitute MT_NULL with MT_RAY in Lua
See merge request STJr/SRB2!2302
|
2024-03-03 23:39:49 +00:00 |
|
Logan Aerl Arias
|
bcc0eb39ea
|
Merge branch 'remove-NOPNG' into 'next'
if PNG graphics support is removed, it is not netplay compatible
See merge request STJr/SRB2!2260
|
2024-03-03 23:37:53 +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
|
55a7afde52
|
Merge branch 'instant-setscale' into 'next'
Add and use an "instant" parameter for P_SetScale
Closes #1120
See merge request STJr/SRB2!2167
|
2024-03-03 23:04:55 +00:00 |
|
Logan Aerl Arias
|
48ead1ae81
|
Merge branch 'fix-it-cv-string-console-block' into 'next'
Fix console not being blocked by IT_CV_STRING
See merge request STJr/SRB2!2304
|
2024-03-03 22:46:54 +00:00 |
|
Logan Aerl Arias
|
14d640a385
|
Merge branch 'shield-gamepad-defaults' into 'next'
New Post-Shield-Button Gamepad Defaults
See merge request STJr/SRB2!2258
|
2024-03-03 17:42:22 +00:00 |
|
Logan Aerl Arias
|
3b205e10b1
|
Merge branch SRB2:next into issue1150d
|
2024-03-03 17:23:16 +00:00 |
|
Logan Aerl Arias
|
e147ca30b9
|
Merge branch SRB2:next into issue1188
|
2024-03-03 17:22:51 +00:00 |
|
Logan Aerl Arias
|
2fe684351e
|
Merge branch 'next' into remove-opengl-chromakey
|
2024-03-03 12:22:08 -05:00 |
|
Logan Aerl Arias
|
7fbdd02087
|
Merge branch 'next' into texture-scaling-fixes
|
2024-03-03 12:21:20 -05:00 |
|
Logan Aerl Arias
|
e5cb182662
|
Merge branch SRB2:next into fix-it-cv-string-console-block
|
2024-03-03 17:20:04 +00:00 |
|
Logan Aerl Arias
|
7f68a72755
|
Merge branch SRB2:next into substitute-null-with-ray
|
2024-03-03 17:19:37 +00:00 |
|
Logan Aerl Arias
|
f372f07bf4
|
libpng for everyone
zlib and libpng are now always needed
|
2024-03-03 12:15:12 -05:00 |
|