Skip to content

Commit

Permalink
Merge branch 'ReactiveDrop:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Duke-M-commits authored Oct 23, 2023
2 parents 5d0b624 + 1b3d507 commit a6d1d01
Show file tree
Hide file tree
Showing 12 changed files with 127 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
go run .
# check for unwanted differences from commit
- name: Check for unwanted changes
- name: Check for unintended changes
run: |
changes=$(git diff | wc -l)
if [[ $changes -gt 0 ]]; then
Expand Down
109 changes: 62 additions & 47 deletions PROGRESS.md

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions release_notes/20231101_italian.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
[h2]Nuova Campagna: Reduction[/h2]
Una versione rimasterizzata della campagna Reduction è ora disponibile nel gioco.

[h2]Official Missions[/h2]
[list]
[*][b]Tears for Tarnor: Oasis Colony Spaceport:[/b] Fixed specific walls becoming invisible after aliens spawned from certain locations.
[*][b]Tears for Tarnor: Oasis Colony Spaceport:[/b] Improved graphics when playing in first or third person.
[*][b]BioGen Corporation: BioGen Labs:[/b] Updated the graphical style of the mission.
[/list]
[h2]Missioni Ufficiali[/h2]
[list]
[*][b]Lacrime per Tarnor: Spazioporto della Colonia Oasis:[/b] Corretti alcuni muri che diventavano invisibili dopo lo spawn di alieni da determinate posizioni.
[*][b]Lacrime per Tarnor: Spazioporto della Colonia Oasis:[/b] Migliorata la grafica quando si gioca in prima o terza persona.
[*][b]BioGen Corporation: Laboratori BioGen:[/b] Aggiornato lo stile grafico della missione.
[/list]

[h2]Armi[/h2]
[list]
Expand Down Expand Up @@ -41,8 +41,8 @@ Una versione rimasterizzata della campagna Reduction è ora disponibile nel gioc
[*]Aggiunta un'opzione ad asw_jukebox per non interrompere la musica di combattimento fornita dal giocatore, per l'uso di musica di combattimento in più parti.
[*]I punti abilità dei soldati possono ora essere riassegnati tramite convars (es. asw_marine_skill_sarge_0).
[*]Aggiunto rd_chainsaw_idle_sound per le sfide che vogliono disabilitare il suono idle della motosega.
[*]Fixed certain mapper-placed Antlion Guards and Antlion Guardians not unlocking the Swarmopedia entry when killed.
[*]Fixed a pathfinding crash caused by incorrect initialization of info_node_link.
[*]Corretto il problema di alcune Guardie Formicaleone e Guardiani Formicaleone posizionati dal mapper che non sbloccavano la voce nella Swarmopedia quando venivano uccisi.
[*]Corretto un arresto anomalo del pathfinding causato da un'inizializzazione errata di info_node_link.
[/list]

[h2]Controller[/h2]
Expand Down
16 changes: 8 additions & 8 deletions release_notes/20231101_japanese.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
[h2]新キャンペーン: Reduction[/h2]
あのReductionキャンペーンのリマスター版が新登場です。

[h2]Official Missions[/h2]
[list]
[*][b]Tears for Tarnor: Oasis Colony Spaceport:[/b] Fixed specific walls becoming invisible after aliens spawned from certain locations.
[*][b]Tears for Tarnor: Oasis Colony Spaceport:[/b] Improved graphics when playing in first or third person.
[*][b]BioGen Corporation: BioGen Labs:[/b] Updated the graphical style of the mission.
[/list]
[h2]公式ミッション[/h2]
[list]
[*][b]Tears for Tarnor: Oasis Colony Spaceport:[/b] 特定の場所からエイリアンが発生すると特定の壁が透明になっていたのを修正。
[*][b]Tears for Tarnor: Oasis Colony Spaceport:[/b] 一人称や三人称視点モードでのグラフィックを改善。
[*][b]BioGen Corporation: BioGen Labs:[/b] このミッションの描画スタイルを改定。
[/list]

