mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge branch '86Box:master' into master

Browse Source
This commit is contained in:
AITUS95
2025-12-30 20:37:18 +01:00
committed by GitHub
parent 33bd395dc5 b1756b250f
commit b1f8a84c16
4 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
CODE_OF_CONDUCT.md Normal file
View File

@@ -0,0 +1,30 @@
# Code of Conduct
In order for everyone to enjoy their time contributing to 86Box or otherwise being a part of the community, we kindly ask you to review and follow the below rules.
## 1. No illegal activity or GitHub ToS violations
- 1.1. Do not distribute malware for non-research purposes. Post samples in a clearly named encrypted archive.
- 1.2. Posting old software is allowed if at least 10 years old and out of support.
- 1.3. Do not post NSFW content (defined at the staff's discretion).
- 1.4. Do not do anything forbidden by the law or the Discord or GitHub Terms of Service.
## 2. No offensive or disruptive behavior or harassment
- 2.1. No gate-keeping. We aim to accommodate and welcome people of all different opinions and knowledge levels to this community.
- 2.2. You may speak any language but provide a summary in English so that we can understand what you are saying and use English when requested.
- 2.3. Do not retroactively delete messages or do major edits unless you posted something by mistake.
- 2.4. Do not antagonize, defame, demean, blackmail, impersonate, dox others, bring outside drama, use intentionally offensive profile aspects, or otherwise post messages to start a fight (eg. platform wars). Discuss or debate the idea, not the person.
- 2.5. Do not backseat moderate, spam, flood, unsolicitedly ping people, advertise without permission, or evade blocks.
- 2.6. Do not speak on behalf of the project unless you are a team member. This includes all messages which could reasonably be understood as being an official position. Ask a team member if you're unsure about your message.
- 2.7. Decisions by higher-ranked users supersede those by lower-ranked users.
- 2.8. Do not engage in political discussions.
- 2.9. Ignoring essential communication from team members does not exempt you from possible actions against you. Seniority must be earned.
## 3. Moderation and appeal protocol
- 3.1. Rule violations are punished at the team's discretion, taking all circumstances into account.
- 3.2. Rules enforcement must be equal, impartial, and not retroactive or politically motivated.
- 3.3. Everyone is innocent until proven guilty.
- 3.4. Unless there is an emergency, urgent action is otherwise warranted, or a user is participating with the express purpose of violating our rules, the team shall deliberate before taking action in order to reach consensus and avoid team conflicts.
## 4. Do not insist on requests or suggestions
- 4.1. You may politely request something from us; if rejected, you are going to be told why and what to do to have it reconsidered.
- 4.2. Follow the contribution requirements listed on the GitHub readme.
- 4.3. Follow proper procedure (eg. for pull requests or bug reports).

8
src/qt/languages/fi-FI.po
View File

@@ -1,6 +1,6 @@
msgid ""
msgstr ""
"PO-Revision-Date: 2025-12-06 18:56+0000\n"
"PO-Revision-Date: 2025-12-29 09:54+0000\n"
"Last-Translator: Daniel Gurney <daniel@gurney.dev>\n"
"Language-Team: Finnish <https://weblate.86box.net/projects/86box/86box/fi/>\n"
"Language: fi-FI\n"
@@ -211,13 +211,13 @@ msgid "Take s&creenshot"
msgstr "Ota &kuvakaappaus"
msgid "Take &raw screenshot"
msgstr "Ota &raaka kuvakaapus"
msgstr "Ota &raaka kuvakaappaus"
msgid "C&opy screenshot"
msgstr "K&opia kuvakaapaus"
msgstr "K&opioi kuvakaappaus"
msgid "Copy r&aw screenshot"
msgstr "Kopia r&aaka kuvakaapaus"
msgstr "Kopioi r&aaka kuvakaappaus"
msgid "S&ound"
msgstr "&Ääni"

8
src/qt/languages/ru-RU.po
View File

@@ -1,6 +1,6 @@
msgid ""
msgstr ""
"PO-Revision-Date: 2025-12-07 13:33+0000\n"
"PO-Revision-Date: 2025-12-30 13:56+0000\n"
"Last-Translator: Alexander Babikov <lemondrops358@gmail.com>\n"
"Language-Team: Russian <https://weblate.86box.net/projects/86box/86box/ru/>\n"
"Language: ru-RU\n"
@@ -212,13 +212,13 @@ msgid "Take s&creenshot"
msgstr "Сделать с&криншот"
msgid "Take &raw screenshot"
msgstr "Сделать &сырой скриншот"
msgstr "Сделать н&еобработанный скриншот"
msgid "C&opy screenshot"
msgstr "С&копировать скриншот"
msgstr "Ско&пировать скриншот"
msgid "Copy r&aw screenshot"
msgstr "Скопировать с&ырой скриншот"
msgstr "Скопировать необработанный скрин&шот"
msgid "S&ound"
msgstr "&Звук"

93
src/video/vid_ati_mach64.c
View File

@@ -2169,6 +2169,14 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
uint32_t dest_dat;
uint32_t host_dat = 0;
int mix = 0;
int draw_pixel = !(mach64->dst_cntl & DST_POLYGON_EN);
if (mach64->dst_cntl & DST_POLYGON_EN) {
if (mach64->dst_cntl & DST_Y_MAJOR)
draw_pixel = 1;
else if (mach64->accel.err >= 0)
draw_pixel = 1;
}
if (mach64->accel.source_host) {
host_dat = cpu_dat;
@@ -2215,7 +2223,7 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
break;
}
if ((mach64->accel.dst_x >= mach64->accel.sc_left) && (mach64->accel.dst_x <= mach64->accel.sc_right) && (mach64->accel.dst_y >= mach64->accel.sc_top) && (mach64->accel.dst_y <= mach64->accel.sc_bottom)) {
if ((mach64->accel.dst_x >= mach64->accel.sc_left) && (mach64->accel.dst_x <= mach64->accel.sc_right) && (mach64->accel.dst_y >= mach64->accel.sc_top) && (mach64->accel.dst_y <= mach64->accel.sc_bottom) && draw_pixel) {
switch (mix ? mach64->accel.source_fg : mach64->accel.source_bg) {
case SRC_HOST:
src_dat = host_dat;
@@ -2285,17 +2293,21 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
if (mach64->dst_cntl & DST_Y_MAJOR) {
mach64->accel.dst_y += mach64->accel.yinc;
mach64->accel.src_y += mach64->accel.yinc;
if (mach64->accel.err >= 0) {
mach64->accel.err += mach64->dst_bres_dec;
mach64->accel.dst_x += mach64->accel.xinc;
mach64->accel.src_x += mach64->accel.xinc;
} else {
mach64->accel.err += mach64->dst_bres_inc;
}
} else {
mach64->accel.dst_x += mach64->accel.xinc;
mach64->accel.src_x += mach64->accel.xinc;
if (mach64->accel.err >= 0) {
mach64->accel.err += mach64->dst_bres_dec;
mach64->accel.dst_y += mach64->accel.yinc;
mach64->accel.src_y += mach64->accel.yinc;
} else {
mach64->accel.err += mach64->dst_bres_inc;
}
@@ -2347,9 +2359,7 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
if (mach64->dst_cntl & DST_POLYGON_EN) {
if (mach64->dst_cntl & DST_Y_MAJOR)
draw_pixel = 1;
else if ((mach64->dst_cntl & DST_X_DIR) && mach64->accel.err < (mach64->dst_bres_dec + mach64->dst_bres_inc)) /*X+*/
draw_pixel = 1;
else if (!(mach64->dst_cntl & DST_X_DIR) && mach64->accel.err >= 0) /*X-*/
else if (mach64->accel.err >= 0)
draw_pixel = 1;
}
@@ -2406,62 +2416,27 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
return;
}
switch (mach64->dst_cntl & 7) {
case 0:
case 2:
mach64->accel.src_x--;
mach64->accel.dst_x--;
break;
case 1:
case 3:
mach64->accel.src_x++;
mach64->accel.dst_x++;
break;
case 4:
case 5:
mach64->accel.src_y--;
mach64->accel.dst_y--;
break;
case 6:
case 7:
mach64->accel.src_y++;
mach64->accel.dst_y++;
break;
default:
break;
}
mach64_log("x %i y %i err %i inc %i dec %i\n", mach64->accel.dst_x, mach64->accel.dst_y, mach64->accel.err, mach64->dst_bres_inc, mach64->dst_bres_dec);
if (mach64->accel.err >= 0) {
mach64->accel.err += mach64->dst_bres_dec;
switch (mach64->dst_cntl & 7) {
case 0:
case 1:
mach64->accel.src_y--;
mach64->accel.dst_y--;
break;
case 2:
case 3:
mach64->accel.src_y++;
mach64->accel.dst_y++;
break;
case 4:
case 6:
mach64->accel.src_x--;
mach64->accel.dst_x--;
break;
case 5:
case 7:
mach64->accel.src_x++;
mach64->accel.dst_x++;
break;
default:
break;
if (mach64->dst_cntl & DST_Y_MAJOR) {
mach64->accel.dst_y += mach64->accel.yinc;
mach64->accel.src_y += mach64->accel.yinc;
if (mach64->accel.err >= 0) {
mach64->accel.err += mach64->dst_bres_dec;
mach64->accel.dst_x += mach64->accel.xinc;
mach64->accel.src_x += mach64->accel.xinc;
} else {
mach64->accel.err += mach64->dst_bres_inc;
}
} else
mach64->accel.err += mach64->dst_bres_inc;
} else {
mach64->accel.dst_x += mach64->accel.xinc;
mach64->accel.src_x += mach64->accel.xinc;
if (mach64->accel.err >= 0) {
mach64->accel.err += mach64->dst_bres_dec;
mach64->accel.dst_y += mach64->accel.yinc;
mach64->accel.src_y += mach64->accel.yinc;
} else {
mach64->accel.err += mach64->dst_bres_inc;
}
}
}
}
break;