mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-11-13 06:29:41 +01:00
Code Issues Releases Wiki Activity

Merge branch 'TerryCavanagh:master' into localisation-credits

Browse source
This commit is contained in:
Reese Rivers 2023-11-29 09:39:31 -05:00 committed by GitHub
commit 382d3c9a21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 50 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
desktop_version/fonts/font.fontmeta
View file

@ -39,33 +39,67 @@
<range start="0x21BA" end="0x21C3"/>
<range start="0x21C5" end="0x21C6"/>
<range start="0x21CB" end="0x21CC"/>
<range start="0x2318" end="0x2318"/>
<range start="0x2325" end="0x2325"/>
<range start="0x237C" end="0x237C"/>
<range start="0x23B2" end="0x23B3"/>
<range start="0x23CE" end="0x23CE"/>
<range start="0x23E9" end="0x23EF"/>
<range start="0x23F4" end="0x23FA"/>
<range start="0x2500" end="0x25A2"/>
<range start="0x25B2" end="0x25B3"/>
<range start="0x25B6" end="0x25B7"/>
<range start="0x25BC" end="0x25BD"/>
<range start="0x25C0" end="0x25C1"/>
<range start="0x2605" end="0x2606"/>
<range start="0x2600" end="0x2606"/>
<range start="0x2609" end="0x2609"/>
<range start="0x260E" end="0x260F"/>
<range start="0x261C" end="0x2620"/>
<range start="0x2622" end="0x2623"/>
<range start="0x263A" end="0x263B"/>
<range start="0x2640" end="0x2640"/>
<range start="0x2642" end="0x2642"/>
<range start="0x262E" end="0x262E"/>
<range start="0x263A" end="0x2640"/>
<range start="0x2642" end="0x2653"/>
<range start="0x2660" end="0x2660"/>
<range start="0x2663" end="0x2663"/>
<range start="0x2665" end="0x2666"/>
<range start="0x2669" end="0x266B"/>
<range start="0x2690" end="0x2691"/>
<range start="0x2693" end="0x2693"/>
<range start="0x269B" end="0x269B"/>
<range start="0x26A0" end="0x26A1"/>
<range start="0x26A5" end="0x26A6"/>
<range start="0x26B3" end="0x26B6"/>
<range start="0x26B8" end="0x26B8"/>
<range start="0x26C4" end="0x26C4"/>
<range start="0x26CF" end="0x26CF"/>
<range start="0x26D3" end="0x26D4"/>
<range start="0x26E2" end="0x26E2"/>
<range start="0x26EC" end="0x26EC"/>
<range start="0x26F6" end="0x26F6"/>
<range start="0x26FA" end="0x26FA"/>
<range start="0x2709" end="0x2709"/>
<range start="0x270F" end="0x270F"/>
<range start="0x2713" end="0x2713"/>
<range start="0x274C" end="0x274C"/>
<range start="0x2753" end="0x2753"/>
<range start="0x2962" end="0x296F"/>
<range start="0x2BD3" end="0x2BD3"/>
<range start="0x2E18" end="0x2E18"/>
<range start="0xE0A0" end="0xE0A3"/>
<range start="0xFFFD" end="0xFFFD"/>
<range start="0x1F311" end="0x1F318"/>
<range start="0x1F451" end="0x1F451"/>
<range start="0x1F4BF" end="0x1F4BF"/>
<range start="0x1F700" end="0x1F705"/>
<range start="0x1F707" end="0x1F707"/>
<range start="0x1F709" end="0x1F709"/>
<range start="0x1F70B" end="0x1F70B"/>
<range start="0x1F70D" end="0x1F70D"/>
<range start="0x1F713" end="0x1F716"/>
<range start="0x1F71A" end="0x1F71A"/>
<range start="0x1F728" end="0x1F728"/>
<range start="0x1F741" end="0x1F741"/>
<range start="0x1FA99" end="0x1FA99"/>
</chars>
<special>

