mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-27 16:09:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
3,530 Commits 4 Branches 160 Tags 2.3 GiB
148f272500
Commit Graph

1520 Commits

Author SHA1 Message Date
VizardAlpha
b21bf2d544
Updates bundle_fr_BE.properties 2019-01-12 14:56:51 +01:00
Anuken
84e754dd10 Added zone class / Dialog method inline 2019-01-09 18:50:10 -05:00
Anuken
b9618d66f2 Removed 'text.*' prefix 2019-01-09 16:58:06 -05:00
Anuken
daa7b20e4a World generation launch pad preset 2019-01-09 16:37:14 -05:00
Anuken
33afab7294 Launchpad block 2019-01-09 11:44:33 -05:00
VizardAlpha
8010a82776
Update bundle_fr_BE.properties 2019-01-09 16:49:25 +01:00
Anuken
048b7bd32f Global inventory / 'Deploying' / Removed command center 2019-01-09 09:07:48 -05:00
Anuken
28fa0b070d Merge branch 'unsector' 
# Conflicts:
#	core/src/io/anuke/mindustry/maps/SectorPresets.java
#	core/src/io/anuke/mindustry/maps/Sectors.java
#	core/src/io/anuke/mindustry/maps/TutorialSector.java
#	core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
#	core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java
#	core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
 2019-01-08 22:28:13 -05:00
Anuken
1d8efe5f9d Packer reorganization 2019-01-08 17:41:51 -05:00
Anuken
521174f911 Removed autogenerated liquid sprites 2019-01-08 09:56:42 -05:00
Anuken
351b8c2469 Fixed content class errors 2019-01-07 18:48:55 -05:00
Anuken
153e6c5f1b Re-structuring 2019-01-03 19:46:25 -05:00
Anuken
b9136e4e98
Merge pull request #364 from Prosta4okua/patch-43 
(Complete) Close before 64 build
 2019-01-02 21:00:15 -02:00
Prosta4okua
197b97d0db
Update bundle_uk_UA.properties 2019-01-02 13:26:36 +02:00
Anuken
912136d174 Merge remote-tracking branch 'origin/master' 2019-01-01 18:41:07 -05:00
Anuken
71e61abcd6
Merge pull request #356 from DaGamerFiles/patch-1 
Update bundle_in_ID.properties [INCOMPLETE]
 2019-01-01 21:33:57 -02:00
Anuken
fa1d440bb0
Merge pull request #355 from JustYanns/patch-2 
Update bundle_fr.properties [Incomplete]
 2019-01-01 21:32:16 -02:00
