mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-15 12:24:28 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,075 Commits 4 Branches 160 Tags 2.3 GiB
029f801159
Commit Graph

1746 Commits

Author SHA1 Message Date
Anuken
f8f48f1c88
Merge pull request #491 from MrPickles14/patch-1 
Update bundle_fr.properties
 2019-06-07 14:14:29 -04:00
Anuken
95e8a603a5
Merge pull request #489 from Kieaer/patch-5 
bundle_ko
 2019-06-07 14:14:03 -04:00
Anuken
c400fd88f3
Merge pull request #487 from beito123/master 
Update Japanese translations
 2019-06-07 14:13:06 -04:00
Anuken
095d90fd22
Merge pull request #484 from Deyvid67/patch-2 
Update bundle_pt_BR.properties
 2019-06-07 14:11:47 -04:00
Anuken
797be92ddd
Merge pull request #482 from laohuaji233/patch-7 
Update bundle_zh_CN.properties
 2019-06-07 14:11:32 -04:00
Anuken
7f23bd694c
Merge pull request #480 from Prosta4okua/patch-1 
Update bundle_uk_UA.properties
 2019-06-07 14:11:15 -04:00
Anuken
1cbf8b960a Added clarifying mode descriptions 2019-06-07 14:10:23 -04:00
Anuken
c8ce195522 Reverted buffers / Added Dexapnow's fixed zone maps [untested] 2019-06-07 14:07:32 -04:00
Anuken
1b4b1d5c9f Maps updated / 100 starting copper in custom maps 2019-06-06 22:45:25 -04:00
Anuken
aee800ab7a Changed turret outlines / Wall block tweaks 2019-06-06 21:18:54 -04:00
Anuken
895b46307a Sprite tweaks 2019-06-06 18:47:53 -04:00
VizardAlpha
328cdac60f
Update bundle_fr_BE.properties 2019-06-06 15:38:24 +02:00
Anuken
3942c6cd55 Even more sprites cleaned up 2019-06-06 00:28:09 -04:00
Anuken
f0f7b5aaf7 Updated sprites 2019-06-05 21:29:34 -04:00
키에르
3ad9e44891
Update bundle_ko.properties 2019-06-05 23:05:01 +09:00
Anuken
80bdaa1edc Cleanup 2019-06-04 23:30:07 -04:00
Anuken
39acb224d1 Merged replacement sprites. Scaling is now disabled by default. 2019-06-04 22:54:01 -04:00
Anuken
f51d565db8 Darker decals / map tweaks 2019-06-04 22:06:17 -04:00
Anuken
fce69005a9 Islands map 2019-06-03 22:09:43 -04:00
Anuken
b73420b156 Added map assets 2019-06-02 23:15:36 -04:00
Anuken
fb863cb39b Editor bugfixes / Median filter 2019-06-02 17:45:44 -04:00
VizardAlpha
9039d52817
Updates bundle_fr_BE.properties 2019-06-01 23:12:52 +02:00
Anuken
940965f03d .mmap file importing / Better exception parsing 2019-05-31 10:24:51 -04:00
Anuken
581782af28 Mass driver power fix / Bugfixes 2019-05-31 09:10:37 -04:00
Prosta4okua
cdb3d29767
Update bundle_uk_UA.properties 2019-05-30 09:56:57 +03:00
Prosta4okua
90fe5329e3
Update bundle_uk_UA.properties 2019-05-30 09:53:37 +03:00
Prosta4okua
22e20cb2da
Update bundle_ru.properties 2019-05-30 09:51:54 +03:00
Anuken
a3454e50d7 Merge 2019-05-30 00:27:05 -04:00
Anuken
75b8f5e543 Properly rounded sprites for 'source/sorter' blocks 2019-05-29 23:42:03 -04:00
Anuken
752267c521 Fixed many various map bugs 2019-05-26 16:46:44 -04:00
Anuken
ba0b4513f1 New tile transitions 2019-05-25 23:56:21 -04:00
Prosta4ok_ua
ceea0d1730 Hmmmm 
Hmmmm
 2019-05-20 21:25:16 +03:00
