stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
15737 commits 171 branches 41 tags 312 MiB
Commit graph

408 commits

Author SHA1 Message Date
Lactozilla
4502e67f0f Ignore flats when loading patches 2024-05-20 02:48:38 -03: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
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
444cfc180f Use alignment enum for drawing aligned font strings 2024-03-08 00:39:53 +01: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
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
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
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
sphere
9b809fec6b Merge branch 'disable-powerup-hud' into 'next' 
Make powerups HUD toggleable via Lua (again)

See merge request STJr/SRB2!2234
 2024-02-27 12:05:36 +00:00
spherallic
dbc1fe8c0e Merge branch 'next' into more-sprite2 2024-02-27 12:23:14 +01:00
spherallic
e03b4c3e7e Cleanup as per ZZZ's suggestion 2024-02-26 17:15:52 +01:00
spherallic
a8a8103ab2 Show extra Force Shield hits using text instead of stacking more icons 2024-02-26 14:43:16 +01:00
sphere
553240f7c2 Merge branch 'showinput' into 'next' 
Allow input view outside of record attack

See merge request STJr/SRB2!2020
 2024-02-25 14:16:44 +00:00
spherallic
73b90d13eb Merge branch 'next' into font_drawer 2024-02-25 00:58:04 +01:00
Lactozilla
0664671c57 Merge branch 'next' into delete-unused-render-code 2024-02-24 14:02:33 -03:00
Logan Aerl Arias
d7086168b8 Merge branch 'next' into fruits-clipper 2024-02-24 11:18:12 -05:00
Zwip-Zwap Zapony
90958614f3 Shield button touchups 2024-02-24 15:41:36 +01:00
Logan Aerl Arias
4d5ed85784 Merge branch 'fix-missing-mobjwasremoved-checks' into 'next' 
Fix various segfaults caused by missing P_MobjWasRemoved checks

See merge request STJr/SRB2!2052
 2024-02-24 03:37:57 +00:00
Lactozilla
5a46f12c62 Merge branch 'next' into delete-unused-render-code 2024-02-19 19:20:48 -03:00
Lactozilla
07656de1d2 Delete old and unused rendering-related code 
- Deleted view border code
- Deleted highcolor code
- Deleted pre-NEWCLIP code
- Deleted ylookup and columnofs
- Deleted the last remnants of con_clipviewtop and dc_hires
 2024-02-18 22:11:22 -03:00
Logan Aerl Arias
b3c3a45a6c Merge branch SRB2:next into fix-missing-mobjwasremoved-checks 2024-02-18 22:56:44 +00:00
spherallic
03c138b782 Merge branch 'next' into font_drawer 2024-02-18 17:43:39 +01:00
Logan Aerl Arias
6763aaefff Merge branch 'next' into ogl-palette-rendering 2024-02-17 19:06:18 -05:00
spherallic
f4588d50b0 Merge branch 'next' into fruits-clipper 2024-02-13 19:14:26 +01:00
Logan Aerl Arias
bf9904cfc2 Merge branch 'fireflower-icon' into 'next' 
Display power-up icon for Fire Flower

See merge request STJr/SRB2!2097
 2024-02-12 05:04:57 +00:00
Gustaf Alhäll
1a53971c39 Fix various segfaults caused by missing P_MobjWasRemoved checks 2024-02-09 19:39:20 +01:00
spherallic
16b28d177e Merge branch 'next' into showinput 2024-02-08 23:09:09 +01:00
spherallic
243fdd1a82 Merge branch 'next' into fruits-clipper 2024-02-04 22:43:48 +01:00
sphere
c91fc082f9 Merge branch 'oldspecnightsrecordsfix' into 'next' 
Fix hud_nightsrecords in old (multiplayer) special stages

See merge request STJr/SRB2!2191
 2024-02-04 21:35:36 +00:00
MIDIMan
5bbc1e323a Merge branch SRB2:next into disable-powerup-hud 2024-01-31 19:34:05 +00: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
MIDIMan
ccb2785c44 Merge branch SRB2:next into disable-powerup-hud 2024-01-28 17:27:32 +00:00
Lactozilla
7fbd8f7025 Merge branch 'next' into more-sprite2 2024-01-02 22:09:17 -03:00
Logan Aerl Arias
10b3c58a3d Merge branch SRB2:next into ogl-palette-rendering 2024-01-02 00:00:11 +00:00
Logan Aerl Arias
4523364a40 Merge branch 'next' into ogl-palette-rendering 2024-01-01 18:22:35 -05:00
Logan Aerl Arias
057a3efe7f Merge branch 'next' into fruits-clipper 2023-12-31 12:04:16 -05:00
Logan Aerl Arias
c409b69dec Merge branch SRB2:next into fireflower-icon 2023-12-31 16:53:11 +00:00
Zwip-Zwap Zapony
c361b732db General NiGHTS fixes 2023-12-29 16:04:03 +01:00
MIDIMan
408021b9f5 Change hud_powerup to hud_powerups for consistency 2023-12-08 09:27:57 -05:00
MIDIMan
3888bf95f2 Make powerup HUD disableable via Lua 2023-12-07 17:56:16 -05:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Lactozilla
4408f4462e Add 'sprite2' field to states 2023-11-12 21:46:49 -03:00
sdasdas
d73ed99703 check for hud_nightsrecords in old special stages 2023-10-31 22:06:22 +03:00
Zwip-Zwap Zapony
cd6cd53959 Combine vid.dupx and vid.dupy 2023-10-30 04:38:51 +00:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
Alam Ed Arias
4b0792de2b Update st_stuff.c 
Correct typos
 2023-10-26 13:12:09 +00:00
Alam Ed Arias
244cca8e9d Merge branch 'master' into font_drawer 2023-10-25 15:06:35 -04:00
Alam Ed Arias
1dd9f5e110 Merge branch SRB2:next into fireflower-icon 2023-10-25 18:19:26 +00:00