Commit Graph

4442 Commits

Author SHA1 Message Date
PotassioK
c062492def Update bundle_it.properties (#850)
* Update bundle_it.properties

* Update bundle_it.properties

* Update bundle_it.properties

* Update bundle_it.properties
2019-10-21 19:01:37 -04:00
Anuken
4f6bd5b684 Bugfixes 2019-10-21 18:55:01 -04:00
Anuken
181c418cea Merge remote-tracking branch 'origin/master' 2019-10-21 17:53:05 -04:00
Anuken
01f6fff823 Correct liquid boost display for turrets 2019-10-21 17:50:26 -04:00
dase1353
3bb787c575 Update bundle_zh_TW.properties (#830)
* Update bundle_zh_TW.properties

Update bundle_zh_TW.properties to last Base Bundle Version

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

update to follow last bundle assets

* Update bundle_zh_TW.properties
2019-10-21 12:48:31 -04:00
laohuaji233
39972c4c2b Update bundle_zh_CN.properties (#844) 2019-10-21 12:45:30 -04:00
Charles Wu
486a45ad14 Update bundle_zh_CN.properties (#798)
fix chinese translation grammatical mistakes
2019-10-21 12:14:49 -04:00
Anuken
eb1d3c27c5 Mods + crash message for iOS/Android 2019-10-21 00:02:36 -04:00
Anuken
83b3bd9a2e Fixed flip not taking into account offset 2019-10-20 20:39:58 -04:00
Anuken
fe4783dc63
Merge pull request #814 from Maxattax97/minimap-players
Add username labels to map/minimap
2019-10-20 17:06:48 -04:00
Max O'Cull
898956d833
Fix compact formatting 2019-10-20 17:03:54 -04:00
Anuken
b1d9be707d
Merge pull request #847 from clfer/feature/build-queue-improvement
Allow to replace previous build request in queue
2019-10-20 16:57:25 -04:00
Anuken
907f1e7dfd Merge remote-tracking branch 'origin/master' 2019-10-20 16:52:06 -04:00
Anuken
2e0e351228 Bugfixes 2019-10-20 16:50:04 -04:00
Anuken
e4b267d757
Merge pull request #838 from ado1928/master
Added more rubble pngs
2019-10-20 16:32:07 -04:00
clfer
a238d7278f Allow to replace previous build request in queue 2019-10-20 21:52:27 +02:00
Anuken
4b428c6636 Bugfixes 2019-10-20 14:06:43 -04:00
Anuken
b5e9f280e6 Schematic preview improvements 2019-10-20 12:48:39 -04:00
Anuken
3c65e366e8 Clear previous schematic when selecting new one 2019-10-20 10:56:17 -04:00
Anuken
e9efe4169c Fixes of bug variety 2019-10-20 10:42:40 -04:00
Anuken
4be22822d4 Bugfixes 2019-10-20 10:06:13 -04:00
Anuken
00054e2c61 Bugfixes 2019-10-19 21:09:59 -04:00
Anuken
cc105e5029 Merge branches 'master' and 'schematics' of https://github.com/Anuken/Mindustry
# Conflicts:
#	gradle.properties
2019-10-19 20:46:25 -04:00
Anuken
f6899cf3c3 Mobile bugfixes 2019-10-19 20:45:17 -04:00
Anuken
a2a4c8c43d Bugfixes 2019-10-19 19:54:41 -04:00
Anuken
0faae5d5ca Bugfix 2019-10-19 19:11:54 -04:00
Anuken
2586c53f0d Complete refactoring of workshop / Schematic+mod support 2019-10-19 18:53:27 -04:00
ado1928
7fdbd27ebb
Add files via upload 2019-10-19 10:58:34 +02:00
Anuken
d0dc21a52c Workshop refactoring 2019-10-19 02:00:43 -04:00
Anuken
f7be953bb5 Schematic import 2019-10-19 01:19:32 -04:00
Anuken
08a51d8f1b Schematic export buttons, workshop support progress 2019-10-19 01:03:49 -04:00
Anuken
32edf58f75 Fixed zips 2019-10-18 20:11:02 -04:00
Anuken
88e1770f2e Bugfixes 2019-10-18 19:31:01 -04:00
Anuken
142e93f3e9 Schematic search button 2019-10-18 17:18:29 -04:00
Anuken
db9eb36c8c Updating arc 2019-10-18 15:07:13 -04:00
Anuken
6a12effd6a Schematic flipping + rotation 2019-10-18 14:38:43 -04:00
Anuken
f7d98591c9 Schematic rotation 2019-10-18 11:38:00 -04:00
Anuken
30bcfb6d5e Functional desktop schematic placement 2019-10-18 00:41:30 -04:00
Anuken
61d15782d0 More functionality, lots of bugfixes 2019-10-17 23:51:23 -04:00
Anuken
dec6a1296b Better schematic previews, keep on game export 2019-10-17 22:57:37 -04:00
Anuken
44c8b07eb1 Things 2019-10-17 22:14:04 -04:00
Anuken
0095d89543 Merge branch 'master' of https://github.com/Anuken/Mindustry into schematics 2019-10-17 21:58:55 -04:00
Anuken
4977f598fd Config drawing 2019-10-17 21:58:49 -04:00
Anuken
25cacbb28d Merge remote-tracking branch 'origin/master' 2019-10-17 17:00:49 -04:00
Anuken
a0c93ea7d3 Made incend bullets apply status instead of creating fire 2019-10-17 17:00:38 -04:00
Anuken
1921bc87a2 Dialog 2019-10-17 16:53:43 -04:00
Anuken
6437e6b878
Update ContentParser.java 2019-10-17 10:56:10 -04:00
Anuken
41284ac3bc Bugfix 2019-10-17 09:01:59 -04:00
Anuken
8cf0df7ac5 Crash fix 2019-10-17 08:40:11 -04:00
Anuken
b804f7fa6e Bugfixes 2019-10-16 23:08:07 -04:00
Anuken
95cda0d9ab no 2019-10-16 19:46:03 -04:00
Anuken
2dae3c4b4a Fixed sound loading 2019-10-16 19:19:08 -04:00
Anuken
fd12027873 Merge remote-tracking branch 'origin/master' 2019-10-16 14:37:31 -04:00
Anuken
ff4c7e4302 Multithreaded packing 2019-10-16 14:36:46 -04:00
Patrick 'Quezler' Mounier
596d58b539
Fix loadout reset 2019-10-16 15:51:18 +02:00
Anuken
af3067c08b
Merge pull request #800 from laohuaji233/patch-23
Update bundle_zh_CN.properties
2019-10-15 18:30:57 -04:00
Anuken
d0006eaa26
Merge pull request #793 from 1RedOne/patch-2
Adds Japanese menu items for Mods
2019-10-15 18:21:04 -04:00
Anuken
52b2731a42
Merge pull request #785 from osoitz/patch-2
Update bundle_eu.properties
2019-10-15 18:19:11 -04:00
Anuken
08f3368766
Merge pull request #782 from Amon-Senpai/patch-2
Update bundle_de.properties
2019-10-15 18:17:30 -04:00
Anuken
86474484ae
Merge pull request #780 from PlayerBrasil13/patch-3
Update bundle_pt_BR.properties
2019-10-15 18:17:11 -04:00
Anuken
e31fb13378
Merge pull request #774 from dase1353/patch-1
Update bundle_zh_TW.properties
2019-10-15 18:15:44 -04:00
Anuken
c147389d25
Merge pull request #769 from Tunacan427/master
Huge updates to Turkish translations
2019-10-15 18:15:12 -04:00
Anuken
e5335e9a97
Merge branch 'master' into master 2019-10-15 18:08:21 -04:00
Anuken
5c0a338e6b
Merge pull request #765 from azureblue/azureblue-patch-1_bundle_pl
Update bundle_pl.properties
2019-10-15 18:07:52 -04:00
Anuken
73329ccaf2
Merge pull request #753 from clfer/feature/update_bundle_fr_FR
Update bundle_fr.properties
2019-10-15 18:05:09 -04:00
DeltaRays
bfe57b309a Update bundle_it.properties (#740) 2019-10-15 17:53:50 -04:00
eru_java
6715c43fc3 Update bundle_ja.properties (Steam Translate and Update) (#736)
Translated STEAM.
Translated new features.
2019-10-15 17:53:03 -04:00
Mengyang Li
f68348bde6 Update bundle_zh_CN.properties: fix minor typo (#725) 2019-10-15 17:47:00 -04:00
Anuken
121e27906c Fixed bullet parsing 2019-10-15 14:31:31 -04:00
Anuken
a1826763f5 Autotiling begins 2019-10-15 08:56:42 -04:00
Anuken
5a3e4f7fb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into schematics 2019-10-15 08:52:48 -04:00
Anuken
8556b7eef7 Block build visibility 2019-10-15 00:23:38 -04:00
Anuken
8e9b84f4f9 Minor position tweak 2019-10-14 23:50:07 -04:00
Anuken
6b1fd152e5 Merge remote-tracking branch 'origin/master' 2019-10-14 23:48:38 -04:00
Charlie Karniol
fab3fcb112 Vastly improved Estonian translation bundle (#737)
* Minor user interface tweaks

* Vastly improved Estonian translation bundle
2019-10-14 23:48:25 -04:00
Maxwelllondon92
a4b6b88b76 Update bundle_it.properties (#730)
* Update bundle_it.properties

Minor corrections and mistypes.
added translation to armored conveyor, rally command
added Editor translation
added UI translation
Adjustment made to the tutorial instruction

* Update bundle_it.properties

correction for wrong name and description of pixelation setting

* Update bundle_it.properties

Minor corrections to keybind menu settings

* Update bundle_it.properties

Corrections: some mech pads were mistakenly translated as ship pads
2019-10-14 23:46:11 -04:00
Anuken
6bceb7311a Better display of broken stuff / 5x slower wall building 2019-10-14 23:43:13 -04:00
Mengyang Li
cbfc766e55 hud: show player position (#717)
* hud: show player position

* hud: clean up old statement

* hug: address comments
2019-10-14 23:42:03 -04:00
njwlgamer
d19c3daa67 Update bundle_nl.properties (#667) 2019-10-14 23:41:02 -04:00
ねらひかだ
86eb832446 Japanese Translations for Google Play (#713)
* Copy descriptions for Google Play

* Update descriptions for Google Play

* Delete not need files

* Add contributors, fix some translations

* Very small changes

* Very small changes 2

* campaign...?

Japanese is not familiar with the word "campaign"
2019-10-14 23:37:33 -04:00
AmateurPotion
ebb859238c Update bundle_ko.properties (#818)
* Update bundle_ko.properties

* Update bundle_ko.properties
2019-10-14 23:22:33 -04:00
Anuken
eb21d5ab67 Experimental schematics 2019-10-14 21:34:06 -04:00
Anuken
edfd402ccd Targeting priority 2019-10-14 18:54:50 -04:00
Anuken
3d8547d7dd Better null checks 2019-10-14 18:40:28 -04:00
Anuken
3ffa768cfc Json cleanup 2019-10-14 17:36:58 -04:00
Anuken
53e9d4a3e3
Update ModsDialog.java 2019-10-14 12:40:56 -04:00
dase1353
a45fc2c030
Update bundle_zh_TW.properties 2019-10-14 11:43:08 +08:00
Anuken
78471c1860 Cleanup 2019-10-13 19:43:51 -04:00
Anuken
7eb3e5c0ea Radial tech tree layout 2019-10-13 19:36:47 -04:00
Anuken
adc7c2bdb6 Full zoom+pan in tech tree and campaign 2019-10-13 17:53:50 -04:00
Anuken
bef8b905de Added github import dialog 2019-10-13 17:14:35 -04:00
Tunacan427
4d91c8f8b7
Merge branch 'master' into master 2019-10-13 23:52:01 +03:00
Anuken
53c842492a Tech tree zoom 2019-10-13 14:49:19 -04:00
Anuken
3d624f7eaf Added inverted sorter 2019-10-13 12:58:58 -04:00
Anuken
6743bd144f Nestable set iteration 2019-10-13 12:11:28 -04:00
Anuken
a09320cb4a A warning 2019-10-12 23:12:02 -04:00
Anuken
9ef31201b6 Fixed #821 2019-10-12 21:48:45 -04:00
Anuken
e7a5f0a6e6 Fixed editor variants 2019-10-12 18:45:46 -04:00
Anuken
0509c28576 Fixed bizzare single type generator initialization 2019-10-12 18:39:08 -04:00
Anuken
dd3fd97b43 Updated arc 2019-10-12 16:56:43 -04:00
Anuken
d973283039 Mod loading fixes 2019-10-12 15:22:54 -04:00
Max O'Cull
b5bec065fe
Fix mis-coloring of entity "tile" 2019-10-12 13:15:47 -04:00
Anuken
01e3bd703e Added option to initialize generators without storage properties 2019-10-12 13:10:33 -04:00
Anuken
d7ca2a33c8 Input fixes 2019-10-12 12:52:50 -04:00
Max O'Cull
243862804a
Remove labels from minimap, keep on larger map 2019-10-12 12:41:26 -04:00
Max O'Cull
23b7176d5a
Remove extraneous withLabels argument 2019-10-11 20:00:00 -04:00
Max O'Cull
120457916a
Add username labels to map/minimap 2019-10-11 19:57:18 -04:00
Anuken
bd3463c824 Override locale names, fixes #757 2019-10-11 18:09:56 -04:00
Anuken
4e0d1b2746 Better mod crash logs 2019-10-11 16:08:14 -04:00
Anuken
4f7561d66c Compile fix 2019-10-11 09:18:21 -04:00
Anuken
a05ee8bbb8 Merge remote-tracking branch 'origin/master' 2019-10-11 09:15:30 -04:00
Anuken
21b7a0235b Attempting to fix github CI 2019-10-11 09:14:43 -04:00
키에르
f01e486edb DepositEvent first (#811)
* Update EventType.java

* Update InputHandler.java
2019-10-11 00:35:29 -04:00
Anuken
204332a76a Mobile input fixes 2019-10-10 22:13:45 -04:00
Anuken
80a4e67ddf Better replacement 2019-10-10 16:47:46 -04:00
Anuken
6e7baf42b1 Fixed encoding 2019-10-10 16:03:12 -04:00
Anuken
36a21e2443 Variant fixes 2019-10-10 09:13:12 -04:00
Anuken
720f7c0b0f Crash fix 2019-10-09 22:02:54 -04:00
Anuken
42d96fa356 Ignore constructor access modifiers 2019-10-09 21:34:37 -04:00
Anuken
534f770314 Block mod overwrite 2019-10-09 18:39:12 -04:00
Anuken
16eb069717 Fixed mod structural crash / Fixed input fragment disappearing 2019-10-09 17:36:57 -04:00
laohuaji233
d65f54c27b
Update bundle_zh_CN.properties 2019-10-10 00:01:33 +08:00
clfer
4a78a04168
Update bundle_fr.properties 2019-10-09 10:03:31 +02:00
Anuken
3a3c5e2304 Merge remote-tracking branch 'origin/master' 2019-10-08 21:30:55 -04:00
Anuken
31e4b2752f Various fixes 2019-10-08 21:27:37 -04:00
azureblue
b43db6035f Power Lasers Transparency (#778)
* Render each visible power link only once.

* Set power lasers opacity based on the setting

* Change power laser colors to work better with transparency

* Slightly reducing power laser width

* Change laser color to the original, minor refactoring

* Change power laser opacity setting label

* Add laser opacity setting text to bundles

* Remove "Show Power Lasers" setting as it's redundant (replaced by lasers opacity setting), changing default laser opacity setting to 100%

* Remove "setting.lasers.name" from other bundles
2019-10-08 19:32:00 -04:00
Anuken
295c922f0a Merge branches 'master' and 'new-planning-system' of https://github.com/Anuken/Mindustry 2019-10-08 19:03:18 -04:00
Anuken
a11ffbce66 Clearer mobile requests 2019-10-08 19:03:04 -04:00
Anuken
0ffa7bd0f5 Mobile input fixes 2019-10-08 19:01:04 -04:00
dase1353
eebfc2d6c5
Update bundle_zh_TW.properties 2019-10-08 08:55:13 +08:00
Anuken
a2dfa6368d Some mobile fixes 2019-10-07 20:52:50 -04:00
dase1353
3805497d71
Update bundle_zh_TW.properties 2019-10-08 08:46:45 +08:00
dase1353
a4ea062a83
Update bundle_zh_TW.properties 2019-10-08 08:37:44 +08:00
dase1353
e46daeed97
Update bundle_zh_TW.properties 2019-10-08 08:34:49 +08:00
Anuken
9fdc4a2c45 Delete old requests, pause building 2019-10-07 20:26:08 -04:00
azureblue
71fc20d971
fixing and improving translation, making letters case more consistent 2019-10-08 02:10:43 +02:00
Anuken
9aec61020d More usability improvements 2019-10-07 19:51:52 -04:00
clfer
c4cab3ed03 Update bundle_fr.properties - Integrate latest bundle.properties changes 2019-10-08 01:17:36 +02:00
Runi Arnsbjörnson
4bcd907f5b Update bundle_fr.properties - runiArnsbjornson update 2019-10-08 00:57:05 +02:00
Anuken
989e0d8fd1 Removal of drone requests 2019-10-07 17:17:01 -04:00
Patrick 'Quezler' Mounier
ddf31e82f6 Remove duplicate check for banned id (#792)
It already existed 2 if's up :)
2019-10-07 09:59:47 -04:00
Stephen Owen
5a749ac106
Converted Romaji to Kanji
somehow typed author '著者' in Romaji and wasn't auto corrected to kanji in this case 😰
2019-10-07 09:52:19 -04:00
Stephen Owen
5831576d21
Adds Japanese menu items for Mods
Adds Japanese menu content for Mods top level menu, and also mod menu items themselves
2019-10-07 09:49:40 -04:00
dase1353
df9ea97863
Update bundle_zh_TW.properties 2019-10-07 17:31:29 +08:00
Anuken
4315cb41f2 Various improvements 2019-10-06 23:03:02 -04:00
Anuken
335c1779ef Conduit autotile, cleanup 2019-10-06 17:30:11 -04:00
Anuken
20462b91d4 Major refactoring of building input in progress 2019-10-06 16:56:31 -04:00
osoitz
19afb81bf6
Update bundle_eu.properties 2019-10-06 16:22:02 +02:00
Amon-Senpai
a049b4faa6
Update bundle_de.properties
Corrected some words
2019-10-06 11:58:00 +02:00
dase1353
c554d791bb
Update bundle_zh_TW.properties 2019-10-06 17:23:00 +08:00
dase1353
01519e75a0
Update bundle_zh_TW.properties 2019-10-06 17:10:52 +08:00
PlayerBrasil13
b6396990ba
Update bundle_pt_BR.properties 2019-10-05 18:11:26 -03:00
PlayerBrasil13
bdd74bfcc3
Update bundle_pt_BR.properties 2019-10-05 18:09:14 -03:00
PlayerBrasil13
aaadca8287
Update bundle_pt_BR.properties 2019-10-05 18:08:42 -03:00
PlayerBrasil13
8873b2368f
Update bundle_pt_BR.properties
Made by:
@Predator127 /September#9140
@PlayerBrasil13  /PlayerBrasil13#6078
2019-10-05 17:44:31 -03:00
Anuken
c95fa25b60 Unlock bosses when defeated 2019-10-05 16:08:34 -04:00
Anuken
9e2ad3c642 Merge branches 'master' and 'zone-objectives' of https://github.com/Anuken/Mindustry 2019-10-05 16:06:57 -04:00
Anuken
a24321ae56 Mod cleanup 2019-10-05 16:05:54 -04:00
Anuken
4b99f7c819 Cleanup, bugfixes 2019-10-05 15:51:29 -04:00
Anuken
ae6925ccce Stop sounds on state change 2019-10-05 10:57:58 -04:00
dase1353
94a2ab23ba
Update bundle_zh_TW.properties 2019-10-05 19:09:11 +08:00
dase1353
b8c4f46630
Update bundle_zh_TW.properties 2019-10-05 19:06:15 +08:00
Anuken
e5c7d5dd2f Config banned blocks 2019-10-05 01:16:03 -04:00
Anuken
c1ff7812d8 Zone objective abstraction, cleanup 2019-10-05 00:21:48 -04:00
Kemal
66925bfc7f Merge branch 'master' of https://github.com/Tunacan427/Mindustry 2019-10-05 03:53:44 +03:00
Kemal
e8c7bd1d32 Some small changes to translation. 2019-10-05 03:53:35 +03:00
Anuken
1b93da20f4 Workshop map listing button 2019-10-04 19:43:26 -04:00
Anuken
edb0ece03b More mod content support 2019-10-04 19:14:45 -04:00
dase1353
12164098a6
Update bundle_zh_TW.properties 2019-10-05 03:13:06 +08:00
dase1353
48145e4e77
Update bundle_zh_TW.properties 2019-10-05 03:08:45 +08:00
Anuken
df3f23731b Workshop mod loading 2019-10-04 15:06:29 -04:00
Anuken
f7b6cea21b Fast color calculation 2019-10-03 22:32:25 -04:00
Anuken
8f0eefa97e Bug report link, proper minimap colors 2019-10-03 22:26:13 -04:00
Anuken
bc02d178ce Support for zones 2019-10-03 18:53:43 -04:00
clfer
3fb1f5f54a Update bundle_fr.properties - Integrate latest bundle.properties changes 2019-10-04 00:39:07 +02:00
clfer
335bfab746 Update bundle_fr.properties - Spelling, accent, wordings, spacing 2019-10-04 00:38:21 +02:00
clfer
2d4d943b61 Update bundle_fr.properties 2019-10-04 00:37:42 +02:00
Tunacan427
f06e5ed87f
Merge branch 'master' into master 2019-10-03 21:39:33 +03:00
Tunacan427
bd777e610f
Update contributors 2019-10-03 21:27:25 +03:00
azureblue
bdcccb0344
adding missing comma 2019-10-03 19:38:54 +02:00
Anuken
46f118db13 Added link to modding guide 2019-10-03 12:51:25 -04:00
azureblue
6d2a4d4d2b
more bundle_pl translation changes
Made a few more changes as I came across translations that were completely wrong.
2019-10-03 18:45:28 +02:00
Miguel de Dios Matias
8e0979020d Update the spanish strings. 2019-10-03 17:53:51 +02:00
Miguel de Dios Matias
7e11cd29e1 Updated and fixed some spanish translations and added empty lines and unstranslated lines from english (to keep the similar structure). 2019-10-03 17:38:49 +02:00
azureblue
6dc1a21cf0
fixing typo
Co-Authored-By: Draco <54777154+Dr4coDragon@users.noreply.github.com>
2019-10-03 16:51:19 +02:00
Anuken
92d7efeea2 Support for modded floors 2019-10-03 08:59:53 -04:00
Anuken
cce0040eaf why does this work 2019-10-02 23:17:06 -04:00
Anuken
3369de6bf7 Merge remote-tracking branch 'origin/master' 2019-10-02 23:09:51 -04:00
Anuken
532926a9e3 Mod reloading that works for some ridiculous reason? 2019-10-02 23:09:35 -04:00
PlayerBrasil13
9e9d2496ed Update bundle_pt_BR.properties (#735)
* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties
2019-10-02 21:29:59 -04:00
Anuken
89db08f4ed Fixed unit tests, server 2019-10-02 21:29:35 -04:00
Anuken
ffd4297b17 Mod corruption load warnings 2019-10-02 21:23:29 -04:00
Anuken
ec29bd3682 Custom sounds, mod sound loading 2019-10-02 21:03:56 -04:00
Anuken
76dbc1cca3 Fixed ore/editor icon generation 2019-10-02 20:25:33 -04:00
azureblue
f5b6e13a1c
Update bundle_pl.properties
Added some missing translations and made changes to existing ones (also changing some units name).
2019-10-03 00:51:35 +02:00
Anuken
e0ec9a047c Modded consumers 2019-10-02 14:44:18 -04:00
Anuken
7dfe2116fe
Update Logic.java 2019-10-02 09:57:17 -04:00
Anuken
525360f284
Update Control.java 2019-10-02 09:56:31 -04:00
Anuken
2db3060a03 Made content icon system more sane 2019-10-01 23:46:40 -04:00
Anuken
d9b8335e0e Block tech tree mods 2019-10-01 21:47:02 -04:00