키에르
764ea699b1
Update bundle_ko.properties 2019-05-20 13:14:59 +09:00
Anuken
bdb7f522fb Balancing / Item tweaks 2019-05-19 17:50:11 -04:00
Prosta4ok_ua
1687ce3182 Added new translations 2019-05-14 23:59:24 +03:00
Anuken
54ad52edc2 Merging of map saves 2019-05-14 11:54:22 -04:00
Anuken
4d40af6ac0 More helpful in-game edit button 2019-05-13 11:47:38 -04:00
Anuken
b2341bf75c Added map default rule editing 2019-05-13 11:31:25 -04:00
Anuken
52674b4668 Mobile diagonal toggle / Cancel button moved 2019-05-12 11:19:31 -04:00
Anuken
4ae2370137 New WIP custom map selection 2019-05-12 10:32:08 -04:00
키에르
cee55afa5c
Update bundle_ko.properties 2019-05-12 15:46:03 +09:00
키에르
f998bbbe4c
Update bundle_ko.properties 2019-05-12 14:45:25 +09:00
Anuken
dd75d88d2f Unit creation, team switch 2019-05-11 12:32:13 -04:00
Anuken
3e51fab387 In-game editing (broken) 2019-05-10 19:13:55 -04:00
Anuken
ae6c938abb Merge remote-tracking branch 'origin/master' 2019-05-10 16:02:15 -04:00
Anuken
68faae69c5 Fixed compilation errors / Re-added basic trace dialog 2019-05-10 16:02:05 -04:00
MrPickles14
08edce7906
Update core/assets/bundles/bundle_fr.properties 
Co-Authored-By: Math2128 <math2128@gmail.com>
 2019-05-10 14:32:24 -04:00
MrPickles14
55eb493d1f
Update bundle_fr.properties 
J'ai changé 2 ou 3 trucs et ajouté des traductions qui n'étaient pas faites
 2019-05-10 14:30:38 -04:00
