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
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
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
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
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
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
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
1dd9f5e110
Merge branch SRB2:next into fireflower-icon
2023-10-25 18:19:26 +00:00
spherallic
52092782f2
Tweak NiGHTS text colors
2023-09-29 00:22:05 +02:00
spherallic
9f2a6cde8a
NiGHTS text changes:
...
- Add lastmaretime to players, used to show time at mare/end results
- Replace textvar numbers with an enum (NTV_)
2023-09-28 22:22:29 +02:00
Hannu Hanhi
a47e1fb272
Merge tag 'SRB2_release_2.2.13' into ogl-palette-rendering-merge13
...
SRB2 release v2.2.13
2023-09-23 19:38:27 +03:00
spherallic
8d14a08cdc
Replace capsule angle checks with arg1 checks
2023-09-23 15:21:44 +02:00
Lactozilla
69df136e2b
Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color
2023-09-12 19:17:07 -03:00
spherallic
6c416c61b1
Final 2.2.12 skincolor changes:
...
- Replaced Mercury & Pumpkin with Ocean & Tangerine
- Renamed Crystal to Siberite & Meteorite to Moonstone
- Tiny tweaks to color ordering and NiGHTS link colors
2023-08-24 13:33:38 +02:00
Gustaf Alhäll
3d14d155e0
Fix segfault when spectating on an Emerald Hunt map
2023-08-12 12:31:59 +02:00
Lactozilla
3377fa986a
Remember the player's color after a team gametype
2023-08-07 13:37:07 -03:00
Mari0shi
84f7b0cf1d
Display HUD Icon for Fire Flower
2023-08-05 09:07:25 -04:00
Sally Coolatta
84e448eb63
Improve handling of team lives labels
...
The lives counter check is now always run, and team name is displayed in its place when its false.
2023-07-24 06:09:50 -04:00
Shane Ellis
a9d0630b15
Add lives check to Team name HUD
2023-07-24 05:18:55 -04:00
spherallic
867a5e0d47
Correct misplaced comment on NiGHTS link colors
2023-06-20 21:48:26 +02:00
spherallic
b97f0a8643
Fix MT_NIGHTSCORE color cycling, using link colors
2023-06-20 20:06:43 +02:00
spherallic
1bd593d173
Use extra colors for very high NiGHTS links, plus:
...
- Replaced Mindaro with Goldenrod
- Changed Topaz, and fixed inconsistency with its placement
- Small tweaks to Kiwi, Seafoam, Noble and Sangria
- Changed other NiGHTS link colors a little (& removed old iterations)
2023-06-20 20:06:43 +02:00
spherallic
7073c3c8d0
Allow input view outside of record attack
2023-06-13 12:10:59 +02:00
sphere
f7af77b932
Merge branch 'netgame-gamedata' into 'next'
...
[SUGOI] Multiplayer emblems
See merge request STJr/SRB2!1756
2023-06-12 22:48:25 +00:00
sphere
65e1f88c75
Merge branch 'nightspowerhud' into 'next'
...
Add HUD icons for timed NiGHTS powerups
See merge request STJr/SRB2!1949
2023-06-09 11:34:25 +00:00
