Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,709 Commits 4 Branches 180 Tags
761728ac438a05870b9dfcb3b1fc95c958be6db1
Commit Graph

2342 Commits

Author SHA1 Message Date
Timmeey86
761728ac43 Fixed the ConsumePower constructors which got mixed up at some point 2018-11-21 23:04:18 +01:00
Timmeey86
d8ddb9dc82 Merged the three ConsumePower classes into a single one 2018-11-21 22:55:53 +01:00
Timmeey86
405f153439 Reverted/Adapted blocks to new Consume interfaces 2018-11-21 21:54:43 +01:00
Timmeey86
f789a35901 Readded buffered and direct consumers as three classes 2018-11-21 20:07:05 +01:00
Timmeey86
558c89cc30 Finished first unit test (equal power input and output) and fixed bugs detected by it 2018-11-21 00:04:26 +01:00
Timmeey86
f561768c67 Handled compiler errors by either resolving them or commenting & adding a TODO 2018-11-20 22:33:36 +01:00
Timmeey86
f5b8d8a60c Fixed compiler errors/typos in PowerGraph 2018-11-19 22:11:11 +01:00
Baltazár Radics
8218cfc72c cleaned up PowerGraph 2018-11-19 22:00:45 +01:00
Baltazár Radics
6ba8a6a600 Added support for buffered power consumers 2018-11-18 23:47:03 +01:00
Baltazár Radics
377fb2329c Merge branch 'master' of github.com:Anuken/Mindustry 2018-11-18 23:26:10 +01:00
Baltazár Radics
285ee665ee rewritten PowerGraph 2018-11-18 23:12:54 +01:00
Prosta4okua
b09b03a427 [COMPLETE]Update bundle_ru.properties (#313) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-11-18 14:12:44 -05:00
Sonnicon
4ef2ede4cf Important comment repair. (#343) 2018-11-18 14:10:35 -05:00
LQ
ea87b958ef update zh_CN translations (#342) 
* Update bundle_zh_CN.properties

Add descriptions translate for zh_CN

* Update bundle_zh_CN.properties
 2018-11-18 09:46:13 -05:00
Anuken
d1d4f79973 Fixed ores appearing as 'air' 2018-11-17 18:01:08 -05:00
Anuken
2a3f7f8cb3 Bundle update 2018-11-17 17:08:31 -05:00
Anuken
7eaef11a84 Improved hover block system 2018-11-17 17:04:16 -05:00
Anuken
efe93d0117 Added tile selection view 2018-11-17 14:45:29 -05:00
Anuken
7d12e18b98 Merge remote-tracking branch 'origin/master' 2018-11-17 13:04:39 -05:00
Anuken
de6bca424f Re-added hacky power graph fix 2018-11-17 13:04:34 -05:00
Sonnicon
1251680a1c Fixed BlocksFragment categories row limit (#340) 2018-11-17 12:56:59 -05:00
William So
cd0e49914b Complete most of the Chinese translations (#338) 
* Update some Chinese translations

* Translate control guides

* Translate mission text, server text, and others

* Translate generic text

* Translate a lot of short strings

* Translate a bunch of mech strings

* Translate rest of the strings except mainly the descriptions

The descriptions will probably take 3 more days to translate. I will stop here now.

I will translate the rest later.
 2018-11-17 12:36:31 -05:00
beito
700e845727 Update Japanese translations (#337) 
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations

* Update Japanese

* Update Japanese
 2018-11-17 12:26:57 -05:00
Anuken
afec65eb56 New mobile text dialog / Cleanup / Minimap fix / Collision optimization 2018-11-17 11:13:59 -05:00
Anuken
d6661da0a7 Syncing enemy display 2018-11-17 00:04:11 -05:00
Anuken
6a5bf08d55 Implemented local server configs 2018-11-16 22:28:27 -05:00
Anuken
ca5db2bff8 Fixed bugs with waiting for players, world border 2018-11-16 18:17:24 -05:00
Anuken
658698ed2f Merge remote-tracking branch 'origin/master' 2018-11-16 17:28:47 -05:00
Anuken
7f391dacbd Fixed low-FPS movement getting broken 2018-11-16 17:28:42 -05:00
Timmeey86
90e0bf95d1 Negative power values will be fixed by reloading the map (#335) 2018-11-15 19:02:17 -05:00
Anuken
930bfb26f4 Merge remote-tracking branch 'origin/master' 2018-11-15 12:40:29 -05:00
Anuken
7e788f212a Additional fixes 2018-11-15 12:38:36 -05:00
Anuken
8f99530795 Fix for off-screen players and laggy interpolation 2018-11-15 12:37:07 -05:00
VizardAlpha
434af4b998 Updates bundle_fr_BE.properties (#333) 
* Updates bundle_fr_BE.properties

* Updates

* last update
 2018-11-15 10:50:21 -05:00
Anuken
a7c8526f3e Merge remote-tracking branch 'origin/master' 2018-11-14 23:46:37 -05:00
Anuken
459256e83a Slower unloader 2018-11-14 23:46:33 -05:00
beito
8dbfb87246 Add Japanese translations (#332) 
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations
 2018-11-14 14:12:41 -05:00
Anuken
9f97ed331b Various bugfixes / Updated uCore 2018-11-14 09:55:54 -05:00
Anuken
ee043e67a4 Probable crash fix 2018-11-13 22:43:10 -05:00
Anuken
6c3b449f74 Merge remote-tracking branch 'origin/master' 2018-11-13 18:51:38 -05:00
Anuken
536c6a7b2c Various bugfixes 2018-11-13 18:51:34 -05:00
Baramos666
e90e0fc615 update descriptions (#325) 2018-11-13 18:15:20 -05:00
VizardAlpha
b704121dcb Minor Update bundle_fr_BE.properties (#326) 2018-11-13 18:14:31 -05:00
Anuken
5e0886d744 Compile fix 2018-11-13 15:53:01 -05:00
Anuken
f819e4829b Writing of player nick bytes 2018-11-13 15:27:50 -05:00
Anuken
8873948e9e String encoding fix 2018-11-13 15:18:50 -05:00
Anuken
a25ea14436 Removed ancient comment 2018-11-13 14:49:58 -05:00
Anuken
1a922f05c1 Fixed sectors carrying over to multiplayer 2018-11-13 12:54:33 -05:00
elmenda452
e8268b1dab Update bundle_es.properties (#327) 
There wasn't much to translate, this is just a second check.
 2018-11-13 11:07:32 -05:00
Anuken
7a516930b1 Bugfixes of various kinds 2018-11-13 09:13:53 -05:00