Anuken
6aa90a44f7
Merge branch 'master' into patch-4 2019-01-01 21:13:20 -02:00
키에르
b2f47e6b70 Update bundle and fix error (+orignal bundle) (#382) 
* Update bundle_ko.properties

* Update bundle.properties

* Duplicate
 2019-01-01 21:09:45 -02:00
VizardAlpha
c905a870e0 Update bundle_fr_BE.properties (#381) 
* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties
 2019-01-01 21:09:34 -02:00
William So
b2360e42c6 Update bundle_zh_TW.properties (#379) 2019-01-01 21:09:25 -02:00
Ignacy
0da621745a Update bundle_pl.properties (#386) 2019-01-01 17:17:02 -02:00
SkeptiC
d8fc3851a7 Create bundle_cs.properties (#388) 
Finished translation to czech
 2019-01-01 17:15:45 -02:00
Anuken
41f16a54de Logo downscale 2018-12-30 12:54:03 -05:00
Anuken
b91510efb3 Input fixes 2018-12-30 11:41:06 -05:00
Anuken
d01b8c7ad1 Improved snapshot netcode 2018-12-29 22:46:46 -05:00
Anuken
7c35b6e95a Minor build file fixes 2018-12-29 15:58:11 -05:00
Anuken
86b35fc43d Various graphical fixes 2018-12-29 13:06:17 -05:00
Anuken
36b27458b6 Merged 4x graphics 2018-12-28 23:46:09 -05:00
Anuken
bbb2153112 Merge branch 'arc-port' of https://github.com/Anuken/Mindustry 2018-12-28 22:22:08 -05:00
CinExPL
89d5618232
Update bundle_pl.properties 2018-12-28 14:36:06 +01:00
Anuken
3b42b604e1 Successful desktop compilation 2018-12-26 17:38:40 -05:00
Prosta4okua
f22caed088
Update bundle_uk_UA.properties 2018-12-26 22:49:18 +02:00
Prosta4okua
1f4e611629
Update bundle_uk_UA.properties 2018-12-26 22:45:13 +02:00
Prosta4okua
84f60f63b8
Update bundle_uk_UA.properties 2018-12-22 17:11:52 +02:00
Prosta4okua
572f358bda
Update bundle_uk_UA.properties 2018-12-22 16:47:57 +02:00
Prosta4okua
46df7726c3
Update bundle_uk_UA.properties 2018-12-22 11:38:01 +02:00
beito
ecab13af57 Update Japanese translations (#378) 
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations

* Update Japanese

* Update Japanese

* Update Japanese translations

Improve and update for new changes

* Update Japanese

* Update Japanese translations

* Update Japanese translations

* Update Japanese translations

* Update Japanese translations

* Update Japanese translations

* Update Japanese translations

* Update Japanese translation

* Update Japanese translations

* Update Japanese translations
 2018-12-17 02:50:01 -02:00
Anuken
6029b6d67f Updated smooth UI 2018-12-14 22:07:43 -05:00
Anuken
9d744580a1 Merge 2018-12-14 21:48:34 -05:00
Prosta4okua
7a533f6053
Update bundle_uk_UA.properties 2018-12-14 18:28:40 +02:00
Prosta4okua
a292ff4287
Update bundle_uk_UA.properties 2018-12-14 18:24:06 +02:00
BasedUser
29329383e4 Update bundle_ru.properties (#377) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-12-14 11:14:30 -05:00
Anuken
5c6d4b9ac2 Fixed extremely strange join dialog server padding 2018-12-14 00:09:44 -05:00
CrazyBearTR
54b892cd29 Incomplete update for turkish translation (#272) 
Its incomplete. Still needed to work on it.
 2018-12-13 15:58:06 -05:00
Anuken
97d54868e9 Grid mode tweak 2018-12-11 17:48:55 -05:00
William So
eab90cac05 [Completed] Translate the rest of bundle_zh_TW.properties (#370) 
* Translate unit strings

* Translate tutorial strings

* Translate walls', projecters', and turrents' strings

* Translate recently added strings

* Translate strings to the part before power

* Translate strings to the part before containers

* Translate containers', drills', and mechs' strings

* Translate factories' strings

* Translate everything else untranslated
 2018-12-10 10:47:40 -05:00
VizardAlpha
ce401b01b6 Updates bundle_fr_BE.properties (#373) 2018-12-10 10:39:14 -05:00
Anuken
c1a7b452e0 Misc cleanup 2018-12-09 23:28:36 -05:00
BasedUser
aacd9dc62c Update bundle_ru.properties (#369) 2018-12-09 00:05:09 -05:00
Prosta4okua
988df8742c
Update bundle_uk_UA.properties 2018-12-07 10:27:11 +02:00
Prosta4okua
10c41bf443
Update bundle_uk_UA.properties 2018-12-07 10:16:21 +02:00
Prosta4okua
bb30876557
From Ber and 2018-12-07 10:13:22 +02:00
Prosta4okua
26e972314e
Update bundle_uk_UA.properties 2018-12-05 22:44:03 +02:00
Anuken
ca04504573 Renamed internal 'noWaves' mode / Fixed text encoding issues 2018-12-05 15:38:32 -05:00
Predator127
004ad0eb8c PT-BR updated (#365) 2018-12-03 12:46:48 -05:00
Anuken
e33c863162 Bugfixes 2018-12-02 16:56:44 -05:00
Prosta4okua
787a9c0083
Update bundle_uk_UA.properties 2018-12-02 22:12:39 +02:00
Prosta4okua
c75c22955c
Update bundle_uk_UA.properties 2018-12-02 22:01:42 +02:00
Anuken
134cc34d74 Merge remote-tracking branch 'origin/master' 2018-12-02 12:03:41 -05:00
Anuken
3397d6c907 Misc bug/crash fixes 2018-12-02 12:03:18 -05:00
VizardAlpha
17432d1f94 Update bundle_fr_BE.properties (#361) 
* Update bundle_fr_BE.properties

* Updates bundle_fr_BE.properties
 2018-12-01 11:22:28 -05:00
elmenda452
56ef7ae60c Update bundle_es.properties (#360) 
It was strangely hard to find the (Constructing) translation... (for block.constructing), but anyway I finally found it
 2018-11-30 15:16:54 -05:00
Anuken
7fd05b7ca6 Added mobile copy/paste 2018-11-29 13:04:34 -05:00
Anuken
8c7716428d Logo update 2018-11-28 22:38:01 -05:00
Anuken
9ac8a4211e Merge 2018-11-28 22:37:49 -05:00
elmenda452
d89b51f17d Update bundle_es.properties (#359) 
Just making another revision.
 2018-11-28 13:22:36 -05:00
Anuken
aa626947ed HUD cleanup 2018-11-28 13:14:54 -05:00
Anuken
f2be23274e Crash fixes 2018-11-28 08:53:03 -05:00
Anuken
76dd3c86f2 Removed redundant sector mission display 2018-11-27 20:36:23 -05:00
Anuken
91468fa2f9 Style changes 2018-11-27 20:12:49 -05:00
Prosta4okua
1ac5f54e9e [СOMPLETE]Update Uk_ua bundle (#328) 
* [WIP]Update Uk_ua bundle

* 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-11-27 13:10:51 -05:00
Prosta4okua
bf983658c8 [COMPLETE]Close before 62 build (#345) 
* [wip]Some changes from Xzimur

* Update bundle_ru.properties

Mine

* Update bundle_ru.properties

New UI / 8c437eb815

* Update bundle_ru.properties

* Update bundle_ru.properties

Разблокированные->разблоки\nрованные

* Update bundle_ru.properties

* Update bundle_ru.properties

Присоеди\nниться

* 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

* 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-11-27 13:08:07 -05:00
Anuken
19c17e96de Mobile UI fixes 2018-11-27 12:31:45 -05:00
Anuken
b45368342d Block config UI fixes 2018-11-27 09:29:28 -05:00
Anuken
dcea8ae64f New UI 2018-11-26 22:47:54 -05:00
Anuken
ccefa45fb0 Atlas update 2018-11-26 13:23:56 -05:00
Anuken
b721d7a10f Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/src/io/anuke/mindustry/core/Renderer.java
#	core/src/io/anuke/mindustry/entities/units/types/Drone.java
#	core/src/io/anuke/mindustry/graphics/CacheLayer.java
#	core/src/io/anuke/mindustry/world/blocks/Floor.java
 2018-11-26 13:23:38 -05:00
VizardAlpha
90198be1cb Updates bundle_fr_BE.properties (#358) 
* Updates bundle_fr_BE.properties

* Updates bundle_fr_BE.properties

* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties
 2018-11-26 12:34:01 -05:00
beito
51a8144f49 Update Japanese translations (#357) 
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations

* Update Japanese

* Update Japanese

* Update Japanese translations

Improve and update for new changes

* Update Japanese

* Update Japanese translations
 2018-11-25 22:54:46 -05:00
Anuken
54ad9ba243 Added fullscreen map screenshot 2018-11-25 20:43:45 -05:00
Anuken
bb6a748167 Various bugfixes 2018-11-25 10:29:38 -05:00
DaGamerFiles
21f61d46da
Update bundle_in_ID.properties [INCOMPLETE] 
Some fixes and translations from line 2 to line 130.
 2018-11-25 17:47:22 +07:00
JustYanns
6ac8a9d440
Update bundle_fr.properties 
Some improvement on the text (capital letters, plurals, ...)
More later !
 2018-11-25 10:29:12 +01:00
Anuken
c321402414 Various bugfixes 2018-11-24 20:04:20 -05:00
Anuken
6f5df6a671 Added list of contributors to credits 2018-11-23 14:30:58 -05:00
Anuken
1baf3190cd Host dialog name selection 2018-11-23 13:35:16 -05:00
Anuken
66c29c49e5 Wave spawner moved / Bundle tweaks / Blank name 2018-11-23 13:32:17 -05:00
키에르
322d76b713 Update bundle_ko.properties (#354) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2018-11-23 08:41:55 -05:00
Anuken
4f56bf3c3e Consume icon fix / Liquid mixer fix 2018-11-23 08:32:56 -05:00
Anuken
24c72650fb Bundles update 2018-11-22 19:10:31 -05:00
Anuken
f5959c8829 Optional display section 2018-11-22 19:09:51 -05:00
VizardAlpha
1bc1f66613 Updates bundle_fr_BE.properties (#351) 
I had not seen the last line to translate.
 2018-11-21 22:02:28 -05:00
Anuken
51641cc704 Merge remote-tracking branch 'origin/master' 2018-11-21 11:00:58 -05:00
Anuken
729f5ed5e4 New version format / Updated bundles / ConnectPacket encoding fix 2018-11-21 11:00:50 -05:00
Anuken
1f955904a4 Merge 2018-11-21 10:04:17 -05:00
VizardAlpha
03ff33acaf Updates bundle_fr_BE.properties (#350) 2018-11-21 10:00:19 -05:00
키에르
6815e56e57 Update bundle_ko.properties (#346) 2018-11-19 22:56:14 -05:00
Anuken
8c437eb815 New UI 2018-11-19 14:30:40 -05:00
Anuken
1ad4815983 Added all placement controls 2018-11-19 14:20:57 -05:00
Anuken
b9fae7fb7d Bundle update 2018-11-19 10:47:18 -05:00
Anuken
19ac8bd9b2 Info menu 2018-11-18 20:50:12 -05:00
Anuken
ab79ccb02b Implemented unlocks for placement 2018-11-18 20:04:15 -05:00
Anuken
d862498516 Replaced tooltips with names 2018-11-18 15:17:19 -05:00
Prosta4okua
b09b03a427 [COMPLETE]Update bundle_ru.properties (#313) 
* 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

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-11-18 14:12:44 -05:00
Anuken
0efaa11553 2 new categories, less space used 2018-11-18 14:10:02 -05:00
LQ
ea87b958ef update zh_CN translations (#342) 
* Update bundle_zh_CN.properties

Add descriptions translate for zh_CN

* Update bundle_zh_CN.properties
 2018-11-18 09:46:13 -05:00
Anuken
ff62f075d0 New place menu 2018-11-18 00:07:25 -05:00
Anuken
2a3f7f8cb3 Bundle update 2018-11-17 17:08:31 -05:00
Anuken
7eaef11a84 Improved hover block system 2018-11-17 17:04:16 -05:00
Anuken
efe93d0117 Added tile selection view 2018-11-17 14:45:29 -05:00
Anuken
f8d55ba837 Better scaling algorithm 2018-11-17 12:51:06 -05:00
William So
cd0e49914b Complete most of the Chinese translations (#338) 
* Update some Chinese translations

* Translate control guides

* Translate mission text, server text, and others

* Translate generic text

* Translate a lot of short strings

* Translate a bunch of mech strings

* Translate rest of the strings except mainly the descriptions

The descriptions will probably take 3 more days to translate. I will stop here now.

I will translate the rest later.
 2018-11-17 12:36:31 -05:00
beito
700e845727 Update Japanese translations (#337) 
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations

* Update Japanese

* Update Japanese
 2018-11-17 12:26:57 -05:00
Anuken
c6f1f19866 Removed shadow sprites 2018-11-17 11:33:56 -05:00
Anuken
745592f507 Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations 2018-11-17 11:24:37 -05:00
Anuken
d52f5e6e03 Shadow tweaks 2018-11-16 21:33:10 -05:00
Anuken
eb62356313 Merge remote-tracking branch 'origin/rendering-optimizations' into rendering-optimizations 2018-11-16 21:20:08 -05:00
Anuken
919dc248e3 Less terrible shadows 2018-11-16 21:20:03 -05:00
VizardAlpha
434af4b998 Updates bundle_fr_BE.properties (#333) 
* Updates bundle_fr_BE.properties

* Updates

* last update
 2018-11-15 10:50:21 -05:00
Anuken
a011728cc9 Build shader update 2018-11-15 10:01:03 -05:00
Anuken
e584139b6d Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations 2018-11-15 09:56:09 -05:00
Anuken
21f3f52c7b Fixed minimap / Improved ore shadows 2018-11-14 18:15:47 -05:00
Anuken
568e43cf3d Script fixes, padding improvements 2018-11-14 17:14:22 -05:00
Anuken
e004e540d7 Correct tile edges 2018-11-14 17:05:51 -05:00
beito
8dbfb87246 Add Japanese translations (#332) 
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations
 2018-11-14 14:12:41 -05:00
Anuken
693b82e47d Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations 2018-11-14 10:12:12 -05:00
Anuken
785c2e36c6 Fixed some things 2018-11-13 23:24:59 -05:00
Anuken
a9df64f861 Semi-usable sprites 2018-11-13 22:10:41 -05:00
Baramos666
e90e0fc615 update descriptions (#325) 2018-11-13 18:15:20 -05:00
VizardAlpha
b704121dcb Minor Update bundle_fr_BE.properties (#326) 2018-11-13 18:14:31 -05:00
elmenda452
e8268b1dab Update bundle_es.properties (#327) 
There wasn't much to translate, this is just a second check.
 2018-11-13 11:07:32 -05:00
Anuken
7a516930b1 Bugfixes of various kinds 2018-11-13 09:13:53 -05:00
Anuken
7baf42b138 New scaling pipelines 2018-11-12 19:03:24 -05:00
Anuken
ab9835b896 New scaling system 2018-11-12 17:37:26 -05:00
Anuken
09db6dc424 4x 2018-11-11 23:31:59 -05:00
Anuken
5d80031a40 Various rendering improvements 2018-11-11 15:57:23 -05:00
Anuken
ece3f96867 Fixed net errors not being displayed properly 2018-11-11 10:50:33 -05:00
Anuken
4f96744ff2 Shield shader simplification 2018-11-08 23:50:03 -05:00
Anuken
6342cc41ac Better lake generation 2018-11-08 22:18:34 -05:00
Anuken
4d8bbe3023 ita -> it 2018-11-08 17:40:50 -05:00
elmenda452
58c6df3537 Update bundle_es.properties (#317) 
Translated the description of nearly everything which wasn't translated and made some changes. I don't really mind if someday these get reset.
 2018-11-08 14:46:39 -05:00
Timmeey86
235a1f36ec Prepared/Fixed translation files for crash reported in #translations (#318) 2018-11-08 14:46:12 -05:00
키에르
b53821976e Update bundle_ko.properties (#316) 
* Update bundle_ko.properties

* Fix typo
 2018-11-08 10:20:30 -05:00
Anuken
cf50d558ba Fixed many various things 2018-11-07 22:37:34 -05:00
Anuken
042c671bd4 Difficulty balance / Better map display / UI fixes 2018-11-07 18:51:27 -05:00
Timmeey86
2f4730a9c6 Fixed unit/second translations since (#315) 2018-11-07 18:12:01 -05:00
Timmeey86
93c2ca8df1 Reworked and extended german translation (#314) 
* Reworked existing german translation

* Translated all block descriptions

* Replaced orange by accent highlighting
 2018-11-07 16:45:57 -05:00
Timmeey86
17e0489164 Improved descriptions of Container, Vault and Mend Projector (#312) 2018-11-07 14:09:26 -05:00
Anuken
7953cc416b Fixed item bridge input / Fixed sandbox map name/desc 2018-11-07 13:50:39 -05:00
Valentin Sonin
a670ac0aea upd bundle_ru.properties (#310) 
add lines 768, 769,770
 2018-11-07 12:41:30 -05:00
elmenda452
ef30018008 Update bundle_es.properties (#311) 
Translated the entire tutorial, and a few more things.
 2018-11-07 12:41:19 -05:00
elmenda452
66810c8b75 Update bundle_es.properties (#309) 
Just translating a few things.
 2018-11-07 00:11:53 -05:00
Anuken
2bba55ebd5 Clearer nuclear reactor output 2018-11-07 00:07:41 -05:00
Anuken
b977ae4d3b Updated bundles / Unbroke wave table 2018-11-06 23:56:11 -05:00
Anuken
d4f5e854c5 Misc. cleanup of UI / Removed 'font scale' var / Removed [orange] 2018-11-06 23:47:23 -05:00
Anuken
837f621633 Merge branch 'freetype' of https://github.com/Anuken/Mindustry 2018-11-06 21:01:21 -05:00
Anuken
a73a75a7f8 Cyrillic, chinese, korean fonts 2018-11-06 20:55:18 -05:00
Anuken
17d1db913f Removed extra fonts in preparation for ttf conversion 2018-11-06 15:52:31 -05:00
Anuken
a924509e92 New font file 2018-11-06 13:09:39 -05:00
Anuken
04b4321ea1 New font 2018-11-06 12:55:13 -05:00
키에르
1f9ebc7295 Update bundle_ko.properties (#308) 2018-11-06 11:11:56 -05:00
Anuken
ffa1aae27c Removed shadow/world padding 2018-11-05 13:49:31 -05:00
Anuken
7cd842df19 Disabled tutorial until further notice 2018-11-05 13:09:04 -05:00
Anuken
b63c02cb10 New UI palette 2018-11-04 19:42:18 -05:00
키에르
2e6c9d408c Update (#304) 
* Update bundle_ko.properties

* remove text.unit.none
 2018-11-04 09:25:10 -05:00
키에르
f3bea49f61 'Unkown' (#302) 2018-11-04 09:22:39 -05:00
Anuken
64f2ee67b2 New sector dialog done 2018-11-04 00:09:25 -04:00
Anuken
19d34779a0 New sector dialog done 2018-11-04 00:08:06 -04:00
Anuken
76a6a0cf75 Fixed crash when trying to open non-existent map 2018-11-03 09:39:59 -04:00
Anuken
da47d97cd0 Removed unused descriptions / Re-ordered all files 2018-11-03 09:28:47 -04:00
Anuken
f59441005e New sorted update script 2018-11-03 09:17:03 -04:00
Anuken
f2c7a26ce0 Sector edges 2018-11-02 20:53:28 -04:00
Anuken
930e25e64a Sector edges 2018-11-02 20:53:08 -04:00
Timmeey86
963269a685 Added descriptions for all unlockables which didn't have them (#297) 
* Added english descriptions for walls and doors

* Added english descriptions for walls and doors

* Added descriptions for projectors, mine and turrets

* Added descriptions for transport blocks and two smelters

* Added descriptions for crafters

* Added descriptions for power-related items and containers

* Added descriptions for drills and extractors

* Added descriptions for ship/mech pads

* Added/updated unit/factory descriptions

* Added english descriptions for walls and doors

* Added descriptions for projectors, mine and turrets

* Added descriptions for transport blocks and two smelters

* Added descriptions for crafters

* Added descriptions for power-related items and containers

* Added descriptions for drills and extractors

* Added descriptions for ship/mech pads

* Added/updated unit/factory descriptions

* Added descriptions for liquids and related blocks.

* Updated descriptions based on discord discussion.

* Updated descriptions as requested by Anuken

* Updated shock mine description
 2018-11-02 19:49:56 -04:00
Anuken
208ae6183c Merge 2018-11-02 19:45:31 -04:00
Anuken
761ae4b816 Mission icons 2018-11-02 19:38:08 -04:00
Anuken
0391ed3e63 Icons of missions 2018-11-02 10:35:29 -04:00
Timmeey86
b6b3997498 Fixed false friend translation (#295) 2018-11-02 10:30:59 -04:00
키에르
dc4812a86e Update bundle_ko.properties (#294) 2018-11-02 08:46:43 -04:00
Baramos666
fc83b0d95b Update bundle_fr.properties (#293) 2018-11-01 20:12:41 -04:00
Anuken
8bf68aa020 Cleanup 2018-11-01 09:09:12 -04:00
Anuken
6e65096bb4 Improved power grid sprites / Bugfixes 2018-10-29 20:43:30 -04:00
Anuken
5b01d923d3 Full error localization 2018-10-28 23:50:30 -04:00
Anuken
108e5a2f5e Non-blocking connect / Localized connect error messages 2018-10-28 23:47:28 -04:00
Anuken
80aed31135 Broke and cleaned up server commands 2018-10-28 14:26:58 -04:00
Anuken
2a21e7c2cb Merge remote-tracking branch 'origin/master' 2018-10-28 00:31:32 -04:00
Anuken
d281277797 Balancing, bugfixes 2018-10-28 00:31:28 -04:00
키에르
fb807bcde4 Update bundle_ko.properties (#278) 2018-10-27 21:26:32 -04:00
Anuken
a810e704ad Renamed ""oil"" / Increased phase fabric boost 2018-10-26 16:06:47 -04:00
MMG
da6a8f806d Adds a few translations (#273) 2018-10-26 10:55:15 -04:00
키에르
b47f44cacd Add texts in font (#275) 
* Add texts in font

* Update bundle_ko.properties

POEditor is break word spacing..
 2018-10-26 10:54:42 -04:00
Anuken
6c076863db "silcion" 2018-10-26 00:11:58 -04:00
Anuken
ddb6e74955 Fixed revenant never shooting 2018-10-26 00:09:09 -04:00
Anuken
2094bc3d80 Renamed phase matter to reduce conflicts / Item balancing 2018-10-26 00:00:25 -04:00
VizardAlpha
103b8cd13a Rename bundle_fr_be.properties to bundle_fr_BE.properties (#271) 
Update Bundle
 2018-10-25 12:16:04 -04:00
Anuken
e6dd36283d Misc. bugfixes 2018-10-24 20:21:48 -04:00
xgamezs
15ce31ea3a Adding a new string (#270) 
* Update bundle_ru.properties (POEditor.com)

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Create bundle_fr_be.properties

* Delete bundle_fr_be.properties

* Create bundle_fr_be.properties

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Create bundle_tr.properties

* Update bundle_tr.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_uk_UA.properties

* Update bundle_ru.properties

* Update bundle.properties

* Update bundle_uk_UA.properties (POEditor.com)
 2018-10-24 18:38:51 -04:00
Anuken
8b8c74cf93 Added filename entry (again) 2018-10-24 13:26:32 -04:00
xgamezs
cc43524b4c Update and standardize translations (POEditor.com) (#258) 
* Update bundle_ru.properties (POEditor.com)

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Create bundle_fr_be.properties

* Delete bundle_fr_be.properties

* Create bundle_fr_be.properties

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Create bundle_tr.properties

* Update bundle_tr.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)
 2018-10-24 13:22:18 -04:00
Anuken
f87d297155 Added filename entry 2018-10-24 13:09:42 -04:00
Anuken
de6681d00a Added special case for unit.none 2018-10-24 10:31:23 -04:00
키에르
2294b6babb Add more texts with Cyrillic (#262) 2018-10-23 09:23:19 -04:00
VizardAlpha
c38f866363 Updates bundle_fr_be.properties (#260) 
Replacing the new translations. Translation finish
 2018-10-23 09:01:46 -04:00
CinExPL
511b112ac7 Update bundle_pl.properties (#257) 2018-10-23 09:01:04 -04:00
키에르
412d92e782 Update bundle_ko.properties (#255) 2018-10-20 09:33:43 -04:00
Niko
c0703a6a5e Add german translations (#256) 
* Replace some English Text with german translations in bundle_de

* Replace some English Text with german translations in bundle_de, renamed map to karte

* Replace some English Text about Units and Fluids with german translations in bundle_de

* Replace some English Text with german translations in bundle_de, renamed map to karte

* Replace some mech and drone definitions with german translations in bundle_de

* Replace almost all definitions with german translations in bundle_de

* Merge branch 'master' into add_german_translations

# Conflicts:
#	core/assets/bundles/bundle_de.properties

* fix some typos in bundle_de
 2018-10-20 09:33:35 -04:00
키에르
e66e17a41a Fix font height (#253) 2018-10-19 10:01:09 -04:00
Anuken
01ceedccd5 Updated bundles / Decreased water extractor power usage 2018-10-19 09:32:23 -04:00
Anuken
ed28af7c73 Changed 'max power' to 'base power', re-scaled display stats of fuel 2018-10-19 09:31:33 -04:00
Anuken
d68d2e9f30 Moved paused text details into bundle 2018-10-18 22:33:11 -04:00
Baramos666
fd7b829e70 Update bundle_fr.properties (#249) 2018-10-18 21:56:44 -04:00
LQ
87a7cc6289 add liquid out speed display (#250) 2018-10-18 21:56:35 -04:00
VizardAlpha
2f8b5e53bb Updates bundle_fr_be.properties (#251) 
Recast of the French translation (Belgium)
 2018-10-18 21:56:09 -04:00
Prosta4okua
8b7fa3b646 [WIP]Update bundle_ru.properties (#243) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-10-18 21:56:00 -04:00
Anuken
5e5838a8c1 let me make this PAINFULLY CLEAR 2018-10-18 16:04:40 -04:00
Skybbles // L5474
0fffbc06dd Spelling correction (#252) 
*maybe you mean CLI board.*
 2018-10-18 14:35:33 -04:00
Anuken
4d360bfb73 Bugfixes 2018-10-18 09:19:29 -04:00
Anuken
6ecdef02ab Block break visual cleanup 2018-10-17 22:10:56 -04:00
Anuken
f530c9514f Changed placement controls / Fixed complete sectors not resetting 2018-10-17 17:28:24 -04:00
Anuken
8e952a550b Fixed: map mirror / crashes / mech pads / player list / mobile placement 2018-10-17 10:20:58 -04:00
Anuken
94b6c133f4 Various resprites 2018-10-14 18:39:24 -04:00
Anuken
81ce12a38c Added random PvP/Waves map generation 2018-10-14 13:24:32 -04:00
Anuken
f670d522bf PvP merge 2018-10-14 10:01:50 -04:00
Anuken
a02f7f46c3 Merge remote-tracking branch 'origin/master' 2018-10-14 09:57:31 -04:00
Anuken
4b7f254e17 Added 2x2 container storage block 2018-10-14 09:57:28 -04:00
Anuken
9b42be560d Fixed bugs with team assignment 2018-10-14 09:41:19 -04:00
VizardAlpha
31b39231a2 Updates bundle_fr_be.properties (#242) 2018-10-13 23:32:08 -04:00
Anuken
4eb2c1f646 PvP autohost 2018-10-13 23:30:05 -04:00
Anuken
5f89d8588d Added 'abandon sector' button 2018-10-13 23:07:57 -04:00
Anuken
0aabc09b82 Made game-overs remote events 2018-10-13 21:58:17 -04:00
Anuken
870f5caca9 PvP game over condition 2018-10-13 17:33:23 -04:00
Anuken
28b4ddfc72 PvP game over condition and message 2018-10-13 17:31:38 -04:00
Prosta4okua
13a4a26e97 Update bundle_ru.properties (#241) 2018-10-13 17:29:09 -04:00
Anuken
81c7e63994 Added 'waiting for players' message 2018-10-13 16:03:21 -04:00
Gureumi
7f234ab5bc Fix font (#240) 2018-10-13 15:53:42 -04:00
Anuken
f8d0682810 Added warnings for missing enemy cores 2018-10-13 15:49:18 -04:00
Anuken
1cd8e8a097 Improved server discovery 2018-10-13 12:21:11 -04:00
Anuken
3688dde5e5 Merged mobile mechs 2018-10-13 10:52:48 -04:00
Anuken
ae6a5b2512 Made PvP a selectable mode 2018-10-13 10:50:22 -04:00
Anuken
8bda5e16cd Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_fr.properties
 2018-10-13 08:59:15 -04:00
Anuken
d70d3d95f0 Bundles updated 2018-10-13 08:58:41 -04:00
Baramos666
554b7d2ec4 Update bundle_fr.properties (#239) 2018-10-13 08:58:04 -04:00
Baramos666
18020d64cc Update bundle_fr.properties (#234) 2018-10-11 22:58:05 -04:00
Anuken
5f1bc6c6c2 Custom spawn locations 2018-10-10 13:02:00 -04:00
Anuken
38f2f1e30a Added legacy map importer 2018-10-09 22:52:28 -04:00
Anuken
4792828da1 Missions now displayed as number / Improved mission gen 2018-10-09 09:22:06 -04:00
VizardAlpha
9566155bdb Created bundle_fr_be.properties (#233) 
For Belgian player
 2018-10-08 14:14:16 -04:00
Anuken
c1d9dee46c Added content mission / Working implementation of preset sectors 2018-10-07 19:21:53 -03:00
Anuken
fd107ab5b8 Code cleanup 2018-10-06 11:56:39 -04:00
Anuken
14e0b471d3 Mobile mechs implemented 2018-10-05 22:58:46 -04:00
Anuken
ed0df64cf9 Fixed compile errors / Refactored sector presets 2018-10-05 22:16:40 -04:00
Anuken
35bc2c9803 Sector preset class / New missions 2018-10-05 16:36:50 -04:00
Anuken
696a59f1b9 Updated revenant factory sprite 2018-10-04 09:31:52 -04:00
Anuken
c82fd9ead5 Added unit tests 2018-10-03 20:58:35 -04:00
Anuken
59832b1777 Added revenant factory sprites 2018-10-03 10:26:37 -04:00
Anuken
d2ce051c4a Implemented Fortress unit / Made artillery ignore air 2018-10-01 09:51:12 -04:00
Anuken
d5d90bde9a Removed mech ability key 2018-09-30 19:22:19 -04:00
Anuken
b43c542213 Auto-target configuration 2018-09-29 20:49:19 -04:00
Anuken
e7533232c0 Fixed custom game waves / Fixed Windows appdata being incorrect 2018-09-29 14:25:29 -11:00
Anuken
d062dffc13 Cleanup / Fixed unlock system in custom games 2018-09-29 02:50:21 -07:00
Jae
24decf8abc Update bundle_zh_CN.properties (#230) 
* Added translations

* Update bundle_fr.properties

* Update bundle_fr.properties

* Added zh_CN translations

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2018-09-27 17:46:17 -04:00
DinoWattz
db3dac261a Update bundle_pt_BR.properties (#231) 
Fixed some words and translated some words
 2018-09-27 13:09:09 -04:00
Jae
720e1a038e French translations added (#228) 
* Added translations

* Update bundle_fr.properties

* Update bundle_fr.properties
 2018-09-26 13:42:20 -04:00
Baramos666
1753c54e88 Update bundle_fr.properties (#229) 2018-09-26 13:28:18 -04:00
Anuken
554d9b4047 Updated bundles 2018-09-25 16:41:18 -04:00
Prosta4okua
02d565ce58 [COMPLETE]Rare update bundle_ru.properties (#223) 
* Update bundle_ru.properties

Added the same thing as in bundle.properties. Also added 9 descriptions. Because of this PL, a PL from xga is old.

* 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

* 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-25 16:39:52 -04:00
Anuken
d5bb1b72b9 Merge branch 'continuous-sectors' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/assets/bundles/bundle.properties
 2018-09-24 22:57:49 -04:00
Anuken
af86564adc Final tutorial fixes 2018-09-24 22:56:48 -04:00
Anuken
5354e02b6f Finally a somewhat functional tutorial / Many bugfixes 2018-09-24 20:24:51 -04:00
Prosta4okua
4ee17a656f Update bundle.properties (#226) 2018-09-24 14:14:23 -04:00
Anuken
20732f04ff Block position starting missions 2018-09-23 23:45:35 -04:00
Anuken
8d20c46228 Basic tutorial text 2018-09-22 16:41:55 -04:00
Anuken
b77caed0ba Added sample tutorial text / Refactoring 2018-09-22 12:20:04 -04:00
Baramos666
df976f1212 Update bundle_fr.properties (#225) 2018-09-22 11:17:07 -04:00
Anuken
999dd5eb6f Better mission display / Improved tutorial item amounts 2018-09-21 23:29:17 -04:00
Anuken
a1a6a3ab81 Tutorial sector prototype / New mission display 2018-09-21 23:14:26 -04:00
Anuken
d067bbfa65 New mission classes 2018-09-21 19:36:19 -04:00
Anuken
ecad5772d2 Fixed power debug blocks not working / Moved debug recipes 2018-09-20 08:47:58 -04:00
Anuken
0c63b27eea Removed old korean font / Fixed targeting going through UI 2018-09-18 09:17:50 -04:00
Anuken
2d25948c57 Revenant factory definition / Crash fix 2018-09-16 21:57:37 -04:00
Anuken
8946af4831 Mass renaming of blocks and units 2018-09-16 19:48:15 -04:00
Anuken
f0aca90de2 Bundle update 2018-09-16 14:19:56 -04:00
Anuken
097228066a Revenant sprite / Training mode / Mine transfer range / Drone heal buff 2018-09-16 14:05:43 -04:00
Anuken
e4ea9d561e Lightning shield absorption 2018-09-15 16:37:28 -04:00
Anuken
d878ad2e7e Meltdown prototype 2018-09-14 10:29:34 -04:00
Anuken
1290d1e9d4 Balancing / Wall renaming 2018-09-13 23:04:43 -04:00
Anuken
f229f1e9fe Added LaserTurret class / Updated bundles 2018-09-13 22:33:03 -04:00
Anuken
6d47b449b9 Spectre improvements 2018-09-13 14:43:52 -04:00
Anuken
594c975c70 Spectre WIP 2018-09-13 09:33:09 -04:00
Anuken
75fae9454d Fixed core crash / Fixed error texture on shoot 2018-09-11 18:12:11 -04:00
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