mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 04:44:24 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,017 Commits 4 Branches 160 Tags 2.3 GiB
799fc6029d
Commit Graph

6879 Commits

Author SHA1 Message Date
Anuken
72fc103e16 UI cleanup 2020-07-23 17:37:45 -04:00
Anuken
69f6154894 Updated bundles 2020-07-23 17:12:55 -04:00
Felix Corvus
91d54dfad3
Прочность 2020-07-23 19:46:46 +03:00
Felix Corvus
8c495a3f57
Update bundle_ru.properties 2020-07-23 19:30:48 +03:00
Anuken
3892cf2283 Merge remote-tracking branch 'origin/master' 2020-07-23 10:27:28 -04:00
Anuken
c93431ecc6 Bugfixes 2020-07-23 10:27:24 -04:00
Anuken
c8f3e26f44
Merge pull request #2247 from leweii/patch-1 
Update bundle_zh_CN.properties
 2020-07-23 09:23:31 -04:00
Anuken
565bac1e2b
Merge pull request #2254 from Remint32/master 
Textures micro fixes and improvements
 2020-07-23 09:23:06 -04:00
Anuken
9e0bd49f04 Fixed #2255 2020-07-23 08:47:30 -04:00
Anuken
701aa840b3 Nondestructive unit cap enforcement 2020-07-22 14:31:44 -04:00
Anuken
b4594b2274 Hard enforcement of unit cap 2020-07-22 13:27:54 -04:00
Anuken
988da3b8e9 Balancing / Bugfixes 2020-07-22 11:03:38 -04:00
Felix Corvus
4157e3c74d
Update bundle_ru.properties 2020-07-22 04:02:57 +03:00
Felix Corvus
916a00b6ff textures micro fixes and improvements 2020-07-22 03:40:58 +03:00
Anuken
43ca3ca210 Correct flow rate scaling 2020-07-21 19:51:57 -04:00
Anuken
93371b1cd0 Merge remote-tracking branch 'origin/master' 2020-07-21 19:49:50 -04:00
Anuken
973d907218 Balancing & bugfixes 2020-07-21 19:49:46 -04:00
Felix Corvus
2ef0e33227 spore-press frames sprites 6.0-ed 2020-07-22 02:18:55 +03:00
Anuken
5cfd784501 Merge remote-tracking branch 'origin/master' 2020-07-21 15:43:10 -04:00
Anuken
5c9e005397 Per-unit cap (still broken) 2020-07-21 15:43:02 -04:00
leweii
c9da9754ef
Update bundle_zh_CN.properties 
In Chinese properties, add some words, and try to make some sentences more fluent.
 2020-07-20 14:05:30 +08:00
Felix Corvus
69dae20275
ru translation respawn line fix 2020-07-20 05:16:57 +03:00
Anuken
07b3991fdf
Merge pull request #2242 from XZimur/patch-1 
Update bundle_uk_UA.properties
 2020-07-19 21:37:07 -04:00
Anuken
4ef0143928 typo 2020-07-19 21:35:32 -04:00
Anuken
7a2a436a52 Fixed #2246 2020-07-19 21:34:31 -04:00
Anuken
6547a38567 Cached Block#offset() 2020-07-19 16:34:06 -04:00
Anuken
c398b89284 Changed mouse_move to use forward mouse button by default 2020-07-19 13:04:26 -04:00
Anuken
9521af7be5 Input fixes 2020-07-19 13:00:55 -04:00
Anuken
c2d6076407 arc 2020-07-19 12:21:56 -04:00
Anuken
a074010eb7 Time.delta cleanup / Basic mobile input 2020-07-19 12:21:21 -04:00
Anuken
f9ed74c15a Fixed #2243 2020-07-19 09:32:57 -04:00
XZimur
4dec69fca7
Update bundle_uk_UA.properties 
I did found several errors in this translation:
1 - Container and Vault are both traslated as "Соховище", so i fixed this by translating Vault as "Вмістилище"
2 - Bridge conduit is translated like "Мостовий водопровід" with means Bridge water pipe, so i changed that to "Мостовий трубопровід" with mens Bridge conduit
 2020-07-19 10:15:14 +03:00
