Skip to content

Commit

Permalink
Update Zictionary scene + Small change in Vietnamese translation (#935)
Browse files Browse the repository at this point in the history
* Squashed commit of the following:

commit f506270
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sat Aug 5 09:49:59 2023 +0700

    Change icon in dict.lua

commit 1f7da06
Merge: b212fff 7be2aa5
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Fri Aug 4 18:14:29 2023 +0700

    Merge https://github.com/26F-Studio/Techmino into VietnameseTranslation

commit 7be2aa5
Author: C₂₉H₂₅N₃O₅ <[email protected]>
Date:   Fri Aug 4 18:40:12 2023 +0800

    Font & Virtual Key Update (#932)

    - Changed the main font to Exo2
    - Changed the monospaced font to League Mono
    - Changed the virtual key design to increase legibility and match the font
    - Added a few symbols

commit ed9417d
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Thu Aug 3 22:57:06 2023 +0700

    Reupdate Vietnamese translation (#930)

commit b212fff
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Thu Aug 3 20:54:45 2023 +0700

    Small update

commit b59d1dc
Merge: 8fcdbd9 36522c7
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Thu Aug 3 19:40:20 2023 +0700

    Merge branch 'main' of https://github.com/26F-Studio/Techmino into VietnameseTranslation

commit 36522c7
Author: MrZ_26 <[email protected]>
Date:   Thu Aug 3 16:04:04 2023 +0800

    修复词典用不了滚轮
    整理代码

commit 20b74ea
Author: MrZ_26 <[email protected]>
Date:   Thu Aug 3 13:46:27 2023 +0800

    词典交互和代码逻辑优化
    框架跟进

commit 0ae9cbc
Author: MrZ_26 <[email protected]>
Date:   Thu Aug 3 10:11:27 2023 +0800

    删行末空格

commit c9cbb0e
Author: MrZ_26 <[email protected]>
Date:   Wed Aug 2 21:45:31 2023 +0800

    修复fixed序列反了

commit 0595ce4
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Wed Aug 2 10:44:01 2023 +0700

    Update Vietnamese translation (again) (#929)

commit 8fcdbd9
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Wed Aug 2 10:22:54 2023 +0700

    remove duplicate

commit 798ea1b
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Wed Aug 2 10:09:02 2023 +0700

    remove duplicate item in ZH file (thanks SundayLee)

commit e6f4f69
Merge: 1463099 fa89ba5
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Wed Aug 2 10:00:17 2023 +0700

    Merge branch 'VietnameseTranslation' of https://github.com/SweetSea-ButImNotSweet/Techmino into VietnameseTranslation

commit 1463099
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Tue Aug 1 23:43:35 2023 +0700

    Small change

commit 7a15406
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sat Jul 15 00:46:17 2023 +0700

    small update

commit 1d10f14
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 10 21:08:10 2023 +0700

    Remove most of unnecessary keywords

commit 07341d4
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 10 14:38:46 2023 +0700

    Update the manual (Rebasing all old commits)

commit 2e2427f
Author: MrZ_26 <[email protected]>
Date:   Wed Aug 2 10:34:19 2023 +0800

    框架跟进

commit aeddee2
Author: MrZ_26 <[email protected]>
Date:   Wed Aug 2 10:23:20 2023 +0800

    修复自定义页面编辑场地消行按钮用不了

commit 43037f8
Author: NOT_A_ROBOT <[email protected]>
Date:   Tue Aug 1 23:50:08 2023 +0700

    Shorten mission displays with RLE (#927) (may need optimization)

commit 0c3d552
Author: MrZ_26 <[email protected]>
Date:   Wed Aug 2 00:46:54 2023 +0800

    越南语语言文件小修正

commit fa89ba5
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Tue Aug 1 23:43:35 2023 +0700

    Small change

commit a1b6b8a
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Tue Aug 1 23:39:04 2023 +0700

    Vietnamese Zictionary update [ONLY MERGE AFTER MERGING #926] (#915)

    * Tweak keywords

    * Small update

    * Update the manual

    * Remove most of unnecessary keywords

    * Revert change

    * Push updates

    * small update

    * Add tips that missing

    * Nvm, little change

    * Minor changes

    * Little update

    * Some updates

    * Small change in updatelog

    * Push update

    * small update

    * Small update

    * Update the translation, last time?

    * Push

    * Push small updates, READY!

    * Push updates

    * Clean up some missed items

    * small updates because of my flipped memory

    * Small changes + NEW TOOL!

    * Remove old info

    * Small updates

    * Small updates

    * Replace alnost "hố" --> "lỗ

    * Small updates

    * Sort group, adapt #926

    * small update

    * Fix some stupid mistake when do translating

    * Small change

    * small change

    * Clean up outdated comment

    * Fixed wrong group tag

    * Add a funny tip 🤪

    * Fix tip

    * Fix tip again

    * Fix tip again (x2)

commit 5061cad
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Tue Aug 1 23:38:30 2023 +0700

    [HOTFIX] [MERGE NOW!] Fix bugs for #926 (#928)

    * Attempt to rework Zictionary scene

    * Rearrange the layout and handling most of thing

    * Remove ALPHA key, done keyboard handling, changed some key's behavior

    * Add Help text

    * Update Help text & fix some bugs

    * Update help text

    * Edit help text

    * Support gamepad

    * small changes in help text

    * small changes

    * Fix copy bug

    * small change

    * Add hint text to open Hint

    * Fix a bug that item accidentally selected when scrolling

    * Clean up a dumb function
    (Forget to cleanup in previous commit)

    * add backup solution, just in case

    * fix another bug

    * fix touch bug

    * Refix the scroll bug when touch

    * small code changes

    * small change in English file

    * Fix bugs, change text, adjust a icon

    * Change English text

    * Add Vietnamese translation

    * Add Chinese, adjust English & Vietnamese

    * Small change in secret Easter egg

    * Fix spelling mistake

commit a26c494
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Tue Aug 1 11:01:26 2023 +0700

    Fix tip again (x2)

commit d66b2d6
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Tue Aug 1 10:39:08 2023 +0700

    Fix tip again

commit e95f87a
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Tue Aug 1 10:35:13 2023 +0700

    Fix tip

commit 1ccd211
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Tue Aug 1 10:12:23 2023 +0700

    Add a funny tip 🤪

commit 86ce124
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Mon Jul 31 22:49:09 2023 +0700

    Fixed wrong group tag

commit 7d62a04
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Mon Jul 31 22:47:02 2023 +0700

    Clean up outdated comment

commit fd3910f
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 31 15:37:10 2023 +0700

    small change

commit 4ab59ef
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 31 12:13:45 2023 +0700

    Small change

commit bf5f7cb
Merge: bb7b1b9 9d3fb33
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Mon Jul 31 11:04:48 2023 +0700

    Merge branch '26F-Studio:main' into VietnameseTranslation

commit 9d3fb33
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Mon Jul 31 02:20:24 2023 +0700

    Improve Zictionary scene so we don't need to hyper tapping much than before (#926)

    * Attempt to rework Zictionary scene

    * Rearrange the layout and handling most of thing

    * Remove ALPHA key, done keyboard handling, changed some key's behavior

    * Add Help text

    * Update Help text & fix some bugs

    * Update help text

    * Edit help text

    * Support gamepad

    * small changes in help text

    * small changes

    * Fix copy bug

    * small change

    * Add hint text to open Hint

    * Fix a bug that item accidentally selected when scrolling

    * Clean up a dumb function
    (Forget to cleanup in previous commit)

    * add backup solution, just in case

    * fix another bug

    * fix touch bug

    * Refix the scroll bug when touch

    * small code changes

    * small change in English file

commit 4d82b18
Author: MrZ_26 <[email protected]>
Date:   Mon Jul 31 02:53:15 2023 +0800

    语言选择场景标题文本修改

commit bb7b1b9
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sat Jul 29 10:36:53 2023 +0700

    Fix some stupid mistake when do translating

commit 5358538
Merge: 23fd5cd 78ac05e
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Fri Jul 28 23:33:55 2023 +0700

    Merge branch '26F-Studio:main' into VietnameseTranslation

commit 23fd5cd
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Fri Jul 28 23:33:19 2023 +0700

    small update

commit 4796a57
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Fri Jul 28 23:23:18 2023 +0700

    Sort group, adapt #926

commit 78ac05e
Author: MrZ_26 <[email protected]>
Date:   Wed Jul 26 02:02:42 2023 +0800

    框架跟进

commit cd7c58e
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 24 15:54:33 2023 +0700

    Small updates

commit 53857af
Merge: a2cdd6f 02cf7b7
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Sun Jul 23 21:59:57 2023 +0700

    Merge branch '26F-Studio:main' into VietnameseTranslation

commit a2cdd6f
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sun Jul 23 21:59:28 2023 +0700

    Replace alnost "hố" --> "lỗ

commit 02cf7b7
Merge: 091bb23 aefde7a
Author: MrZ_26 <[email protected]>
Date:   Thu Jul 20 15:00:40 2023 +0800

    Merge remote-tracking branch 'tech/imple/revise-seq-generator'

commit 4629b47
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 17 22:17:15 2023 +0700

    Small updates

commit 9907971
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 17 22:04:06 2023 +0700

    Small updates

commit 16d8919
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Mon Jul 17 09:58:28 2023 +0700

    Remove old info

commit 091bb23
Author: MrZ_26 <[email protected]>
Date:   Mon Jul 17 10:47:23 2023 +0800

    词典标题栏不会溢出了

commit 0ec0d80
Author: MrZ_26 <[email protected]>
Date:   Mon Jul 17 10:29:38 2023 +0800

    修复手柄摇杆左右的图标反了 close #912

commit d4d87cc
Author: MrZ_26 <[email protected]>
Date:   Mon Jul 17 05:50:18 2023 +0800

    调整bagP1inf序列模式位置

commit c782c1f
Author: MrZ_26 <[email protected]>
Date:   Mon Jul 17 05:47:20 2023 +0800

    修复四连块之外的ASC旋转中心不正确 close #910

commit f7cdae8
Author: MrZ_26 <[email protected]>
Date:   Mon Jul 17 04:24:49 2023 +0800

    修复玩家死亡掉落动画任务能跨局把新开的局里的玩家移除 close #918

commit f41a68d
Author: MrZ_26 <[email protected]>
Date:   Mon Jul 17 04:19:32 2023 +0800

     添加bagPinf序列模式的图标

commit c38bb79
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 17 00:15:31 2023 +0700

    Small changes + NEW TOOL!

commit 80b56af
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sun Jul 16 12:42:02 2023 +0700

    small updates because of my flipped memory

commit 745f836
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sun Jul 16 12:30:22 2023 +0700

    Clean up some missed items

commit 9f45842
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sun Jul 16 12:23:14 2023 +0700

    Push updates

commit 9b7c09d
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sun Jul 16 11:50:04 2023 +0700

    Push small updates, READY!

commit be11a9a
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sun Jul 16 11:25:52 2023 +0700

    Push

commit 92361e0
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sun Jul 16 11:18:50 2023 +0700

    Update the translation, last time?

commit 146db23
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sat Jul 15 09:15:08 2023 +0700

    Small update

commit 9ec237a
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sat Jul 15 00:46:17 2023 +0700

    small update

commit c39c6c0
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sat Jul 15 00:42:14 2023 +0700

    Push update

commit 1273d54
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Sat Jul 15 00:42:01 2023 +0700

    Small change in updatelog

commit b649d98
Merge: 58df11f 3dc6168
Author: C6H12O6 + NaCl + H2O <[email protected]>
Date:   Fri Jul 14 19:52:50 2023 +0700

    Merge branch '26F-Studio:main' into VietnameseTranslation

commit 58df11f
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Fri Jul 14 10:12:33 2023 +0700

    Some updates

commit aefde7a
Merge: 7e00a7d 3dc6168
Author: Imple Lee <[email protected]>
Date:   Thu Jul 13 14:15:51 2023 +0800

    Merge branch 'main' into imple/revise-seq-generator

commit 3dc6168
Author: Imple Lee <[email protected]>
Date:   Thu Jul 13 13:26:17 2023 +0800

    add new generator: bagP1inf (#916)

commit 6502af6
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Thu Jul 13 09:10:20 2023 +0700

    Little update

commit 42f0671
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Thu Jul 13 07:38:06 2023 +0700

    Minor changes

commit 7f2f608
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Thu Jul 13 00:40:08 2023 +0700

    Nvm, little change

commit 8e03157
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Thu Jul 13 00:32:27 2023 +0700

    Add tips that missing

commit 7e00a7d
Author: Imple Lee <[email protected]>
Date:   Wed Jul 12 07:42:50 2023 +0800

    use `trueNextCount` as replay-visible next count

commit 8304cf6
Author: Imple Lee <[email protected]>
Date:   Wed Jul 12 07:27:22 2023 +0800

    make sequence generator independent of player

commit 7d4d664
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Tue Jul 11 23:17:38 2023 +0700

    small update

commit 34c1255
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Tue Jul 11 20:47:14 2023 +0700

    Push updates

commit c25e7a3
Author: Imple Lee <[email protected]>
Date:   Tue Jul 11 20:05:31 2023 +0800

    fix noInitSZO

commit b7b02ab
Author: Imple Lee <[email protected]>
Date:   Tue Jul 11 19:50:52 2023 +0800

    simplify sequence generator

commit f0e2a6d
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 10 21:08:22 2023 +0700

    Revert change

commit b1b39a3
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 10 21:08:10 2023 +0700

    Remove most of unnecessary keywords

commit 47b201e
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 10 14:38:46 2023 +0700

    Update the manual

commit 6c59718
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 10 12:12:34 2023 +0700

    Small update

commit 974895c
Author: Squishy (C6H12O6+NaCl+H2O) <[email protected]>
Date:   Mon Jul 10 12:03:28 2023 +0700

    Tweak keywords

* Edit the index in Zictionary, not much

* Revert a change in dict.lua

* Small change in Vietnamese translation

* Fix strange behaviors and update Vnese Zictionary

* Push a little change

* Last update?

* Rewritten sentences

* Fix stuck help text (by not clearing search result when trigger with F1 key

* Fix stuck help text
(by not clearing search result when trigger with F1 key)

* Fix a small bug

* Update Vietnamese translation

* small change

* Block performance loss

* Update Vietnamese translation (to 1/2 works now)

* Replace unfittable word

* Temp update

* Just a big update

* Update both manual and UI translation

* Smaller fallback

* uh forgetting changes

* remove "not" in a line which was for debugging

* Sync work

* Update debug code

* Update debug code

* Update Zictionary + update for hot reloading code

* Last update

* Last update again

* Last update, TB;DR

* Commenting out the hotload function

* Merge from the stash

* shorten file

* Fix cannot use Backspace key

* Edit comment

* last update
  • Loading branch information
SweetSea-ButImNotSweet authored Aug 27, 2023
1 parent df79e99 commit 7f8e3e6
Show file tree
Hide file tree
Showing 5 changed files with 1,166 additions and 1,076 deletions.
4 changes: 2 additions & 2 deletions parts/language/dict_en.lua
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ FNNS and {"Support 3",
{"HisPool generator",
"hisPool history pool",
"term",
"History Pool Randomizer, a derivative of the His generator. It added a \"pool\" mechanism from which the new blocks are spawned, as opposed to the simple random generator used by His. HisPool also increases the probability of spawning a block with the lowest presence.\n\nThis mechanism stabilizes the sequence and ensures that a drought (see entry) doesn't last forever. The stability of HisPool lies between His and Bag.",
"History Pool Randomizer, a derivative of the His generator. It added a \"pool\" mechanism from which the new blocks are spawned, as opposed to the simple random generator used by His. HisPool also increases the probability of spawning a block with the lowest presence.\n\nThis mechanism stabilizes the sequence and ensures that a drought (see entry) doesn't last forever. The stability of HisPool lies between His and Bag.",
},
{"bagES generator",
"bages easy start",
Expand Down Expand Up @@ -1256,4 +1256,4 @@ FNNS and {"Support 3",
"term",
"In Tetris, timing refers to the choice of moments to attack with optimal effort. Good timing can help you to defend yourself while crushing your opponent. However, we recommend new players focus on their own fields and improve their speeds before learning timing.",
},
}
}
Loading

0 comments on commit 7f8e3e6

Please sign in to comment.