Timmeey86
4cb72c1998
Resolved some of the power-related TODOs
2018-11-29 00:38:53 +01:00
Timmeey86
12ccc10e83
Restored SolarGenerator and adapted to new power system.
2018-11-28 23:56:11 +01:00
Timmeey86
ec631f3499
Changed test naming conventions as requested by Anuke
2018-11-28 23:54:26 +01:00
Anuken
75d2ea1519
Added build revision
2018-11-28 17:42:12 -05:00
Anuken
14e9a94061
Merge remote-tracking branch 'origin/master'
2018-11-28 17:24:26 -05:00
Anuken
d3284ab9f6
Chained block inventory scaling
2018-11-28 17:24:21 -05:00
Anuken
775df43470
Merge remote-tracking branch 'origin/master'
2018-11-28 14:00:57 -05:00
Anuken
e2e6024e8f
Pan tweak
2018-11-28 14:00:51 -05:00
elmenda452
d89b51f17d
Update bundle_es.properties ( #359 )
...
Just making another revision.
2018-11-28 13:22:36 -05:00
Anuken
aa626947ed
HUD cleanup
2018-11-28 13:14:54 -05:00
Baltazár Radics
630693d64e
Merge pull request #7 from Timmeey86/baltitenger
...
Adapted ItemLiquidGenerator to new power system
2018-11-28 17:14:19 +01:00
Anuken
f2be23274e
Crash fixes
2018-11-28 08:53:03 -05:00
Timmeey86
2972780bed
Initial Efficiency is now zero. Blocks display efficiency.
2018-11-28 13:19:52 +01:00
Timmeey86
cf3d2c3def
Fixed handling of item duration
2018-11-28 11:59:58 +01:00
Timmeey86
1f8751054c
Tested/fixed delta calculations
...
Tests now use a fixed delta of 0.5 to make sure calculations work with deltas different from 1.0
2018-11-28 11:04:08 +01:00
Anuken
cc90e6d479
b a l a n c i n g
2018-11-27 21:07:29 -05:00
Anuken
76dd3c86f2
Removed redundant sector mission display
2018-11-27 20:36:23 -05:00
Anuken
91468fa2f9
Style changes
2018-11-27 20:12:49 -05:00
Timmeey86
739219c57b
Finished first draft of ItemLiquidGenerator through TDD
2018-11-27 22:28:41 +01:00
Timmeey86
f56e1933a6
Fixed occassional crashes of Power Tests and continued TDD
2018-11-27 21:27:35 +01:00
Anuken
8e4aec9c4d
Merge remote-tracking branch 'origin/master'
2018-11-27 13:19:48 -05:00
Anuken
e6e29aaf1e
Team button layout fix
2018-11-27 13:19:44 -05:00
Prosta4okua
1ac5f54e9e
[СOMPLETE]Update Uk_ua bundle ( #328 )
...
* [WIP]Update Uk_ua bundle
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
2018-11-27 13:10:51 -05:00
Prosta4okua
bf983658c8
[COMPLETE]Close before 62 build ( #345 )
...
* [wip]Some changes from Xzimur
* Update bundle_ru.properties
Mine
* Update bundle_ru.properties
New UI / 8c437eb815
* Update bundle_ru.properties
* Update bundle_ru.properties
Разблокированные->разблоки\nрованные
* Update bundle_ru.properties
* Update bundle_ru.properties
Присоеди\nниться
* 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
* Update bundle_ru.properties
* Update bundle_ru.properties
2018-11-27 13:08:07 -05:00
Anuken
e17286eb9f
Player list fixes with teams
2018-11-27 13:00:34 -05:00
Anuken
19c17e96de
Mobile UI fixes
2018-11-27 12:31:45 -05:00
Anuken
b45368342d
Block config UI fixes
2018-11-27 09:29:28 -05:00
Timmeey86
11e071289b
Reorganized power tests ...
...
... and changed creation of fake tiles so update() implementations have all required dependencies
2018-11-27 08:51:19 +01:00
Anuken
dcea8ae64f
New UI
2018-11-26 22:47:54 -05:00
Baltazár Radics
c9480ef17d
Merge pull request #6 from Timmeey86/baltitenger
...
Merged most recent Anuken master into branch and fixed conflicts
2018-11-26 23:28:52 +01:00
Timmeey86
a9517096f9
Merged current Anuke master into branch
2018-11-26 23:25:24 +01:00
Timmeey86
fc3f03425e
Merge branch 'master' of https://github.com/baltitenger/Mindustry into baltitenger
2018-11-26 23:12:55 +01:00
Baltazár Radics
8d43046f13
Merge pull request #5 from Timmeey86/baltitenger
...
Fixed batteries / Added Tests / Fixed delta
2018-11-26 22:18:29 +01:00
Timmeey86
cd6880aff4
Merge branch 'master' of https://github.com/baltitenger/Mindustry into baltitenger
2018-11-26 21:59:25 +01:00
Anuken
ccefa45fb0
Atlas update
2018-11-26 13:23:56 -05:00
Anuken
b721d7a10f
Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations
...
# Conflicts:
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/src/io/anuke/mindustry/core/Renderer.java
# core/src/io/anuke/mindustry/entities/units/types/Drone.java
# core/src/io/anuke/mindustry/graphics/CacheLayer.java
# core/src/io/anuke/mindustry/world/blocks/Floor.java
2018-11-26 13:23:38 -05:00
Anuken
ef85d1d83e
Merge remote-tracking branch 'origin/master'
2018-11-26 12:40:28 -05:00
Anuken
d03ceb2a23
Bugfixes / Sorter item memory
2018-11-26 12:40:24 -05:00
VizardAlpha
90198be1cb
Updates bundle_fr_BE.properties ( #358 )
...
* Updates bundle_fr_BE.properties
* Updates bundle_fr_BE.properties
* Update bundle_fr_BE.properties
* Update bundle_fr_BE.properties
* Update bundle_fr_BE.properties
2018-11-26 12:34:01 -05:00
Timmeey86
f640494c1f
PowerGraph now handles delta
...
Also power bars are displayed for non-buffered consumers as well
2018-11-26 10:26:49 +01:00
Timmeey86
77b9feb765
More Tests and fixes
...
- Batteries will now get charged with no consumers
- Fixed stat display of power generators
2018-11-26 09:24:08 +01:00
Timmeey86
99139dfcca
Added unit tests for batteries...
...
...and fixed battery distribution until all tests passed
2018-11-26 08:58:16 +01:00
Anuken
a241f63ddc
Merge remote-tracking branch 'origin/master'
2018-11-25 22:55:18 -05:00
Anuken
70507258ae
Cleanup
2018-11-25 22:55:13 -05:00
beito
51a8144f49
Update Japanese translations ( #357 )
...
* 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
* Update Japanese translations
Improve and update for new changes
* Update Japanese
* Update Japanese translations
2018-11-25 22:54:46 -05:00
Anuken
54ad9ba243
Added fullscreen map screenshot
2018-11-25 20:43:45 -05:00
Anuken
a7f7a09418
Drone repair cleanup / Percentage-based repair
2018-11-25 16:34:31 -05:00
Anuken
44897fb371
Mobile chat fix / Turret balance / UI disable variable
2018-11-25 13:58:19 -05:00
Anuken
bb6a748167
Various bugfixes
2018-11-25 10:29:38 -05:00
DaGamerFiles
21f61d46da
Update bundle_in_ID.properties [INCOMPLETE]
...
Some fixes and translations from line 2 to line 130.
2018-11-25 17:47:22 +07:00