mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,508 Commits 4 Branches 160 Tags 2.1 GiB
b47f44cacd
Commit Graph

1079 Commits

Author SHA1 Message Date
Anuken
649fc5a0e6 Bundles updated 2018-09-11 16:34:31 -04:00
Anuken
67cfa5d42f Made blocks no longer unlock in custom games 2018-09-11 16:27:45 -04:00
Anuken
5dcacdeea1 Merge remote-tracking branch 'origin/master' 2018-09-11 09:22:59 -04:00
Anuken
2f7073bbe4 Removed NetEvents class / Added unused patrol command 2018-09-11 09:22:54 -04:00
Prosta4okua
e8df6ed3be Nice Update bundle_uk_UA.properties. :) (#220) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2018-09-11 09:22:16 -04:00
Anuken
6ef2256bf2 Removed all reflection 2018-09-09 21:44:10 -04:00
xgamezs
fb9f42ff93 Update bundle_uk_UA.properties (#219) 2018-09-08 23:02:49 -04:00
Anuken
778069c15d New artillery turret bullet patterns 2018-09-08 13:43:25 -04:00
Anuken
e98457c540 Fixed server build error 2018-09-08 11:57:57 -04:00
Anuken
7a3a76065c Added RTG generator 2018-09-08 11:48:27 -04:00
Anuken
c73c97dc7b Added arc turret 2018-09-08 11:35:29 -04:00
Anuken
7dd487ccc5 Force projector implementation 2018-09-07 23:24:55 -04:00
Anuken
2ad8f1c112 Bundles updated / Crash fix 2018-09-07 09:18:58 -04:00
Anuken
f0d884e114 Force projector sprite 2018-09-06 22:08:22 -04:00
Prosta4okua
df3f2ea9c1 [Complete]Russian bundle. (#208) 
* 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 bundle_ru.properties

* Update bundle_ru.properties
 2018-09-06 19:53:31 -04:00
Anuken
1960b59629 Packer compile fix / Mapping fix 2018-09-06 19:38:19 -04:00
Anuken
484721fece Fixed game data clearing 2018-09-05 13:00:15 -04:00
Anuken
9c36026991 Data clearing / Bugfixes 2018-09-05 10:24:47 -04:00
Anuken
d4ccfa31b5 Balancing 2018-09-04 22:16:23 -04:00
Anuken
5814b2a4b8 Merge remote-tracking branch 'origin/master' 2018-09-04 22:08:08 -04:00
Anuken
d3f61af493 Added shock mines 2018-09-04 22:08:05 -04:00
xgamezs
233ea7bb4a Update bundle_ru.properties (#214) 2018-09-04 21:23:08 -04:00
Anuken
7b90544d91 Fixed player mech icon clip / Added kick confirmation 2018-09-04 17:42:56 -04:00
xgamezs
add525396f Update bundle_ru.properties (#213) 2018-09-04 14:43:35 -04:00
Anuken
26ae4edd63 Added version type 2018-09-04 12:10:48 -04:00
CrazyBearTR
bcde481304 Update of the Turkish Translation Bundle (#212) 
* Update of the Turkish Translation Bundle

Some words were wrong. Fixed in this version.

* Update bundle_tr.properties
 2018-09-03 19:38:01 -04:00
Prosta4okua
5b1341e488 [Complete]Update bundle_uk_UA.properties (#211) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2018-09-03 19:37:55 -04:00
Anuken
e0a94f694b Shader fix / Hail buff / Tau nerf / Turkish lower case fix 2018-09-03 15:57:06 -04:00
Anuken
e877310d85 Mech balancing / Less glitchy menu shader 2018-09-03 13:33:40 -04:00
CrazyBearTR
cebaa6949e Turkish language request (#210) 2018-09-03 09:55:04 -04:00
Anuken
5129e2ea73 Crash fixes 2018-09-03 09:02:16 -04:00
Anuken
5e29115c2e Fixed ship flight targeting / Fixed unit weapon sprite offset 2018-09-02 16:23:39 -04:00
Anuken
a01f64080d Fixed unit pads / Added chat log 2018-09-02 14:16:14 -04:00
Anuken
1d21d36253 Fixed font line height / Bundles updated / Changelog date 2018-09-02 13:49:38 -04:00
Prosta4okua
e204b89eaf Update bundle_ru.properties (#206) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-09-02 13:20:40 -04:00
Anuken
54497c43b6 Fixed mobile menu shader / Added 'old save' message for sectors 2018-09-02 11:46:47 -04:00
Anuken
469b3c0a94 Balance tweaks / Changed block liquid place-ability 2018-09-01 22:29:25 -04:00
Anuken
d90d88c68b Menu shader / Sprite fixes 2018-09-01 20:16:49 -04:00
Anuken
dcc061af3e New seed-based AI bases 2018-09-01 14:44:06 -04:00
Leone25
e633528a7a Update bundle_ita.properties (#205) 2018-08-31 09:24:26 -04:00
Prosta4okua
8791747453 [Complete]Update bundle_ru.properties (#202) 
* 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 bundle_ru.properties
 2018-08-30 23:52:41 -04:00
Anuken
f29673a6e3 Made desktop selection rebindable 2018-08-30 16:46:41 -04:00
Senventise
35a85860b1 Add Simplified Chinese font and update translations (#204) 
* update translation

* add simplified chinese font

* delete outdated font

* Update uiskin.json
 2018-08-29 09:38:10 -04:00
Anuken
8c6ae2576d Fuse shot implemented 2018-08-28 19:00:29 -04:00
Anuken
802e7b12d0 Surge uses / Fixes, optimizations / Turret implementation base 2018-08-27 23:50:23 -04:00
Anuken
ac9d37d038 Core player shield / Bundles updated 2018-08-27 13:30:34 -04:00
Anuken
6323c13704 Mech descriptions / Balancing / Crash fix / Physics fix 2018-08-27 09:52:33 -04:00
Anuken
2f7f16daff Added mend projector 2018-08-26 23:03:02 -04:00
Anuken
33fcfda1a0 Added alloy smelter 2018-08-25 16:50:42 -04:00
Anuken
e392c8f0e6 All reconstructors implemented / Balancing 2018-08-25 14:52:46 -04:00
Anuken
86a7f837cd Implemented halberd 2018-08-25 09:55:08 -04:00
Anuken
9465497481 Implemented trident 2018-08-24 23:32:08 -04:00
Anuken
8c3f3ac304 Javelin abilities 2018-08-24 17:53:54 -04:00
Anuken
94805259d7 Added alpha drone swarm ability 2018-08-24 13:54:53 -04:00
Anuken
5e8686db77 Removed Upgrade class / Buffed units / Bugfixes 2018-08-24 09:39:02 -04:00
Anuken
ee835f6514 Merge branch 'master' of https://github.com/Anuken/Mindustry into mechs-balance-altfire 
# Conflicts:
#	core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
 2018-08-24 08:57:19 -04:00
Anuken
5de61aaed3 Unlockable mechs 2018-08-24 08:55:19 -04:00
Anuken
30dd089c8b Tau mech implemented 2018-08-22 23:29:14 -04:00
Anuken
8319288776 Omega mech ability / Rendering fix 2018-08-22 16:13:26 -04:00
Anuken
e1f7c7b03d Omega mech implementation 2018-08-21 22:40:39 -04:00
Prosta4okua
b0103d1ce3 [Complete]Update bundle_ru.properties (#199) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-08-21 13:27:20 -04:00
Prosta4okua
9c532047d3 [Complete]Update bundle_uk_UA.properties (#201) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2018-08-21 13:27:09 -04:00
Anuken
6dcbe4fabb Added phase walls 2018-08-21 10:36:42 -04:00
Anuken
7a5e61fd2e Fixed off-color stone floor blocks 2018-08-20 22:17:34 -04:00
Anuken
dc6f01c0d3 Merge branch 'resource-rework' of https://github.com/Anuken/Mindustry 2018-08-20 22:09:57 -04:00
Anuken
1cc8cbe8a8 Bundles updated / Updated mechanical drill sprite 2018-08-20 22:09:15 -04:00
Anuken
01ae8bec85 Turret sprite fixes 2018-08-20 21:30:37 -04:00
Anuken
258ab87f6b Palette swap / Blocks changed and renamed 2018-08-20 21:04:03 -04:00
Anuken
8ba2db6c58 Dense alloy / Compile errors fixed 2018-08-20 17:43:56 -04:00
Gureumi
c47a220721 Update bundle_ko.properties (#198) 2018-08-20 09:21:13 -04:00
Leone25
0288daa39d Update bundle_ita.properties (#195) 2018-08-19 18:40:53 -04:00
Prosta4okua
3f075068a9 Update bundle_ru.properties (#196) 2018-08-19 18:40:43 -04:00
Anuken
278e7027f2 Bundles updated 2018-08-19 13:35:35 -04:00
JustYanns
279187d13b Update bundle_fr.properties [Complete] (#146) 
* Update bundle_fr.properties

Few things translated in french.
I'll do more soon !!

* Update bundle_fr.properties V2

Update with comment of Math2128

* Update bundle_fr.properties V3

Few translations fixed

* Update bundle_fr.properties V4

•1 Thorium is the same in french and in english. 
•2 Carbide and cryofluid are not translatable !!
•3 Phase matter = "matière de Phase" doesn't sound good, I think we have to let the english word.
•4 Pyratite can be translated as "pyrrhotite" is it a good idea ?

* Update bundle_fr V5

Few translations fixed

* Update bundle_fr.properties V6 [Almost complete]

The french translation is almost finished, I will release the final translation soon.

* Update bundle_fr.properties [pre-release1]

Translation almost finished,
I just have 2 problems (see in the conversation)

* Update bundle_fr.properties  [pre-release2]

Translation almost finished
I just have 2 problems (see in the conversation)

* Update bundle_fr.properties [pre-release3]

Thank you to Math2128, for having helping me ;)

* Update bundle_fr.properties  [pre-release4]

Translations of Math2128's commit added
 2018-08-19 13:34:17 -04:00
Gureumi
a2ef11eb0f Fix 'has connected' message + Add chat font (#194) 
* Fix 'has connected' message

* Add chat font
 2018-08-19 10:29:40 -04:00
Leone25
b2c388276f Update bundle_ita.properties (#192) 2018-08-18 18:33:49 -04:00
Prosta4okua
178928f866 [Complete]Update bundle_uk_UA.properties (#188) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2018-08-18 13:10:57 -04:00
Prosta4okua
7e548f9969 Update bundle_ru.properties (#191) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-08-18 13:10:43 -04:00
Anuken
a60ce3c54c Merge branch 'master' of https://github.com/Anuken/Mindustry into resource-rework 2018-08-18 13:10:22 -04:00
Anuken
64dbe8312e Fixed merge issues 2018-08-18 13:07:54 -04:00
Anuken
7f443c71ae Merge remote-tracking branch 'origin/master' 2018-08-18 13:06:59 -04:00
Anuken
27276c025c Merge branch 'remove-ammo' of https://github.com/Anuken/Mindustry 2018-08-18 13:06:54 -04:00
Uriel
dec01c23a9 [Completed] Remaking spanish translation bundle (#187) 
* started translating all the stuff

* translated more of the original english file

* translated more parts

* almost half of the file!

* MOREgit add .!

* Update bundle_es.properties

* completed

* forgot about these ones...
 2018-08-18 08:57:42 -04:00
Anuken
20021c5b31 Fixed 1-character names being valid / Fixed collideLine with tiles 2018-08-17 20:21:49 -04:00
Anuken
f8d6797fc2 Fixed android module being necessary to compile 2018-08-17 18:05:28 -04:00
Anuken
25051980ce Fixed category bundle properties missing 2018-08-17 14:51:18 -04:00
Anuken
c92e8161a1
Merge pull request #190 from Prosta4okua/patch-21 
[Complete] bundle_ru.properties
 2018-08-17 11:33:29 -04:00
Anuken
177b565d7c
Merge pull request #173 from Gab351/patch-1 
Translate l227 to l239
 2018-08-17 10:38:24 -04:00
Prosta4okua
a62b336b6c
Update bundle_ru.properties 2018-08-17 12:59:51 +03:00
Prosta4okua
3ea61c8b3a
Update bundle_ru.properties 2018-08-17 12:02:44 +03:00
Prosta4okua
4c57f9f902
Update bundle_ru.properties 2018-08-17 10:48:29 +03:00
Anuken
020c6388c2 Block renaming 2018-08-16 18:38:04 -04:00
Anuken
53d35e8c77 Bundles updated / Fixed some localization bugs 2018-08-16 17:43:43 -04:00
Anuken
1699ab48e8 Added alternate health bar on all units 2018-08-16 17:07:20 -04:00
Leone25
b15c04a532
Update bundle_ita.properties 2018-08-16 21:10:04 +02:00
Anuken
80d57f8c0c Comma fix 2018-08-16 11:25:27 -04:00
Anuken
d071877963
Merge pull request #186 from Leone25/patch-1 
Big update for italian bundle
 2018-08-15 13:12:18 -04:00
Anuken
0267cb4006 Conduit sprites improved / Fixed incorrect proximity update 2018-08-15 13:11:55 -04:00
Leone25
bf571e595c
Update bundle_ita.properties 2018-08-15 19:05:18 +02:00
Anuken
c0cad70212 Merge remote-tracking branch 'origin/master' 2018-08-15 10:49:05 -04:00
Anuken
7bd6dbb4b4 Partial korean font PR revert / Crash fixes 2018-08-15 10:48:19 -04:00
Prosta4okua
e154b5179d
Update bundle_ru.properties 2018-08-15 08:27:26 +03:00
Anuken
52110d6008 ok 2018-08-14 19:30:05 -04:00
Leone25
d0ff149cca
Update bundle_ita.properties 2018-08-14 21:07:39 +02:00
Leone25
b70de81c2d
Update bundle_ita.properties 2018-08-14 14:41:38 +02:00
Gureumi
5e89b2568f Add korean chat fonts + fix typos 2018-08-14 15:59:07 +09:00
Leone25
fefc734bfa
Update bundle_ita.properties 2018-08-12 22:24:10 +02:00
Prosta4okua
7f8735842c
Update bundle_ru.properties 2018-08-12 22:28:23 +03:00
Prosta4okua
a226983470
Update bundle_ru.properties 2018-08-12 19:19:07 +03:00
Prosta4okua
28526d0a12
Update bundle_ru.properties 2018-08-12 18:54:51 +03:00
Prosta4okua
913e005bae
Update bundle_ru.properties 2018-08-12 10:44:56 +03:00
Prosta4okua
7bd9fd5bae
Update bundle_ru.properties 2018-08-12 00:12:55 +03:00
Anuken
ef936214f0
Merge pull request #180 from Prosta4okua/patch-17 
[Complete]Update bundle_uk_UA.properties
 2018-08-10 10:20:43 -04:00
Prosta4okua
ecda4d74ab
Update bundle_uk_UA.properties 2018-08-10 16:12:44 +03:00
Prosta4okua
31124037b5
Update bundle_uk_UA.properties 2018-08-10 16:07:46 +03:00
Prosta4okua
aaf95e0756
Update bundle_uk_UA.properties 2018-08-10 16:06:01 +03:00
Gureumi
804e311875 Update 2018-08-10 19:21:46 +09:00
Anuken
547d334f43
Merge pull request #178 from Leone25/patch-1 
update italian boundle_ita
 2018-08-09 19:29:34 -04:00
Leone25
7432dc115e
Update bundle_ita.properties 2018-08-10 00:48:20 +02:00
Prosta4okua
0a8ff0cde7
Update bundle_ru.properties 2018-08-10 00:59:27 +03:00
Prosta4okua
bd5f44030e
Update bundle_ru.properties 2018-08-10 00:53:41 +03:00
Anuken
79abb86262 Merge remote-tracking branch 'origin/master' 2018-08-09 17:45:09 -04:00
Anuken
fe6f98ec5a Minor bugfixes / Added block names to bundle/ Autogen ore names 2018-08-09 17:44:52 -04:00
Gureumi
8328b11f6b
Update. 2018-08-09 19:54:09 +09:00
Anuken
a804053904 Typo fix / Biomatter compressor buffed 2018-08-08 21:10:57 -04:00
Anuken
0cb8c600b7 Merge remote-tracking branch 'origin/master' 2018-08-08 20:53:02 -04:00
Anuken
aa5348f37e Auto-play server sectors / Difficulty decrease / Improved d/c messages 2018-08-08 20:52:51 -04:00
Anuken
0736574a57
Merge pull request #174 from Prosta4okua/patch-13 
[Сomlete]Update bundle_ru.properties
 2018-08-08 20:07:23 -04:00
Anuken
d56365ce63
Merge pull request #175 from CinExPL/patch-1 
Update bundle_pl.properties
 2018-08-08 20:07:14 -04:00
Prosta4okua
c82d2f856a
Update bundle_ru.properties 2018-08-09 00:02:22 +03:00
Prosta4okua
8432677826
Update bundle_ru.properties 2018-08-08 23:58:41 +03:00
Prosta4okua
0c0c6e5470
Update bundle_ru.properties 2018-08-08 23:56:42 +03:00
Anuken
57019b6e20 Fixed oil extractor desync / Buffed thermal genenerator / Typo fix 2018-08-08 16:00:33 -04:00
CinExPL
12ab2249b4
Update bundle_pl.properties 2018-08-08 21:10:42 +02:00
Anuken
4e3204bc6d All known crashes fixed 2018-08-08 11:18:30 -04:00
Prosta4okua
273523480f
Update bundle_ru.properties 2018-08-08 08:34:44 +03:00
Anuken
b27fefae88 Misc fixes 2018-08-08 01:09:57 -04:00
Anuken
cb16c75e11 Minor bundle fixes / Web build fixed 2018-08-07 19:36:56 -04:00
Anuken
21ba6e257c Added indicator when core is under attack 2018-08-07 17:01:17 -04:00
Leone25
3acb843109
Update bundle_ita.properties 2018-08-07 21:48:42 +02:00
Leone25
1768aea66f
Update bundle_ita.properties 2018-08-07 20:54:40 +02:00
Anuken
a1dbbbdafc Crash fixes / 2x2 drills 2018-08-07 11:40:25 -04:00
Anuken
dcb840f290 Many bugfixes / Dagger unit buffed / Build times increased 2018-08-07 11:17:32 -04:00
Leone25
b4272e0387
Update bundle_ita.properties 2018-08-06 20:44:09 +02:00
Anuken
aaa82b34e4 Difficulty display / More starting resources / Recipe tweaks 2018-08-06 12:42:34 -04:00
Anuken
80001246ef Added sector wave difficulty / ita bundle updated 2018-08-06 11:19:44 -04:00
Anuken
c7c7cfde74
Merge branch 'master' into patch-2 2018-08-06 11:17:20 -04:00
Gab_351
502c4e51ae
Translate l227 to l239 2018-08-06 15:16:39 +03:00
Anuken
6904d4693f Merge remote-tracking branch 'origin/master' 2018-08-05 19:19:55 -04:00
Anuken
3ef7ec3be5 Bundles updated 2018-08-05 19:19:50 -04:00