Anuken
c772e1fcc6 Bugfixes 2020-07-18 22:50:05 -04:00
Felix Corvus
f0acfb3cf3
бесконечные правки 2020-07-18 17:43:20 +03:00
Anuken
870f06218b Bugfixes 2020-07-18 09:36:43 -04:00
Anuken
6b3039dba2 Modifier reordering 2020-07-17 19:00:39 -04:00
Anuken
521e3c773f Weapon occlusion / Balancing 2020-07-17 16:57:27 -04:00
Anuken
60ce8ca935 Naval unit sprites complete 2020-07-17 16:41:46 -04:00
Anuken
d02268d347 Additional pyratite balancing 2020-07-17 15:25:17 -04:00
Anuken
54e5d6a302 Fixed #2238 2020-07-17 13:20:31 -04:00
Anuken
1bb621bbd5 Naval unit tweaks 2020-07-17 11:15:07 -04:00
Anuken
b2b6ddb5b2 arc 2020-07-17 08:48:13 -04:00
Anuken
660abe188b Fixed #2237 2020-07-17 08:46:11 -04:00
Anuken
208105f21d Prototype T1 naval unit 2020-07-16 21:09:42 -04:00
Anuken
a193351bd7 Merge remote-tracking branch 'origin/master' 2020-07-16 14:32:43 -04:00
Anuken
e3f40cd968 Cleanup 2020-07-16 14:32:38 -04:00
Felix Corvus
4e3226ee3d
bruh trails -> pretty trails fix 2020-07-16 18:41:22 +03:00
Felix Corvus
22ff8e2b9b hmm 2020-07-16 17:44:24 +03:00
Felix Corvus
df7285a1f5
Update bundle_ru.properties 2020-07-16 15:10:36 +03:00
Felix Corvus
6d55285b62
Update bundle_ru.properties 2020-07-16 14:23:34 +03:00
키에르
3d26e461c2
Update bundle_ko.properties 
block.segment - block.silicon-curcible, setting.mapcenter.name
 2020-07-16 00:13:37 +09:00
Anuken
b9de9e5a0c
Merge pull request #2068 from Kieaer/patch-4 
[Following] Update bundle_ko.properties
 2020-07-15 10:16:36 -04:00
Anuken
61b99f04e9 Merge remote-tracking branch 'origin/master' 2020-07-15 10:01:09 -04:00
Anuken
fd89911dd4 Text field dialog cleanup 2020-07-15 10:01:01 -04:00
Anuken
6a5900d745
Merge pull request #2195 from Prosta4okua/master 
Ru translation
 2020-07-15 09:49:11 -04:00
Anuken
a6593e3572
Merge pull request #2142 from Math2128/patch-5 
Update bundle_fr.properties
 2020-07-15 09:44:36 -04:00
Anuken
16873c6086
Merge pull request #2221 from T1NT4/patch-2 
Update bundle_pt_BR.properties
 2020-07-14 20:41:24 -04:00
Anuken
23e1d0998a
Merge pull request #2093 from zethnest/map-center 
[QOL] Center Map to Player Implementation
 2020-07-14 20:41:03 -04:00
Anuken
6e08b67817
Merge pull request #2164 from Cyberman-42/patch-1 
Update bundle_nl.properties
 2020-07-14 15:30:33 -04:00
Anuken
7a60339c5d
Update bundle_nl.properties 2020-07-14 15:30:16 -04:00
Anuken
7f6026bd52 Implemented #2153 2020-07-14 15:27:58 -04:00
Anuken
e0f1242ca7 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-07-14 15:04:04 -04:00
Anuken
bd95d81b40 nah 2020-07-14 15:03:59 -04:00
Anuken
d5b71e2773
Merge pull request #2210 from xerus2000/patch-1 
Unify tower terminology in german translation of tutorial
 2020-07-14 15:03:08 -04:00
Anuken
c21b02b1ec
Merge pull request #2187 from Catchears/patch-1 
Improved german translation.
 2020-07-14 15:02:33 -04:00
Anuken
c1cd84593d
Merge pull request #2194 from driver1748/patch-1 
Corrected some translations
 2020-07-14 14:58:35 -04:00
