mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-25 02:15:37 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,483 Commits 4 Branches 160 Tags 2.3 GiB
b4b589bfc2
Commit Graph

2483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
b4b589bfc2 Removed unnecessary synchronization 2018-10-22 22:48:15 -04:00
Baltazár Radics
cb69eb7c0f Simplified power logic (#261) 
* Simplified power logic

* Made the requested changes
 2018-10-22 22:47:44 -04:00
Anuken
7d83cd89f2 Fixed breaking with multiblock being offseted 2018-10-22 22:21:22 -04:00
Anuken
b2dca0a34f Merge branch 'optimizations' of https://github.com/Anuken/Mindustry 2018-10-21 21:50:14 -04:00
Anuken
3bd73961d7 Merged inventory saving/loading, item-based capacity 2018-10-21 21:46:12 -04:00
Anuken
67f574b5d8 Storage graph inventory sharing 2018-10-21 19:49:32 -04:00
Anuken
f9b70a37aa Correct storage graphs 2018-10-21 17:20:08 -04:00
Anuken
d4047e1413 Fixed crash 2018-10-21 17:03:51 -04:00
Anuken
80f5b4c3b7 Crashy storage graph implementation 2018-10-21 17:02:37 -04:00
Anuken
4668a6d8c0 Implemented sector state network sync 2018-10-20 18:41:05 -04:00
Anuken
e6f076306f Merge branch 'rework-sectors' of https://github.com/Anuken/Mindustry 2018-10-20 17:36:56 -04:00
Anuken
b73dc127a3 Fixed enemy base generation 2018-10-20 17:36:07 -04:00
Anuken
8c8a2311d6 Fixed sector clear not resetting 0,0 2018-10-20 16:04:13 -04:00
Anuken
0555fb22ca Fixed pump crash 2018-10-20 14:09:00 -04:00
Anuken
85cde62039 Fixed phase weaver blink / Fixed item image offset (again) 2018-10-20 13:53:25 -04:00
Anuken
46a2648d15 Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 13:50:30 -04:00
Anuken
e55f6ecd6b Fixes to power system 2018-10-20 13:49:58 -04:00
Anuken
c71fee3fed Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 13:21:05 -04:00
Anuken
4d6c25c9d3 Fixed flying units blocking construction 2018-10-20 13:20:35 -04:00
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
83a5c3af8a Updated uCore with new threading changes 2018-10-20 11:41:10 -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
64bd306c6d Fixed crash 2018-10-20 09:02:29 -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
cb1f54aac4 Removed wiki link 2018-10-18 23:00:18 -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