mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 12:53:48 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,876 Commits 4 Branches 160 Tags 2.3 GiB
f400ccc66a
Commit Graph

13444 Commits

Author SHA1 Message Date
Anuken
e198da53e4 Merge remote-tracking branch 'origin/master' 2022-11-10 12:15:55 -05:00
Anuken
c1e783ba71 PayloadSource UnitCreateEvent 2022-11-10 12:15:51 -05:00
Github Actions
3dfb8c4c20 Automatic bundle update 2022-11-10 16:41:24 +00:00
Catchears
d81500d99d
german translation (again) (#7232) 
* update to 9a3a6c31b3

* shawak's requested changes

* update sector names

no one has opposed them yet, so we'll give them a try

* oops, accidentally modified english bundle, reverting

* update translation to a54907583b

* changes as requested by shawak

* update to 522070be4b

* @stuffyAI's changes

* update to 69a7354468

* remove duplicate entries

new translations are quite plentiful, will take a bit to get done

* update to 99df85df1c

* vereinheitlichung - siehe commitbeschreibung

unterschied zwischen items und materialien verdeutlichen
vereinheitlichung von 'fracht' als begriff für 'payload'

ich halte diese verändernungnen für vernünftig, bin aber wie immer offen für andere vorschläge

bei 'materialeinheiten' (unit.items, zeile 976) bin ich mir unsicher, ob der begriff inzwischen veraltet ist (stattdessen lieber items?) - er wird nur an zwei stellen benutzt, die nur vor jahren bearbeitet wurden. ich habe ihn erstmal beibehalten.

* update to f968a8689c

* update to 85228bad0a

* update to e3d1a04626

* update to 634ece405f

I'll probably be keeping this PR more up to date as we get closer to v7 release date, feel free to unsub from the PR if it gets annoying.

* update to ebb37f4abe

* der Mod -> die Mod

Mod, abgeleitet von Modifikation (f), sollte mMn weiterhin feminin bleiben.

* update to 8f9736d1d9

* update to c3d9a501c6

hopefully final update

* add changes from https://github.com/Anuken/Mindustry/pull/6999/files

Co-authored-by: end-me-please <90796271+end-me-please@users.noreply.github.com>

Co-authored-by: end-me-please <90796271+end-me-please@users.noreply.github.com>
 2022-11-10 11:40:35 -05:00
Даркнесс#3729
2a11ac6414
fixes (#7856) 2022-11-10 09:18:09 -05:00
Github Actions
89e3f2a2fa Automatic bundle update 2022-11-10 13:24:03 +00:00
Anuken
5440ffcaf9 Merge remote-tracking branch 'origin/master' 2022-11-10 08:22:59 -05:00
Anuken
3fe38e8925 Better fix for #7854 2022-11-10 08:22:53 -05:00
Даркнесс#3729
fcca002823
[Translation] RU V7 translation (#7785) 
* [Translation] RU V7 translation

* Категории процессоров

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* 👀

* Update bundle_ru.properties

* скилл исьюше

* Подсказки для командного режима

* Немного перевел цели секторов

* попробовал сделать описания юнитов :/

* Update bundle_ru.properties

* Update bundle_ru.properties

* дрели

* Create bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* нагрев -> тепло

* Подсказки

* Update contributors

* Update bundle_ru.properties

* скилл иссуе

* Update bundle_ru.properties

Co-authored-by: Evgenij <86189625+Kowkodivka@users.noreply.github.com>
Co-authored-by: Slotterleet <62336673+Slotterleet@users.noreply.github.com>
 2022-11-10 08:22:10 -05:00
Jerzozwierz
11e35370be
Update bundle_pl because 11.11 is close (#7853) 2022-11-09 14:14:37 -05:00
Anuken
2e9026936e Less floating menu buttons 2022-11-09 14:05:22 -05:00
Anuken
1651dc520c Better inset borders for phones 2022-11-09 13:56:53 -05:00
Anuken
ef526a6d83 Merge remote-tracking branch 'origin/master' 2022-11-09 13:29:17 -05:00
Anuken
be72da71de map name 2022-11-09 13:29:13 -05:00
Nunting
b0303e84a3
Update bundle_ko.properties (#7850) 2022-11-09 08:47:50 -05:00
Anuken
37f1760a59 Renamed 'erekir waves map' 2022-11-09 08:45:11 -05:00
Anuken
8d255b3ccd Fixed #7852 2022-11-09 08:31:19 -05:00
Anuken
1842e9d139 Merge remote-tracking branch 'origin/master' 2022-11-09 08:30:01 -05:00
Anuken
8f7419db71 Fixed #7851 2022-11-09 08:29:53 -05:00
Anuken
56eb1a084c Revert "Fixing a mistake I made (#7788)" 
This reverts commit 3c7ddc8375.
 2022-11-09 08:29:32 -05:00
Github Actions
e5e41b497d Automatic bundle update 2022-11-09 02:46:35 +00:00
Anuken
52d2d25790 Merge remote-tracking branch 'origin/master' 2022-11-08 21:44:53 -05:00
Anuken
c3d9a501c6 Campaign completion text in bundle 2022-11-08 21:44:47 -05:00
Nunting
baa7580e13
Update bundle_ko.properties (#7806) 2022-11-08 18:47:17 -05:00
Anuken
464feaa80e Merge remote-tracking branch 'origin/master' 2022-11-08 16:52:18 -05:00
Anuken
ddadbab74d Canvas block blending 2022-11-08 16:52:12 -05:00
Lonami
41562ac6c1
Don't stop mining while commanding units (#7844) 
This addresses https://github.com/Anuken/Mindustry-Suggestions/issues/4077.
 2022-11-08 08:57:27 -05:00
MEEPofFaith
8f9736d1d9
Make certain negative stats red (#7842) 2022-11-07 21:28:28 -05:00
MEEPofFaith
68434ad42e
Clearer Building Damage Multiplier Stat (#7471) 2022-11-07 17:59:47 -05:00
BF 109 F-4
3c7ddc8375
Fixing a mistake I made (#7788) 
* Add files via upload

* Delete Erekir Waves Map better.msav

* Fixing a mistake

I uploaded it incorrectly last time so I'm fixing it.

* Old version

Fixed
 2022-11-07 15:50:47 -05:00
Anuken
381197d58f Merge remote-tracking branch 'origin/master' 2022-11-07 15:07:36 -05:00
Anuken
09b65fddb8 Fixed #7841 2022-11-07 15:07:32 -05:00
Github Actions
4050812b84 Automatic bundle update 2022-11-07 16:28:17 +00:00
Anuken
927566e038 Merge remote-tracking branch 'origin/master' 2022-11-07 11:27:11 -05:00
Anuken
a329c4944b Fixed #7839 2022-11-07 11:27:07 -05:00
Github Actions
47a38d2bb8 Automatic bundle update 2022-11-07 15:22:08 +00:00
SoMall-dumpling
d20f4c42a7
Update bundle_zh_CN.properties (#7666) 
* Update bundle_zh_CN.properties

Translations for v139

* Update bundle_zh_CN.properties

abcigch的建议/其他修改

* Update bundle_zh_CN.properties

保姆级教学

* Update bundle_zh_CN.properties

补完

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

地图名字太难翻译啦！但是还是要翻译！怎么办！

* Update bundle_zh_CN.properties

先这样吧

* Update bundle_zh_CN.properties

a tweak to origin
 2022-11-07 10:21:20 -05:00
Github Actions
14984f6a02 Automatic bundle update 2022-11-07 14:44:21 +00:00
ThatOneBepis
e428e33cd2
Update bundle_sr.properties (#7810) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-07 09:43:16 -05:00
Anuken
ce36b750e3 Merge remote-tracking branch 'origin/master' 2022-11-07 08:43:26 -05:00
Anuken
e0021f3714 Fixed #7837 2022-11-07 08:43:22 -05:00
MEEPofFaith
810a905af3
Allow heat region to produce light (#6879) 
* Allow heat region to produce light

* Method overload for backwards compatability
 2022-11-06 14:28:59 -05:00
Anuken
83be0116c6 Merge remote-tracking branch 'origin/master' 2022-11-06 13:38:44 -05:00
Anuken
3a0b1a6cf5 Fixed missile unit DPS calculation 2022-11-06 13:38:38 -05:00
Github Actions
d91a338f3d Automatic bundle update 2022-11-05 21:08:33 +00:00
Angel-24
9537cad965
Update bundle_es.properties (#7767) 
* Update bundle_es.properties

Updated spanish translation. Tutorials, mods messages, and more.

* Update bundle_es.properties

* ImUrX's review

* Bloques "integrados" -> Bloques "estáticos"

Renamed "world" blocks.

* Update bundle_es.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-05 17:07:50 -04:00
Anuken
dc2a68573b Fixed #7829 2022-11-05 15:03:57 -04:00
Anuken
8bba2459f2 Fixed #7826 2022-11-05 08:56:44 -04:00
Anuken
3390c08d44 Merge remote-tracking branch 'origin/master' 2022-11-05 08:36:10 -04:00
Anuken
0b7156ce13 Fixed #7827 2022-11-05 08:36:06 -04:00
MEEPofFaith
e914cb59cd
Idle weapon reset to baseRotation (#7825) 2022-11-05 07:05:55 -04:00
Github Actions
58e9d641f0 Automatic bundle update 2022-11-04 23:35:50 +00:00
Garen7
82fffb1285
Adds select all unit production hotkey (#7824) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2022-11-04 19:34:44 -04:00
Github Actions
e7b7fc971a Automatic bundle update 2022-11-04 22:00:43 +00:00
RTOmega
6ecf9b1e73
TR V7 Translate (#7822) 
wow this took a really long time
 2022-11-04 17:59:50 -04:00
Anuken
bd0085a701 Merge remote-tracking branch 'origin/master' 2022-11-04 17:28:32 -04:00
Anuken
a3afb7c726 Fixed #7821 2022-11-04 17:28:28 -04:00
MEEPofFaith
d42c0e3c48
baseRotation + rotationLimit compatability (#7820) 2022-11-04 16:04:35 -04:00
Anuken
f9d7c172c4 Possible minimap fog update fix for servers 2022-11-04 15:14:06 -04:00
Anuken
13d726108b Fixed #7818 2022-11-04 11:23:02 -04:00
Anuken
07a1c6c2c4 Merge remote-tracking branch 'origin/master' 2022-11-04 08:59:29 -04:00
Anuken
9f0a1d863e Fixed #7815 2022-11-04 08:59:24 -04:00
MEEPofFaith
36a7e98f86
Show build cost even in sandbox (#7814) 2022-11-03 23:27:46 -04:00
matusm1
3a0f4409fc
Precision errors in float to string methods (#7809) 
* replaced fixValue with autoFixed

* Reverted, only fixValue implementation
 2022-11-03 18:02:24 -04:00
Github Actions
e073eca93c Automatic bundle update 2022-11-03 16:15:17 +00:00
Anuken
4e5bc8fc94 Rebuild select hint 2022-11-03 12:11:35 -04:00
Anuken
3a142507d1 redundant log 2022-11-03 11:39:11 -04:00
Anuken
b8e245f945 Tested and fixed Steam achievements 2022-11-03 11:37:37 -04:00
Anuken
b1be360180 Merge remote-tracking branch 'origin/master' 2022-11-03 09:08:53 -04:00
Anuken
679e6bd27b Removed screenshots from game data export 2022-11-03 09:08:49 -04:00
Github Actions
f21cea225b Automatic bundle update 2022-11-03 13:04:48 +00:00
osoitz
e12aee6961
Update bundle_eu.properties (#7727) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-03 09:03:55 -04:00
Github Actions
6abb549b18 Automatic bundle update 2022-11-03 12:59:57 +00:00
Nunting
161bb87eb8
Update bundle_ko.properties (#7800) 2022-11-03 08:58:59 -04:00
Anuken
7e0a6b985c Fixed #7804 / Fixed #7803 2022-11-03 08:57:15 -04:00
Anuken
d1f7fce7f9 Merge remote-tracking branch 'origin/master' 2022-11-03 08:45:13 -04:00
Anuken
cef2778d43 Fixed #7803 2022-11-03 08:45:07 -04:00
Lucky Clover
993f3973d2
worldMessage.targetable=false (#7802) 
turret would try to attack worldMessage but cant hit it
so why not combine privileged with targetable(
 2022-11-02 23:52:23 -04:00
Github Actions
4c0664c068 Automatic bundle update 2022-11-02 14:02:46 +00:00
Anuken
ebb37f4abe Fixed ability descriptions 2022-11-02 10:01:43 -04:00
Anuken
696d5e77ca Merge remote-tracking branch 'origin/master' 2022-11-02 08:37:16 -04:00
Anuken
74839a7f8d Fixed #7801 2022-11-02 08:37:11 -04:00
Catchears
5c353b1807
this game -> mod caused errors (#7799) 2022-11-01 19:38:53 -04:00
Anuken
3e6c54069d Merge remote-tracking branch 'origin/master' 2022-11-01 16:28:30 -04:00
Anuken
34a83de3cf Misc fixes 2022-11-01 16:28:24 -04:00
null
1624bb4502
fix factory plan icon scaling, unhardcode node beam regions (#7796) 
* unfuck factory plan icon scaling, unhardcode node beam regions

* fix
 2022-11-01 11:25:28 -04:00
Anuken
ff115ee376 Heat icon 2022-11-01 10:57:41 -04:00
Anuken
5a44bf6023 Merge remote-tracking branch 'origin/master' 2022-11-01 08:47:05 -04:00
Anuken
7f37b97861 Removed serverPaused 2022-11-01 08:47:00 -04:00
null
d5bea214cb
make small paydriver have dark shade and palette change (#7794) 2022-11-01 07:57:09 -04:00
Anuken
bc2664994e Fixed #7793 2022-11-01 07:53:47 -04:00
Anuken
aef18b8696 Fixed #7795 2022-11-01 07:52:24 -04:00
Anuken
4aae1d7c9e Merge remote-tracking branch 'origin/master' 2022-11-01 02:00:11 -04:00
Anuken
8b13298468 Desc typo fix 2022-11-01 02:00:07 -04:00
Github Actions
df056d0f6a Automatic bundle update 2022-11-01 05:59:47 +00:00
Anuken
9d343057c6 Fixed #7790 2022-11-01 01:59:00 -04:00
Epowerj
f9cc84aeb1 Merge remote-tracking branch 'origin/master' 2022-11-01 01:53:26 -04:00
Epowerj
f6d344e5a5 Tweaked origin enemy base 2022-11-01 01:53:20 -04:00
Anuken
68bde6f900 Don't show 'waiting for players' when not paused 2022-11-01 01:49:20 -04:00
Anuken
240c234e88 Fixed #7791 2022-11-01 01:45:05 -04:00