stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-26 03:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
16139 commits 174 branches 42 tags 303 MiB
Commit graph

1612 commits

Author SHA1 Message Date
Lactozilla
5b2f3df8a6 Merge branch 'public_next' into 2214 2024-12-18 19:00:21 -03:00
Lactozilla
5fd606ead3 Fix #1324 2024-12-13 15:18:27 -03:00
Eidolon
aabf8ae54e Merge branch 'next' of git.do.srb2.org:STJr/SRB2 into 2214 2024-10-16 17:43:38 -05:00
Lactozilla
e7b4beba20 Update dates in copyright notices of all files modified in 2024 2024-09-21 21:35:01 -03:00
spherallic
5c4b9bf8c7 Fix build error 2024-08-25 21:59:52 +02:00
spherallic
a9d7da6003 Restore super transformation conditions 2024-08-13 14:43:24 +02:00
sphere
63fd343a97 Merge branch 'fix-cr_player-positioning' into 'next' 
Fix CR_PLAYER interpolation in reverse gravity

See merge request STJr/SRB2!2423
 2024-07-01 14:14:37 +00:00
spherallic
d47a95e9ba Fix #1230 2024-06-24 23:51:03 +02:00
sphere
bf37b29d83 Merge branch 'mobj-alpha' into 'next' 
Add 'alpha' field to objects

See merge request STJr/SRB2!2382
 2024-06-24 21:18:10 +00:00
sphere
bba2eed0aa Merge branch 'ulse' into 'next' 
Fix tiny spindash math moment

See merge request STJr/SRB2!2421
 2024-06-03 14:36:20 +00:00
pastel
b0d5828e79 Fix tiny spindash math moment 2024-06-03 14:36:20 +00:00
sphere
3ef5d14e3a Merge branch 'issue1062' into 'next' 
Don't change drawangle while riding on a fan

Closes #1062

See merge request STJr/SRB2!2371
 2024-06-03 13:12:38 +00:00
SSNTails
b453e6732d pastel's ideas #2 2024-05-29 21:43:09 -04:00
SSNTails
bd8684e3e0 pastel's ideas 2024-05-29 21:42:05 -04:00
SSNTails
53c6e65fd2 Merge branch 'issue1062' of https://git.do.srb2.org/SSNTails/SRB2 into issue1062 2024-05-29 21:18:42 -04:00
SSNTails
19736fa55e possibly more valid...? 2024-05-29 21:18:36 -04:00
SSNTails
5fe927038c Merge branch SRB2:next into issue1062 2024-05-29 21:42:28 +00:00
SSNTails
a2bba687ba Don't break automatic mode. 2024-05-29 17:19:49 -04:00
Zwip-Zwap Zapony
723b5662ef Fix CR_PLAYER/CR_PTERABYTE positioning 2024-04-18 20:15:30 +02:00
MIDIMan
0062c9fd59 Merge branch SRB2:next into mobj-alpha 2024-04-02 14:12:11 +00:00
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
SSNTails
a58d9036bc Restore MF2_OBJECTFLIP/MFE_VERTICALFLIP on rollout rock disconnect 2024-03-15 14:28:44 -04: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
MIDIMan
8fb5f88f89 Merge branch SRB2:next into mobj-alpha 2024-03-11 00:03:44 +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
MIDIMan
29378e7f94 Merge branch SRB2:next into mobj-alpha 2024-03-06 02:26:50 +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
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
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
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
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