Compare commits

...

219 Commits
v77 ... v81

Author SHA1 Message Date
Anuken
8bc59fb67c Fixed startup logo not fitting on screen 2019-06-29 13:50:59 -04:00
Anuken
ab5319f3d1 Merge pull request #515 from Kieaer/patch-6
Update bundle_ko.properties
2019-06-29 13:31:49 -04:00
Anuken
6128df0062 Merge pull request #517 from DVanatic/patch-1
Request Update (bundle.in_ID.properties)
2019-06-29 13:31:40 -04:00
Anuken
142938cdca Merge pull request #521 from Prosta4okua/patch-1
Patch 1. Fight!
2019-06-29 13:31:24 -04:00
Anuken
b32efe129e Merge pull request #523 from Predator127/patch-8
Update bundle_pt_BR.properties
2019-06-29 13:31:14 -04:00
Anuken
2b20272a61 Merge pull request #525 from VizardAlpha/patch-22
Updates bundle_fr_BE.properties
2019-06-29 13:31:01 -04:00
Anuken
d9ef79a7b5 Regression fix / Slightly better server dialog 2019-06-29 13:19:53 -04:00
Anuken
576f0be4ab Fixed incorrect game-overs on zone attack maps 2019-06-29 11:02:27 -04:00
키에르
47099a8a9b Update bundle_ko.properties 2019-06-29 15:00:06 +09:00
Anuken
04dfda0c55 Some minor map tweaks and fixes 2019-06-28 23:47:43 -04:00
Anuken
b6df916700 Map updates 2019-06-28 23:16:26 -04:00
Prosta4ok_ua
e239406199 Нові переклади 2019-06-25 23:16:07 +03:00
Anuken
266744b1dd Fixed salvo range 2019-06-24 19:44:57 -04:00
Anuken
ab716e96e2 Bugfixes 2019-06-24 16:54:50 -04:00
Anuken
649d527dcf Temporary loading screen 2019-06-23 14:09:29 -04:00
Anuken
c5e7ddaf7a Added option to set TextField length for showTextInput() (#534)
* Add files via upload

* Added option to set TextField length for showTextInput()

the character length default was 12, and unchangeable afaik, so I added an option to change the character length, as well as suggesting a new character length for save file's name.
(I actually have no idea if this PR can be delivered correctly, wish me luck.)

* Rename UI.java to core\src\io\anuke\mindustry\ui/UI.java

* Rename SaveDialog.java to core\src\io\anuke\mindustry\ui\dialogs\SaveDialog.java

* Delete UI.java

* Added option to set TextField length for showTextInput()

the character length default was 12, and unchangeable afaik, so I added an option to change the character length, as well as suggesting a new character length for save file's name. (I actually have no idea if this PR can be delivered correctly, wish me luck.)

* Delete UI.java

* Delete SaveDialog.java

* Add files via upload

* Add files via upload

* Delete UI.java

* Delete SaveDialog.java

* Delete core\src\io\anuke\mindustry\ui\dialogs\SaveDialog.java

* Delete Mindustry-64.zip
2019-06-23 12:45:37 -04:00
Anuken
b2a4cb42cf Sprite updates 2019-06-23 12:36:13 -04:00
Anuken
3fc5941f54 Wiki whitespace fix 2019-06-23 11:16:11 -04:00
Anuken
741360022b Typo 2019-06-23 11:03:05 -04:00
Anuken
86e2f62aed Fixed locales not generating 2019-06-23 10:52:03 -04:00
Anuken
e552915637 Test 2 2019-06-23 10:33:25 -04:00
Anuken
98a51c1f61 Testing improved deployment script 2019-06-23 10:29:22 -04:00
(G_H)
aa84eefa8f Merge branch 'master' into GH-v80 2019-06-23 21:07:06 +08:00
(G_H)
22e12ce3e5 Delete Mindustry-64.zip 2019-06-23 20:22:22 +08:00
(G_H)
f4a82b5c01 Delete core\src\io\anuke\mindustry\ui\dialogs\SaveDialog.java 2019-06-23 20:22:13 +08:00
(G_H)
60520ea855 Delete SaveDialog.java 2019-06-23 17:59:36 +08:00
(G_H)
b70a0869cd Delete UI.java 2019-06-23 17:59:24 +08:00
(G_H)
7bdd21bb75 Add files via upload 2019-06-23 17:59:14 +08:00
(G_H)
0dd3736f2a Add files via upload 2019-06-23 17:58:42 +08:00
(G_H)
deb2d30706 Delete SaveDialog.java 2019-06-23 17:57:30 +08:00
(G_H)
c416e1546d Delete UI.java 2019-06-23 17:57:16 +08:00
(G_H)
6d3a67ae59 Added option to set TextField length for showTextInput()
the character length default was 12, and unchangeable afaik, so I added an option to change the character length, as well as suggesting a new character length for save file's name. (I actually have no idea if this PR can be delivered correctly, wish me luck.)
2019-06-23 17:55:12 +08:00
(G_H)
6b60147152 Delete UI.java 2019-06-23 17:52:45 +08:00
Anuken
8c91aca838 New maps / New generation filter(s) and tweaks 2019-06-22 20:40:53 -04:00
Anuken
b47e282747 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-06-21 16:16:28 -04:00
(G_H)
134d0e7e4a Rename SaveDialog.java to core\src\io\anuke\mindustry\ui\dialogs\SaveDialog.java 2019-06-22 00:50:46 +08:00
(G_H)
26b596760b Rename UI.java to core\src\io\anuke\mindustry\ui/UI.java 2019-06-22 00:49:39 +08:00
(G_H)
8a5e15e82d Added option to set TextField length for showTextInput()
the character length default was 12, and unchangeable afaik, so I added an option to change the character length, as well as suggesting a new character length for save file's name.
(I actually have no idea if this PR can be delivered correctly, wish me luck.)
2019-06-22 00:32:17 +08:00
Anuken
ffb5eee62a Update BuilderTrait.java 2019-06-21 09:11:17 -04:00
Anuken
387d9b39da Icon fixes 2019-06-20 22:20:25 -04:00
Anuken
43b5cb62bb Fixed #530 / Better icons / Server list ordering 2019-06-20 22:12:17 -04:00
Anuken
580923a646 Render tests 2019-06-20 16:27:57 -04:00
Anuken
06444f497b Internal tool changes 2019-06-20 15:34:48 -04:00
Anuken
1676ad5f1b Bugfixes 2019-06-20 09:14:47 -04:00
Anuken
478d86677d Fixed boulder sprites 2019-06-20 00:16:22 -04:00
Anuken
c5e0db8de9 Why are these synced? 2019-06-19 22:59:28 -04:00
Anuken
228690b400 Fixed net disconnect error 2019-06-19 22:20:45 -04:00
Anuken
8e95be0ac2 Crash fix + drill balance 2019-06-19 21:41:49 -04:00
Anuken
47b1e700ea Fixed travis syntax error 2019-06-19 18:11:08 -04:00
Anuken
3ad1949727 Minor tweaks before release 2019-06-19 18:04:31 -04:00
Anuken
441680861e Player spawning bugfix 2019-06-19 13:32:38 -04:00
키에르
5e848ecbb3 Update bundle_ko.properties 2019-06-19 19:38:55 +09:00
Anuken
c9520e607f Implemented craters map, again / Disabled unit editing 2019-06-18 20:45:21 -04:00
Anuken
40a8c52ba1 Testing travis build again 2019-06-18 18:41:03 -04:00
Anuken
cb6ffd7810 Testing travis wiki building 2019-06-18 18:30:43 -04:00
Anuken
185a7bb7d8 Bugfixes / Sprite update / Multiplayer in-game editor / Drone tweaks 2019-06-17 21:35:19 -04:00
Anuken
bc3405d11d Bugfixes 2019-06-17 15:45:10 -04:00
Anuken
2804361436 Bugfix 2019-06-17 12:18:10 -04:00
Anuken
4f40f3c4b2 More sprite updates 2019-06-17 10:08:24 -04:00
Anuken
897c55c410 Bugfixes 2019-06-16 23:38:50 -04:00
Anuken
9e97b5851e Where did that go? 2019-06-16 19:11:41 -04:00
Anuken
625fbdb2d7 Auto-rebuilding enemy drones / GC improvements 2019-06-16 18:50:51 -04:00
키에르
0f32d3f619 Update bundle_ko.properties 2019-06-16 13:31:16 +09:00
Anuken
273c74b275 Many things 2019-06-15 23:26:43 -04:00
Anuken
2500d0a930 Fixed maps getting rejected even with cores 2019-06-14 23:03:19 -04:00
Anuken
25bf3be009 Merge remote-tracking branch 'origin/master' 2019-06-14 21:07:10 -04:00
Anuken
910dab1896 More drone changes 2019-06-14 21:06:58 -04:00
Arkanic
6198ad557a English bundle graphite description (#528)
* added graphite description

graphite now has a description
Yay. my fist commit

* fixed grammar

thanks @anuken
2019-06-14 18:40:05 -04:00
Anuken
89b3d3b670 Removed difficulty 2019-06-14 15:53:09 -04:00
Anuken
122f43ddb9 Fixed unit tests 2019-06-14 15:07:39 -04:00
Anuken
50104d2532 Fixed door toggle 2019-06-14 13:29:40 -04:00
Prosta4ok_ua
f5f30d6026 Add new strings 2019-06-14 14:35:15 +03:00
Anuken
114cd48521 Actually functional builder drones 2019-06-13 22:34:24 -04:00
Anuken
548da3ea5f Further drone splitting / Even drone player distribution 2019-06-13 22:22:25 -04:00
Anuken
2a8b8d040b Fixed deconstruction exploit 2019-06-13 20:17:48 -04:00
Nathan R
0dc2d4445b Fixed download image (#526) 2019-06-13 19:00:52 -04:00
Anuken
8ac497354a Miner drone / Editor bugfixes 2019-06-12 22:09:24 -04:00
Anuken
0cbbcc00a5 Zone rules moved to maps 2019-06-12 19:25:22 -04:00
Anuken
5cfab33ada Fixed unit tests / Fixed zones having incorrect waves 2019-06-12 18:42:12 -04:00
Anuken
18328320c1 Fixed black blocks/units after quit / Fixed intense wave spawn lag 2019-06-12 18:07:19 -04:00
Anuken
73c48afc99 Save loading regression tests 2019-06-12 15:52:47 -04:00
Anuken
62bd0442df Testing loading of old saves 2019-06-12 15:29:41 -04:00
Anuken
0aee75c1c1 Splitting of building+mining into separate traits 2019-06-12 14:03:50 -04:00
Anuken
dc3c27297f Team drawing 2019-06-12 10:28:38 -04:00
Anuken
9363946874 Fixed terminology 2019-06-11 23:39:01 -04:00
Anuken
df78412896 Desktop/mobile descriptive tool modes 2019-06-11 23:31:57 -04:00
Anuken
16190aa878 Better server discovery 2019-06-11 13:01:28 -04:00
VizardAlpha
e6e5b95adc Update bundle_fr_BE.properties 2019-06-11 16:34:08 +02:00
VizardAlpha
990adcd3b3 Updates bundle_fr_BE.properties 2019-06-11 16:23:50 +02:00
Anuken
75a5bbdbb1 Start on multicast 2019-06-11 10:05:35 -04:00
Anuken
af1746932f Fixed incorrect scaling 2019-06-11 08:47:16 -04:00
Predator127
56ff5689f4 Update bundle_pt_BR.properties
Revised translation with a better vocabulary
2019-06-10 22:02:15 -03:00
Anuken
0dd15f3141 Fixed build errors 2019-06-10 18:51:06 -04:00
Anuken
72fb7b9df7 Net refactor 2019-06-10 18:46:58 -04:00
Anuken
d7e1297cce Tweaks 2019-06-10 15:14:57 -04:00
Anuken
3c9d4ee38f Merge remote-tracking branch 'origin/master' 2019-06-10 13:55:40 -04:00
Anuken
828e6bb1b7 New changes, possible fixes to UI layout bugs 2019-06-10 13:55:18 -04:00
Zachary
6e42d59716 Update README.md (#522)
fixed the google play store image L0L uWu
2019-06-10 11:29:05 -04:00
Prosta4ok_ua
6f589b5c84 Hello everyone 2019-06-10 18:20:08 +03:00
Anuken
6d1b8b81fa Bugfixes 2019-06-10 10:11:28 -04:00
키에르
cddd7e0e94 Update bundle_ko.properties 2019-06-10 19:42:12 +09:00
Anuken
340bc5f2f7 Ground zero map updated 2019-06-09 23:29:10 -04:00
DVanatic
ecd117cd58 Request Update (bundle.in_ID.properties)
I have read the guides and yes, i know the consequence of translating all lines despite it going to change soon-ish. i've been a diehard fan of this game since i saw it and really interested in following and working with this game's development!
2019-06-10 08:39:00 +07:00
Anuken
ea0788f56c Better wave timer / Sprite tweaks / Core wave spawns 2019-06-09 21:09:29 -04:00
Anuken
4199702b9b Updated turret sprites 2019-06-09 14:46:48 -04:00
Anuken
5946aaa31f Merge remote-tracking branch 'origin/master' 2019-06-09 12:04:49 -04:00
Anuken
444b5dbd97 Turret balance / Bugfixes 2019-06-09 12:04:45 -04:00
키에르
695ccfcc4d Update bundle_ko.properties 2019-06-09 18:34:45 +09:00
Fenr1r
a6d5bdd001 Fix some mistyping and refactoring (#503)
* remove unused import

* fix mixtyping (duplicated ;)

* remove redundant type casting
detail: item's type is defined as short.

* Revert "remove redundant type casting"

This reverts commit 39bf91d9ff.
2019-06-08 23:20:47 -04:00
Anuken
bd4d8efd78 Fixed invisible ship bug 2019-06-08 22:20:30 -04:00
Anuken
53baad766f More balancing and cleanup 2019-06-08 17:34:29 -04:00
Anuken
8ac746188b Unit pad balance 2019-06-08 17:22:46 -04:00
Prosta4okua
62dbce089f Update bundle_ru.properties 2019-06-08 22:42:36 +03:00
Anuken
fd5d0b2cbb Fixed PvP core assignment 2019-06-08 14:41:35 -04:00
Anuken
6226e0c5a3 Fixed old pathfinding targets not resetting on death 2019-06-08 13:04:26 -04:00
Anuken
01a9be835f what 2019-06-08 12:29:27 -04:00
Anuken
97eb66b0a5 Bundle update 2019-06-08 12:11:32 -04:00
Anuken
048c5e68f1 Crash fix 2019-06-08 11:28:33 -04:00
Anuken
8f39def993 Changed wiki link to point to unfinished 4.0 wiki 2019-06-08 10:56:47 -04:00
Anuken
0be674d7af Changed back overflow gate speed 2019-06-08 10:48:32 -04:00
Anuken
e6499f7e5a Bugfixes 2019-06-08 10:41:22 -04:00
Anuken
10bd1d1969 Fixed #509 2019-06-08 10:05:08 -04:00
Anuken
ec94267b8e Update ServerControl.java 2019-06-08 09:23:15 -04:00
Anuken
d3ad113bf5 Update ServerControl.java
;
2019-06-08 09:18:39 -04:00
Anuken
8d7242a1ef Update ServerControl.java 2019-06-08 09:08:49 -04:00
Anuken
13879dd374 Fixed #513 2019-06-07 18:58:07 -04:00
Anuken
0f519fd358 Bugfixes for 78.1 2019-06-07 17:34:46 -04:00
Anuken
e7fb128499 Fixed sorter loading 2019-06-07 16:13:48 -04:00
Anuken
c2d619cb7f Save IO fixes 2019-06-07 16:06:23 -04:00
Anuken
78176cca90 unused -> unchecked 2019-06-07 15:06:17 -04:00
Anuken
dbc49649c0 Merge remote-tracking branch 'origin/master' 2019-06-07 15:04:43 -04:00
Anuken
49ee821029 More stuff fixed / Contributor list 2019-06-07 15:03:01 -04:00
Anuken
e1499330bc Merge pull request #508 from VizardAlpha/patch-21
Updates bundle_fr_BE.properties
2019-06-07 14:19:21 -04:00
Anuken
222175e005 Merge pull request #497 from ZacBytes/patch-5
Update bundle_zh_CN.properties
2019-06-07 14:18:40 -04:00
Anuken
388927715e Merge branch 'master' into patch-5 2019-06-07 14:18:33 -04:00
Anuken
ac9e1febfb Merge pull request #492 from MrPickles14/patch-2
Update bundle_fr.properties
2019-06-07 14:16:08 -04:00
Anuken
e47836cc64 Merge branch 'master' into patch-2 2019-06-07 14:16:00 -04:00
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
4458ae042e hhh 2019-06-07 11:18:06 -04:00
Anuken
1c3d7c1c73 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-06-07 10:25:14 -04:00
Anuken
dd05f5278c Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-06-06 12:05:46 -04:00
VizardAlpha
328cdac60f Update bundle_fr_BE.properties 2019-06-06 15:38:24 +02:00
키에르
3ad9e44891 Update bundle_ko.properties 2019-06-05 23:05:01 +09:00
VizardAlpha
9039d52817 Updates bundle_fr_BE.properties 2019-06-01 23:12:52 +02: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
72638fc215 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-05-21 13:19:27 -04:00
Zachary
65418529cd Update bundle_zh_CN.properties
Skrttt Skrrtt Vroom Vroom

Translated some new stuff
2019-05-21 23:00:01 +08: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
Prosta4ok_ua
1687ce3182 Added new translations 2019-05-14 23:59:24 +03: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
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
키에르
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
Anuken
465c0e7dc3 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-05-05 12:50:04 -04: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
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
Deyvid67
c97826ed29 Update bundle_pt_BR.properties 2019-05-02 14:33:29 -03:00
Anuken
9c653a46bc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/src/io/anuke/mindustry/game/Version.java
2019-05-02 12:59:05 -04:00
beito123
9f5a183793 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
2019-05-02 20:08:10 +09:00
Anuken
c2a6690d24 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-05-01 20:52:02 -04:00
Anuken
5e5b719704 Added version toggle 2019-05-01 20:51:44 -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
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
beito123
a2fa65330d Update Japanese translations 2019-04-29 17:40:03 +09:00
beito123
d3af66b7ed Merge remote-tracking branch 'upstream/master' 2019-04-29 17:18:16 +09:00
beito123
4a7960d64b Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
2019-04-16 19:10:18 +09:00
Anuken
c5226c9e59 Merge branch 'master' into master 2019-03-20 17:13:48 -06:00
beito123
3bad95b389 Update Japanese translations 2019-03-20 15:29:36 +09:00
beito123
54ef7760b9 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
2019-03-20 13:11:49 +09:00
beito123
2ed5d34192 Update Japanese 2019-03-19 21:20:29 +09:00
beito123
9336a2b4c5 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
2019-03-17 17:56:40 +09:00
beito123
eb92ca8cd7 Update Japanese 2019-03-17 16:44:51 +09:00
(G_H)
d3922905c9 Add files via upload 2019-03-06 20:56:15 +08:00
beito123
f5866d7f72 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
2019-03-06 14:59:38 +09:00
beito123
dbbc72d00f Update Japanese translations 2019-03-06 14:49:12 +09:00
beito123
2b4bcf0b0a Oops! 2019-02-15 12:17:43 +09:00
beito123
0851f2d0e2 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
2019-02-13 12:23:26 +09:00
beito123
ea9ed841ee Update Japanese translations 2018-12-16 21:54:32 +09:00
beito123
567f3fd3cd Update Japanese translations 2018-12-15 17:26:26 +09:00
beito123
9dcd8dc419 Merge remote-tracking branch 'fork_master/master' 2018-12-15 15:48:39 +09:00
beito123
e19bd9d434 Update Japanese translation 2018-12-10 23:10:57 +09:00
beito123
35ecd26634 Update Japanese translations 2018-12-10 00:37:00 +09:00
beito123
ac3bb37c36 Update Japanese translations 2018-12-09 19:36:29 +09:00
beito123
17b8b285a3 Update Japanese translations 2018-12-09 19:10:41 +09:00
beito123
788bf383aa Update Japanese translations 2018-12-09 19:07:40 +09:00
beito123
8d0b889f3c Update Japanese translations 2018-12-09 15:09:37 +09:00
beito123
d250fb655d Merge remote-tracking branch 'fork_master/master' 2018-12-09 14:26:55 +09:00
beito123
74eb79de17 Merge remote-tracking branch 'fork_master/master' 2018-12-08 00:44:59 +09:00
beito123
e2eabfc141 Merge remote-tracking branch 'fork_master/master' 2018-12-01 17:08:54 +09:00
beito123
a3ee43b31c Update Japanese translations 2018-11-25 23:49:40 +09:00
beito123
12dd16d4bf Update Japanese 2018-11-25 23:40:33 +09:00
beito123
a5b9e57576 Update Japanese translations
Improve and update for new changes
2018-11-25 23:33:00 +09:00
beito123
6c194d257c merge from master 2018-11-25 22:39:04 +09:00
beito123
09598e0ced Update Japanese 2018-11-16 19:39:16 +09:00
beito123
6af2696f6a Update Japanese 2018-11-16 19:01:05 +09:00
beito123
69dac77932 Merge remote-tracking branch 'fork_master/master' 2018-11-16 18:44:14 +09:00
beito123
2764e0e5fa Upadte Japanese translations 2018-11-15 01:42:11 +09:00
beito123
fa5cdc3afa Update Japanese translation
Applies commit 7a51693. and small changes.
2018-11-15 01:07:39 +09:00
beito123
8dae5ec47a Add new japanese translation
It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.
2018-11-15 00:39:37 +09:00
385 changed files with 15115 additions and 12399 deletions

View File

@@ -1,20 +1,28 @@
jdk: jdk:
- openjdk8 - openjdk8
script: script:
- "git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc" - git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
- "./gradlew test" - "./gradlew test"
- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}" - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}" - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
deploy: deploy:
provider: releases - provider: releases
skip_cleanup: true skip_cleanup: true
draft: false draft: false
api_key: api_key:
secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg= secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
file: file:
- "desktop/build/libs/desktop-release.jar" - desktop/build/libs/desktop-release.jar
- "server/build/libs/server-release.jar" - server/build/libs/server-release.jar
on: on:
repo: Anuken/Mindustry repo: Anuken/Mindustry
tags: true tags: true
- provider: script
script: bash update_wiki.sh
on:
repo: Anuken/Mindustry
tags: true
env:
global:
secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=

View File

@@ -40,6 +40,6 @@ After building, the output .JAR file should be in `/desktop/build/libs/desktop-r
### Downloads ### Downloads
<a href="https://anuke.itch.io/mindustry"><img src="https://i.imgur.com/sk26hTV.png" width="auto" height="75"></a> <a href="https://anuke.itch.io/mindustry"><img src="https://static.itch.io/images/badge.svg" width="auto" height="75"></a>
<a href="https://play.google.com/store/apps/details?id=io.anuke.mindustry&hl=en"><img src="https://i.imgur.com/8dF6l81.png" width="auto" height="75"></a> <a href="https://play.google.com/store/apps/details?id=io.anuke.mindustry&hl=en"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cd/Get_it_on_Google_play.svg/1280px-Get_it_on_Google_play.svg.png" width="auto" height="75"></a>

View File

@@ -113,11 +113,13 @@ android{
} }
} }
buildTypes{ if(project.hasProperty("RELEASE_STORE_FILE")) {
release{ buildTypes {
release {
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
} }
}
} }
// called every time gradle gets executed, takes the native dependencies of // called every time gradle gets executed, takes the native dependencies of
// the natives configuration, and extracts them to the proper libs/ folders // the natives configuration, and extracts them to the proper libs/ folders

View File

@@ -35,7 +35,7 @@ allprojects{
} }
getArcHash = { getArcHash = {
//get latest commit hash from gtihub since JITPack's '-snapshot' version doesn't work correctly //get latest commit hash from github since JITPack's '-snapshot' version doesn't work correctly
if(arcHash == null){ if(arcHash == null){
try{ try{
arcHash = 'git ls-remote https://github.com/Anuken/Arc.git'.execute().text.split("\t")[0] arcHash = 'git ls-remote https://github.com/Anuken/Arc.git'.execute().text.split("\t")[0]
@@ -113,6 +113,8 @@ allprojects{
maven{ url 'https://jitpack.io' } maven{ url 'https://jitpack.io' }
jcenter() jcenter()
} }
tasks.withType(Javadoc).all{ enabled = false }
} }
project(":desktop"){ project(":desktop"){
@@ -170,7 +172,7 @@ project(":ios"){
project(":core"){ project(":core"){
apply plugin: "java" apply plugin: "java"
task finish{ task preGen{
generateLocales() generateLocales()
} }
@@ -200,6 +202,8 @@ project(":core"){
compileJava.finalizedBy(copyGen) compileJava.finalizedBy(copyGen)
} }
compileJava.dependsOn(preGen)
compile arcModule("arc-core") compile arcModule("arc-core")
compile arcModule("extensions:freetype") compile arcModule("extensions:freetype")
compile arcModule("extensions:arcnet") compile arcModule("extensions:arcnet")
@@ -242,6 +246,12 @@ project(":tools"){
dependencies{ dependencies{
compile project(":core") compile project(":core")
//for render tests
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
compile arcModule("backends:backend-lwjgl3")
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 401 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 411 B

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 920 B

After

Width:  |  Height:  |  Size: 800 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 606 B

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 454 B

After

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 455 B

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 811 B

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 475 B

After

Width:  |  Height:  |  Size: 546 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 436 B

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 850 B

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 371 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 389 B

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 268 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 155 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 291 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 464 B

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 541 B

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 294 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 280 B

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 317 B

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 953 B

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 877 B

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 721 B

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 567 B

After

Width:  |  Height:  |  Size: 549 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 730 B

After

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 806 B

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 974 B

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 229 B

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 678 B

After

Width:  |  Height:  |  Size: 782 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 633 B

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 2.8 KiB

Some files were not shown because too many files have changed in this diff Show More