Anuken
85d67db1ed
Merge pull request #2175 from AlbertCerfeda/patch-2 
Minor changes
 2020-07-14 14:58:13 -04:00
Anuken
fe0d3cfe22
Merge pull request #2140 from soytheLB/patch-5 
Update bundle_es.properties
 2020-07-14 14:56:30 -04:00
Anuken
1661905d9b
Merge pull request #2106 from PetrGasparik/v105 
Czech translation - up to date!
 2020-07-14 14:56:09 -04:00
Anuken
ca1e43d79c
Merge branch 'master' into patch-2 2020-07-14 14:52:28 -04:00
Anuken
43676b68bf
Merge pull request #2105 from TheJaaju/patch-4 
Update bundle_fi.properties
 2020-07-14 14:49:27 -04:00
Anuken
752cccb588
Merge pull request #2062 from GioIacca9/patch-11 
Minor changes
 2020-07-14 14:45:51 -04:00
Anuken
3eca6b770e <added missing sprites IntelliJ missed> 2020-07-14 14:39:11 -04:00
Anuken
a1a72ee713 <added missing sprites IntelliJ missed> 2020-07-14 13:21:12 -04:00
Anuken
9dc49743e8 Implemented #1335 2020-07-14 13:20:50 -04:00
Anuken
fb08a3638b NetClient cleanup 2020-07-14 13:04:22 -04:00
Anuken
f9b6b8e5b7 recieve -> receive 2020-07-14 11:16:32 -04:00
Anuken
da577a0db2 Merge remote-tracking branch 'origin/master' 2020-07-14 11:11:56 -04:00
Anuken
fbd55a341e Implemented server autosave config (#1296) 2020-07-14 11:11:49 -04:00
Anuken
064a0545a8
Merge pull request #1941 from bluet-it/master 
add bundle_hu
 2020-07-14 10:41:34 -04:00
Anuken
a33ac30a01
Merge pull request #1595 from andreasgamborg/patch-1 
Create bundle_da.properties
 2020-07-14 10:41:28 -04:00
Anuken
6d7d4bcba1
Merge pull request #2028 from burunduk/patch-2 
Update bundle_uk_UA.properties
 2020-07-14 10:40:34 -04:00
Anuken
b541cfcc75
Update bundle_zh_TW.properties (#2081) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-07-14 10:37:54 -04:00
Ali-C-Ila
6c52812a0d
Update bundle_zh_TW.properties (#2054) 2020-07-14 10:37:41 -04:00
Lapis
360494af50
Update bundle_ja.properties (#2046) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties

* Small fix

* Small fix

* Update bundle_ja.properties

* Update bundle_ja.properties

* add waves.guardian

* Fixed setting.atmosphere.name translation

* translation of waves.shields

* Update bundle_ja.properties
 2020-07-14 10:37:22 -04:00
Anuken
b48e6d0e2f Illuminator tweaks 2020-07-14 10:25:56 -04:00
Felix Corvus
83d334582b
Update bundle_ru.properties 
Changes from https://github.com/Anuken/Mindustry/pull/2225
 2020-07-14 07:24:40 +03:00
Anuken
250d982d99 Internal unit name finalizations 2020-07-13 20:39:43 -04:00
Ubuntu8406
982b7f33bc
A small update of the finnish translation 2020-07-13 19:10:40 +03:00
Anuken
103ebc009d Fixed #2224 2020-07-13 08:50:19 -04:00
Petr Gašparík
a0ef83fb62 Czech translation - small improvement 2020-07-13 10:43:31 +02:00
Petr Gašparík
682bfcc8e8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-07-13 10:42:30 +02:00
Anuken
d31a530d6e Minor unit production balancing 2020-07-12 23:25:36 -04:00
Anuken
f5f495b9b8 Leg unit movement fixes 2020-07-12 11:34:19 -04:00
Anuken
dad5b186db Bugfixes / Negative knockback / Unit progress 2020-07-11 23:35:58 -04:00
Anuken
430eef02e2 Multi-legged unit implementations 2020-07-11 22:41:26 -04:00
Anuken
0555e4dfa7 Various palette changes 2020-07-11 14:44:50 -04:00
Anuken
6188250605 Unit tweaks 2020-07-11 13:20:23 -04:00
Anuken
064172e1f1 Bugfixes 2020-07-11 10:26:27 -04:00
Anuken
0752076bf2 Bullet cleanup 2020-07-11 09:08:17 -04:00
Anuken
a8d5198ca6 IntelliJ still refusing to add new files 2020-07-10 20:05:10 -04:00
Anuken
9cb4645b11 More unit progress 2020-07-10 20:04:45 -04:00
T1NT4
b81de5ebe4
Update bundle_pt_BR.properties 
changed the revenant factory description to match the revenant unit description on the database, and also fixed the revenant factory description so it no longer says that revenant are ground units
 2020-07-10 18:00:12 -03:00
Anuken
d7e432f730 Unit name changes 2020-07-10 16:38:19 -04:00
Anuken
d1485e3e65 IntelliJ has failed to commit this file 3 times 
It's been checked in my version control UI for my last 3 commits, and was invisible in my first commit despite me refreshing the list
 2020-07-10 13:26:05 -04:00
Anuken
21170634bd More unit abilities 2020-07-10 13:22:45 -04:00
Anuken
baa9f22a0b Ground support unit implementations 2020-07-10 12:14:24 -04:00
Anuken
f39702e1cc Core unit balance 2020-07-10 09:43:59 -04:00
Anuken
b94f883f39 More multiplayer fixes 2020-07-09 20:58:49 -04:00
Anuken
7c5f3762dd Bugfixes 2020-07-09 16:48:36 -04:00
Anuken
938ae6e80a Merge remote-tracking branch 'origin/master' 2020-07-09 13:14:05 -04:00
Anuken
2584197a02 Multiplayer bugfixes 2020-07-09 13:13:57 -04:00
zethnest
2a81370c66
fix power produce & consumption (#2217) 2020-07-09 09:23:49 -04:00
Anuken
29e9d064df Unit wreck visuals 2020-07-08 23:48:12 -04:00
Anuken
b0f69263c7 Bugfixes 2020-07-08 19:17:08 -04:00
Anuken
c15aec641a Environmental lights / Bugfixes 2020-07-08 12:40:17 -04:00
Anuken
a9333baa78 Research tweaks 2020-07-08 12:11:27 -04:00
Anuken
26e70fa585 Many various campaign mechanic changes 2020-07-07 21:13:03 -04:00
Anuken
b95206cf87 Support for jar mods on desktop 2020-07-07 09:34:52 -04:00
Anuken
56ffe5aea8 Campaign mechanics 2020-07-06 21:53:34 -04:00
Anuken
a6523630bf Unit sprite cleanup 2020-07-06 11:05:37 -04:00
Catchears
8a5f19e4f9 Changes from stuffAI 2020-07-06 13:08:48 +02:00
Janek
14f975bde7
Unify Tutorial terminology in german translation 
A friend of mine was playing through the tutorial and was confused by the term "Turm", since the duo is translated as "Geschütz", so he didn't quite know what the tutorial wanted. This unifies the terminology, since in the beginning you only have one "Geschütz" choice anyways.
 2020-07-05 17:54:48 +02:00
Anuken
9b285e6b21 Removed references to "phantom" 2020-07-05 11:15:46 -04:00
Anuken
403597f860 Unit cleanup 2020-07-05 10:39:54 -04:00
Anuken
add0d0cd86 Unit naming / Fixed #2209 2020-07-04 23:53:22 -04:00
Anuken
8576d535bd Removed "on" prefix from all remote methods 2020-07-03 18:48:31 -04:00
Anuken
7ff2e98420 Cleanup 2020-07-03 16:41:06 -04:00
Anuken
843a8c3e56 Fixed crashes with team IDs above 127 2020-07-03 12:36:12 -04:00
Anuken
3772b04c6b Miner unit fixes 2020-07-03 09:30:08 -04:00
Anuken
fb7633cb07 Cyclone hits ground targets again 2020-07-02 23:35:36 -04:00
Anuken
efa8d8a0d7 Minor weapon fixes 2020-07-02 23:19:44 -04:00
Anuken
f4a7108382 Weapon system refactoring 2020-07-02 22:48:37 -04:00
Anuken
d59aab1a7d Air/ground bullet cleanup 2020-07-02 15:52:21 -04:00
Anuken
ee3aedc75f Implemented core item display (WIP) 2020-07-02 15:27:02 -04:00
Anuken
cecb5cf4b4 Added tractor beam turret 2020-07-02 14:02:33 -04:00
Anuken
0a7e40bd23 Merged wall classes 2020-07-02 10:44:31 -04:00
Anuken
fd2deb0a82 Moved pref saving to specific locations 2020-07-02 10:20:16 -04:00
Anuken
5f6c71b9d3 Replaced concept of "turns" with raw seconds 2020-07-01 11:50:33 -04:00
Anuken
3cf5adc278 Merge remote-tracking branch 'origin/master' 2020-06-30 19:14:40 -04:00
Anuken
e907c2045c Cleanup 2020-06-30 19:14:32 -04:00
Katsute
5740c2b6d0
hideme (#2201) 
Co-authored-by: Katsute <Katsute@users.noreply.github.com>
 2020-06-30 11:53:14 -04:00
Anuken
c2c0c3fd08 Fixed #2197 2020-06-29 21:22:12 -04:00
Anuken
df4278a646 Removed item core restrictions 2020-06-29 19:32:15 -04:00
Anuken
810a59f146 Mass driver resprite 2020-06-29 16:23:25 -04:00
Anuken
bf5dd7386e Reduced garbage allocation 2020-06-29 15:58:48 -04:00
Anuken
d58e3ac235 Implemented more sector launch mechanics 2020-06-29 11:58:43 -04:00
WinterUnderTheSnow
679aab18ee
*Phantom is now Phenom too 
XD
 2020-06-29 10:07:53 +08:00
Anuken
fb032eb763 Enforce sector core capacity 2020-06-28 20:16:36 -04:00
Anuken
0d6657a1e8 Idle sector resource production 2020-06-28 18:55:42 -04:00
Anuken
fceac4c1a1 Don't show launch animation for existing bases 2020-06-28 13:35:08 -04:00
Anuken
b3f29f100d Custom launch items 2020-06-28 13:33:53 -04:00
Prosta4okua
24071ed23b
Merge branch 'master' into master 2020-06-28 19:41:37 +03:00
Prosta4okua
e1e9b28bf1
Ненужная большая буква + обновление с master. 
1. Вы -> вы
2. Ваш -> ваш
«Вы» используется только в деловом общении.
 2020-06-28 19:34:12 +03:00
Anuken
6386cae19a Launching dialog bugfixes & requirement display 2020-06-28 11:40:03 -04:00
WinterUnderTheSnow
b12d3ae0ba
Corrected some translations 
4,5 Noticed that using discord in China need some unusual ways.
19 ‘Gameover’ not ‘Your core has been destroyed!’
105 Mod guide is actually guiding you how to make a mod 
116 ‘dependences’refers to ‘mods needed’,not ‘condition needed’
126 ‘import mod from GitHub’sounds better than’import github mod’
151 I think ‘Your are not invited to play on this server’ sounds better than ‘You are not in the whitelist’.This will stop noobs spamming everywhere.
155 ‘Server admin’ but not ‘Room owner’
156,193,203,206 ‘ban’ is better than ‘blacklist’
195 added one this server’
1000 phantom?Why not Phenom(Yes that CPU) XD (In fact ‘神魂修理机’ is a joke too)
 2020-06-28 21:40:17 +08:00
Anuken
bd274f804a Loadout selection + custom loadout schematics 2020-06-27 23:04:38 -04:00
Anuken
63356e96ec Merge remote-tracking branch 'origin/master' 2020-06-27 19:16:47 -04:00
Anuken
80332e37d5 Upgradeable cores 2020-06-27 19:16:39 -04:00
Summet
63717bdf51
Small Colored Shields Improvement. (#2193) 
When a player places a force projector, the color of its edges will be the color of the player.
 2020-06-27 11:06:13 -04:00
Anuken
313cadb763 Minor cleanup / Trail experiment 2020-06-27 09:20:52 -04:00
Anuken
0847b20401 Cleanup 2020-06-26 18:50:30 -04:00
Anuken
7401c16ded Team-colored shields 2020-06-26 18:42:29 -04:00
Anuken
0df4e26736 Cleanup 2020-06-26 15:59:54 -04:00
Anuken
fdf7c88083 argh 2020-06-26 14:27:26 -04:00
Anuken
eabc5c15c7 Codegen for an inheritance tree 2020-06-26 11:58:35 -04:00
Catchears
bec394abbc Fix translations 2020-06-26 08:43:39 +01:00
Anuken
96f41b0cf3 Cleanup 2020-06-25 22:34:38 -04:00
Anuken
c12865eabc Removed reload, forced mandatory mod restart 2020-06-25 22:31:47 -04:00
Anuken
ecfac00c30 Arc 2020-06-25 12:54:55 -04:00
Anuken
d90807b29c Bugfixes 2020-06-25 12:51:30 -04:00
Catchears
f4f5658fee Revert "Revert "Small comma fix"" 
This reverts commit 62399d0f2b.
 2020-06-25 13:22:50 +01:00
Catchears
62399d0f2b Revert "Small comma fix" 
This reverts commit 47ec565316.
 2020-06-25 13:22:39 +01:00
Catchears
47ec565316 Small comma fix 2020-06-25 11:06:28 +01:00
Catchears
0f224c7780 Add / improve translations again 2020-06-25 11:02:48 +01:00
Catchears
946ac8eefb Change capitalisation due to a mistake 2020-06-25 09:45:21 +01:00
Anuken
19cb144cdb Minor GL fixes 2020-06-24 20:37:49 -04:00
Anuken
b204074690 More multiplayer fixes 2020-06-24 10:07:05 -04:00
Anuken
d5c758c18a arc 2020-06-23 22:47:40 -04:00
Anuken
843be42568 More multiplayer bugfixes 2020-06-23 22:46:28 -04:00
Anuken
db2f61ec29 less instant disconnect, more broken multiplayer 2020-06-23 21:07:20 -04:00
Anuken
d095008e7c Some initial multiplayer bugfixes 2020-06-23 20:01:55 -04:00
Anuken
fc8e1d5b6d Bugfixes 2020-06-23 16:27:32 -04:00
Anuken
ba78eab30a Proper player icons 2020-06-23 15:40:24 -04:00
Anuken
7b7e803011 Cleanup 2020-06-22 23:08:59 -04:00
Anuken
7dfd20d020 Core launch cost 2020-06-22 21:02:53 -04:00
Petr Gašparík
f0882d8d5e Czech translation - up to date 2020-06-22 23:19:57 +02:00
Petr Gašparík
e3735ffa9c Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-06-22 22:54:57 +02:00
Math2128
185e4334f6
Update bundle_fr.properties 
Update to the main bundle
 2020-06-22 13:52:06 -04:00
Anuken
58d8e22b40 Added smooth camera option 2020-06-22 13:40:04 -04:00
Anuken
47b06d0eac Added sandstorm weather 2020-06-22 11:10:12 -04:00
Anuken
42c323365a Removed CoreLauncher 2020-06-21 20:22:20 -04:00
Anuken
9c69e3a1a0 Bugfixes / Sector preset cleanup 2020-06-21 16:00:26 -04:00
Catchears
af7b7ef2b1
Improved german translation. 2020-06-21 20:03:46 +01:00
Anuken
4a8be42258 Lowercase enums 2020-06-21 12:38:59 -04:00
Anuken
6f1a64db78 Updated atlas with correct enum names 2020-06-21 12:25:11 -04:00
Anuken
934db24d3b Renamed Texture enums with correct case 2020-06-21 12:20:02 -04:00
Anuken
93ae73abb6 Sprite cleanup 2020-06-21 10:38:13 -04:00
Anuken
71ea9b3bd9 (IntelliJ refuses to add new files after refresh) 2020-06-21 10:34:00 -04:00
Anuken
6517eaf62f Implemented #2177 2020-06-21 10:33:08 -04:00