BIN
desktop_version/fonts/font.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

4
desktop_version/src/Editor.cpp
View file

@ -180,12 +180,12 @@ editorclass::editorclass(void)
autotile_types["lab_green"] = lab_green_vec;
static const short outside[] = {
2, 0, 2, 0, 1, 2, 1, 2, 2, 0, 2, 2, 2, 2, 1, 2, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0,
2, 0, 2, 0, 1, 2, 1, 2, 2, 0, 2, 2, 1, 2, 1, 2, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0,
0, 2, 2, 2, 2, 2, 0, 2, 0, 1, 2, 1, 2, 2, 0, 2, 0, 1, 2, 1, 2, 0, 0, 2, 0, 2, 2,
2, 2, 0, 0, 0, 0, 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2,
1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 0, 1, 2, 1,
2, 2, 0, 2, 0, 1, 2, 1, 2, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
2, 2, 0, 2, 0, 1, 2, 1, 2, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 2, 0, 2, 2, 2, 2, 2, 0,
2, 0, 1, 2, 1, 2, 2, 0, 2, 0, 1, 2, 1, 2, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 2,
2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 2, 2, 2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 2, 2,

10
desktop_version/src/Graphics.cpp
View file

@ -853,7 +853,6 @@ void Graphics::drawgui(void)
{
int text_yoff;
int yp;
bool opaque;
int font_height = font::height(textboxes[i].print_flags);
if (flipmode)
{
@ -872,7 +871,9 @@ void Graphics::drawgui(void)
char buffer[SCREEN_WIDTH_CHARS + 1];
if (textboxes[i].r == 0 && textboxes[i].g == 0 && textboxes[i].b == 0)
const bool transparent = (textboxes[i].r | textboxes[i].g | textboxes[i].b) == 0;
if (transparent)
{
/* To avoid the outlines for different lines overlapping the text itself,
* first draw all the outlines and then draw the text. */
@ -937,9 +938,10 @@ void Graphics::drawgui(void)
}
}
opaque = textboxes[i].tl >= 1.0;
const bool opaque = textboxes[i].tl >= 1.0;
const bool draw_overlays = opaque || transparent;
if (!opaque)
if (!draw_overlays)
{
continue;
}

27
desktop_version/src/Music.cpp
View file

@ -435,27 +435,12 @@ end:
sample_pos = 0;
stb_vorbis_seek_start(vorbis);
if (!IsHalted())
{
if (SDL_memcmp(&musicVoiceFormat, &format, sizeof(format)) != 0)
{
Halt();
musicVoiceFormat = format;
}
}
Halt();
if (IsHalted())
{
SDL_zero(callbacks);
callbacks.OnBufferStart = &MusicTrack::refillReserve;
callbacks.OnBufferEnd = &MusicTrack::swapBuffers;
FAudio_CreateSourceVoice(faudioctx, &musicVoice, &format, 0, 2.0f, &callbacks, NULL, NULL);
}
else
{
Pause();
FAudioSourceVoice_FlushSourceBuffers(musicVoice);
}
SDL_zero(callbacks);
callbacks.OnBufferStart = &MusicTrack::refillReserve;
callbacks.OnBufferEnd = &MusicTrack::swapBuffers;
FAudio_CreateSourceVoice(faudioctx, &musicVoice, &format, 0, 2.0f, &callbacks, NULL, NULL);
FAudioBuffer faudio_buffer;
SDL_zero(faudio_buffer);
@ -546,7 +531,6 @@ end:
static bool paused;
static FAudioSourceVoice* musicVoice;
static FAudioWaveFormatEx musicVoiceFormat;
static void refillReserve(FAudioVoiceCallback* callback, void* ctx)
{
@ -725,7 +709,6 @@ end:
};
bool MusicTrack::paused = false;
FAudioSourceVoice* MusicTrack::musicVoice = NULL;
FAudioWaveFormatEx MusicTrack::musicVoiceFormat;
musicclass::musicclass(void)
{