Commit graph

15656 commits

Author SHA1 Message Date
LJ Sonic
f6cb5d563c Only log sprite and frame additions when at least one was added 2024-03-17 00:40:29 +01:00
LJ Sonic
0f6f6afb44 Fix sprite and frame addition logging 2024-03-17 00:28:25 +01:00
LJ Sonic
761a972927 Fix R_AddSingleSpriteDef for short sprite names 2024-03-17 00:27:19 +01:00
LJ Sonic
4ebda932bb Cleanup 2024-03-16 19:36:18 +01:00
LJ Sonic
7371566592 Fix error message for too long sprite names 2024-03-16 19:35:56 +01:00
LJ Sonic
dc3436df78 Fix compiler warnings 2024-03-16 18:54:10 +01:00
LJ Sonic
9b6c642345 Fix infinite loop 2024-03-16 18:13:43 +01:00
LJ Sonic
a0c253f81e Fix invalid syntax 2024-03-16 17:49:34 +01:00
LJ Sonic
de8a4bb3e1 Fix compiler warnings 2024-03-16 17:21:35 +01:00
LJ Sonic
a6b71826f9 Use R_GetSpriteNumByName everywhere 2024-03-16 17:00:59 +01:00
LJ Sonic
45d54c38f7 Use bitarray_t for used_spr 2024-03-16 16:26:33 +01:00
LJ Sonic
b3844a9ca5 Cleanup initfreeslots() 2024-03-16 16:14:52 +01:00
LJ Sonic
178d29cf0c Allow up to 256 frames per sprite 2024-03-16 00:51:23 +01:00
LJ Sonic
99a9e5fcc9 Add support for LongSprites/ folder 2024-03-15 21:22:12 +01:00
LJ Sonic
42c610af9c Fix GetFramesAndRotationsFromShortLumpName 2024-03-15 21:02:41 +01:00
LJ Sonic
33f176fd5b Refactor R_AddSingleSpriteDef 2024-03-15 20:15:38 +01:00
LJ Sonic
837c3a7be3 Refactor R_AddSingleSpriteDef 2024-03-15 20:06:21 +01:00
LJ Sonic
1c415749f7 Refactor R_AddSpriteDefs 2024-03-15 15:45:35 +01:00
LJ Sonic
092ac6643e Allow sprite names with up to 64 characters 2024-03-14 20:32:10 +01:00
LJ Sonic
8073b8b3f0 Fix rare Lua bug when updating a SPR_ constant 2024-03-14 20:20:12 +01:00
LJ Sonic
9ca5ce01f1 No longer store wadnum in sprnames 2024-03-14 13:56:47 +01: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