mirror of
https://github.com/CookiePLMonster/SilentPatch.git
synced 2025-01-01 16:53:01 +05:00
Merge branch 'master' into dev
This commit is contained in:
commit
02f7063535
2 changed files with 2 additions and 2 deletions
|
@ -700,7 +700,7 @@ CRGBA* CRGBA::BlendGangColour_Dynamic(uint8_t r, uint8_t g, uint8_t b, uint8_t a
|
||||||
{
|
{
|
||||||
return BlendGangColour(r, g, b, a);
|
return BlendGangColour(r, g, b, a);
|
||||||
}
|
}
|
||||||
*this = HudColour[3];
|
*this = CRGBA(HudColour[3], a);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<SILENTPATCH_EXT>.asi</SILENTPATCH_EXT>
|
<SILENTPATCH_EXT>.asi</SILENTPATCH_EXT>
|
||||||
<SILENTPATCH_FULL_NAME>SilentPatch for San Andreas</SILENTPATCH_FULL_NAME>
|
<SILENTPATCH_FULL_NAME>SilentPatch for San Andreas</SILENTPATCH_FULL_NAME>
|
||||||
<SILENTPATCH_REVISION_ID>29</SILENTPATCH_REVISION_ID>
|
<SILENTPATCH_REVISION_ID>29</SILENTPATCH_REVISION_ID>
|
||||||
<SILENTPATCH_BUILD_ID>1</SILENTPATCH_BUILD_ID>
|
<SILENTPATCH_BUILD_ID>2</SILENTPATCH_BUILD_ID>
|
||||||
<SILENTPATCH_COPYRIGHT>2014-2018</SILENTPATCH_COPYRIGHT>
|
<SILENTPATCH_COPYRIGHT>2014-2018</SILENTPATCH_COPYRIGHT>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup />
|
<PropertyGroup />
|
||||||
|
|
Loading…
Reference in a new issue