mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,863 Commits 4 Branches 160 Tags 2.3 GiB
38a2ae0db2
Commit Graph

6738 Commits

Author SHA1 Message Date
Felix Corvus
38a2ae0db2
Merge branch 'master' into master 2020-07-24 20:37:08 +03:00
Felix Corvus
07b5999b13
Merge branch 'master' into master 2020-07-24 20:34:49 +03:00
Anuken
58c39e14d6 risse -> risso 2020-07-24 13:27:15 -04:00
Felix Corvus
7c0080ee65
Russian translation of units 2020-07-24 20:20:35 +03:00
Anuken
8db4f88ecc Plastanium conveyor blend fix 2020-07-24 12:56:30 -04:00
Anuken
0372ec7c9f Bugfixes, balancing 2020-07-24 12:42:59 -04:00
Anuken
a48efd971c Removed "naval" sector requirement 2020-07-24 10:53:17 -04:00
Anuken
c1283b856b Some initial air boss stats 2020-07-23 21:50:07 -04:00
Anuken
d6af9a6671 arc 2020-07-23 17:39:28 -04:00
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