mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-26 23:50:18 +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
Anuken
4cb92cdb06 Fixed some deployment issues 2019-03-21 00:58:06 -04:00
Anuken
9e067ebdd6 Merge remote-tracking branch 'origin/master' 2019-03-21 00:19:10 -04:00
Anuken
fd5fcc9928 Wave editor bugfixes 2019-03-21 00:19:06 -04:00
Prosta4okua
c0b2abb5fd Update bundle_uk_UA.properties (#423) 
* 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
 2019-03-20 21:04:20 -06:00
Anuken
62f6ed0878 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_ru.properties
 2019-03-20 22:41:24 -04:00
Anuken
886b62bbad Too many things to list in a single line commit log 2019-03-20 22:40:47 -04:00
Prosta4okua
4bd58589fc Update bundle_ru.properties (#422) 
* 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
 2019-03-20 17:37:46 -06:00
키에르
0ce4144767 Update bundle_ko.properties (#425) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

91741ec29c

* Update bundle_ko.properties

783f453da3 (diff-daade3141498d8856d75ec34b88bbb19)
 2019-03-20 17:16:21 -06:00
bei2
cde945f40e Update Japanese translations (#428) 
* 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

* Oops!

* Update Japanese translations

* Update Japanese

* Update Japanese

* Update Japanese translations
 2019-03-20 17:14:03 -06:00
Anuken
e2126a2693 Mandatory line placement tutorial 2019-03-20 19:12:14 -04:00
Anuken
fbf4c411c1 Map editor fixes / Zone environment changes 2019-03-19 23:51:52 -04:00
Anuken
ce5218db58 Wave editor clipboard save+load / Bugfixes / Balancing 2019-03-19 19:25:48 -04:00
Anuken
e2ea7f9b87 Bundle update 2019-03-19 15:27:19 -04:00
Anuken
94d9f04814 Toggleable diagonals 2019-03-19 15:26:30 -04:00
Anuken
c86dbac04a no snek 2019-03-19 14:01:00 -04:00
Anuken
f36eed32b9 Bugfixes / Balancing 2019-03-19 12:47:09 -04:00
Anuken
949f171579 Fixed ores not spawning in certain maps 2019-03-18 09:29:27 -04:00
Anuken
87d586a30e More boulders 2019-03-17 18:35:33 -04:00
Anuken
783f453da3 Generate tool bugfixes / Map edits / New blocks 2019-03-17 18:30:33 -04:00
Anuken
6dcf889ffe Map tweaks 2019-03-17 14:04:55 -04:00
Anuken
91741ec29c Enemy indicators 2019-03-16 12:44:45 -04:00
Anuken
8269d842ce Removed redundant zone waves / Fixed wave dialog float issue 2019-03-16 10:13:49 -04:00
Anuken
d038bdb6ce Better filter layout 2019-03-15 20:32:08 -04:00
Anuken
6cef301b94 Filter localization / Ore filter / Pick tool ore compatibility 2019-03-15 20:19:09 -04:00
Anuken
e7ffbd817c Improved generation tool 2019-03-15 15:06:55 -04:00
Anuken
7d1a8f5404 Unfinished generation tool 2019-03-15 00:13:54 -04:00
Anuken
43bcf0cf3b Fixed unit icons / New scatter AA turret 2019-03-14 16:37:07 -04:00
Anuken
ed105b102d Custom wave patterns / Fixed checkbox sprite / Bugfixes 2019-03-14 14:01:22 -04:00
Anuken
f2662045ed New item bars / Map bugfixes / Stub wave editing 2019-03-13 21:26:53 -04:00
Anuken
ecb77b0283 Fortress builtin map / Attributes / Efficiency stat / Bugfixes 2019-03-12 23:39:39 -04:00
Anuken
4d4869842e Bugfixes 2019-03-12 16:37:32 -04:00
Anuken
0c75f920de Fixed editor placing blocks at 0 health 2019-03-12 14:57:10 -04:00
Anuken
e7b51f313b Merge branches 'master' and 'new-map-format' of https://github.com/Anuken/Mindustry 2019-03-12 13:50:48 -04:00
Anuken
8ad6f3abcc New ore system / Multiblock fixes 2019-03-12 13:28:00 -04:00
Anuken
0a04de04f1 Format bugfixes 2019-03-12 11:07:02 -04:00
Anuken
0fd0abc6c0 Fixed compile errors / New non-crappy undo system 2019-03-11 23:06:41 -04:00
Anuken
9e6745f691 Fixed polluted water 2019-03-11 13:34:15 -04:00
Anuken
0f4d574115 New unfinished environment blocks / Bugfixes / Tech tree tweak 2019-03-10 22:38:53 -04:00
Anuken
1feb4a5e6d Tar shader / Spritesheet split / Font cleanup 2019-03-10 11:11:16 -04:00
키에르
f861b75c7d Fix fonts (#424) 
* Fix fonts

* Add more fonts & bundle update

* Increase font size
 2019-03-10 08:03:54 -06:00
Anuken
98212df076 Water shader 2019-03-09 22:53:16 -05:00
Anuken
a0905d5695 Faster, smaller server / Bundle check cleanup 2019-03-09 19:12:54 -05:00
Anuken
2a35e22dd2 Merge remote-tracking branch 'origin/master' 2019-03-09 16:47:12 -05:00
Anuken
f86a07daee Removed awt use / Sand recolor / Bugfixes / Link fix 2019-03-09 16:47:08 -05:00
키에르
997628622a bundle upgrade for beta version (#421) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2019-03-09 09:19:17 -07:00
Anuken
563e015c92 Fixed power bug 2019-03-09 09:51:12 -05:00
Anuken
64533de597 Bugfixes / Font changed / Zone tweaks 2019-03-08 19:07:23 -05:00
Anuken
82e44397ff Bundle update / Minor tweaks 2019-03-05 13:50:28 -05:00
Anuken
335c880af2 Bundle update / Unit factory active stats 2019-03-05 11:36:55 -05:00
Anuken
966efa0669 Bugfixes / Sprite tweak 2019-03-05 09:53:37 -05:00
Anuken
1235b41172
Update bundle.properties 2019-03-04 13:19:41 -05:00
Anuken
21f3a053ed Impact map balance / Block balance / Editor block sorting 2019-03-03 19:54:20 -05:00
Anuken
9e960d461b Balancing 2019-03-03 19:27:31 -05:00
Anuken
02fad0a9cc Consumer fixes / Removed unit factory target tag / Rank tweak 2019-03-03 10:55:56 -05:00
Anuken
627b78043b Atlas updated 2019-03-02 23:09:50 -05:00
Anuken
89b439c3c8 Bugfixes 2019-03-02 23:06:14 -05:00
Anuken
4a4a9f267b Switched impact blocks to blue 2019-03-01 23:18:00 -05:00
Anuken
f605aabaa9 Updated packed sprites for last commit 2019-03-01 23:03:09 -05:00
Anuken
d82d0ae923 Waveskip / Stat fixes / 3x3 thermalpump / Removed liquid tiers 2019-03-01 23:01:12 -05:00
Anuken
1e111d29d9 More map balance / Fixed 'oh no' on 5x5+ block destruction 2019-03-01 17:18:08 -05:00
Anuken
110def97d9 Sprite fixes 2019-02-28 22:59:48 -05:00
Anuken
914f1b38f8 Zone tweaks 2019-02-28 12:03:24 -05:00
Anuken
2aff73a958 Added drill output rate bar 2019-02-28 09:45:03 -05:00
Anuken
13c2eae1f4 Frozen forest rework / Reduced starter copper / Auto-deselect 2019-02-27 19:48:00 -05:00
Anuken
8f4258b119 Build shader swap 2019-02-26 16:02:06 -05:00
Anuken
4eba89603e Shader tests 2019-02-26 15:13:05 -05:00
Anuken
61f75d7331 Removed unused shader 2019-02-26 14:48:23 -05:00
Anuken
cd387c5c3a Merge remote-tracking branch 'origin/master' 2019-02-26 14:47:08 -05:00
Anuken
2fa32e5099 Nuclear reactor fixes / Additional info bars 2019-02-26 14:47:05 -05:00
Damlon
f12da57720 Update bundle_ko.properties (#417) 
* Update bundle_ko.properties

Javelin : 자비린->재블린
https://www.korean.go.kr/front/onlineQna/onlineQnaView.do;front=2D3014620660AD4C0DA36360CA63518C?mn_id=61&qna_seq=144359&pageIndex=11

Dagger : 디거->대거
노코멘트.

Combustion Generator : 석탄 발전기->화력 발전기
석탄 이외에 여러 재료들을 불태워 발전하는 방식이기 때문

* Update bundle_ko.properties

대거->디거.. 는 되있넹?
Frozen Forest:겨울 정글->얼어붙은 숲
Forest는 숲의 의미가 강함

differential generator:미분 발전기->차동 발전기.
differential 이 발전기 출력 제한시키는 발전기 안정장치밖에 안나옴. 일단은 가장 적절한 차동 발전기로.

Graphite press:흑연 프레스->흑연 압축기
Multi press:멀티 프레스->다중 압축기
석탄 압축해서 흑연 만드는 공장임. Press(압축)

*Crags 는 울퉁불퉁한 돌들. 정도의 뜻이 있으나 깔쌈한 번역 안떠올라서 패스.

* Update bundle_ko.properties
 2019-02-26 11:12:46 -07:00
Anuken
964d1a0d87 Shader cleanup 2019-02-26 13:11:49 -05:00
Anuken
0cb14461ba Improved antialiasing / Improved outlines 2019-02-26 10:42:20 -05:00
Anuken
d05f9c5540 Bundle pruning 2019-02-25 22:38:01 -05:00
Prosta4okua
690580c57d Update bundle_ru.properties (#363) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* From PL Beryllium

* 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

* 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

RIP

* 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
 2019-02-25 20:36:55 -07:00
Prosta4okua
5039763a52 Update bundle_uk_UA.properties (#392) 
* 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
 2019-02-25 20:33:12 -07:00
Anuken
2cc54ffa5b Merge remote-tracking branch 'origin/master' 2019-02-25 22:26:55 -05:00
Anuken
0a9b78f013 Bugfixes / Renamed biomatter / Cleaned up conveyor sprites 2019-02-25 22:26:51 -05:00
키에르
e42fa7ad20 Update bundle_ko.properties (#416) 
Hotfix
 2019-02-25 08:02:53 -07:00
Kenny
4f253999ac Added Translations and misc. (#410) 
* Added Translations and misc.

Added many translations(maybe it is the newer things?) and did some misc. grammar change.

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2019-02-24 17:59:58 -07:00
키에르
9108a7bae6 Update bundle_ko.properties (#411) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2019-02-24 17:59:37 -07:00
AceEllysium
6ba88323fe Create bundle_nl.properties (#413) 
* Create bundle_nl.properties

* Update bundle_nl.properties

* Update bundle_nl.properties

* Update bundle_nl.properties

* Update bundle_nl.properties

* Update bundle_nl.properties
 2019-02-24 17:59:20 -07:00
Anuken
b0126206e1 Bridge sprite cleanup 2019-02-21 17:16:42 -05:00
Anuken
9c240850b8 Fixed pad shader/disconnect bugs 2019-02-21 14:08:42 -05:00
Anuken
5b7b50f555 Boss waves, health bars / Better lasers / Bugfixes 2019-02-21 13:11:28 -05:00
Anuken
4b028b3435 Re-added core database in game menus 2019-02-20 09:14:51 -05:00
Anuken
cbcf237d80 Bugfixes 2019-02-19 13:43:15 -05:00
Anuken
cb12501d5b Untested loadout config / Better filter display / Bugfixes 2019-02-18 22:51:31 -05:00
Anuken
5e2a455045 a 2019-02-17 01:36:46 -05:00
Anuken
4677de80c1 Destructible grey blocks / Content cleanup / Wave fixes / Impact balance 2019-02-16 11:10:01 -05:00
Anuken
18fcc6e596 Bugfixes / Requirement display 2019-02-14 15:20:08 -05:00
Anuken
66766b43c7 Bugfixes 2019-02-14 10:00:17 -05:00
Anuken
8c6c4c2630 Power balance info 2019-02-13 22:37:12 -05:00
Anuken
a708c8b7ea Untested rank system / 'Fixed' junction speed / Balancing 2019-02-13 18:28:36 -05:00
Anuken
85f73fee02 Bundle fixes 2019-02-13 16:23:41 -05:00
DinoWattz
0ad89ebc04 Update bundle_pt_BR.properties (#401) 2019-02-12 12:05:32 -05:00
CinExPL
a4b9579d25 Update bundle_pl.properties (#406) 
improving some spelling errors
 2019-02-12 12:05:13 -05:00
Anuken
e65b6670ec Incomplete production meta system 2019-02-12 10:49:13 -05:00
Anuken
d218fb926a Bugfixes 2019-02-11 17:32:44 -05:00
Anuken
718f56172e Enlarged laser/blast drills / Removed ground zero copper cost 2019-02-10 17:32:22 -05:00
Anuken
34b7961814 Improved placement visuals 2019-02-10 12:32:33 -05:00