Commit Graph

2119 Commits

Author SHA1 Message Date
Anuken
6ed4e2d946 Improved random recipe selection 2018-10-20 13:19:47 -04:00
Anuken
6b4242478f Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 11:52:02 -04:00
Anuken
ef5478279b Fixed 2 crashes 2018-10-20 11:48:59 -04:00
Anuken
62bb8bce1c Added missing imports 2018-10-20 11:44:19 -04:00
Anuken
f78abd61d4 Merge remote-tracking branch 'origin/master' 2018-10-20 11:39:05 -04:00
Anuken
209c6fa1c1 Merged in better multithreading 2018-10-20 11:39:00 -04:00
Anuken
6e3c600a49 Crash fix 2018-10-20 11:36:05 -04:00
Anuken
b1cda57174 Massively improved thread safety 2018-10-20 11:25:58 -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
Anuken
6be49f898c Removed onFirstBegin() 2018-10-19 23:20:04 -04:00
Anuken
59bc73656f Save file refactor / Changed sector size 2018-10-19 22:46:53 -04:00
Anuken
bed22f51b4 Updated sector unlocking 2018-10-19 16:23:01 -04:00
Anuken
c1362a02f3 Removed all references to size 2018-10-19 13:48:08 -04:00
Anuken
859a3cbe6e Fixed Java 10-related crash 2018-10-19 12:58:53 -04:00
Anuken
a6d82f44b3 Initial (broken) commit 2018-10-19 12:57:24 -04:00
키에르
e66e17a41a Fix font height (#253) 2018-10-19 10:01:09 -04:00
Anuken
cfa6d7080c Fixed font 2018-10-19 09:56:50 -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
74cf91f99e Fixed increased router storage / Fixed instant building after reload 2018-10-19 08:47:19 -04:00
Anuken
44479930df Fixed mobile mechs configuration / Block selection / Crash 2018-10-19 08:30:37 -04:00
Anuken
d68d2e9f30 Moved paused text details into bundle 2018-10-18 22:33:11 -04:00
Anuken
948c48ea23 Merge remote-tracking branch 'origin/master' 2018-10-18 21:57:19 -04:00
Anuken
a9ccf6ca42 Updated travis config / Fixed flying mech land effect 2018-10-18 21:57:13 -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
dd2c71fe61 Removed sandbox from shuffle list / duplicate maps / mobile mech pickup 2018-10-18 18:20:07 -04:00
Anuken
3b58d57e5c Fixed unlocks not clearing / Fixed map editor not updating 2018-10-18 16:58:57 -04:00
Anuken
cecf32e52e Fixed RTG generator not using items 2018-10-18 16:33:39 -04:00
Anuken
91a2dfab36 Fixed build block repair / Sectors in random maps / Editor unlocks 2018-10-18 16:31:15 -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
e3001b614e Fixed pathfinding through liquids / Switched overlay render layer 2018-10-18 00:02:12 -04:00
Anuken
6ecdef02ab Block break visual cleanup 2018-10-17 22:10:56 -04:00
Anuken
36903eb749 Fixed mission onBegin() being called many times 2018-10-17 17:35:33 -04:00
Anuken
f530c9514f Changed placement controls / Fixed complete sectors not resetting 2018-10-17 17:28:24 -04:00
Anuken
fdffa77bc5 Fixed mobile targeting / Removed 'transfer speed' / Buffed large nodes 2018-10-17 17:09:26 -04:00
Anuken
245dd39a60 Potentially fixed targeting issues 2018-10-17 14:01:18 -04:00
Anuken
4614aacc02 Fixed chat not clearing 2018-10-17 13:54:34 -04:00
Anuken
64ccdab90c Removed extra trace info (for now) 2018-10-17 13:41:25 -04:00
Anuken
02286b0c4e Fixed player build indicators, power void 2018-10-17 10:31:59 -04:00
Anuken
8e952a550b Fixed: map mirror / crashes / mech pads / player list / mobile placement 2018-10-17 10:20:58 -04:00
Anuken
a29f95194d Various fixes / Placement visual improvements 2018-10-17 00:36:43 -04:00
Anuken
0e5db49b93 Fixed missing blocks causing invalid map data error 2018-10-16 20:03:35 -04:00
Anuken
a2c29c0937 Removed tutorial ore post-generation / Updated uCore 2018-10-16 19:31:06 -04:00
Anuken
c318f05cfd Minor lightning visual change / Hid PvP mode on web 2018-10-16 17:46:44 -04:00