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

68 commits

Author SHA1 Message Date
Lactozilla
e7b4beba20 Update dates in copyright notices of all files modified in 2024 2024-09-21 21:35:01 -03:00
Lactozilla
bd641c3857 Fix #1263 2024-06-02 21:40:14 -03:00
katsy
509df21f25 Fix backwards compat for SPR2 Super (resolves #1225) 2024-05-14 02:07:11 +00:00
LJ Sonic
99a9e5fcc9 Add support for LongSprites/ folder 2024-03-15 21:22:12 +01: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
spherallic
dbc1fe8c0e Merge branch 'next' into more-sprite2 2024-02-27 12:23:14 +01:00
Logan Aerl Arias
cf5520b275 Merge branch SRB2:next into instant-setscale 2024-02-17 03:25:41 +00:00
Lactozilla
970a9d65dd Merge branch 'next' into more-sprite2 2024-01-13 03:43:34 -03:00
sphere
4ae2482283 Merge branch 'character-nightsattack' into 'next' 
Draw Character in NiGHTS Attack

See merge request STJr/SRB2!2175
 2024-01-11 12:11:54 +00:00
Mari0shi
5a2a24b868 Draw Character in NiGHTS Attack 2024-01-11 12:11:54 +00:00
Zwip-Zwap Zapony
564d18b1ea Add and use an "instant" parameter for P_SetScale 2024-01-03 14:04:40 +01:00
Lactozilla
7fbd8f7025 Merge branch 'next' into more-sprite2 2024-01-02 22:09:17 -03:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05:00
Lactozilla
70e9e2bdb0 Merge branch 'next' into more-sprite2 2023-12-27 23:48:20 -03:00
Gustaf Alhäll
ddba6e80f7
Handle player state is P_MobjSetState 2023-12-23 13:45:16 +01:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Lactozilla
f0bb1a4ab6 Add some comments 2023-11-13 14:08:08 -03:00
Lactozilla
a60c55e866 Refactor this code into P_ApplySuperFlagToSprite2 2023-11-13 13:24:18 -03:00
Lactozilla
0f0ee4d156 Fix P_GetStateSprite2 2023-11-12 22:52:17 -03:00
Lactozilla
4408f4462e Add 'sprite2' field to states 2023-11-12 21:46:49 -03:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
Lactozilla
69df136e2b Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color 2023-09-12 19:17:07 -03:00
katsy
d8d352a11a fix some issues with supername code 2023-08-22 15:11:47 -05:00
sphere
32a40e3dbe Merge branch 'alphabetsoup' into 'next' 
Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen

See merge request STJr/SRB2!1642
 2023-08-20 17:29:03 +00:00
katsy
1a0d9eab79 Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen 2023-08-20 17:29:03 +00:00
Lactozilla
976b9b862d Restore player skins if forced skin restrictions are lifted 2023-08-15 13:51:12 -03:00
Lactozilla
062af20628 Don't change cv_skin or cv_playercolor if there is no need to 2023-08-15 04:29:50 -03:00
sphere
860767aa65 Merge branch 'increasemaxunlockables' into 'next' 
Increase maximum unlockables

Closes #770

See merge request STJr/SRB2!1988
 2023-07-14 22:47:37 +00:00
Gustaf Alhäll
8d8257b4a6
Handle missing frames for sprite gracefully 2023-07-06 19:12:29 +02:00
spherallic
1cc870485d Increase unlockable limits: 
- MAXUNLOCKABLES from 32 to 80
- MAXEXTRAEMBLEMS from 16 to 48
- COMPAT_GAMEDATA_ID is used to account for the old values to prevent
losing records.
- Also fixes linedef actions 319/320.
 2023-06-13 01:53:50 +02:00
Sally Coolatta
49fa46d80e Online emblems 
Currently, emblems share with everyone. Will add an option to toggle this.
 2023-06-02 16:06:43 -04:00
MascaraSnake
55d96daa28 Merge branch 'refresh-spr2' into 'next' 
[SUGOI] Refresh Sprite2s

See merge request STJr/SRB2!1750
 2023-05-24 05:04:31 +00:00
MascaraSnake
8486bd083a R_SkinUsable: Only check header of current map if one exists 2023-04-11 19:13:30 +02:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
Alam Ed Arias
7e0fa2d34c Cleanup whitespace changes from SRB2_release_2.2.9 2022-11-11 21:19:25 -05:00
Sally Coolatta
c0a2d31a22 Merge remote-tracking branch 'upstream/2210-release' into refresh-spr2 2022-03-07 13:09:06 -05:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
Sally Coolatta
f7b166da07 Refresh sprite2s 
Allows for custom characters to be loaded first, then a wad that adds a custom sprite2, and the custom character's sprite2s won't be discarded.
 2022-02-27 07:56:45 -05:00
Jaime Ita Passos
1a84f1bcba Minor changes and fixes 2021-08-10 15:17:22 -03:00
Jaime Ita Passos
2aa9bb59ef Memory management fixes 
Date:      Mon Aug 9 15:57:07 2021 -0300
 2021-08-09 15:57:35 -03:00
lachablock
f9723a567c Merge remote-tracking branch 'origin/next' into raise-skin-limit 2021-08-09 14:19:09 +10:00
CobaltBW
1c3a898bbb Fixed locked characters being visible in multiplayer select screen 2021-07-15 12:53:13 -07:00
CobaltBW
c3fa9bea0f ri# mified: src/tazx# mofied: src/tazx# modified: src/tazx# modified: src/tazxc 2021-06-29 14:07:49 -07:00
Shane Ellis
18c47afc76 Merge branch 'next' into 'addplayer' 
# Conflicts:
#   src/lua_baselib.c
#   src/r_skins.c
 2021-06-02 11:47:11 -04:00
SteelT
a72d6bba22 Merge branch 'skin-unlocks-sanity' into 'next' 
[SUGOI] Remove skin->availability, add SECRET_SKIN

See merge request STJr/SRB2!1474
 2021-05-28 21:30:16 -04:00
Steel Titanium
a2667f4dc9 Merge branch 'master' into next 2021-05-11 20:08:44 -04:00
Sally Coolatta
5d93f86499 Merge branch 'next' into skin-unlocks-sanity 2021-05-08 12:55:46 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Sally Coolatta
92107f28d5 Add string variable for unlockables and emblems 
Skin unlockables / skin emblems are now checked at runtime to see if there's any matches.
 2021-04-25 17:54:47 -04:00
Sally Coolatta
f0b9e0e415 Default to first usable skin instead of 0, I_Error if none are usable 2021-04-25 16:38:33 -04:00