mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-01 20:04:02 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,541 Commits 4 Branches 160 Tags 2.3 GiB
e86171e3c7
Commit Graph

10521 Commits

Author SHA1 Message Date
Anuken
e86171e3c7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-15 20:51:57 -04:00
Anuken
c4fe53955b Moved Scripts loaders to Vars.tree.loadSound/Music 2021-09-15 11:24:39 -04:00
Anuken
0068952ba6 Content parser listener 2021-09-15 10:49:22 -04:00
Anuken
a3b3745d01 Merge remote-tracking branch 'origin/master' 2021-09-14 21:28:39 -04:00
Anuken
95c3476144 Fixed #6001 2021-09-14 21:28:34 -04:00
Matthew Peng
4cb3bef1a7
Parentize Vela and Corvus shoot effects (#5997) 2021-09-14 14:24:19 -04:00
Darkness#3729
248f59131b
[RU] Translation of all latest bundles (#5985) 
* [RU] Translation of all latest bundles

* Also this line

* Update bundle_ru.properties

* Fix
 2021-09-14 12:52:19 -04:00
JrTRinny
63b39cdb72
there is no cliffs (#5991) 2021-09-14 09:32:08 -04:00
Rex
be0397355f
br (#5990) 2021-09-13 21:08:42 -04:00
Anuken
ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
Rex
d36a00a6fe
update bundle_es.properties (#5989) 
* Update bundle_es.properties

* Update bundle_es.properties

* 131

* support units

* fixed
 2021-09-13 20:08:40 -04:00
Darkness6030
2906c61d06
Prevent players to kick themselves (#5988) 2021-09-13 13:39:23 -04:00
Anuken
e1ba9f16f6 Merge remote-tracking branch 'origin/master' 2021-09-13 09:04:01 -04:00
Anuken
826ddf4aad strip message newlines 2021-09-13 09:03:56 -04:00
kituta
d20048fe11
Update bundle_ja.properties (#5849) 
* Update bundle_ja.properties

Addition. //追加
Changed wording of the toolmode. //toolmodeの文言を変更
Small fixes. //小さな修正

* Update bundle_ja.properties

Change of wording //文言の変更

* Update bundle_ja.properties

Addition. //追加

* Update bundle_ja.properties

Addition. //追加
366 editor.cliffs = Walls To Cliffs は「建築不能領域を表す断崖の壁を描く機能」だと思いますが、把握できていないため未翻訳で置いておきます。
「断崖を描く」

* Update bundle_ja.properties

Add

* Update bundle_ja.properties

fix //句点を忘れていました

* Update bundle_ja.properties

Small fixes. //小さな修正
 2021-09-13 08:44:13 -04:00
Anuken
edbe795aa5 Merge remote-tracking branch 'origin/master' 2021-09-12 20:21:59 -04:00
Anuken
087cd2c55a Cleanup 2021-09-12 20:21:55 -04:00
JrTRinny
d33a4f9f87
More Target varieties for energy field ability (#5828) 
* more targets for energy field ability

* group booleans
 2021-09-12 14:55:26 -04:00
Shockwave
f64d078f29
Update bundle_zh_CN.properties (#5938) 
* Update bundle_zh_CN.properties

1. Inherited from <https://github.com/Anuken/Mindustry/pull/5661>
2. Synced latest commit from English bundle.

* Update bundle_zh_CN.properties

Synced cliff support for editor

* Update bundle_zh_CN.properties

Minor optimization

* Update bundle_zh_CN.properties

Minor fix at line 349~

* Update bundle_zh_CN.properties

Synced recent update in English bundle. (Hide All and Show All)

* Update bundle_zh_CN.properties

1. Synced hint for high threat level sector
2. Unified the term "sector"
3. Minor fix on the half-width commas

* Update bundle_zh_CN.properties

Optimized key-pressing descriptions.

* Update bundle_zh_CN.properties

Restore line 934 to half-width comma

* Update bundle_zh_CN.properties

Synced name of new sectors.
 2021-09-12 12:54:32 -04:00
RebornTrack970
da465c7786
TR Translate before release (#5980) 2021-09-12 11:34:03 -04:00
NickName73
9c12125e89
Update bundle_ru.properties (#5911) 2021-09-12 11:22:17 -04:00
Sharlotte
2a6d7c5a13
Update bundle_ko.properties (#5892) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2021-09-12 11:21:53 -04:00
YellOw139
71e38862b9
[Bundle][RO] Update (#5848) 
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 254284760f
- Typo fixes & various other improvements

* Update full_description.txt

* Update full_description.txt

* killing confusion

* Update bundle_ro.properties

* deep-tainted-water

* should do for now

* sector.name
 2021-09-12 11:21:17 -04:00
彭瑞暄
b58a63b200
Update bundle_zh_TW.properties (#5860) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

minor correction
 2021-09-12 11:21:09 -04:00
VizardAlpha
ee8b4f478d
Updates bundle_fr.properties (#5931) 
* Updates bundle_fr.properties

* Added rivers on Serpulo / Added deep tainted water

* Error correction

* More campaign map progress .. Added new commits

* Update bundle_fr.properties
 2021-09-12 11:09:46 -04:00
JrTRinny
1941f22676
Update bundle_th.properties (#5908) 
* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties

* more beautiful names

* Update bundle_th.properties
 2021-09-12 11:09:40 -04:00
Anuken
35ffbef557 #5932 2021-09-12 11:07:18 -04:00
Anuken
46bda97362 Merge remote-tracking branch 'origin/master' 2021-09-12 09:05:23 -04:00
Anuken
a1b9f7d1b3 Fixed #5979 2021-09-12 09:05:18 -04:00
Matthew Peng
32db058dbe
Why is the smelter -top drawn between the flame circles? (#5817) 2021-09-11 18:47:30 -04:00
Anuken
2f7c5994a7 Fixed #5978 2021-09-11 15:43:24 -04:00
Anuken
2664bb84be Fixed #5974 2021-09-11 13:30:10 -04:00
Anuken
bdcfb7ab45 Merge remote-tracking branch 'origin/master' 2021-09-11 12:15:39 -04:00
Anuken
5cf47f4198 Clamp sector description in info 2021-09-11 12:15:34 -04:00
Darkness6030
515ee060d2
[RU] Sectors name translation (#5972) 
С береговой линией все понятно. 
Но почему я выбрал "Прибрежная крепость"?
Все просто. "Naval" переводится как "Водяной", но "Водяная Крепость" - звучит *не очень*.
Нужен какой-то синоним. Я рассмотрел варианты "Морская", "Береговая", но в конце концов остановился на варианте "Прибрежная".

Если вы думаете иначе, предлагайте свой вариант перевода.
 2021-09-11 10:20:57 -04:00
Anuken
90c2473448 Duct bridge crash fix 2021-09-11 10:07:00 -04:00
Anuken
c5a90759e5 Fixed #5971 / Fixed #5973 2021-09-11 08:45:17 -04:00
Anuken
cccce6badd Make Base AI walls correspond to tier 2021-09-10 21:11:57 -04:00
Anuken
decc570867 Slightly denser generated bases 2021-09-10 17:23:17 -04:00
Anuken
caa34c959e More campaign map progress 2021-09-10 17:07:06 -04:00
Anuken
b8fa15e546 Merge remote-tracking branch 'origin/master' 2021-09-10 16:33:30 -04:00
Anuken
47d5be679d Map progress 2021-09-10 16:33:26 -04:00
buthed010203
fc7f689ea4
Named pathfinder thread (#5969) 2021-09-10 15:56:42 -04:00
Anuken
7c028ffcb8 Experimental positional spawn support / WIP map 2021-09-10 13:56:12 -04:00
Anuken
10c3f9e44a River noise target field 2021-09-10 09:22:39 -04:00
Anuken
b2a634e5e7 Untested/WIP naval campaign map 2021-09-10 09:17:25 -04:00
Anuken
ae0a70703b Wave edit dialog cleanup 2021-09-09 22:25:08 -04:00
TranquillyUnpleasant
9076325fa1
Add a copy button to spawn groups (#5957) 
* copy button

* rebuild groups on removal

* two factor sorting

* copy method for spawngroup

* implement Clonable

* revert to copy to call clone
 2021-09-09 19:38:56 -04:00
Anuken
08d7390775 Merge remote-tracking branch 'origin/master' 2021-09-09 17:05:00 -04:00
Anuken
cbe188abab Map editor bugfixes / Re-added build noise 2021-09-09 17:04:55 -04:00