[h2]武器[/h2]
[list]
Expand Down Expand Up @@ -41,8 +41,8 @@
[*]プレイヤーが追加した戦闘用BGMが中断されないようになるオプションをasw_jukeboxに追加した。複数パートに分かれた戦闘用BGMに使える。
[*]隊員のスキルポイントはコンソール変数を使用して変更できるようになった(例:asw_marine_skill_sarge_0)。
[*]チェーンソーの待機時の音を消したいチャレンジ用にrd_chainsaw_idle_soundを追加。
[*]Fixed certain mapper-placed Antlion Guards and Antlion Guardians not unlocking the Swarmopedia entry when killed.
[*]Fixed a pathfinding crash caused by incorrect initialization of info_node_link.
[*]特定のユーザー作成マップで配置されたアントライオンガードとアントライオンガーディアンを倒してもエイリアン図鑑でアンロックされなかったのを修正。
[*]info_node_linkが正しく初期化されないことにより経路探索がクラッシュを起こしていたのを修正。
[/list]

[h2]コントローラー[/h2]
Expand Down
16 changes: 8 additions & 8 deletions release_notes/20231101_schinese.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
[h2]新战役:无家可归[/h2]
重制版战役:无家可归,现已可玩!

[h2]Official Missions[/h2]
[list]
[*][b]Tears for Tarnor: Oasis Colony Spaceport:[/b] Fixed specific walls becoming invisible after aliens spawned from certain locations.
[*][b]Tears for Tarnor: Oasis Colony Spaceport:[/b] Improved graphics when playing in first or third person.
[*][b]BioGen Corporation: BioGen Labs:[/b] Updated the graphical style of the mission.
[/list]
[h2]官方战役[/h2]
[list]
[*]修复 [b]塔诺尔之泪:绿洲殖民地太空港[/b] 特定刷怪点刷怪时导致墙壁消失的问题。
[*]改进 [b]塔诺尔之泪:绿洲殖民地太空港[/b] 第一/第三人称下的画面表现。
[*]改进 [b]生物基因公司:生物基因实验室[/b] 视觉表现风格。
[/list]

[h2]武器[/h2]
[list]
Expand Down Expand Up @@ -41,8 +41,8 @@
[*]增加 一个 asw_jukebox 的子选项,使其不会中断玩家提供的战斗音乐,用于设置分阶段战斗音乐。
[*]增加 现在可以通过控制台命令重新分配士兵技能点(例如 asw_marine_skill_sarge_0)。
[*]增加 rd_chainsaw_idle_sound 命令供希望禁用电锯空闲音效的挑战使用。
[*]Fixed certain mapper-placed Antlion Guards and Antlion Guardians not unlocking the Swarmopedia entry when killed.
[*]Fixed a pathfinding crash caused by incorrect initialization of info_node_link.
[*]修复 杀死某些由地图作者放置的蚁狮守卫/远古蚁狮守卫后无法解锁虫群百科的问题。
[*]修复 info_node_link错误初始化引发导路问题进而导致游戏崩溃的错误。
[/list]

