stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 05:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
16008 commits 173 branches 41 tags 182 MiB
Commit graph

16008 commits

This branch
This branch
All branches
Author SHA1 Message Date
SSNTails
8e43f0a46e Merge branch SRB2:next into issue1133 2024-03-16 14:38:00 +00:00
SSNTails
b4ad054422 Zwip Zwap Zapony's suggestions 2024-03-16 10:28:49 -04:00
LJ Sonic
178d29cf0c Allow up to 256 frames per sprite 2024-03-16 00:51:23 +01:00
SSNTails
2181dadb4c Checking MFE_VERTICALFLIP matching is actually redundant.. 2024-03-15 16:39:37 -04:00
Hanicef
01b017019b Fix spectator list not compensating for non-green resolutions 2024-03-15 21:35:28 +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
SSNTails
a58d9036bc Restore MF2_OBJECTFLIP/MFE_VERTICALFLIP on rollout rock disconnect 2024-03-15 14:28:44 -04: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
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
e44c751187 Fix #1215 2024-03-14 04:13:09 -03:00
Lactozilla
7469a6271b Fix #1219 2024-03-14 00:59:49 -03:00
BarrelsOFun
cfc23648f5 Transform FlingRing instead of spawning new Ring 2024-03-13 19:58:24 -07:00
SSNTails
34cf7c1a01 I don't think flipping the flag here is even needed... 2024-03-13 18:08:07 -04: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
spherallic
8dce0e1a3f Prevent white flash upon starting the game (in Software) 2024-03-12 17:29:08 +01:00
spherallic
373e23dd90 Merge branch 'next' into quick-intro 2024-03-12 17:19:36 +01: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
8fb5f88f89 Merge branch SRB2:next into mobj-alpha 2024-03-11 00:03:44 +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
Hanicef
7d3c0ca301 Fix finished players getting kicked for idling 2024-03-09 23:57:11 +01:00
Hanicef
7e3f6a2803 Add variable to move idle players to spectators 2024-03-09 23:54:52 +01: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
MIDIMan
29378e7f94 Merge branch SRB2:next into mobj-alpha 2024-03-06 02:26:50 +00:00
Hanicef
51e912e87b Fix segfault when passing NULL as player 2024-03-05 18:29:07 +01:00
Hanicef
b3aa23bc21 Remove unused variable 2024-03-05 18:23:23 +01:00
Hanicef
259997d121 Remove varargs from P_SpawnMobjFromMobj 2024-03-05 18:23:22 +01:00
Hanicef
02811b72f6 Fix segfault when trying to spawn an MT_PLAYER from Lua 2024-03-05 18:22:27 +01:00
Logan Aerl Arias
d2a068d158 Merge branch SRB2:next into issue1040 2024-03-04 17:21:35 +00:00