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
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
Sally Coolatta
8278e621fb
Removed skin->availability
...
Locked skins now are a specific unlockable type, instead of being tied to the skin's properties.
This has plagued custom gamedata since 2.2 launch. It's extremely obnoxious having to set aside random numbers as dummy unlockables just to ensure that Amy Fang & Metal are unlocked from the start in a custom map pack.
Other changes made to accommodate this:
- R_GetSkinAvailabilities is now created from the list of unlockables set to skin type. (1st skin unlockable defined is (1), 2nd skin unlockable defined is (1 << 1), etc...)
- The "Added skin x" print shows up when loading addons but not at all for the base game, because the previous behavior of hiding based on if the skin was locked would now require iterating unlockables, which felt wrong to do during that stage of the loading process
- I noticed in my test wad that Sonic&Tails would give you Sonic&Sonic out if Tails was locked. I fixed that by making both skins required to show the character select option.
Mods that reserved empty dummy unlockables for Amy Fang and Metal won't have to do anything. Mods that wanted to re-lock them behind different requirements will have to update, but in the future they will not have to be in specific slots. Additionally, now Sonic Tails and Knuckles can also be locked for mods.
2021-04-25 07:18:32 -04:00
Monster Iestyn
2aaaddae7c
Fix mistake I made with my previous commit for r_skins.c
2021-03-22 14:17:22 +00:00
Monster Iestyn
571d6c5438
Merge branch 'next' into monster-cleaning-up-again
2021-03-22 13:53:53 +00:00
Shane Ellis
8fa8ca6222
Update r_skins.c
2021-01-15 17:47:26 -05:00
Shane Ellis
edc312066d
Revert "CL_RemovePlayer() - Allow for removal of non-consoleplayer and…"
...
This reverts commit f166af4d8b
2021-01-15 22:01:51 +00:00
Shane Ellis
f166af4d8b
CL_RemovePlayer() - Allow for removal of non-consoleplayer and non-secondaryviewplayer player instances (e.g. bot players)
2021-01-15 17:00:21 -05:00
Shane Ellis
9eeaef2e32
Exception made in R_SkinUsable() for player bot types
2021-01-15 16:55:49 -05:00
katsy
d999e436f1
GETFLAG
2020-12-14 20:23:24 -05:00
James R
75c5c8ba6a
Add missing *individual* skin flags
2020-11-28 02:22:08 -08:00
Monster Iestyn
a38a6a9dc0
Split off actual skin-setting code from SetPlayerSkinByNum so that both SetPlayerSkin and SetPlayerSkinByNum can call it, rather than to each other
2020-11-13 20:49:18 +00:00
lachwright
a78a0071f2
Save changes made to the bot's skin, and display it properly in save select
2020-09-17 19:00:49 +09:30
Steel Titanium
0d48d4c833
WIP: Remove support for DOS
...
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
kaysrishaq
0f9e3554e2
various color fixes
2020-07-12 07:39:52 -04:00
SwitchKaze
b37c73b008
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
James R
673a842043
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-04-09 16:47:52 -07:00
Monster Iestyn
e81ef824d6
Set the "spritename" variable within R_AddSingleSpriteDef rather than externally to it, since R_InstallSpriteLump is the only place it gets used anyway
...
This way we don't have to make it some extern in order for r_skins.c to use it
2020-03-08 19:51:18 +00:00
Monster Iestyn
a67dbfff54
Create r_skins.c/.h, to contain skins code formerly in r_things.c/h
2020-03-08 19:32:07 +00:00