[h2]控制器[/h2]
Expand Down
12 changes: 6 additions & 6 deletions resource/mail/biogen_mail_windows_english.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// PDA belongs to Isaac Lezeas (pun = Isaac Lazyass)
GAME
{
"MailFrom1" "From: Ren Ruble"
"MailDate1" "Date: Unknown"
"MailSubject1" "Subject: Maintenance Rooms"
"MailBody1A" "I would like to let you know that this is not funny anymore. Daily glass replacement cost is sinking our budget for new projects. Make a proper door, or your team gets a cut in salary!"
"MailBody1B" "- With much love, BioGen Management"
}
"MailFrom1" "From: Ren Ruble"
"MailDate1" "Date: Unknown"
"MailSubject1" "Subject: Maintenance Rooms"
"MailBody1A" "I would like to let you know that this is not funny anymore. Daily glass replacement cost is sinking our budget for new projects. Make a proper door, or your team gets a cut in salary!"
"MailBody1B" "- With much love, BioGen Management"
}
9 changes: 9 additions & 0 deletions resource/mail/biogen_mail_windows_italian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// PDA belongs to Isaac Lezeas (pun = Isaac Lazyass)
GAME
{
"MailFrom1" "Da: Ren Ruble"
"MailDate1" "Data: Sconosciuto"
"MailSubject1" "Oggetto: Sale Manutenzione"
"MailBody1A" "Non è più divertente. Il costo giornaliero della sostituzione dei vetri sta affossando il nostro budget per i nuovi progetti. Crea una porta adeguata o il tuo team subirà un taglio di stipendio!"
"MailBody1B" "- Con molto amore, la Direzione della BioGen"
}
9 changes: 9 additions & 0 deletions resource/mail/biogen_mail_windows_japanese.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// PDA belongs to Isaac Lezeas (pun = Isaac Lazyass)
GAME
{
"MailFrom1" "差出人: レン・ラブル"
"MailDate1" "送信日時: 不明"
"MailSubject1" "件名: 部屋のメンテナンス"
"MailBody1A" "笑い事じゃないっていい加減分かっていただけますかね。毎日ガラスを取り替えているせいで新プロジェクトの予算が圧迫されてるんです。ちゃんとしたドアを作らないなら、あなたの部署の給与を下げますよ!"
"MailBody1B" "- BioGen管理部より、愛を込めて"
}
9 changes: 9 additions & 0 deletions resource/mail/biogen_mail_windows_schinese.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// PDA belongs to Isaac Lezeas (pun = Isaac Lazyass)
GAME
{
"MailFrom1" "发件人:任 卢布"
"MailDate1" "日期:不详"
"MailSubject1" "主题:维修间"
"MailBody1A" "我很认真的通知您,每天的玻璃更换成本过高,长此以往我们就要被迫挪用新项目预算填这个窟窿了。你要么做一扇合格的门,要么你和你的团队集体降薪,拿薪水自己填窟窿!"
"MailBody1B" "- 顺颂事祺, 生物基因公司管理层"
}
4 changes: 2 additions & 2 deletions resource/reactivedrop_italian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2791,8 +2791,8 @@
"[english]asw_pda_owner_name_ed_savage" "Ed Savage"
"asw_pda_owner_name_maxwell_fierze" "Maxwell Fierze"
"[english]asw_pda_owner_name_maxwell_fierze" "Maxwell Fierze"
"asw_pda_owner_name_isaac_lezeas" "Isaac Lezeas"
"[english]asw_pda_owner_name_isaac_lezeas" "Isaac Lezeas"
"asw_pda_owner_name_isaac_lezeas" "Isaac Sfaticucci"
"[english]asw_pda_owner_name_isaac_lezeas" "Isaac Lezeas"
"asw_galactic_map_core_systems" "SISTEMI NUCLEO"
"[english]asw_galactic_map_core_systems" "CORE SYSTEMS"
"asw_galactic_map_syntek_megacorporation" "SYNTEK MEGACORPORATION"
Expand Down
6 changes: 3 additions & 3 deletions resource/reactivedrop_japanese.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2789,10 +2789,10 @@
"[english]asw_pda_owner_name_puzzle_solving_community" "Puzzle Solving Community"
"asw_pda_owner_name_ed_savage" "エド・サヴェージ"
"[english]asw_pda_owner_name_ed_savage" "Ed Savage"
"asw_pda_owner_name_maxwell_fierze" "マクスウェル・フィイェレザ"
"asw_pda_owner_name_maxwell_fierze" "マクスウェル・フィアザ"
"[english]asw_pda_owner_name_maxwell_fierze" "Maxwell Fierze"
"asw_pda_owner_name_isaac_lezeas" "Isaac Lezeas"
"[english]asw_pda_owner_name_isaac_lezeas" "Isaac Lezeas"
"asw_pda_owner_name_isaac_lezeas" "アイザック・サボリーマ"
"[english]asw_pda_owner_name_isaac_lezeas" "Isaac Lezeas"
"asw_galactic_map_core_systems" "首脳部統括星域"
"[english]asw_galactic_map_core_systems" "CORE SYSTEMS"
"asw_galactic_map_syntek_megacorporation" "SYNTEKメガコーポ"
Expand Down
4 changes: 2 additions & 2 deletions resource/reactivedrop_schinese.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2791,8 +2791,8 @@
"[english]asw_pda_owner_name_ed_savage" "Ed Savage"
"asw_pda_owner_name_maxwell_fierze" "麦克斯韦•菲尔兹"
"[english]asw_pda_owner_name_maxwell_fierze" "Maxwell Fierze"
"asw_pda_owner_name_isaac_lezeas" "Isaac Lezeas"
"[english]asw_pda_owner_name_isaac_lezeas" "Isaac Lezeas"
"asw_pda_owner_name_isaac_lezeas" "艾萨克·莱齐亚斯"
"[english]asw_pda_owner_name_isaac_lezeas" "Isaac Lezeas"
"asw_galactic_map_core_systems" "核心系统"
"[english]asw_galactic_map_core_systems" "CORE SYSTEMS"
"asw_galactic_map_syntek_megacorporation" "新特超级集团"
Expand Down

0 comments on commit a6d1d01

Please sign in to comment.