MrPickles14
df26148e7c
Update bundle_fr.properties 2019-05-10 12:23:21 -04:00
Anuken
23843be981 More bugfix stuff 2019-05-09 12:57:00 -04:00
Anuken
486e3ffc0a Actual map conversion, loading of saves 2019-05-09 10:53:52 -04:00
Leone25
24374cf7e3 Update bundle_it.properties (#490) 
please merge as soon as possible
 2019-05-07 09:34:42 -04:00
키에르
bb322f1bff
Update bundle_ko.properties 2019-05-06 16:20:54 +09:00
키에르
72843e9c92
Update bundle_ko.properties 2019-05-06 16:19:20 +09:00
Prosta4ok_ua
e4e2b6ab00 Hmmmmmm 2019-05-05 18:37:24 +03:00
beito123
b37ae484c0
Update Japanese translations 2019-05-05 23:39:15 +09:00
Anuken
a3f5583326 Fixed tar fields 2019-05-04 22:17:17 -04:00
beito123
18f1b5f9d2
Update Japanese translations 2019-05-05 01:52:35 +09:00
beito123
96a92fd85f
Update Japanese translations 2019-05-04 18:42:05 +09:00
beito123
e5175d6309
Update Japanese translations 2019-05-04 18:37:44 +09:00
beito123
b5ceee3336
Merge remote-tracking branch 'upstream/master' 2019-05-04 16:42:48 +09:00
Anuken
93ffb66e59 Fixed all known issues with power system 2019-05-03 21:19:41 -04:00
Anuken
a161c09441 Switched default mech to dart / Bugfixes 2019-05-03 09:21:45 -04:00
Anuken
b2408b1a7c New block stats / Junction bugfixes 2019-05-02 23:10:41 -04:00
Deyvid67
c97826ed29
Update bundle_pt_BR.properties 2019-05-02 14:33:29 -03:00
beito123
9f5a183793
Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
 2019-05-02 20:08:10 +09:00
L5474
4054c7d12d fix #481 + capitalization (#483) 
hope you're happy based
 2019-05-01 15:40:37 -04:00
laohuaji233
bb5e454b91
Update bundle_zh_CN.properties 
Most of them have been translated into Chinese, but there are still some uncertainties.
 2019-05-01 23:19:27 +08:00
Prosta4okua
ffb12f9c0b
Update bundle_ru.properties 2019-05-01 18:18:01 +03:00
Prosta4okua
a89786d079
Update bundle_uk_UA.properties 2019-05-01 18:17:35 +03:00
Anuken
2d3fd513d8 1 2019-05-01 11:12:27 -04:00
Prosta4ok_ua
271d01dc9d Tar fields, Overgrowth, Dart Mech Pad 2019-05-01 13:16:12 +03:00
Prosta4okua
d3ffaea042
Update bundle_uk_UA.properties 2019-05-01 11:36:13 +03:00
Anuken
f3385e6453 Pruned bundles 2019-04-30 23:34:41 -04:00
Anuken
761e0114a5 Apparent typo fix 2019-04-30 12:56:57 -04:00
laohuaji233
dcae128d06 Update bundle_zh_CN.properties (#475) 
more translations
 2019-04-30 12:49:39 -04:00
J-VdS
a891a8badc NL_BE bundle progress (Fishbuilder) (#474) 
* Create bundle_nl_BE.properties

work in progress, just to save the file

* tot 148
 2019-04-30 12:47:54 -04:00
Zachary
f3ec5b533e Update bundle_ja.properties (#473) 
Translated like one name lmao
 2019-04-30 12:47:42 -04:00
Zachary
d50397edf1 Update bundle_zh_CN.properties (#472) 
Translated more block names.
 2019-04-30 12:47:32 -04:00
Predator127
70f279d978 Update bundle_pt_BR.properties (#467) 
This is an updated version of the Brazillian translation, Made by Hanko
 2019-04-30 12:46:01 -04:00
VizardAlpha
84c5a75b6c Updates bundle_fr_BE.properties (#462) 
* Updates bundle_fr_BE.properties

* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties
 2019-04-30 12:45:38 -04:00
Paul T
97663e87a6 Update bundle_de.properties (#452) 
* Update bundle_de.properties

* Update bundle_de.properties
 2019-04-30 12:45:06 -04:00
laohuaji233
5956edcb8e Update bundle_zh_CN.properties (#453) 
More translations
 2019-04-30 12:44:57 -04:00
Prosta4okua
7e975f2134 Update bundle_uk_UA.properties and bundle_ru.properties (#454) 
* Update bundle_uk_UA.properties

Виправив помилку, переклав Slag.

* Update bundle_uk_UA.properties

Додав переклад дьогтю

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_ru.properties

Commit from Github Desktop

* Update bundle_ru.properties

* New translations was added

Salt Rocks and Pebbles

* Update bundle_ru.properties

* Update bundle_ru.properties

* New text

* Fix error

* Update bundle_ru.properties

* Add new translations

* Add Solonchaki :D

* 1
 2019-04-30 12:44:41 -04:00
키에르
40de13f9c7 Update bundle_ko.properties (#457) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

*  Apr 22, 2019

* fix typo

* Update bundle_ko.properties
 2019-04-30 12:44:08 -04:00
Dominik
70946539e3 Update bundle_pl.properties (#458) 
Translated: wave info, generate, ammo info, drill, power efficency
 2019-04-30 12:43:20 -04:00
CinExPL
996c594dfc Update bundle_pl.properties (#460) 
Improvements based on comparison with original bundle file.
 2019-04-30 12:39:00 -04:00
Anuken
cf61dd0704 Removed antialiasing due to bugs / Improved default waves 2019-04-30 12:05:01 -04:00
Anuken
6fd5f1563a Fixed incorrect power source sprite 2019-04-30 00:07:38 -04:00
Anuken
3c643c917a Map bugfixes / Sprite tweak / Zone loadout moved to dialog 2019-04-29 23:58:16 -04:00
beito123
a2fa65330d
Update Japanese translations 2019-04-29 17:40:03 +09:00
Anuken
617bdf9910 New zone maps / Dark map border / Tweaks 2019-04-28 20:25:41 -04:00
Anuken
4c17b56e28 Less messy respawning / Standard starter mech / Bugfixes 2019-04-28 10:34:53 -04:00
Anuken
768d67a8ae Updated desolate rift / Spawning fixes 2019-04-26 23:23:45 -04:00
Anuken
79b0e76be0 Bugfixes / Unit test fix 2019-04-23 11:59:07 -04:00
Anuken
30650efd98 Added unfinished zone map 2019-04-22 23:56:46 -04:00
Anuken
0382c35ac0 Settings menu layout improved / Rule dialog improvements 2019-04-21 22:39:56 -04:00
Anuken
75dcceff43 Zone requirement changes / Bugfixes 2019-04-20 19:57:20 -04:00
Franciszek Zaranowicz
af91979d4c New custom games and custom rules screen (#464) 
* New waves and limited respawning option.

Added ability to manipulate number of respawns per wave. Added option to hold counting for next wave until all enemies are destroyed

* Critical bug fixed

Fixed frozen wave timer when rules.waitForWaveToEnd was enabled

* Requested changes

* Missed Import

* New custom game and custom rules screen

RulePreset is now a Gamemode (because each of them has a different goal).
New button under Gamemode selection which opens a dialog to modify rules of gamemode.
Now without any mutually exclusive options

* Requested changes

* Applied some text sugestions

* Wrong waveInProgress message displaying fixed

* Unwanted text

* Text changes

* I broke git

* Fixed chrash

* More fixes

New rule : manyCores; needed for sanbox mode

* Visual fix

* Requested changes #1 : small oversights

* Moved respawning logic to Player

and another imports cleanup

* manyCores in now attackMode

* UI changes

* Given back waves to sandbox and integer input in custom rules

* Renamed functions in CustomRulesScreen

* SPACES... Actually one space...
 2019-04-20 14:19:17 -04:00
Anuken
5f89a1b9ca Sprite updates 2019-04-16 20:30:47 -04:00
Anuken
b9db5ad662 Added block cracks 2019-04-16 12:15:06 -04:00
Anuken
5b8084e1fa Solid bush block 2019-04-16 00:49:14 -04:00
Anuken
ab67b67e4c Updated environmental sprites 2019-04-15 22:52:44 -04:00
Anuken
8413443c26 Tech tree usability improvements / Bugfixes 2019-04-15 18:32:32 -04:00
Anuken
f67fb31bc5 Updated craters map 2019-04-14 21:44:01 -04:00
Anuken
392dcf3092 Made frozen forest less constricted / Tree block fix / Server crash fix 2019-04-13 17:32:49 -04:00
Anuken
89b9501f35 Fixed tree color 2019-04-13 11:04:36 -04:00
Anuken
816ae84005 Overlay testing 2019-04-12 23:03:34 -04:00
Anuken
ef2b8be726 Cleaned up some sprites 2019-04-11 22:52:29 -04:00
Anuken
df51078858 New generation 2019-04-11 16:41:46 -04:00
Anuken
daccfa5fe3 Procedural zone generation 2019-04-09 22:52:38 -04:00
Anuken
b4fb687c4f Coal centrifuge / In-game chat / Player health rule / Bugfixes 2019-04-09 12:44:07 -04:00
Anuken
b40beb0d1d Source reformat 2019-04-08 09:03:18 -04:00
Anuken
9699d9467a New tests / Bugfixes 2019-04-07 14:09:34 -04:00
Anuken
503fc980f4 Bugfixes 2019-04-05 14:10:01 -04:00
Anuken
efed11eb97 stuff 2019-04-05 09:26:31 -04:00
Anuken
45d157fe3f Minimap fixes 2019-04-04 23:34:09 -04:00
키에르
c582bdea46 Update bundle_ko.properties (#439) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* match orignal bundle

* Update bundle_ko.properties

* Update bundle_ko.properties
 2019-04-04 19:59:09 -06:00
laohuaji233
e6c6a9381b Update bundle_zh_CN.properties (#440) 
* Update bundle_zh_CN.properties

More translations and fixed some wrong words

* Update bundle_zh_CN.properties
 2019-04-04 19:58:05 -06:00
VXF
4b4c0755c6 Update bundle_zh_CN.properties (#441) 2019-04-04 19:53:34 -06:00
Prosta4okua
aeb0539c91 Russian bundle (#443) 
* Go build communism

* Update bundle_ru.properties

Last commit: minimap

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2019-04-04 19:53:02 -06:00
Prosta4okua
9feafa45f5 Ukrainian bundle (#444) 
* No. Routernism is better.

Last commit: bugfixes

* Update bundle_uk_UA.properties

Last commit: minimap

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2019-04-04 19:52:09 -06:00
Math2128
927df391f3 Update bundle_fr.properties (#447) 
* Update bundle_fr.properties

Haven't done much. If I have more time, I will work on it. If anyone else wants to contribute, make sure not to do the same as me ! :p

* Update bundle_fr.properties

* Update bundle_fr.properties

* Update bundle_fr.properties

Add a bit more. If anyone knows where to find all the filters in the game, please tell me. It'll help me get the word in context

* Update bundle_fr.properties

* Update bundle_fr.properties

* Update bundle_fr.properties

* Update bundle_fr.properties

* Update bundle_fr.properties
 2019-04-04 19:50:59 -06:00
Anuken
0820338b55 Moved FPS counter once more / Pulverizer sprite fix 2019-04-04 19:31:17 -04:00
Anuken
09a435320a Impact reactor display bugfix 2019-04-04 15:14:45 -04:00
Anuken
bf56200c06 Power amount message for buffered blocks 2019-04-04 15:06:27 -04:00
Anuken
148f272500 New rule modifiers 2019-04-04 00:03:19 -04:00
Anuken
efdaf0d986 Balancing, tweaks and bugfixes 2019-04-02 22:43:20 -04:00
Anuken
3f6aeac33d Cleanup of new graphical options 2019-04-02 17:18:55 -04:00
Anuken
d9692004cc Shield optimization 2019-04-02 17:08:22 -04:00
Anuken
67a12eecad Bugfixes 2019-04-02 15:52:44 -04:00
Anuken
66dc1e94f5 Slight entity optimizations / Turret sprite fixes 2019-04-02 13:58:44 -04:00
Anuken
41a6dbe06c Basic minimap 2019-04-01 21:16:22 -04:00
Anuken
608de34205 Updated bundles 2019-04-01 13:32:49 -04:00
Anuken
b4071f6dcb Merge 2019-03-31 18:24:25 -04:00
Anuken
6b70418861 Cleanup 2019-03-31 18:20:38 -04:00
Anuken
de0235ad94 Sweeping rework 2019-03-31 17:49:15 -04:00
Anuken
160ae4e244 Fixed startup crashing 2019-03-31 10:37:52 -04:00
Anuken
801eadd8a8 Bugfixes 2019-03-30 19:10:06 -04:00
Anuken
b419a96d69 Mech balance / Re-added map screenshot 2019-03-30 00:17:29 -04:00
Skybbles // L5474
cbc81376be pulverizer pulverises scrap not stone (#442) 2019-03-29 13:55:45 -06:00
Anuken
0c20c6ecb7 Removed greek bundle temporarily, as font does not support it 2019-03-28 20:48:34 -04:00
Anuken
61f6368591 Bundle update 2019-03-28 17:31:22 -04:00
Valen. H
1027ca2a85 Greek (#394) 
Made in 2018, might be a bit out of date but seems functional. (4-alpha-63)
**Not complete**
 2019-03-28 15:29:11 -06:00
Prosta4okua
5acc42f739 @router & @xzimur Create a PR for the Russian language (#437) 
Останній комміт — Code cleanup (97f5bf3cc4 (diff-daade3141498d8856d75ec34b88bbb19))
 2019-03-28 15:26:14 -06:00
laohuaji233
1edeaeb94e Update bundle_zh_CN.properties (#436) 
more translations
 2019-03-28 15:26:08 -06:00
키에르
879acc6077 Update bundle_ko.properties (#435) 
* Update bundle_ko.properties

* Oops

* Oops 2

* Update bundle_ko.properties

* Update bundle_ko.properties
 2019-03-28 15:25:35 -06:00
Anuken
e6a24b8ba1 Balancing / Bugfixes / Decreased build duration slightly 2019-03-28 14:38:00 -04:00
Anuken
d56869aefa Unit shadows 2019-03-28 12:42:04 -04:00
Anuken
07c28c3f6d Minor fixes 2019-03-28 11:00:34 -04:00